diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt index 1c2609c7..a92afd90 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt @@ -30,23 +30,19 @@ class SortChecklistDialog(private val activity: SimpleActivity, val callback: (C ChecklistSortDirection.DESCENDING -> sort_direction_desc.id } ) - - separate_done_from_undone.isChecked = config.checklistSeparateDoneFromUndone } AlertDialog.Builder(activity) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this, R.string.sort_checklist) { + activity.setupDialogStuff(view, this, R.string.sort_by) { getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { val sortField = getSortField(view) val sortDirection = getSortDirection(view) - val separateDoneFromUndone = view.separate_done_from_undone.isChecked config.checklistSortField = sortField config.checklistSortDirection = sortDirection - config.checklistSeparateDoneFromUndone = separateDoneFromUndone - callback.invoke(ChecklistSort(sortField, sortDirection, separateDoneFromUndone)) + callback.invoke(ChecklistSort(sortField, sortDirection)) dismiss() } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt index e93ae04f..0a43f586 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt @@ -3,7 +3,6 @@ package com.simplemobiletools.notes.pro.models data class ChecklistSort( val field: ChecklistSortField, val direction: ChecklistSortDirection, - val separateDoneFromUndone: Boolean, ) { fun getSortComparator(): Comparator { @@ -15,10 +14,8 @@ data class ChecklistSort( private fun compareWithSortDirection(compareFunc: (ChecklistItem) -> Comparable<*>): Comparator { return when (direction) { - ChecklistSortDirection.ASCENDING -> if (separateDoneFromUndone) compareBy({ it.isDone }, compareFunc) else compareBy(compareFunc) - ChecklistSortDirection.DESCENDING -> if (separateDoneFromUndone) compareByDescending { it.isDone }.thenByDescending(compareFunc) else compareByDescending( - compareFunc - ) + ChecklistSortDirection.ASCENDING -> compareBy(compareFunc) + ChecklistSortDirection.DESCENDING -> compareByDescending(compareFunc) } } } diff --git a/app/src/main/res/layout/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml index 2d077d97..8824a9c1 100644 --- a/app/src/main/res/layout/dialog_sort_checklist.xml +++ b/app/src/main/res/layout/dialog_sort_checklist.xml @@ -8,17 +8,11 @@ android:paddingTop="@dimen/small_margin" android:paddingEnd="@dimen/activity_margin"> - - + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/medium_margin"> - + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/medium_margin"> - - - diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index 9bb77520..c030a9d5 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -44,7 +44,7 @@ إضافة عناصر قائمة تدقيق جديدة قائمة التدقيق فارغة Remove done items - Sort direction - Separate done items from undone items - Sort checklist تصدير جميع الملاحظات كملفات diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index d8549fe1..c9131657 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -63,9 +63,6 @@ Add new checklist items The checklist is empty Remove done items - Sort direction - Separate done items from undone items - Sort checklist Bütün qeydləri fayl şəklində çıxar diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 844f5fb9..f47471a4 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -63,9 +63,6 @@ Přidat do seznamu nové položky Seznam položek je prázdný Remove done items - Sort direction - Separate done items from undone items - Sort checklist Exportovat všechny poznámky jako soubory diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 2bba92d8..00f5b5ec 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -63,9 +63,6 @@ Ychwanegu eitemau newydd at restr wirio Mae\'r rhestr wirio yn wag Remove done items - Sort direction - Separate done items from undone items - Sort checklist Allforio pob nodyn fel ffeil diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 40cc7546..e5ffab98 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -63,9 +63,6 @@ Føj nye punkter til tjeklisten Tjeklisten er tom Remove done items - Sort direction - Separate done items from undone items - Sort checklist Eksporter alle noter som filer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ed6510a3..591c9381 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -63,9 +63,6 @@ Neue Checklisteneinträge hinzufügen Die Checkliste ist leer Abgeschlossene Einträge entfernen - Sort direction - Separate done items from undone items - Sort checklist Alle Notizen als Dateien exportieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2834079e..02541e75 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -63,9 +63,6 @@ Προσθήκη νέων στοιχείων λίστας ελέγχου Η λίστα ελέγχου είναι κενή Κατάργηση ολοκληρωμένων στοιχείων - Sort direction - Separate done items from undone items - Sort checklist Εξαγωγή όλων των σημειώσεων ως αρχεία diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2425641b..bf61b2b4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -63,9 +63,6 @@ Añadir nuevos ítems a la lista La lista está vacía Borrar ítems completados - Sort direction - Separate done items from undone items - Sort checklist Exportar todas las notas como archivos diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index c05d0a39..4820b27d 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -63,9 +63,6 @@ افزودن موارد به فهرست نشان‌دار فهرست نشان‌دار خالی است پاک کردن موارد انجام شده - Sort direction - Separate done items from undone items - Sort checklist برون‌ریزی همه یادداشت‌ها به عنوان پرونده diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9ad8707f..735fceda 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -63,9 +63,6 @@ Lisää uusia kohtia muistilistaan Muistilista on tyhjä Poista tehdyt kohdat - Sort direction - Separate done items from undone items - Sort checklist Vie kaikki muistiinpanot tiedostoina diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 753ec85a..69422ab7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -63,9 +63,6 @@ Ajouter de nouveaux éléments La checklist est vide Supprimer les items cochés - Sort direction - Separate done items from undone items - Sort checklist Exporter toutes les notes en tant que fichiers diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index bc09a171..b88b2722 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -63,9 +63,6 @@ Engadir elementos a unha nova lista de verificación A lista de verificación está baleira Remove done items - Sort direction - Separate done items from undone items - Sort checklist Exportar todas as notas como ficheiros diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index cf8f62f1..10c700cc 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -63,9 +63,6 @@ Dodajte nove stavke na spisak Spisak je prazan Remove done items - Sort direction - Separate done items from undone items - Sort checklist Izvezi sve bilješke kao datoteke diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index ea6c5bb7..262f3179 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -63,9 +63,6 @@ Add new checklist items The checklist is empty Remove done items - Sort direction - Separate done items from undone items - Sort checklist Export all notes as files diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index cbfe2c5b..0d25bf0e 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -63,9 +63,6 @@ Tambah item checklist baru Checklist kosong Remove done items - Sort direction - Separate done items from undone items - Sort checklist Ekspor semua catatan ke berkas diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cbfe2c5b..0d25bf0e 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -63,9 +63,6 @@ Tambah item checklist baru Checklist kosong Remove done items - Sort direction - Separate done items from undone items - Sort checklist Ekspor semua catatan ke berkas diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 58fb7a5f..0143d4fe 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -63,9 +63,6 @@ Aggiungi nuovi elementi La scaletta è vuota Remove done items - Sort direction - Separate done items from undone items - Sort checklist Esporta le note come file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 790a8a31..f15392f3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -63,9 +63,6 @@ 新しいチェックリスト項目を追加 チェックリストが空です Remove done items - Sort direction - Separate done items from undone items - Sort checklist すべてのメモをファイルとしてエクスポート diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 2d586ff8..e44f0a9c 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -68,9 +68,6 @@ Eksportuoti visus užrašus kaip bylas Importuoti keletą bylų, kaip užrašus Importuoti aplanką - Sort direction - Separate done items from undone items - Sort checklist How can I change the widgets color? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 68ee3938..a3c475e4 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -63,9 +63,6 @@ Items toevoegen De lijst is leeg Afgeronde items wissen - Sort direction - Separate done items from undone items - Sort checklist Alle notities naar bestanden exporteren diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 446b3df1..014fb524 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -63,9 +63,6 @@ Dodaj nowe elementy listy kontrolnej Lista kontrolna jest pusta Usuń wykonane elementy - Sort direction - Separate done items from undone items - Sort checklist Eksportuj wszystkie notatki jako pliki diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 1dfd3f80..05311397 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -63,9 +63,6 @@ Adicionar novos itens à lista de verificação A lista de verificação está vazia Remover itens concluídos - Sort direction - Separate done items from undone items - Sort checklist Exportar todas as notas como arquivo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6c67a214..bea0dc03 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -63,9 +63,6 @@ Adicionar itens à lista de verificação A lista está vazia Remover itens realizados - Sort direction - Separate done items from undone items - Sort checklist Exportar todas as notas como ficheiros diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 23cc9424..dfb40e28 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -63,9 +63,6 @@ Добавить позиции в список Список пуст Remove done items - Sort direction - Separate done items from undone items - Sort checklist Экспортировать все заметки в файлы diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 5be13f4a..ccac363e 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -63,9 +63,6 @@ Pridať do zoznamu nové položky Zoznam položiek je prázdny Odstrániť splnené položky - Sort direction - Separate done items from undone items - Sort checklist Exportovať všetky poznámky ako súbory diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d49149ec..742b7a3d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -63,9 +63,6 @@ Lägg till nya checklisteobjekt Checklistan är tom Remove done items - Sort direction - Separate done items from undone items - Sort checklist Exportera alla anteckningar som filer diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 0a91311b..ce48718f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -63,9 +63,6 @@ Yeni yapılacak listesi öğeleri ekle Yapılacak listesi boş Tamamlanan öğeleri kaldır - Sort direction - Separate done items from undone items - Sort checklist Tüm notları dosya olarak dışa aktar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2e620b09..c2db7d30 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -63,9 +63,6 @@ Додати нові позиції у списку Список порожній Вилучати виконані позиції - Sort direction - Separate done items from undone items - Sort checklist Експортувати всі нотатки як файли diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index efd1b0d6..4f950e70 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -63,9 +63,6 @@ 添加新的清单项目 清单为空 Remove done items - Sort direction - Separate done items from undone items - Sort checklist 以文件导出所有笔记 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 548ffc25..22ba5012 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -63,9 +63,6 @@ 新增新的核對清單項目 核對清單為空白 Remove done items - Sort direction - Separate done items from undone items - Sort checklist 將全部筆記匯出成檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c80e63cd..f719a1d1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -63,9 +63,6 @@ Add new checklist items The checklist is empty Remove done items - Sort direction - Separate done items from undone items - Sort checklist Export all notes as files