From 21155dc6ca0997dbd385921992f92b2140c306a7 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 22 Jun 2015 23:09:14 -0500 Subject: [PATCH] Move show hidden and completed to menu Closes #273 --- .../activity/SortSelectionActivity.java | 13 +--------- .../astrid/activity/TaskListActivity.java | 22 +++++++++++++++- .../astrid/activity/TaskListFragment.java | 9 +++---- .../com/todoroo/astrid/core/SortHelper.java | 13 ++++++++-- .../tasks/widget/ScrollableViewsFactory.java | 11 ++------ src/main/res/layout/sort_selection_dialog.xml | 26 ------------------- src/main/res/menu/task_list_activity.xml | 11 ++++++++ src/main/res/values-ar/strings.xml | 3 --- src/main/res/values-bg-rBG/strings.xml | 3 --- src/main/res/values-ca/strings.xml | 3 --- src/main/res/values-cs/strings.xml | 3 --- src/main/res/values-da/strings.xml | 3 --- src/main/res/values-de/strings.xml | 3 --- src/main/res/values-el/strings.xml | 3 --- src/main/res/values-es/strings.xml | 3 --- src/main/res/values-fi/strings.xml | 3 --- src/main/res/values-fr/strings.xml | 3 --- src/main/res/values-it/strings.xml | 3 --- src/main/res/values-iw/strings.xml | 3 --- src/main/res/values-ja/strings.xml | 3 --- src/main/res/values-ko/strings.xml | 3 --- src/main/res/values-nb/strings.xml | 3 --- src/main/res/values-nl/strings.xml | 3 --- src/main/res/values-pl/strings.xml | 3 --- src/main/res/values-pt-rBR/strings.xml | 3 --- src/main/res/values-pt/strings.xml | 3 --- src/main/res/values-ru/strings.xml | 3 --- src/main/res/values-sk/strings.xml | 3 --- src/main/res/values-sl-rSI/strings.xml | 3 --- src/main/res/values-sv/strings.xml | 3 --- src/main/res/values-th/strings.xml | 2 -- src/main/res/values-tr/strings.xml | 3 --- src/main/res/values-uk/strings.xml | 3 --- src/main/res/values-zh-rCN/strings.xml | 3 --- src/main/res/values-zh-rTW/strings.xml | 3 --- src/main/res/values/keys.xml | 2 ++ src/main/res/values/strings-core.xml | 11 +------- src/main/res/values/strings.xml | 2 ++ 38 files changed, 54 insertions(+), 149 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java index 2629dd11f..84d1caca6 100644 --- a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java @@ -19,6 +19,7 @@ import com.todoroo.astrid.core.SortHelper; import org.tasks.R; import org.tasks.preferences.ActivityPreferences; +import org.tasks.preferences.Preferences; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastHoneycomb; @@ -47,12 +48,6 @@ public class SortSelectionActivity { if((flags & SortHelper.FLAG_REVERSE_SORT) > 0) { ((CheckBox) body.findViewById(R.id.reverse)).setChecked(true); } - if((flags & SortHelper.FLAG_SHOW_COMPLETED) > 0) { - ((CheckBox) body.findViewById(R.id.completed)).setChecked(true); - } - if((flags & SortHelper.FLAG_SHOW_HIDDEN) > 0) { - ((CheckBox) body.findViewById(R.id.hidden)).setChecked(true); - } if(!showDragDrop) { body.findViewById(R.id.sort_drag).setVisibility(View.GONE); @@ -126,12 +121,6 @@ public class SortSelectionActivity { if(((CheckBox)body.findViewById(R.id.reverse)).isChecked()) { flags |= SortHelper.FLAG_REVERSE_SORT; } - if(((CheckBox)body.findViewById(R.id.completed)).isChecked()) { - flags |= SortHelper.FLAG_SHOW_COMPLETED; - } - if(((CheckBox)body.findViewById(R.id.hidden)).isChecked()) { - flags |= SortHelper.FLAG_SHOW_HIDDEN; - } if(((RadioButton)body.findViewById(R.id.sort_drag)).isChecked()) { flags |= SortHelper.FLAG_DRAG_DROP; } diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 00e274d23..9b8fdf2f6 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -153,9 +153,19 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.task_list_activity, menu); TaskListFragment tlf = getTaskListFragment(); + MenuItem hidden = menu.findItem(R.id.menu_show_hidden); + if (preferences.getBoolean(R.string.p_show_hidden_tasks, false)) { + hidden.setChecked(true); + } + MenuItem completed = menu.findItem(R.id.menu_show_completed); + if (preferences.getBoolean(R.string.p_show_completed_tasks, false)) { + completed.setChecked(true); + } if (tlf instanceof GtasksListFragment) { menu.findItem(R.id.menu_clear_completed).setVisible(true); menu.findItem(R.id.menu_sort).setVisible(false); + hidden.setVisible(false); + completed.setVisible(false); } else if(tlf instanceof TagViewFragment) { menu.findItem(R.id.menu_tag_settings).setVisible(true); } else if(tlf.getFilter() instanceof CustomFilter && ((CustomFilter) tlf.getFilter()).getId() > 0) { @@ -443,7 +453,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList return true; case R.id.menu_sort: AlertDialog dialog = SortSelectionActivity.createDialog( - this, tlf.hasDraggableOption(), preferences, tlf, tlf.getSortFlags(), preferences.getSortMode()); + this, tlf.hasDraggableOption(), preferences, tlf, preferences.getSortFlags(), preferences.getSortMode()); dialog.show(); return true; case R.id.menu_tag_settings: @@ -451,6 +461,16 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList putExtra(TagViewFragment.EXTRA_TAG_DATA, getTaskListFragment().getActiveTagData()); }}, REQUEST_EDIT_TAG); return true; + case R.id.menu_show_hidden: + item.setChecked(!item.isChecked()); + preferences.setBoolean(R.string.p_show_hidden_tasks, item.isChecked()); + tlf.reconstructCursor(); + return true; + case R.id.menu_show_completed: + item.setChecked(!item.isChecked()); + preferences.setBoolean(R.string.p_show_completed_tasks, item.isChecked()); + tlf.reconstructCursor(); + return true; case R.id.menu_filter_settings: startActivityForResult(new Intent(this, FilterSettingsActivity.class) {{ putExtra(FilterSettingsActivity.TOKEN_FILTER, tlf.getFilter()); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index c5f3ead74..bcce16a80 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -688,8 +688,9 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel + Join.left(TaskAttachment.TABLE.as(FILE_METADATA_JOIN), Task.UUID.eq(Field.field(FILE_METADATA_JOIN + "." + TaskAttachment.TASK_UUID.name))) + filter.getSqlQuery(); + int sortFlags = SortHelper.setManualSort(preferences.getSortFlags(), isDraggable()); sqlQueryTemplate.set(SortHelper.adjustQueryForFlagsAndSort( - preferences, joinedQuery, getSortFlags(), preferences.getSortMode())); + preferences, joinedQuery, sortFlags, preferences.getSortMode())); String groupedQuery; if (sqlQueryTemplate.get().contains("GROUP BY")) { @@ -894,13 +895,9 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel return isInbox || isTodayFilter; } - public int getSortFlags() { - return SortHelper.setManualSort(preferences.getSortFlags(), isDraggable()); - } - @Override public void onSortSelected(int flags, int sort) { - boolean wasManualSort = SortHelper.isManualSort(getSortFlags()); + boolean wasManualSort = SortHelper.isManualSort(preferences.getSortFlags()); boolean manualSettingChanged = wasManualSort != SortHelper.isManualSort(flags); preferences.setSortFlags(flags); diff --git a/src/main/java/com/todoroo/astrid/core/SortHelper.java b/src/main/java/com/todoroo/astrid/core/SortHelper.java index cb7270220..52dc8e8b1 100644 --- a/src/main/java/com/todoroo/astrid/core/SortHelper.java +++ b/src/main/java/com/todoroo/astrid/core/SortHelper.java @@ -24,12 +24,21 @@ import org.tasks.preferences.Preferences; public class SortHelper { public static final int FLAG_REVERSE_SORT = 1; + + @SuppressWarnings("UnusedDeclaration") + @Deprecated public static final int FLAG_SHOW_COMPLETED = 1 << 1; + + @SuppressWarnings("UnusedDeclaration") + @Deprecated public static final int FLAG_SHOW_HIDDEN = 1 << 2; + @SuppressWarnings("UnusedDeclaration") @Deprecated public static final int FLAG_SHOW_DELETED = 1 << 3; + public static final int FLAG_DRAG_DROP = 1 << 4; + @SuppressWarnings("UnusedDeclaration") @Deprecated private static final int FLAG_SHOW_RECENTLY_COMPLETED = 1 << 5; @@ -59,14 +68,14 @@ public class SortHelper { } // flags - if((flags & FLAG_SHOW_COMPLETED) > 0) { + if (preferences.getBoolean(R.string.p_show_completed_tasks, false)) { originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(), Criterion.all.toString()); } else { originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(), Criterion.or(Task.COMPLETION_DATE.lte(0), Task.COMPLETION_DATE.gt(DateUtilities.now() - 60000)).toString()); } - if((flags & FLAG_SHOW_HIDDEN) > 0) { + if (preferences.getBoolean(R.string.p_show_hidden_tasks, false)) { originalSql = originalSql.replace(TaskCriteria.isVisible().toString(), Criterion.all.toString()); } diff --git a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java index 96418b7f3..58845005d 100644 --- a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java +++ b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java @@ -1,7 +1,6 @@ package org.tasks.widget; import android.annotation.TargetApi; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -13,12 +12,10 @@ import android.widget.RemoteViews; import android.widget.RemoteViewsService; import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.astrid.actfm.TagViewFragment; import com.todoroo.astrid.activity.TaskEditFragment; import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.data.Task; @@ -190,7 +187,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac } private TodorooCursor getCursor() { - String query = getQuery(context); + String query = getQuery(); return taskService.fetchFiltered(query, null, Task.ID, Task.TITLE, Task.DUE_DATE, Task.COMPLETION_DATE, Task.IMPORTANCE, Task.RECURRENCE); } @@ -199,11 +196,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac return new Task(cursor); } - private String getQuery(Context context) { - if (filter.isTagFilter()) { - ((FilterWithCustomIntent) filter).customTaskList = new ComponentName(context, TagViewFragment.class); // In case legacy widget was created with subtasks fragment - } - + private String getQuery() { int flags = preferences.getSortFlags(); int sort = preferences.getSortMode(); if(sort == 0) { diff --git a/src/main/res/layout/sort_selection_dialog.xml b/src/main/res/layout/sort_selection_dialog.xml index 3ebbceee6..88c6a785b 100644 --- a/src/main/res/layout/sort_selection_dialog.xml +++ b/src/main/res/layout/sort_selection_dialog.xml @@ -58,33 +58,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/SSD_sort_reverse" /> - - - - - - - - - - diff --git a/src/main/res/menu/task_list_activity.xml b/src/main/res/menu/task_list_activity.xml index 4ba57814c..b66edf07e 100644 --- a/src/main/res/menu/task_list_activity.xml +++ b/src/main/res/menu/task_list_activity.xml @@ -19,6 +19,17 @@ android:title="@string/TLA_menu_sort" android:icon="@drawable/ic_sort_white_24dp" app:showAsAction="ifRoom" /> + + + + نسخ المهمه حذف المهمة الغاء حذف المهمة - المهمات المخفية - عرض المهام المنجزه - عرض المهام المخفيه عرض المهام المحذوفة الترتيب الذكي بالعنوان diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 92da3aca2..f5deee12c 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -47,9 +47,6 @@ Изтрий задача Възстанови Задача Изчистване на задачите - Скрити задачи - Покажи завършени задачи - Покажи скрити задачи Покажи изтрити задачи Ръчно подреждане с подзадачи Умно сортиране diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index c80d74450..08f3b2b75 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -42,9 +42,6 @@ Suprimeix la tasca Recupera la tasca Purgar tasques - Tasques ocultes - Mostra les tasques completades - Mostra les tasques ocultes Mostra les tasques suprimides Ordre manual amb subtasques Classificació intel·ligent Tasks diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index cb6560388..b8b5303a1 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -44,9 +44,6 @@ Smazat úkol Obnovit úkol Smazat úkol - Skryté úkoly - Ukázat dokončené úkoly - Ukázat skryté úkoly Ukázat smazané úkoly Ručně nebo s podúkoly Chytré třídění diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 859af3dbc..2c98f30eb 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -38,9 +38,6 @@ Rediger Gendan opgave Ryd opgave - Skjulte opgaver - Vis færdiggjorte opgaver - Vis skjulte opgaver Vis slettede opgaver Manuel ordre med delopgaver Tasks Intelligent sortering diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index bed712e6b..35f677db7 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -43,9 +43,6 @@ Aufgabe löschen Aufgabe wiederherstellen Aufgabe endgültig löschen - Versteckte Aufgaben - Erledigte Aufgaben anzeigen - Versteckte Aufgaben anzeigen Gelöschte Aufgaben anzeigen Manuelle Sortierung mit Unteraufgaben Smarte Sortierung diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 03e2e63fc..1908da2fc 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -42,9 +42,6 @@ %s [διαγράφηκε] Επεξεργασία Αντιγραφή εργασίας - Κρυμμένα καθήκοντα - Εμφάνιση ολοκληρωμένων καθηκόντων - Εμφάνιση κρυμμένων καθηκόντων Εμφάνιση διεγραμμένων καθηκόντων Χειροκίνητη κατάταξη με υποκαθήκοντα Έξυπνη ταξινόμηση diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 9b0aa10d1..11b96fb5d 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -44,9 +44,6 @@ Eliminar tarea Restaurar Tarea Purgar Tareas - Tareas Ocultas - Mostrar tareas completadas - Mostrar tareas ocultas Mostrar tareas eliminadas Orden manual con subtareas Ordenación inteligente diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 33e43eea0..b5f6d5932 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -6,9 +6,6 @@ Valitse mitä Google tiliä haluat käyttää: - Piilota tehtävät - Näytä valmiit tehtävät - Näytä piilotetut tehtävät Näytä poistetut tehtävät Manuaalinen järjestys osatehtäviin Älykäs sorttaus diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 6d8d8db2d..528ff3f98 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -44,9 +44,6 @@ Supprimer la tâche Récupérer la tâche Purger la tâche - Tâches masquées - Afficher les tâches complétées - Afficher les tâches cachées Afficher les tâches supprimées Ordonner manuellement avec les sous-tâches Tri intelligent Tasks diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 87a253cd5..c3874b666 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -43,9 +43,6 @@ Elimina attività Ripristina Attività Elimina Attività - Attività Nascoste - Mostra Attività Collegate - Mostra Attività Nascoste Mostra Attività Cancellate Ordinamento Intelligente Per Titotlo diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 9caa5e9ec..edc208d77 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -44,9 +44,6 @@ מַחֲקֵי משימה בטלי מחיקת משימה אַיֵּן משימה - משימות מוסתרות - הצג משימות שבוצעו - הצג משימות מוסתרות הצג משימות שנמחקו סידור ידני עם תתי-משימות Tasks מיון חכם diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index d993c8aa0..6d18ee9d2 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -44,9 +44,6 @@ タスクを削除 元に戻す タスクを削除 - 非表示のタスク - 完了タスクの表示 - 非表示タスクの表示 削除済タスクの表示 サブタスクの手動設定順 自動 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index d16b9dcc2..c8ec506ea 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -47,9 +47,6 @@ 일정 지우기 일정 복구하기 일정 비우기 - 숨긴 일정 - 완료한 일정 보기 - 숨긴 일정 보기 지운 일정 보기 수동 정렬 (하위일정 포함) Tasks 스마트 정렬 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index a33e26593..ad22b3f0e 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -35,9 +35,6 @@ Slett oppgave Gjenopprett slettet oppgave Rens ut oppgave - Skjulte oppgaver - Vis fullførte oppgaver - Vis skjulte oppgaver Vis slettede oppgaver Tasks intelligent sortering Etter tittel diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 5ff76fec7..8d6d0cfd5 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -44,9 +44,6 @@ Taak wissen Taak herstellen Taak opruimen - Verborgen Taken - Voltooide taken weergeven - Verborgen taken weergeven Verwijderde taken weergeven Handmatige volgorde met subtaken Slim Sorteren diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 3514abcf9..37f8e99f6 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -44,9 +44,6 @@ Usuń zadanie Przywrócone zadanie Trwale usuń zadanie - Ukryte zadania - Pokaż ukończone zadania - Pokaż ukryte zadania Pokaż usunięte zadania Ręczne z podzadaniami Automatyczne diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 9da151335..81cef58b2 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -43,9 +43,6 @@ Excluir tarefa Restaurar tarefa Destruir tarefa - Tarefas ocultas - Exibir tarefas terminadas - Exibir tarefas ocultas Exibir tarefas excluídas Ordem manual com subtarefas Ordenação inteligente Tasks diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index d89e4c9f4..eb079c067 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -46,9 +46,6 @@ Eliminar tarefa Recuperar tarefa Remover tarefa - Tarefas ocultas - Mostrar Tarefas Completas - Mostrar tarefas ocultas Mostrar tarefas apagadas Ordem manual com subtarefas Ordenação Inteligente Tasks diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index e05825d5d..8d7707387 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -44,9 +44,6 @@ Удалить задачу Отменить удаление задачи Очистить задачу - Скрытые задачи - Показать завершённые задачи - Показать скрытые задачи Показать удалённые задачи Ручная сортировка с подзадачами Умная сортировка diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 1763f9285..c6b90eb23 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -44,9 +44,6 @@ Vymazať úlohu Nevymazať úlohu Vyčistiť úlohu - Skryté úlohy - Zobraziť dokončené úlohy - Zobraziť skryté úlohy Zobraziť vymazané úlohy Ručne alebo s pdúlohami Chytré triedenie diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index 43e92e81e..7572431cf 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -47,9 +47,6 @@ Zbriši opravek Razveljavi izbris opravka Očisti opravek - Skriti opravki - Prikaži dokončane opravke - Prikaži skrite opravke Prikaži zbrisane opravke Ročna nastavitev s podopravki Pametno razvrščanje diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index bc37d3ff1..ce3e22aa1 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -44,9 +44,6 @@ Radera uppgift Återställ raderad uppgift Rensa uppgift - Dolda uppgifter - Visa avslutade uppgifter - Visa dolda uppgifter Visa raderade uppgifter Manuell sortering med underuppgifter Tasks intelligent sortering diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml index 9aedbbb57..29e246602 100644 --- a/src/main/res/values-th/strings.xml +++ b/src/main/res/values-th/strings.xml @@ -23,8 +23,6 @@ Sort & Hidden แก้ไข แผนงานที่ลบไม่ได้ - แสดงแผนงานที่เสร็จแล้ว - แสดงแผนงานที่ซ่อนไว้ แสดงแผนงานที่ถูกลบ จัดเรียงด้วย Tasks Smart ตามชื่อ diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 6312a62d0..9f0e35e71 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -43,9 +43,6 @@ Görevi Sil Görevi Kurtar Görevi Temizle - Gizli Görevler - Tamamlanan Görevleri Göster - Gizli Görevleri Göster Silinmiş Görevleri Göster Tasks Akıllı Sıralama Başlığa göre diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 8034c187f..7d713c532 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -47,9 +47,6 @@ Видалити завдання Відмінити видалення завдання Очитстити завдання - Приховані завдання - Показати завершені завдання - Показати приховані завдання Показати видалені завдання Ручний порядок з підзадачами Розумне сортування diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index e8df7cfdb..07ffc75c6 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -43,9 +43,6 @@ 删除任务 未删除任务 清除任务 - 隐藏任务 - 显示已完成任务 - 显示隐藏的任务 显示已删除任务 清单小助理智能排序 按标题 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 1c1054b80..2158cd147 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -44,9 +44,6 @@ 刪除任務工作 還原工作刪除 清除工作 - 隱藏任務工作 - 顯示已完成工作 - 顯示隱藏的工作 顯示已刪除工作 Tasks智慧排序 依主旨 diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml index 588d277bb..7170e9553 100644 --- a/src/main/res/values/keys.xml +++ b/src/main/res/values/keys.xml @@ -243,6 +243,8 @@ geofence_responsiveness geofence_reminders_enabled show_deleted_tasks + show_hidden_tasks + show_completed_tasks @string/TEA_ctrl_when_pref diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml index f3236d144..9b89efbac 100644 --- a/src/main/res/values/strings-core.xml +++ b/src/main/res/values/strings-core.xml @@ -77,16 +77,7 @@ - - Hidden Tasks - - - Show completed tasks - - - Show hidden tasks - - + Show deleted tasks diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7a76bfec6..7cc09aaa3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -121,6 +121,8 @@ Delete Filter Settings This setting will be removed in a future update + Show hidden + Show completed