From 2da3a6a3ff7fcca692063c48dbb7cfd12949d0c7 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 4 Nov 2016 17:49:11 -0500 Subject: [PATCH] Remove 'Undelete' context menu option --- .../astrid/activity/TaskListFragment.java | 43 ++++++------------- .../java/org/tasks/tasklist/ViewHolder.java | 3 -- src/main/res/values-ar/strings.xml | 1 - src/main/res/values-bg-rBG/strings.xml | 2 - src/main/res/values-ca/strings.xml | 2 - src/main/res/values-cs/strings.xml | 2 - src/main/res/values-da/strings.xml | 2 - src/main/res/values-de/strings.xml | 2 - src/main/res/values-el/strings.xml | 1 - src/main/res/values-es/strings.xml | 2 - src/main/res/values-fa/strings.xml | 1 - src/main/res/values-fi/strings.xml | 2 - src/main/res/values-fr/strings.xml | 2 - src/main/res/values-hu/strings.xml | 2 - src/main/res/values-it/strings.xml | 2 - src/main/res/values-iw/strings.xml | 2 - src/main/res/values-ja/strings.xml | 2 - src/main/res/values-ko/strings.xml | 2 - src/main/res/values-nb/strings.xml | 2 - src/main/res/values-nl/strings.xml | 2 - src/main/res/values-pl/strings.xml | 2 - src/main/res/values-pt-rBR/strings.xml | 2 - src/main/res/values-pt/strings.xml | 2 - src/main/res/values-ru/strings.xml | 2 - src/main/res/values-sk/strings.xml | 2 - src/main/res/values-sl-rSI/strings.xml | 2 - src/main/res/values-sv/strings.xml | 2 - src/main/res/values-th/strings.xml | 1 - src/main/res/values-tr/strings.xml | 2 - src/main/res/values-uk/strings.xml | 2 - src/main/res/values-zh-rCN/strings.xml | 2 - src/main/res/values-zh-rTW/strings.xml | 2 - src/main/res/values/strings.xml | 6 --- 33 files changed, 13 insertions(+), 95 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 457ef270b..2a5ee033d 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -104,7 +104,6 @@ public class TaskListFragment extends InjectingFragment implements private static final int CONTEXT_MENU_COPY_TASK_ID = R.string.TAd_contextCopyTask; private static final int CONTEXT_MENU_DELETE_TASK_ID = R.string.TAd_contextDeleteTask; - private static final int CONTEXT_MENU_UNDELETE_TASK_ID = R.string.TAd_contextUndeleteTask; // --- instance variables @@ -498,12 +497,8 @@ public class TaskListFragment extends InjectingFragment implements int id = (int) task.getId(); menu.setHeaderTitle(task.getTitle()); - if (task.isDeleted()) { - menu.add(id, CONTEXT_MENU_UNDELETE_TASK_ID, Menu.NONE, R.string.TAd_contextUndeleteTask); - } else { - menu.add(id, CONTEXT_MENU_COPY_TASK_ID, Menu.NONE, R.string.TAd_contextCopyTask); - menu.add(id, CONTEXT_MENU_DELETE_TASK_ID, Menu.NONE, R.string.TAd_contextDeleteTask); - } + menu.add(id, CONTEXT_MENU_COPY_TASK_ID, Menu.NONE, R.string.TAd_contextCopyTask); + menu.add(id, CONTEXT_MENU_DELETE_TASK_ID, Menu.NONE, R.string.TAd_contextDeleteTask); } /** Show a dialog box and delete the task specified */ @@ -580,29 +575,17 @@ public class TaskListFragment extends InjectingFragment implements long itemId; switch (item.getItemId()) { - // --- context menu items - - case CONTEXT_MENU_COPY_TASK_ID: - itemId = item.getGroupId(); - duplicateTask(itemId); - return true; - case CONTEXT_MENU_DELETE_TASK_ID: { - itemId = item.getGroupId(); - Task task = taskDao.fetch(itemId, Task.ID, Task.TITLE, Task.UUID); - if (task != null) { - deleteTask(task); - } - return true; - } - case CONTEXT_MENU_UNDELETE_TASK_ID: { - itemId = item.getGroupId(); - Task task = new Task(); - task.setId(itemId); - task.setDeletionDate(0L); - taskDao.save(task); - loadTaskListContent(); - return true; - } + case CONTEXT_MENU_COPY_TASK_ID: + itemId = item.getGroupId(); + duplicateTask(itemId); + return true; + case CONTEXT_MENU_DELETE_TASK_ID: + itemId = item.getGroupId(); + Task task = taskDao.fetch(itemId, Task.ID, Task.TITLE, Task.UUID); + if (task != null) { + deleteTask(task); + } + return true; default: return super.onOptionsItemSelected(item); } diff --git a/src/main/java/org/tasks/tasklist/ViewHolder.java b/src/main/java/org/tasks/tasklist/ViewHolder.java index 2ff1e0e45..3d2659442 100644 --- a/src/main/java/org/tasks/tasklist/ViewHolder.java +++ b/src/main/java/org/tasks/tasklist/ViewHolder.java @@ -171,9 +171,6 @@ public class ViewHolder extends RecyclerView.ViewHolder { String nameValue = task.getTitle(); long hiddenUntil = task.getHideUntil(); - if(task.getDeletionDate() > 0) { - nameValue = context.getResources().getString(R.string.TAd_deletedFormat, nameValue); - } if(hiddenUntil > DateUtilities.now()) { nameValue = context.getResources().getString(R.string.TAd_hiddenFormat, nameValue); } diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index c90073c18..0a62efca8 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -24,7 +24,6 @@ تعديل نسخ المهمه حذف المهمة - الغاء حذف المهمة الترتيب الذكي بالعنوان بواسطة التعديل الأخير diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 5209d2431..8f7600eec 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -38,12 +38,10 @@ Търсене Настройки %s [скрито] - %s [изтрити] Приключена\n%s Редактирай Копирай задача Изтрий задача - Възстанови Задача Ръчно подреждане с подзадачи Умно сортиране По име diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 29d168d48..689aba16a 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -26,12 +26,10 @@ Cerca Paràmetres %s [ocult] - %s [eliminat] Acabat fa\n%s Edita Copia la tasca Suprimeix la tasca - Recupera la tasca Ordre manual amb subtasques Classificació intel·ligent Tasks Per títol diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index e347301a6..95dd10ce6 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -30,12 +30,10 @@ Hledat Nastavení %s [skrytý] - %s [smazán] Dokončeno\n%s Upravit Kopírovat úkol Smazat úkol - Obnovit úkol Ručně nebo s podúkoly Chytré třídění Podle názvu diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index b448e2580..93dcc7f60 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -26,9 +26,7 @@ Sorter & skjulte Opsætning %s [skjult] - %s [slettet] Rediger - Gendan opgave Manuel ordre med delopgaver Tasks Intelligent sortering Efter titel diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 7bb111479..ff08e37ee 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -33,12 +33,10 @@ Suchen Einstellungen %s [versteckt] - %s [gelöscht] Abgeschlossen\n%s Bearbeiten Aufgabe kopieren Aufgabe löschen - Aufgabe wiederherstellen Manuelle Sortierung mit Unteraufgaben Smarte Sortierung Nach Titel diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 933cdd33e..512b2e83f 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -31,7 +31,6 @@ Αναζήτηση Ρυθμίσεις %s [κρυφό] - %s [διαγράφηκε] Επεξεργασία Αντιγραφή εργασίας Χειροκίνητη κατάταξη με υποκαθήκοντα diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 6ae87b28e..a0b964b74 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -35,12 +35,10 @@ Buscar Configuración %s [oculto] - %s [borrado] Terminado\n%s Editar Copiar tarea Eliminar tarea - Restaurar Tarea Orden manual con subtareas Ordenación inteligente Por título diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index a47e997f3..f322dc936 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -28,7 +28,6 @@ ویرایش کپی وظایف حذف وظیفه - بازگرداندن وظیفه حذف شده چینش دستی بهمراه زیروظایف چینش هوشمندانه براساس موضوع diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index c54480e2e..4c42cb3ca 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -38,12 +38,10 @@ Etsi Asetukset %s (piilotettu) - %s (poistettu) Lopetettu\n%s Muokkaa Kopio tehtävä Poista Tasks - Kumoa Tasks poisto Manuaalinen järjestys osatehtäviin Älykäs sorttaus Otsikoittain diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 272b849f5..beb57bb67 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -35,12 +35,10 @@ Rechercher Paramètres %s [masqué(e)] - %s [supprimé(e)] Accomplie\n%s Modifier Copier la tâche Supprimer la tâche - Récupérer la tâche Ordonner manuellement avec les sous-tâches Tri intelligent Tasks Par titre diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 36038bf42..456c4b5fc 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -38,12 +38,10 @@ Keresés Beállítások %s [rejtett] - %s [törölve] Befejezve\n%s Szerkesztés Feladat másolása Feladat törlése - Feladat törlésének visszavonása Manuális sorrend részfeladatokkal Intelligens rendezés Név alapján diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 537b26507..46070ee59 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -35,12 +35,10 @@ Cerca Impostazioni %s [Nascosto] - %s [eliminato] Terminata\n%s Modifica Copia Attività Elimina attività - Ripristina Attività Ordinamento manuale con attività correlate Ordinamento Intelligente Per Titotlo diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 4e1d726aa..6a7eb24af 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -35,12 +35,10 @@ חיפוש הגדרות %s [מוסתרת] - %s [נמחקה] הסתיימה\n%s עריכה העתק משימה מַחֲקֵי משימה - בטלי מחיקת משימה סידור ידני עם תתי-משימות מיון חכם ע״פ כותרת diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index d01bf7abe..37bd8b6d8 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -35,12 +35,10 @@ 検索 設定 %s [非表示] - %s [削除済] %s\nに完了 編集する タスクをコピー タスクを削除 - 元に戻す サブタスクの手動設定順 自動 タイトル順 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 7b5c13b6e..201e88dce 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -38,12 +38,10 @@ 검색 설정 %s [숨김] - %s [지움] 일정 완료\n%s 편집 일정 복사하기 일정 지우기 - 일정 복구하기 수동 정렬 (하위일정 포함) Tasks 스마트 정렬 제목 순서 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 008422d85..cd07bd62f 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -24,11 +24,9 @@ Sorter & Skjult Innstillinger %s [skjult] - %s [slettet] Rediger Kopier oppgave Slett oppgave - Gjenopprett slettet oppgave Tasks intelligent sortering Etter tittel Etter forfallsdato diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 94b40cfe1..9cb0b94e7 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -35,12 +35,10 @@ Zoek Instellingen %s [verborgen] - %s [verwijderd] Afgerond\n%s Bewerken Taak kopiëren Taak wissen - Taak herstellen Handmatige volgorde met subtaken Slim Sorteren Op titel diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index beb06c60b..f530ac566 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -35,12 +35,10 @@ Szukaj Ustawienia %s [ukryte] - %s [usunięte] Ukończono\n%s Edytuj Kopiuj zadanie Usuń zadanie - Przywróć zadanie Ręczne z podzadaniami Automatyczne Wg tytułu diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index e9b6f815e..482ca954e 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -30,12 +30,10 @@ Buscar Configurações %s [oculta] - %s [excluída] Concluída\n%s Editar Copiar tarefa Excluir tarefa - Restaurar tarefa Ordem manual com subtarefas Ordenação inteligente Tasks Por título diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 2e7ae6f5c..fd090d506 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -33,12 +33,10 @@ Procura Definições %s [oculta] - %s [eliminada] Terminada\n%s Editar Copiar tarefa Eliminar tarefa - Recuperar tarefa Ordem manual com subtarefas Ordenação Inteligente Tasks Por Título diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index b04680fef..11d2b6193 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -35,12 +35,10 @@ Поиск Настройки %s [скрыто] - %s [удалено] Завершено\n%s Редактировать Копировать задачу Удалить задачу - Отменить удаление задачи Ручная сортировка с подзадачами Умная сортировка По названию diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index bb4263951..bd025c8c3 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -30,12 +30,10 @@ Hľadať Nastavenia %s [skryté] - %s [vymazané] Dokončené\n%s Upraviť Kopírovať úlohu Vymazať úlohu - Nevymazať úlohu Ručne alebo s pdúlohami Chytré triedenie Podľa názvu diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index 94f12e2de..895bdbb13 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -31,12 +31,10 @@ Iskanje Nastavitve %s [skrit] - %s [zbrisan] Opravljen\n%s Uredi Naredi kopijo opravka Zbriši opravek - Razveljavi izbris opravka Ročna nastavitev s podopravki Pametno razvrščanje Po naslovu diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index eca5a806d..246ac17f4 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -35,12 +35,10 @@ Sök Inställningar %s [dold] - %s [raderad] Avslutad\n%s Redigera Kopiera uppgift Radera uppgift - Återställ raderad uppgift Manuell sortering med underuppgifter Tasks intelligent sortering Efter titel diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml index a972c1060..58d309b17 100644 --- a/src/main/res/values-th/strings.xml +++ b/src/main/res/values-th/strings.xml @@ -16,7 +16,6 @@ คลิก เพื่อตั้งค่า Sort & Hidden แก้ไข - แผนงานที่ลบไม่ได้ จัดเรียงด้วย Tasks Smart ตามชื่อ ตามความสำคัญ diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 202854245..7c92b1415 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -27,12 +27,10 @@ Ara Ayarlar %s [gizli] - %s [silinmiş] Bitti\n%s Düzenle Görevi Kopyala Görevi Sil - Görevi Kurtar Tasks Akıllı Sıralama Başlığa göre Bitiş Tarihine Göre diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 15ffa241c..460e15f99 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -38,12 +38,10 @@ Пошук Налаштування %s [приховано] - %s [видалено] Завершено\n%s Редагувати Копіювати завдання Видалити завдання - Відмінити видалення завдання Ручний порядок з підзадачами Розумне сортування За назвою diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 77fb1b4d7..bdb1cf988 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -32,12 +32,10 @@ 搜索 设置 %s [已隐藏] - %s [已删除] 完成\n%s 项 编辑 复制任务 删除任务 - 未删除任务 清单小助理智能排序 按标题 按到期日 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index ebe7950ba..815892cf0 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -28,12 +28,10 @@ 搜索 設定 %s [隱藏] - %s [刪除] %s\n完成 編輯 複製任務工作 刪除任務工作 - 還原工作刪除 Tasks智慧排序 依主旨 依到期日 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8f1f1ca82..c4804b5c9 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -105,9 +105,6 @@ File %1$s contained %2$s.\n\n %s [hidden] - - %s [deleted] - Finished\n%s @@ -120,9 +117,6 @@ File %1$s contained %2$s.\n\n Delete Task - - Undelete Task -