Merge branch 'master' into observable2call

28 files changed, 60 insertions, 30 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 5299633b2..7ef485dd1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,12 +72,11 @@ dependencies {
     def lifecycleVersion = "2.6.2"
     def roomVersion = "2.6.1"
     def glideVersion = "4.16.0"
-    def nextcloudCommonsVersion = "1.9.0"
-    def androidCommonsVersion = "0.4.0"
+    def nextcloudCommonsVersion = "2.0.1"
+    def androidCommonsVersion = "1.0.0"
 
     implementation project(path: ':cross-tab-drag-and-drop')
     implementation project(path: ':tab-layout-helper')
-    implementation project(path: ':reactive-livedata')
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
@@ -114,6 +113,7 @@ dependencies {
     }
     implementation "com.github.stefan-niedermann.android-commons:util:$androidCommonsVersion"
     implementation "com.github.stefan-niedermann.android-commons:shared-preferences:$androidCommonsVersion"
+    implementation "com.github.stefan-niedermann.android-commons:reactive-livedata:$androidCommonsVersion"
 
     // Custom Date / Time Picker for branding support
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java b/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java
index 4ac1b8f93..b54d3b5d6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java
@@ -33,8 +33,8 @@ public class Migration_20_21 extends Migration {
                 @ColorInt int color1;
                 @ColorInt int color2;
                 try {
-                    color1 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString1));
-                    color2 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString2));
+                    color1 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString1));
+                    color2 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString2));
                 } catch (Exception e) {
                     color1 = Color.GRAY;
                     color2 = Color.GRAY;
@@ -64,7 +64,7 @@ public class Migration_20_21 extends Migration {
 
                 @ColorInt int color1;
                 try {
-                    color1 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString1));
+                    color1 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString1));
                 } catch (Exception e) {
                     color1 = Color.GRAY;
                 }
@@ -98,7 +98,7 @@ public class Migration_20_21 extends Migration {
 
                 @ColorInt int color1;
                 try {
-                    color1 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString1));
+                    color1 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString1));
                 } catch (Exception e) {
                     color1 = Color.GRAY;
                 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
index 317557a61..b2fba2063 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
@@ -97,7 +97,7 @@ public class Board extends AbstractRemoteEntity implements Serializable {
 
     public void setColor(String color) {
         try {
-            setColor(Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(color)));
+            setColor(Color.parseColor(ColorUtil.formatColorToParsableHexString(color)));
         } catch (Exception e) {
             DeckLog.logError(e);
             setColor(Color.GRAY);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
index b065f411c..4555faccc 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
@@ -73,7 +73,7 @@ public class Label extends AbstractRemoteEntity implements Serializable {
 
     public void setColor(String color) {
         try {
-            setColor(Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(color)));
+            setColor(Color.parseColor(ColorUtil.formatColorToParsableHexString(color)));
         } catch (Exception e) {
             DeckLog.logError(e);
             setColor(Color.GRAY);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java
index 5c2a83dff..26327890c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java
@@ -585,7 +585,7 @@ public class JsonToEntityParser {
         String rawString = getNullAsEmptyString(element.get(field));
         try {
             if (!rawString.trim().isEmpty()) {
-                String colorAsString = ColorUtil.INSTANCE.formatColorToParsableHexString(rawString);
+                String colorAsString = ColorUtil.formatColorToParsableHexString(rawString);
                 return Color.parseColor(colorAsString);
             }
         } catch (Exception e) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java
index 635344d0b..0855ef71e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java
@@ -14,7 +14,7 @@ public class JsonColorSerializer extends TypeAdapter<Integer> {
         if (value == null) {
             out.nullValue();
         } else {
-            out.value(ColorUtil.INSTANCE.intColorToHexString(value));
+            out.value(ColorUtil.intColorToHexString(value));
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java
index 381a290e6..7a4d1a193 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java
@@ -23,7 +23,7 @@ public class ManageLabelsViewHolder extends RecyclerView.ViewHolder {
         binding.label.setText(label.getTitle());
         final int labelColor = label.getColor();
         binding.label.setChipBackgroundColor(ColorStateList.valueOf(labelColor));
-        final int color = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor);
+        final int color = ColorUtil.getForegroundColorForBackgroundColor(labelColor);
         binding.label.setTextColor(color);
         binding.delete.setOnClickListener((v) -> listener.requestDelete(label));
         binding.editText.setOnClickListener((v) -> listener.requestEdit(label));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
index 0af489781..0f0b91b6c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
@@ -98,7 +98,7 @@ public class LabelAutoCompleteAdapter extends AutoCompleteAdapter<Label> {
 
         final var label = getItem(position);
         final int labelColor = label.getColor();
-        final int color = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor);
+        final int color = ColorUtil.getForegroundColorForBackgroundColor(labelColor);
 
         if (label.getLocalId() == null) {
             binding.label.setText(String.format(context.getString(R.string.label_add, label.getTitle())));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
index f78edd3f7..fd1cf6115 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
@@ -32,7 +32,7 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder {
         itemView.setOnClickListener(View::showContextMenu);
         itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> {
             inflater.inflate(R.menu.activity_menu, menu);
-            menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.INSTANCE.copyToClipboard(context, activity.getSubject()));
+            menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(context, activity.getSubject()));
         });
         final var type = ActivityType.findById(activity.getType());
         setImageResource(binding.type, type);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java
index 7b00f2a84..977035940 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java
@@ -47,7 +47,7 @@ public abstract class AttachmentViewHolder extends RecyclerView.ViewHolder {
                 menu.findItem(android.R.id.copyUrl).setVisible(false);
             } else {
                 menu.findItem(android.R.id.copyUrl).setVisible(true);
-                menu.findItem(android.R.id.copyUrl).setOnMenuItemClickListener(item -> ClipboardUtil.INSTANCE.copyToClipboard(itemView.getContext(), attachment.getFilename(), attachmentUri));
+                menu.findItem(android.R.id.copyUrl).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(itemView.getContext(), attachment.getFilename(), attachmentUri));
             }
         });
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
index 7a4df435f..37e9497e4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
@@ -61,7 +61,7 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder {
         itemView.setOnClickListener(View::showContextMenu);
         itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> {
             inflater.inflate(R.menu.comment_menu, menu);
-            menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.INSTANCE.copyToClipboard(itemView.getContext(), comment.getComment().getMessage()));
+            menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(itemView.getContext(), comment.getComment().getMessage()));
             final var replyMenuItem = menu.findItem(R.id.reply);
             if (comment.getStatusEnum() != DBStatus.LOCAL_EDITED && account.getServerDeckVersionAsObject().supportsCommentsReplies()) {
                 replyMenuItem.setOnMenuItemClickListener(item -> {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
index d86f9361a..1c1f737a9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
@@ -278,7 +278,7 @@ public class CardDetailsFragment extends Fragment implements CardDueDateView.Due
         try {
             final int labelColor = label.getColor();
             chip.setChipBackgroundColor(ColorStateList.valueOf(labelColor));
-            final int color = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor);
+            final int color = ColorUtil.getForegroundColorForBackgroundColor(labelColor);
             chip.setTextColor(color);
 
             if (chip.getCloseIcon() != null) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
index 0e558fb85..b6fd5a484 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
@@ -37,14 +37,14 @@ public class ExceptionActivity extends AppCompatActivity {
         }
 
         final var adapter = new TipsAdapter(this::startActivity);
-        final String debugInfo = "Full Crash:\n\n" + ExceptionUtil.INSTANCE.getDebugInfos(this, throwable, BuildConfig.FLAVOR);
+        final String debugInfo = "Full Crash:\n\n" + ExceptionUtil.getDebugInfos(this, throwable, BuildConfig.FLAVOR);
 
         binding.tips.setAdapter(adapter);
         binding.tips.setNestedScrollingEnabled(false);
         binding.toolbar.setTitle(R.string.error);
         binding.message.setText(throwable.getMessage());
         binding.stacktrace.setText(debugInfo);
-        binding.copy.setOnClickListener((v) -> ClipboardUtil.INSTANCE.copyToClipboard(this, getString(R.string.simple_exception), "```\n" + debugInfo + "\n```"));
+        binding.copy.setOnClickListener((v) -> ClipboardUtil.copyToClipboard(this, getString(R.string.simple_exception), "```\n" + debugInfo + "\n```"));
         binding.close.setOnClickListener((v) -> finish());
 
         final var utils = ThemeUtils.defaultBrand(this);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
index a69ddf80e..54fa0912d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
@@ -53,7 +53,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
 
         final var adapter = new TipsAdapter((actionIntent) -> requireActivity().startActivity(actionIntent));
 
-        final String debugInfos = ExceptionUtil.INSTANCE.getDebugInfos(requireContext(), throwable, BuildConfig.FLAVOR, account == null ? null : account.getServerDeckVersion());
+        final String debugInfos = ExceptionUtil.getDebugInfos(requireContext(), throwable, BuildConfig.FLAVOR, account == null ? null : account.getServerDeckVersion());
 
         binding.tips.setAdapter(adapter);
         binding.stacktrace.setText(debugInfos);
@@ -66,7 +66,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
                 .setView(binding.getRoot())
                 .setTitle(R.string.error_dialog_title)
                 .setPositiveButton(android.R.string.copy, (a, b) -> {
-                    ClipboardUtil.INSTANCE.copyToClipboard(requireContext(), getString(R.string.simple_exception), "```\n" + debugInfos + "\n```");
+                    ClipboardUtil.copyToClipboard(requireContext(), getString(R.string.simple_exception), "```\n" + debugInfos + "\n```");
                     a.dismiss();
                 })
                 .setNegativeButton(R.string.simple_close, null)
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
index 0a8dadfa2..ef8ce7c4d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
@@ -86,7 +86,7 @@ public class FilterLabelsAdapter extends RecyclerView.Adapter<FilterLabelsAdapte
             binding.label.setText(label.getTitle());
             final int labelColor = label.getColor();
             binding.label.setChipBackgroundColor(ColorStateList.valueOf(labelColor));
-            final int textColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor);
+            final int textColor = ColorUtil.getForegroundColorForBackgroundColor(labelColor);
             binding.label.setTextColor(textColor);
             itemView.setSelected(selectedLabels.contains(label));
             applyTheme(color);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java
index fc5992b68..6ce29a27e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java
@@ -519,7 +519,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen
         utils.deck.themeEmptyContentView(binding.emptyContentViewBoards);
         utils.platform.colorNavigationView(binding.navigationView, false);
 
-        @ColorInt final int headerTextColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(accountColor);
+        @ColorInt final int headerTextColor = ColorUtil.getForegroundColorForBackgroundColor(accountColor);
         headerBinding.headerView.setBackgroundColor(accountColor);
         headerBinding.appName.setTextColor(headerTextColor);
         DrawableCompat.setTint(headerBinding.logo.getDrawable(), headerTextColor);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java
index c0ab59e75..95fffe567 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java
@@ -70,7 +70,7 @@ public class ShareProgressDialogFragment extends ThemedDialogFragment {
                 binding.errorReportButton.setOnClickListener((v) -> {
                     final StringBuilder debugInfos = new StringBuilder(exceptionsCount + " attachments failed to upload:");
                     for (Throwable t : exceptions) {
-                        debugInfos.append(ExceptionUtil.INSTANCE.getDebugInfos(requireContext(), t, BuildConfig.FLAVOR));
+                        debugInfos.append(ExceptionUtil.getDebugInfos(requireContext(), t, BuildConfig.FLAVOR));
                     }
                     ExceptionDialogFragment.newInstance(new UploadAttachmentFailedException(debugInfos.toString()), null)
                             .show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName());
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java
index d69ff2898..cd6a63a3d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java
@@ -45,7 +45,7 @@ public class LabelChip extends Chip {
             int labelColor = label.getColor();
             final var colorStateList = ColorStateList.valueOf(labelColor);
             setChipBackgroundColor(colorStateList);
-            setTextColor(ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor));
+            setTextColor(ColorUtil.getForegroundColorForBackgroundColor(labelColor));
         } catch (IllegalArgumentException e) {
             DeckLog.logError(e);
         }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 9d37fbf94..abdd52434 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -15,6 +15,7 @@
     <string name="simple_close">إغلاق</string>
     <string name="simple_filter">فلتر</string>
     <string name="simple_completed">مُكتمل</string>
+    <string name="simple_reset">إعادة التعيين</string>
     <string name="simple_discard">الغاء</string>
     <string name="simple_update">تحديث</string>
     <string name="simple_delete">حذف </string>
@@ -86,6 +87,7 @@
 
     <string name="label_clear_due_date">مسح حسب التاريخ </string>
     <string name="label_clear_done">غير مكتمل</string>
+    <string name="label_due_at">بسبب: %1$s</string>
     <string name="label_add">اضف %1$s</string>
 
     <string name="card_edit_details">التفاصيل</string>
@@ -181,6 +183,8 @@
     <string name="filter_no_due">لا تأريخ انجاز</string>
     <string name="filter_later">لاحقا</string>
 
+    <string name="filter_done_no_filter">الكل</string>
+    <string name="filter_done_done">مُكتمل</string>
     <string name="filter_done_undone">غير مكتمل</string>
 
     <string name="archived_cards">البطاقات المؤرشفة</string>
@@ -194,6 +198,8 @@
     <string name="filter_tags_title">الوسوم</string>
     <string name="filter_user_title">المستخدمين:</string>
     <string name="filter_duedate_title">تاريخ الانجاز</string>
+    <string name="filter_done_title">مُكتمل</string>
+
     <string name="action_board_dearchive">التراجع عن أرشفة اللوح</string>
     <string name="archived_boards">الالواح المؤرشفة</string>
 
diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index af980f43c..507156b12 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -87,6 +87,7 @@
 
     <string name="label_clear_due_date">Clear due date</string>
     <string name="label_clear_done">Not completed</string>
+    <string name="label_due_at">Due at: %1$s</string>
     <string name="label_add">Add %1$s</string>
 
     <string name="card_edit_details">Details</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 95b00d98c..ad5ffe303 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -15,6 +15,7 @@
     <string name="simple_close">Затваряне</string>
     <string name="simple_filter">Филтър</string>
     <string name="simple_completed">Завършен</string>
+    <string name="simple_reset">Възстановяване</string>
     <string name="simple_discard">Отхвърляне</string>
     <string name="simple_update">Обновяване</string>
     <string name="simple_delete">Изтриване</string>
@@ -173,6 +174,8 @@
     <string name="filter_no_due">Няма крайна дата</string>
     <string name="filter_later">По-късно</string>
 
+    <string name="filter_done_no_filter">Всички</string>
+    <string name="filter_done_done">Завършен</string>
     <string name="filter_done_undone">Незавършен</string>
 
     <string name="archived_cards">Архивирани карти</string>
@@ -186,6 +189,8 @@
     <string name="filter_tags_title">Етикети</string>
     <string name="filter_user_title">Потребители</string>
     <string name="filter_duedate_title">Крайна дата</string>
+    <string name="filter_done_title">Завършен</string>
+
     <string name="action_board_dearchive">Отмяна на архивирането на таблото</string>
     <string name="archived_boards">Архивирани табла</string>
 
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 4a8d62c73..dcefb3523 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -15,6 +15,7 @@
     <string name="simple_close">Tanca</string>
     <string name="simple_filter">Filtre</string>
     <string name="simple_completed">S\'ha completat</string>
+    <string name="simple_reset">Reinicialitza</string>
     <string name="simple_discard">Descarta\'l</string>
     <string name="simple_update">Actualitza</string>
     <string name="simple_delete">Eliminar</string>
@@ -171,6 +172,8 @@
     <string name="filter_no_due">Sense venciment</string>
     <string name="filter_later">Més tard</string>
 
+    <string name="filter_done_no_filter">Totes</string>
+    <string name="filter_done_done">S\'ha completat</string>
     <string name="filter_done_undone">No completat</string>
 
     <string name="archived_cards">Targetes arxivades</string>
@@ -184,6 +187,8 @@
     <string name="filter_tags_title">Etiquetes</string>
     <string name="filter_user_title">Usuaris</string>
     <string name="filter_duedate_title">Data de venciment</string>
+    <string name="filter_done_title">S\'ha completat</string>
+
     <string name="action_board_dearchive">Desfés l\'arxivament del tauler</string>
     <string name="archived_boards">Taulers arxivats</string>
 
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 44bc12faf..1a8afacbc 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -15,6 +15,7 @@
     <string name="simple_close">Zavřít</string>
     <string name="simple_filter">Filtr</string>
     <string name="simple_completed">Dokončeno</string>
+    <string name="simple_reset">Vrátit na výchozí</string>
     <string name="simple_discard">Zahodit</string>
     <string name="simple_update">Aktualizovat</string>
     <string name="simple_delete">Smazat</string>
@@ -177,6 +178,8 @@
     <string name="filter_no_due">Žádný termín</string>
     <string name="filter_later">Později</string>
 
+    <string name="filter_done_no_filter">Vše</string>
+    <string name="filter_done_done">Dokončeno</string>
     <string name="filter_done_undone">Nedokončeno</string>
 
     <string name="archived_cards">Archivované karty</string>
@@ -190,6 +193,8 @@
     <string name="filter_tags_title">Štítky</string>
     <string name="filter_user_title">Uživatelé</string>
     <string name="filter_duedate_title">Datum termínu</string>
+    <string name="filter_done_title">Dokončeno</string>
+
     <string name="action_board_dearchive">Vzít zpět archivaci tabule</string>
     <string name="archived_boards">Archivované tabule</string>
 
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 29b985f29..6b13fc350 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -15,6 +15,7 @@
     <string name="simple_close">Luk</string>
     <string name="simple_filter">Filter</string>
     <string name="simple_completed">Fuldført</string>
+    <string name="simple_reset">Nulstil</string>
     <string name="simple_discard">Kassér</string>
     <string name="simple_update">Opdatér</string>
     <string name="simple_delete">Slet</string>
@@ -154,6 +155,8 @@
     <string name="filter_no_due">Ingen forfaldsdato</string>
     <string name="filter_later">Senere</string>
 
+    <string name="filter_done_no_filter">Alle</string>
+    <string name="filter_done_done">Fuldført</string>
     <string name="filter_done_undone">Ikke afsluttet</string>
 
     <string name="archived_cards">Arkiverede kort</string>
@@ -164,6 +167,8 @@
     <string name="filter_tags_title">Tags</string>
     <string name="filter_user_title">Brugere</string>
     <string name="filter_duedate_title">Forfaldsdato</string>
+    <string name="filter_done_title">Fuldført</string>
+
     <string name="archived_boards">Arkiverede lister</string>
 
     <string name="error">Der skete en fejl</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 87cc25296..8c903d617 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -87,6 +87,7 @@
 
     <string name="label_clear_due_date">Fälligkeitsdatum entfernen</string>
     <string name="label_clear_done">Nicht fertiggestellt</string>
+    <string name="label_due_at">Fällig am: %1$s</string>
     <string name="label_add">%1$s hinzufügen</string>
 
     <string name="card_edit_details">Details</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c4e1f98b5..55d97df14 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -87,6 +87,7 @@
 
     <string name="label_clear_due_date">Borrar fecha de finalización</string>
     <string name="label_clear_done">No completado</string>
+    <string name="label_due_at">Caduca en: %1$s</string>
     <string name="label_add">Añadir %1$s</string>
 
     <string name="card_edit_details">Detalles</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2057f8b0c..7c35432d0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -36,7 +36,7 @@
     <string name="delete_board">Вилучити дошку</string>
     <string name="delete_something">Вилучити %1$s</string>
 
-    <string name="about">Про програму</string>
+    <string name="about">Про застосунок</string>
     <string name="about_version_title">Версія</string>
     <string name="about_version">Ви використовуєте%1$s</string>
     <string name="about_maintainer_title">Підтримка</string>
@@ -51,7 +51,7 @@
     <string name="about_translate_title">Перекласти</string>
     <string name="about_translate">Приєднуйтесь до команди Nextcloud на Transifex та допоможіть нам перекласти цей застосунок:%1$s</string>
     <string name="about_app_license_title">Ліцензія застосунку</string>
-    <string name="about_app_license">Ця програма ліцензована під GNU GENERAL PUBLIC LICENSE v3+.</string>
+    <string name="about_app_license">Цей застосунок ліцензовано ліцензією GNU GENERAL PUBLIC LICENSE v3+.</string>
     <string name="about_app_license_button">Переглянути ліцензію</string>
     <string name="about_icons_disclaimer_title">Значки</string>
     <string name="about_icons_disclaimer_app_icon">Для оригінального розміру піктограми див. %1$s.</string>
@@ -208,12 +208,12 @@
     <string name="error_dialog_title">От халепа!</string>
     <string name="error_dialog_tip_token_mismatch_retry">Спробуйте примусово закрити застосунок та наново запустити. Можливо, встановлено неправильне з\'єднання із застосунком Nextcloud.</string>
     <string name="error_dialog_tip_database_upgrade_failed">Не вдалося оновити базу даних. Будь ласка, повідомте про проблему, очистіть сховище даних для подальшого використання застосунку.</string>
-    <string name="error_dialog_tip_clear_storage">Ви можете очистити сховище, відкривши інформацію про програму та вибравши Пам’ять → Очистити пам’ять.</string>
+    <string name="error_dialog_tip_clear_storage">Ви можете очистити сховище, для цього відкрийте інформацію про застосунок та виберіть \"Пам’ять\" → \"Очистити пам’ять\".</string>
     <string name="error_dialog_tip_offline_no_internet">Схоже, ви намагаєтеся виконати синхронізацію без доступу до мережі.</string>
     <string name="error_dialog_tip_offline_connection_refused">Відмовлено у з\'єднанні. Будь ласка, перевірте, чи доступний ваш сервер з бравзера.</string>
     <string name="error_dialog_tip_offline_connection_timeout">З\'єднання розірвано. Будь ласка, перевірте доступ до мережі. Також, це може бути наслідком того, що сервер зай</string>
     <string name="error_dialog_tip_sync_only_on_wifi">Якщо ви увімкнете параметр \"Синхронізація тільки з Wi-Fi\", то синхронізація буде виконуватися лише за умови наявности з\'єднання через Wi-Fi.</string>
-    <string name="error_dialog_tip_files_delete_storage">Якщо примусове їх завершення не допомагає, спробуйте очистити сховище обох програм.</string>
+    <string name="error_dialog_tip_files_delete_storage">Якщо примусове їх завершення не допомагає, спробуйте очистити сховище даних обох застосунків.</string>
     <string name="error_dialog_timeout_toggle">Перевірте доступ до мережі. Часом може допомогти послідовне вимикання та вмикання мобільних даних або Wi-Fi.</string>
     <string name="error_dialog_check_server_logs">Виникла проблема з налаштуванням Nextcloud. Будь ласка, подивіться файли журналу сервера.</string>
     <string name="error_dialog_check_maintenance">Будь ласка, перевірте, чи ваш сервер Nextcloud наразі не перебуває в режимі обслуговування.</string>
@@ -227,7 +227,7 @@
     <string name="error_dialog_certificate">Ймовірно виникли проблеми з сертифікатом серверу. Перевірте всі записи у застосунку Nextcloud для отримання додаткової інформації.</string>
     <string name="error_dialog_unknown_error">Схоже, що ваша хмара Nextcloud не доступна. Будь ласка, перевірте з\'єднання з мережею, а також можливість встановити з\'єднання через бравзер.</string>
     <string name="error_action_open_deck_info">Відкрити інформацію про застосунок</string>
-    <string name="error_action_open_nextcloud_app">Відкрити програму Nextcloud</string>
+    <string name="error_action_open_nextcloud_app">Відкрити застосунок Nextcloud</string>
     <string name="error_action_open_network">Налаштування мережі</string>
     <string name="error_action_server_logs">Журнал сервера</string>
     <string name="error_action_open_in_browser">Відкрити у переглядачі</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 27c12bece..dc0bfd9d5 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -87,6 +87,7 @@
 
     <string name="label_clear_due_date">清除到期日期</string>
     <string name="label_clear_done">未完成</string>
+    <string name="label_due_at">到期日：%1$s</string>
     <string name="label_add">新增%1$s</string>
 
     <string name="card_edit_details">詳細資料</string>