Remove unnecessary strings, remove separate done from/undone

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()
                     }
                 }

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<ChecklistItem> {
@@ -15,10 +14,8 @@ data class ChecklistSort(
 
     private fun compareWithSortDirection(compareFunc: (ChecklistItem) -> Comparable<*>): Comparator<ChecklistItem> {
         return when (direction) {
-            ChecklistSortDirection.ASCENDING -> if (separateDoneFromUndone) compareBy({ it.isDone }, compareFunc) else compareBy(compareFunc)
-            ChecklistSortDirection.DESCENDING -> if (separateDoneFromUndone) compareByDescending<ChecklistItem> { it.isDone }.thenByDescending(compareFunc) else compareByDescending(
-                compareFunc
-            )
+            ChecklistSortDirection.ASCENDING -> compareBy(compareFunc)
+            ChecklistSortDirection.DESCENDING -> compareByDescending(compareFunc)
         }
     }
 }

app/src/main/res/layout/dialog_sort_checklist.xml

@@ -8,17 +8,11 @@
     android:paddingTop="@dimen/small_margin"
     android:paddingEnd="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/sort_field_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/medium_margin"
-        android:text="@string/sort_by" />
-
     <RadioGroup
         android:id="@+id/sort_field_type"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/medium_margin">
 
         <com.simplemobiletools.commons.views.MyCompatRadioButton
             android:id="@+id/sort_field_title"
@@ -39,18 +33,14 @@
 
     </RadioGroup>
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/sort_direction_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/medium_margin"
-        android:paddingTop="@dimen/medium_margin"
-        android:text="@string/sort_direction" />
+
+    <include layout="@layout/divider" />
 
     <RadioGroup
         android:id="@+id/sort_direction_type"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_margin">
 
         <com.simplemobiletools.commons.views.MyCompatRadioButton
             android:id="@+id/sort_direction_asc"
@@ -70,12 +60,4 @@
             android:text="@string/descending" />
 
     </RadioGroup>
-
-    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-        android:id="@+id/separate_done_from_undone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/medium_margin"
-        android:text="@string/sort_separate_done_from_undone" />
-
 </LinearLayout>

app/src/main/res/menu/menu.xml

@@ -44,7 +44,7 @@
     <item
         android:id="@+id/sort_checklist"
         android:icon="@drawable/ic_sort_vector"
-        android:title="@string/sort_checklist"
+        android:title="@string/sort_by"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/share"

app/src/main/res/values-ar/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">إضافة عناصر قائمة تدقيق جديدة</string>
     <string name="checklist_is_empty">قائمة التدقيق فارغة</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">تصدير جميع الملاحظات كملفات</string>

app/src/main/res/values-az/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Add new checklist items</string>
     <string name="checklist_is_empty">The checklist is empty</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Bütün qeydləri fayl şəklində çıxar</string>

app/src/main/res/values-cs/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Přidat do seznamu nové položky</string>
     <string name="checklist_is_empty">Seznam položek je prázdný</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportovat všechny poznámky jako soubory</string>

app/src/main/res/values-cy/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Ychwanegu eitemau newydd at restr wirio</string>
     <string name="checklist_is_empty">Mae\'r rhestr wirio yn wag</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Allforio pob nodyn fel ffeil</string>

app/src/main/res/values-da/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Føj nye punkter til tjeklisten</string>
     <string name="checklist_is_empty">Tjeklisten er tom</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Eksporter alle noter som filer</string>

app/src/main/res/values-de/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Neue Checklisteneinträge hinzufügen</string>
     <string name="checklist_is_empty">Die Checkliste ist leer</string>
     <string name="remove_done_items">Abgeschlossene Einträge entfernen</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Alle Notizen als Dateien exportieren</string>

app/src/main/res/values-el/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Προσθήκη νέων στοιχείων λίστας ελέγχου</string>
     <string name="checklist_is_empty">Η λίστα ελέγχου είναι κενή</string>
     <string name="remove_done_items">Κατάργηση ολοκληρωμένων στοιχείων</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Εξαγωγή όλων των σημειώσεων ως αρχεία</string>

app/src/main/res/values-es/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Añadir nuevos ítems a la lista</string>
     <string name="checklist_is_empty">La lista está vacía</string>
     <string name="remove_done_items">Borrar ítems completados</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportar todas las notas como archivos</string>

app/src/main/res/values-fa/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">افزودن موارد به فهرست نشان‌دار</string>
     <string name="checklist_is_empty">فهرست نشان‌دار خالی است</string>
     <string name="remove_done_items">پاک کردن موارد انجام شده</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">برون‌ریزی همه یادداشت‌ها به عنوان پرونده</string>

app/src/main/res/values-fi/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Lisää uusia kohtia muistilistaan</string>
     <string name="checklist_is_empty">Muistilista on tyhjä</string>
     <string name="remove_done_items">Poista tehdyt kohdat</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Vie kaikki muistiinpanot tiedostoina</string>

app/src/main/res/values-fr/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Ajouter de nouveaux éléments</string>
     <string name="checklist_is_empty">La checklist est vide</string>
     <string name="remove_done_items">Supprimer les items cochés</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exporter toutes les notes en tant que fichiers</string>

app/src/main/res/values-gl/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Engadir elementos a unha nova lista de verificación</string>
     <string name="checklist_is_empty">A lista de verificación está baleira</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportar todas as notas como ficheiros</string>

app/src/main/res/values-hr/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Dodajte nove stavke na spisak</string>
     <string name="checklist_is_empty">Spisak je prazan</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Izvezi sve bilješke kao datoteke</string>

app/src/main/res/values-hu/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Add new checklist items</string>
     <string name="checklist_is_empty">The checklist is empty</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Export all notes as files</string>

app/src/main/res/values-id/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Tambah item checklist baru</string>
     <string name="checklist_is_empty">Checklist kosong</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Ekspor semua catatan ke berkas</string>

app/src/main/res/values-in/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Tambah item checklist baru</string>
     <string name="checklist_is_empty">Checklist kosong</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Ekspor semua catatan ke berkas</string>

app/src/main/res/values-it/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Aggiungi nuovi elementi</string>
     <string name="checklist_is_empty">La scaletta è vuota</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Esporta le note come file</string>

app/src/main/res/values-ja/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">新しいチェックリスト項目を追加</string>
     <string name="checklist_is_empty">チェックリストが空です</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">すべてのメモをファイルとしてエクスポート</string>

app/src/main/res/values-lt/strings.xml

@@ -68,9 +68,6 @@
     <string name="export_all_notes">Eksportuoti visus užrašus kaip bylas</string>
     <string name="import_notes">Importuoti keletą bylų, kaip užrašus</string>
     <string name="import_folder">Importuoti aplanką</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">How can I change the widgets color?</string>

app/src/main/res/values-nl/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Items toevoegen</string>
     <string name="checklist_is_empty">De lijst is leeg</string>
     <string name="remove_done_items">Afgeronde items wissen</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Alle notities naar bestanden exporteren</string>

app/src/main/res/values-pl/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Dodaj nowe elementy listy kontrolnej</string>
     <string name="checklist_is_empty">Lista kontrolna jest pusta</string>
     <string name="remove_done_items">Usuń wykonane elementy</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Eksportuj wszystkie notatki jako pliki</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Adicionar novos itens à lista de verificação</string>
     <string name="checklist_is_empty">A lista de verificação está vazia</string>
     <string name="remove_done_items">Remover itens concluídos</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportar todas as notas como arquivo</string>

app/src/main/res/values-pt/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Adicionar itens à lista de verificação</string>
     <string name="checklist_is_empty">A lista está vazia</string>
     <string name="remove_done_items">Remover itens realizados</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportar todas as notas como ficheiros</string>

app/src/main/res/values-ru/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Добавить позиции в список</string>
     <string name="checklist_is_empty">Список пуст</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Экспортировать все заметки в файлы</string>

app/src/main/res/values-sk/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Pridať do zoznamu nové položky</string>
     <string name="checklist_is_empty">Zoznam položiek je prázdny</string>
     <string name="remove_done_items">Odstrániť splnené položky</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportovať všetky poznámky ako súbory</string>

app/src/main/res/values-sv/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Lägg till nya checklisteobjekt</string>
     <string name="checklist_is_empty">Checklistan är tom</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportera alla anteckningar som filer</string>

app/src/main/res/values-tr/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Yeni yapılacak listesi öğeleri ekle</string>
     <string name="checklist_is_empty">Yapılacak listesi boş</string>
     <string name="remove_done_items">Tamamlanan öğeleri kaldır</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Tüm notları dosya olarak dışa aktar</string>

app/src/main/res/values-uk/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Додати нові позиції у списку</string>
     <string name="checklist_is_empty">Список порожній</string>
     <string name="remove_done_items">Вилучати виконані позиції</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Експортувати всі нотатки як файли</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">添加新的清单项目</string>
     <string name="checklist_is_empty">清单为空</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">以文件导出所有笔记</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">新增新的核對清單項目</string>
     <string name="checklist_is_empty">核對清單為空白</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">將全部筆記匯出成檔案</string>

app/src/main/res/values/strings.xml

@@ -63,9 +63,6 @@
     <string name="add_new_checklist_items">Add new checklist items</string>
     <string name="checklist_is_empty">The checklist is empty</string>
     <string name="remove_done_items">Remove done items</string>
-    <string name="sort_direction">Sort direction</string>
-    <string name="sort_separate_done_from_undone">Separate done items from undone items</string>
-    <string name="sort_checklist">Sort checklist</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Export all notes as files</string>