From a90bfb9a0ac463e4b28195d58629bc8330e64758 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Wed, 29 Sep 2021 10:35:21 +0100 Subject: [PATCH 01/12] Implement checklist sort --- app/proguard-rules.pro | 3 + .../notes/pro/activities/MainActivity.kt | 8 ++ .../pro/activities/WidgetConfigureActivity.kt | 10 +-- .../notes/pro/adapters/NotesPagerAdapter.kt | 5 ++ .../notes/pro/dialogs/SortChecklistDialog.kt | 53 ++++++++++++ .../notes/pro/fragments/ChecklistFragment.kt | 13 ++- .../notes/pro/models/ChecklistItem.kt | 2 +- .../notes/pro/models/ChecklistSort.kt | 26 ++++++ .../pro/models/ChecklistSortDirection.kt | 6 ++ .../notes/pro/models/ChecklistSortField.kt | 6 ++ .../main/res/layout/dialog_sort_checklist.xml | 81 +++++++++++++++++++ app/src/main/res/menu/menu.xml | 5 ++ app/src/main/res/values/strings.xml | 3 + 13 files changed, 212 insertions(+), 9 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt create mode 100644 app/src/main/res/layout/dialog_sort_checklist.xml diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ca6d111a..e9eb2553 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,3 +1,6 @@ -keep class com.simplemobiletools.notes.pro.models.ChecklistItem { ; } +-keep class com.simplemobiletools.notes.pro.models.ChecklistSort { + ; +} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 4baabd91..61e3d0c2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -163,6 +163,7 @@ class MainActivity : SimpleActivity() { findItem(R.id.export_all_notes).isVisible = multipleNotesExist && hasPermission(PERMISSION_WRITE_STORAGE) findItem(R.id.open_search).isVisible = !isCurrentItemChecklist() findItem(R.id.remove_done_items).isVisible = isCurrentItemChecklist() + findItem(R.id.sort_checklist).isVisible = isCurrentItemChecklist() findItem(R.id.import_folder).isVisible = hasPermission(PERMISSION_READ_STORAGE) findItem(R.id.lock_note).isVisible = mNotes.isNotEmpty() && !mCurrentNote.isLocked() findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() && mCurrentNote.isLocked() @@ -201,6 +202,7 @@ class MainActivity : SimpleActivity() { R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java)) R.id.about -> launchAbout() R.id.remove_done_items -> fragment?.handleUnlocking { removeDoneItems() } + R.id.sort_checklist -> fragment?.handleUnlocking { displaySortChecklistDialog() } else -> return super.onOptionsItemSelected(item) } return true @@ -1169,4 +1171,10 @@ class MainActivity : SimpleActivity() { private fun removeDoneItems() { getPagerAdapter().removeDoneCheckListItems(view_pager.currentItem) } + + private fun displaySortChecklistDialog() { + SortChecklistDialog(this) { + getPagerAdapter().sortChecklistItems(view_pager.currentItem, it) + } + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt index be3f203f..4a5fa5d7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt @@ -149,11 +149,11 @@ class WidgetConfigureActivity : SimpleActivity() { val items = Gson().fromJson>(note.value, checklistItemType) ?: ArrayList(1) items.apply { if (isEmpty()) { - add(ChecklistItem(0, "Milk", true)) - add(ChecklistItem(1, "Butter", true)) - add(ChecklistItem(2, "Salt", false)) - add(ChecklistItem(3, "Water", false)) - add(ChecklistItem(4, "Meat", true)) + add(ChecklistItem(0, System.currentTimeMillis(),"Milk", true)) + add(ChecklistItem(1, System.currentTimeMillis(),"Butter", true)) + add(ChecklistItem(2, System.currentTimeMillis(),"Salt", false)) + add(ChecklistItem(3, System.currentTimeMillis(),"Water", false)) + add(ChecklistItem(4, System.currentTimeMillis(),"Meat", true)) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt index 3e4ca20a..e23a0bef 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt @@ -11,6 +11,7 @@ import com.simplemobiletools.notes.pro.fragments.NoteFragment import com.simplemobiletools.notes.pro.fragments.TextFragment import com.simplemobiletools.notes.pro.helpers.NOTE_ID import com.simplemobiletools.notes.pro.helpers.NoteType +import com.simplemobiletools.notes.pro.models.ChecklistSort import com.simplemobiletools.notes.pro.models.Note class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity: Activity) : FragmentStatePagerAdapter(fm) { @@ -95,4 +96,8 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity fun removeDoneCheckListItems(position: Int) { (fragments[position] as? ChecklistFragment)?.removeDoneItems() } + + fun sortChecklistItems(position: Int, sort:ChecklistSort){ + (fragments[position] as? ChecklistFragment)?.sortChecklist(sort) + } } 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 new file mode 100644 index 00000000..6049706e --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt @@ -0,0 +1,53 @@ +package com.simplemobiletools.notes.pro.dialogs + +import android.content.DialogInterface +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AlertDialog +import com.simplemobiletools.commons.extensions.setupDialogStuff +import com.simplemobiletools.notes.pro.R +import com.simplemobiletools.notes.pro.activities.SimpleActivity +import com.simplemobiletools.notes.pro.models.ChecklistSort +import com.simplemobiletools.notes.pro.models.ChecklistSortDirection +import com.simplemobiletools.notes.pro.models.ChecklistSortField +import kotlinx.android.synthetic.main.dialog_sort_checklist.view.separate_items_checkbox +import kotlinx.android.synthetic.main.dialog_sort_checklist.view.sort_direction_type +import kotlinx.android.synthetic.main.dialog_sort_checklist.view.sort_field_type + +class SortChecklistDialog(private val activity: SimpleActivity, val callback: (ChecklistSort) -> Unit) { + init { + val view = (activity.layoutInflater.inflate(R.layout.dialog_sort_checklist, null) as ViewGroup) + + AlertDialog.Builder(activity) + .setPositiveButton(R.string.ok, null) + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this, R.string.sort_checklist) { + getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { + callback.invoke( + ChecklistSort( + field = getSortField(view), + direction = getSortDirection(view), + separateCheckedFromUnchecked = view.separate_items_checkbox.isChecked + ) + ) + dismiss() + } + } + } + } + + private fun getSortField(view: View): ChecklistSortField { + return when (view.sort_field_type.checkedRadioButtonId) { + R.id.sort_field_title -> ChecklistSortField.TITLE + else -> ChecklistSortField.DATE_CREATED + } + } + + private fun getSortDirection(view: View): ChecklistSortDirection { + return when (view.sort_direction_type.checkedRadioButtonId) { + R.id.sort_direction_asc -> ChecklistSortDirection.ASCENDING + else -> ChecklistSortDirection.DESCENDING + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt index c6b2dbcc..4d89478b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt @@ -1,6 +1,7 @@ package com.simplemobiletools.notes.pro.fragments import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -18,8 +19,7 @@ import com.simplemobiletools.notes.pro.extensions.updateWidgets import com.simplemobiletools.notes.pro.helpers.NOTE_ID import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener -import com.simplemobiletools.notes.pro.models.ChecklistItem -import com.simplemobiletools.notes.pro.models.Note +import com.simplemobiletools.notes.pro.models.* import kotlinx.android.synthetic.main.fragment_checklist.view.* class ChecklistFragment : NoteFragment(), ChecklistItemsListener { @@ -140,7 +140,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { titles.forEach { title -> title.split("\n").map { it.trim() }.filter { it.isNotBlank() }.forEach { row -> - newItems.add(ChecklistItem(currentMaxId + 1, row, false)) + newItems.add(ChecklistItem(currentMaxId + 1, System.currentTimeMillis(), row, false)) currentMaxId++ } } @@ -215,4 +215,11 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { override fun refreshItems() { setupAdapter() } + + private val TAG = "ChecklistFragment" + fun sortChecklist(sort: ChecklistSort) { + Log.d(TAG, "sortChecklist: $sort") + items = items.sortedWith(sort.getSortComparator()).toMutableList() as ArrayList + setupAdapter() + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt index e0892b78..39b3cede 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt @@ -1,3 +1,3 @@ package com.simplemobiletools.notes.pro.models -data class ChecklistItem(val id: Int, var title: String, var isDone: Boolean) +data class ChecklistItem(val id: Int, val dateCreated: Long = 0L, var title: String, var isDone: Boolean) 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 new file mode 100644 index 00000000..4d24610b --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt @@ -0,0 +1,26 @@ +package com.simplemobiletools.notes.pro.models + +data class ChecklistSort( + val field: ChecklistSortField, + val direction: ChecklistSortDirection, + val separateCheckedFromUnchecked: Boolean, +) { + + companion object { + val DEFAULT = ChecklistSort(ChecklistSortField.TITLE, ChecklistSortDirection.ASCENDING, false) + } + + fun getSortComparator(): Comparator { + return when (field) { + ChecklistSortField.TITLE -> compareWithSortDirection { it.title } + ChecklistSortField.DATE_CREATED -> compareWithSortDirection { it.dateCreated } + } + } + + private fun compareWithSortDirection(compareFunc: (ChecklistItem) -> Comparable<*>): Comparator { + return when (direction) { + ChecklistSortDirection.ASCENDING -> if(separateCheckedFromUnchecked) compareBy { it.isDone }.thenBy(compareFunc) else compareBy(compareFunc) + ChecklistSortDirection.DESCENDING -> if(separateCheckedFromUnchecked) compareByDescending { it.isDone }.thenByDescending(compareFunc) else compareByDescending(compareFunc) + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt new file mode 100644 index 00000000..fb52e458 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt @@ -0,0 +1,6 @@ +package com.simplemobiletools.notes.pro.models + +enum class ChecklistSortDirection { + ASCENDING, + DESCENDING, +} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt new file mode 100644 index 00000000..39eef3ea --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt @@ -0,0 +1,6 @@ +package com.simplemobiletools.notes.pro.models + +enum class ChecklistSortField { + TITLE, + DATE_CREATED, +} diff --git a/app/src/main/res/layout/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml new file mode 100644 index 00000000..77260504 --- /dev/null +++ b/app/src/main/res/layout/dialog_sort_checklist.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index c5d0e1d8..9bb77520 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -41,6 +41,11 @@ android:icon="@drawable/ic_delete_vector" android:title="@string/remove_done_items" app:showAsAction="ifRoom" /> + Reddit: https://www.reddit.com/r/SimpleMobileTools + Sort direction + Separately sort checked from unchecked items + Sort checklist Export all notes as files @@ -109,9 +112,6 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools - Sort direction - Separately sort checked from unchecked items - Sort checklist تصدير جميع الملاحظات كملفات diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index c9131657..d8549fe1 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -63,6 +63,9 @@ 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 f47471a4..844f5fb9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -63,6 +63,9 @@ 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 00f5b5ec..2bba92d8 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -63,6 +63,9 @@ 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 e5ffab98..40cc7546 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -63,6 +63,9 @@ 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 591c9381..ed6510a3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -63,6 +63,9 @@ 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 02541e75..2834079e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -63,6 +63,9 @@ Προσθήκη νέων στοιχείων λίστας ελέγχου Η λίστα ελέγχου είναι κενή Κατάργηση ολοκληρωμένων στοιχείων + 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 bf61b2b4..2425641b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -63,6 +63,9 @@ 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 4820b27d..c05d0a39 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -63,6 +63,9 @@ افزودن موارد به فهرست نشان‌دار فهرست نشان‌دار خالی است پاک کردن موارد انجام شده + 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 735fceda..9ad8707f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -63,6 +63,9 @@ 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 69422ab7..753ec85a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -63,6 +63,9 @@ 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 b88b2722..bc09a171 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -63,6 +63,9 @@ 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 10c700cc..cf8f62f1 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -63,6 +63,9 @@ 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 262f3179..ea6c5bb7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -63,6 +63,9 @@ 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 0d25bf0e..cbfe2c5b 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -63,6 +63,9 @@ 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 0d25bf0e..cbfe2c5b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -63,6 +63,9 @@ 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 0143d4fe..58fb7a5f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -63,6 +63,9 @@ 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 f15392f3..790a8a31 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -63,6 +63,9 @@ 新しいチェックリスト項目を追加 チェックリストが空です 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 e44f0a9c..2d586ff8 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -68,6 +68,9 @@ 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 a3c475e4..68ee3938 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -63,6 +63,9 @@ 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 014fb524..446b3df1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -63,6 +63,9 @@ 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 05311397..1dfd3f80 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -63,6 +63,9 @@ 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 bea0dc03..6c67a214 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -63,6 +63,9 @@ 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 dfb40e28..23cc9424 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -63,6 +63,9 @@ Добавить позиции в список Список пуст 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 ccac363e..5be13f4a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -63,6 +63,9 @@ 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 742b7a3d..d49149ec 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -63,6 +63,9 @@ 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 ce48718f..0a91311b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -63,6 +63,9 @@ 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 c2db7d30..2e620b09 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -63,6 +63,9 @@ Додати нові позиції у списку Список порожній Вилучати виконані позиції + 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 4f950e70..efd1b0d6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -63,6 +63,9 @@ 添加新的清单项目 清单为空 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 22ba5012..548ffc25 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -63,6 +63,9 @@ 新增新的核對清單項目 核對清單為空白 Remove done items + Sort direction + Separate done items from undone items + Sort checklist 將全部筆記匯出成檔案 From 1ea4f0bf042a323c9f8bac7d5373c4711d0aaa96 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Wed, 29 Sep 2021 11:49:08 +0100 Subject: [PATCH 04/12] cleanup formatting --- .../notes/pro/activities/WidgetConfigureActivity.kt | 10 +++++----- .../notes/pro/fragments/ChecklistFragment.kt | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt index 4a5fa5d7..051621a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt @@ -149,11 +149,11 @@ class WidgetConfigureActivity : SimpleActivity() { val items = Gson().fromJson>(note.value, checklistItemType) ?: ArrayList(1) items.apply { if (isEmpty()) { - add(ChecklistItem(0, System.currentTimeMillis(),"Milk", true)) - add(ChecklistItem(1, System.currentTimeMillis(),"Butter", true)) - add(ChecklistItem(2, System.currentTimeMillis(),"Salt", false)) - add(ChecklistItem(3, System.currentTimeMillis(),"Water", false)) - add(ChecklistItem(4, System.currentTimeMillis(),"Meat", true)) + add(ChecklistItem(0, System.currentTimeMillis(), "Milk", true)) + add(ChecklistItem(1, System.currentTimeMillis(), "Butter", true)) + add(ChecklistItem(2, System.currentTimeMillis(), "Salt", false)) + add(ChecklistItem(3, System.currentTimeMillis(), "Water", false)) + add(ChecklistItem(4, System.currentTimeMillis(), "Meat", true)) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt index 4d89478b..a3ee16eb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt @@ -1,7 +1,6 @@ package com.simplemobiletools.notes.pro.fragments import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -19,7 +18,9 @@ import com.simplemobiletools.notes.pro.extensions.updateWidgets import com.simplemobiletools.notes.pro.helpers.NOTE_ID import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener -import com.simplemobiletools.notes.pro.models.* +import com.simplemobiletools.notes.pro.models.ChecklistItem +import com.simplemobiletools.notes.pro.models.ChecklistSort +import com.simplemobiletools.notes.pro.models.Note import kotlinx.android.synthetic.main.fragment_checklist.view.* class ChecklistFragment : NoteFragment(), ChecklistItemsListener { @@ -216,9 +217,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { setupAdapter() } - private val TAG = "ChecklistFragment" fun sortChecklist(sort: ChecklistSort) { - Log.d(TAG, "sortChecklist: $sort") items = items.sortedWith(sort.getSortComparator()).toMutableList() as ArrayList setupAdapter() } From 9d60d27e53ad782563d1e1f3cce9f78d54912b51 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Sun, 3 Oct 2021 14:53:40 +0100 Subject: [PATCH 05/12] Remove unnecessary strings, remove separate done from/undone --- .../notes/pro/dialogs/SortChecklistDialog.kt | 8 ++--- .../notes/pro/models/ChecklistSort.kt | 7 ++--- .../main/res/layout/dialog_sort_checklist.xml | 30 ++++--------------- app/src/main/res/menu/menu.xml | 2 +- app/src/main/res/values-ar/strings.xml | 3 -- app/src/main/res/values-az/strings.xml | 3 -- app/src/main/res/values-cs/strings.xml | 3 -- app/src/main/res/values-cy/strings.xml | 3 -- app/src/main/res/values-da/strings.xml | 3 -- app/src/main/res/values-de/strings.xml | 3 -- app/src/main/res/values-el/strings.xml | 3 -- app/src/main/res/values-es/strings.xml | 3 -- app/src/main/res/values-fa/strings.xml | 3 -- app/src/main/res/values-fi/strings.xml | 3 -- app/src/main/res/values-fr/strings.xml | 3 -- app/src/main/res/values-gl/strings.xml | 3 -- app/src/main/res/values-hr/strings.xml | 3 -- app/src/main/res/values-hu/strings.xml | 3 -- app/src/main/res/values-id/strings.xml | 3 -- app/src/main/res/values-in/strings.xml | 3 -- app/src/main/res/values-it/strings.xml | 3 -- app/src/main/res/values-ja/strings.xml | 3 -- app/src/main/res/values-lt/strings.xml | 3 -- app/src/main/res/values-nl/strings.xml | 3 -- app/src/main/res/values-pl/strings.xml | 3 -- app/src/main/res/values-pt-rBR/strings.xml | 3 -- app/src/main/res/values-pt/strings.xml | 3 -- app/src/main/res/values-ru/strings.xml | 3 -- app/src/main/res/values-sk/strings.xml | 3 -- app/src/main/res/values-sv/strings.xml | 3 -- app/src/main/res/values-tr/strings.xml | 3 -- app/src/main/res/values-uk/strings.xml | 3 -- app/src/main/res/values-zh-rCN/strings.xml | 3 -- app/src/main/res/values-zh-rTW/strings.xml | 3 -- app/src/main/res/values/strings.xml | 3 -- 35 files changed, 11 insertions(+), 129 deletions(-) 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 From 60bbaf958cea1d31aace942207b18db22c9f4d13 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sun, 3 Oct 2021 22:44:03 +0200 Subject: [PATCH 06/12] removing an empty line --- app/src/main/res/layout/dialog_sort_checklist.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml index 8824a9c1..0d46d608 100644 --- a/app/src/main/res/layout/dialog_sort_checklist.xml +++ b/app/src/main/res/layout/dialog_sort_checklist.xml @@ -33,7 +33,6 @@ - Date: Sun, 3 Oct 2021 22:45:12 +0200 Subject: [PATCH 07/12] removing an unused constant --- .../kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt index 89cb049e..f04c823c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt @@ -103,8 +103,4 @@ class Config(context: Context) : BaseConfig(context) { var checklistSortDirection: ChecklistSortDirection get() = ChecklistSortDirection.valueOf(prefs.getString(CHECKLIST_SORT_DIRECTION, ChecklistSortDirection.ASCENDING.name)!!) set(sortDirection) = prefs.edit().putString(CHECKLIST_SORT_DIRECTION, sortDirection.name).apply() - - var checklistSeparateDoneFromUndone: Boolean - get() = prefs.getBoolean(CHECKLIST_SEPARATE_DONE_FROM_UNDONE, false) - set(separate) = prefs.edit().putBoolean(CHECKLIST_SEPARATE_DONE_FROM_UNDONE, separate).apply() } From 289ec7208c257f813e8c675a980f6a4b40b92aab Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sun, 3 Oct 2021 22:45:28 +0200 Subject: [PATCH 08/12] removing an unused constant --- .../kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt index acfd7e2d..9b579fa6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt @@ -34,7 +34,6 @@ const val FONT_SIZE_PERCENTAGE = "font_size_percentage" const val ADD_NEW_CHECKLIST_ITEMS_TOP = "add_new_checklist_items_top" const val CHECKLIST_SORT_FIELD = "checklist_sort_field" const val CHECKLIST_SORT_DIRECTION = "checklist_sort_direction" -const val CHECKLIST_SEPARATE_DONE_FROM_UNDONE = "checklist_done_from_undone" // gravity const val GRAVITY_LEFT = 0 From f5ccdc45b92baa4edd9219795a92e5446a1c769c Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sun, 3 Oct 2021 22:54:49 +0200 Subject: [PATCH 09/12] avoid calling isCurrentItemChecklist() multiple times --- .../notes/pro/activities/MainActivity.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 61e3d0c2..214bbdd4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -156,14 +156,16 @@ class MainActivity : SimpleActivity() { override fun onPrepareOptionsMenu(menu: Menu): Boolean { val multipleNotesExist = mNotes.size > 1 + val isCurrentItemChecklist = isCurrentItemChecklist() + menu.apply { findItem(R.id.rename_note).isVisible = multipleNotesExist findItem(R.id.open_note).isVisible = multipleNotesExist findItem(R.id.delete_note).isVisible = multipleNotesExist findItem(R.id.export_all_notes).isVisible = multipleNotesExist && hasPermission(PERMISSION_WRITE_STORAGE) - findItem(R.id.open_search).isVisible = !isCurrentItemChecklist() - findItem(R.id.remove_done_items).isVisible = isCurrentItemChecklist() - findItem(R.id.sort_checklist).isVisible = isCurrentItemChecklist() + findItem(R.id.open_search).isVisible = !isCurrentItemChecklist + findItem(R.id.remove_done_items).isVisible = isCurrentItemChecklist + findItem(R.id.sort_checklist).isVisible = isCurrentItemChecklist findItem(R.id.import_folder).isVisible = hasPermission(PERMISSION_READ_STORAGE) findItem(R.id.lock_note).isVisible = mNotes.isNotEmpty() && !mCurrentNote.isLocked() findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() && mCurrentNote.isLocked() From 0937d0da24c94d4ed8c9de259c099aff7bc0e005 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Tue, 5 Oct 2021 21:39:34 +0100 Subject: [PATCH 10/12] Edit sorting logic --- .../notes/pro/activities/MainActivity.kt | 4 +- .../notes/pro/adapters/NotesPagerAdapter.kt | 5 +- .../notes/pro/dialogs/SortChecklistDialog.kt | 88 ++++++++++--------- .../notes/pro/fragments/ChecklistFragment.kt | 9 +- .../notes/pro/helpers/Config.kt | 10 --- .../notes/pro/helpers/Constants.kt | 2 - .../notes/pro/models/ChecklistItem.kt | 23 ++++- .../main/res/layout/dialog_sort_checklist.xml | 12 +-- app/src/main/res/values/integers.xml | 3 + 9 files changed, 82 insertions(+), 74 deletions(-) create mode 100644 app/src/main/res/values/integers.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 214bbdd4..c98a87e4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -40,9 +40,9 @@ import com.simplemobiletools.notes.pro.helpers.NoteType import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID import com.simplemobiletools.notes.pro.models.Note -import kotlinx.android.synthetic.main.activity_main.* import java.io.File import java.nio.charset.Charset +import kotlinx.android.synthetic.main.activity_main.* class MainActivity : SimpleActivity() { private val EXPORT_FILE_SYNC = 1 @@ -1176,7 +1176,7 @@ class MainActivity : SimpleActivity() { private fun displaySortChecklistDialog() { SortChecklistDialog(this) { - getPagerAdapter().sortChecklistItems(view_pager.currentItem, it) + getPagerAdapter().refreshChecklist(view_pager.currentItem) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt index e23a0bef..55b93fc7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt @@ -11,7 +11,6 @@ import com.simplemobiletools.notes.pro.fragments.NoteFragment import com.simplemobiletools.notes.pro.fragments.TextFragment import com.simplemobiletools.notes.pro.helpers.NOTE_ID import com.simplemobiletools.notes.pro.helpers.NoteType -import com.simplemobiletools.notes.pro.models.ChecklistSort import com.simplemobiletools.notes.pro.models.Note class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity: Activity) : FragmentStatePagerAdapter(fm) { @@ -97,7 +96,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity (fragments[position] as? ChecklistFragment)?.removeDoneItems() } - fun sortChecklistItems(position: Int, sort:ChecklistSort){ - (fragments[position] as? ChecklistFragment)?.sortChecklist(sort) + fun refreshChecklist(position: Int){ + (fragments[position] as? ChecklistFragment)?.refreshItems() } } 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 a92afd90..202e61fa 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 @@ -1,65 +1,67 @@ package com.simplemobiletools.notes.pro.dialogs -import android.content.DialogInterface -import android.view.View -import android.view.ViewGroup import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.setupDialogStuff +import com.simplemobiletools.commons.helpers.SORT_BY_DATE_CREATED +import com.simplemobiletools.commons.helpers.SORT_BY_TITLE +import com.simplemobiletools.commons.helpers.SORT_DESCENDING import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.models.ChecklistSort -import com.simplemobiletools.notes.pro.models.ChecklistSortDirection -import com.simplemobiletools.notes.pro.models.ChecklistSortField import kotlinx.android.synthetic.main.dialog_sort_checklist.view.* -class SortChecklistDialog(private val activity: SimpleActivity, val callback: (ChecklistSort) -> Unit) { +class SortChecklistDialog(private val activity: SimpleActivity, private val callback: () -> Unit) { + private val view = activity.layoutInflater.inflate(R.layout.dialog_sort_checklist, null) + private val config = activity.config + private var currSorting = config.sorting + init { - val config = activity.config - val view = (activity.layoutInflater.inflate(R.layout.dialog_sort_checklist, null) as ViewGroup).apply { - sort_field_type.check( - when (config.checklistSortField) { - ChecklistSortField.TITLE -> sort_field_title.id - ChecklistSortField.DATE_CREATED -> sort_field_date_created.id - } - ) - - sort_direction_type.check( - when (config.checklistSortDirection) { - ChecklistSortDirection.ASCENDING -> sort_direction_asc.id - ChecklistSortDirection.DESCENDING -> sort_direction_desc.id - } - ) - } - + setupSortRadio() + setupOrderRadio() AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok, null) + .setPositiveButton(R.string.ok) { _, _ -> dialogConfirmed() } .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this, R.string.sort_by) { - getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { - val sortField = getSortField(view) - val sortDirection = getSortDirection(view) - config.checklistSortField = sortField - config.checklistSortDirection = sortDirection - callback.invoke(ChecklistSort(sortField, sortDirection)) - dismiss() - } - } + activity.setupDialogStuff(view, this, R.string.sort_by) } } - private fun getSortField(view: View): ChecklistSortField { - return when (view.sort_field_type.checkedRadioButtonId) { - R.id.sort_field_title -> ChecklistSortField.TITLE - else -> ChecklistSortField.DATE_CREATED + private fun setupSortRadio() { + val fieldRadio = view.sorting_dialog_radio_sorting + var fieldBtn = fieldRadio.sorting_dialog_radio_title + + if (currSorting and SORT_BY_DATE_CREATED != 0) { + fieldBtn = fieldRadio.sorting_dialog_radio_date_created } + + fieldBtn.isChecked = true } - private fun getSortDirection(view: View): ChecklistSortDirection { - return when (view.sort_direction_type.checkedRadioButtonId) { - R.id.sort_direction_asc -> ChecklistSortDirection.ASCENDING - else -> ChecklistSortDirection.DESCENDING + private fun setupOrderRadio() { + val orderRadio = view.sorting_dialog_radio_order + var orderBtn = orderRadio.sorting_dialog_radio_ascending + + if (currSorting and SORT_DESCENDING != 0) { + orderBtn = orderRadio.sorting_dialog_radio_descending + } + + orderBtn.isChecked = true + } + + private fun dialogConfirmed() { + val sortingRadio = view.sorting_dialog_radio_sorting + var sorting = when (sortingRadio.checkedRadioButtonId) { + R.id.sorting_dialog_radio_date_created -> SORT_BY_DATE_CREATED + else -> SORT_BY_TITLE + } + + if (view.sorting_dialog_radio_order.checkedRadioButtonId == R.id.sorting_dialog_radio_descending) { + sorting = sorting or SORT_DESCENDING + } + + if (currSorting != sorting) { + config.sorting = sorting + callback() } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt index a3ee16eb..8a36a75c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt @@ -19,7 +19,6 @@ import com.simplemobiletools.notes.pro.helpers.NOTE_ID import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener import com.simplemobiletools.notes.pro.models.ChecklistItem -import com.simplemobiletools.notes.pro.models.ChecklistSort import com.simplemobiletools.notes.pro.models.Note import kotlinx.android.synthetic.main.fragment_checklist.view.* @@ -159,7 +158,8 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { private fun setupAdapter() { updateUIVisibility() - + ChecklistItem.sorting = requireContext().config.sorting + items.sort() ChecklistAdapter( activity = activity as SimpleActivity, items = items, @@ -216,9 +216,4 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { override fun refreshItems() { setupAdapter() } - - fun sortChecklist(sort: ChecklistSort) { - items = items.sortedWith(sort.getSortComparator()).toMutableList() as ArrayList - setupAdapter() - } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt index f04c823c..9f3da2ad 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt @@ -5,8 +5,6 @@ import android.content.Context import android.os.Environment import android.view.Gravity import com.simplemobiletools.commons.helpers.BaseConfig -import com.simplemobiletools.notes.pro.models.ChecklistSortDirection -import com.simplemobiletools.notes.pro.models.ChecklistSortField class Config(context: Context) : BaseConfig(context) { companion object { @@ -95,12 +93,4 @@ class Config(context: Context) : BaseConfig(context) { var addNewChecklistItemsTop: Boolean get() = prefs.getBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, false) set(addNewCheckListItemsTop) = prefs.edit().putBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, addNewCheckListItemsTop).apply() - - var checklistSortField: ChecklistSortField - get() = ChecklistSortField.valueOf(prefs.getString(CHECKLIST_SORT_FIELD, ChecklistSortField.TITLE.name)!!) - set(sortField) = prefs.edit().putString(CHECKLIST_SORT_FIELD, sortField.name).apply() - - var checklistSortDirection: ChecklistSortDirection - get() = ChecklistSortDirection.valueOf(prefs.getString(CHECKLIST_SORT_DIRECTION, ChecklistSortDirection.ASCENDING.name)!!) - set(sortDirection) = prefs.edit().putString(CHECKLIST_SORT_DIRECTION, sortDirection.name).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt index 9b579fa6..2a439d41 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt @@ -32,8 +32,6 @@ const val LAST_CREATED_NOTE_TYPE = "last_created_note_type" const val MOVE_DONE_CHECKLIST_ITEMS = "move_undone_checklist_items" // it has been replaced from moving undone items at the top to moving done to bottom const val FONT_SIZE_PERCENTAGE = "font_size_percentage" const val ADD_NEW_CHECKLIST_ITEMS_TOP = "add_new_checklist_items_top" -const val CHECKLIST_SORT_FIELD = "checklist_sort_field" -const val CHECKLIST_SORT_DIRECTION = "checklist_sort_direction" // gravity const val GRAVITY_LEFT = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt index 39b3cede..79d79be8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt @@ -1,3 +1,24 @@ package com.simplemobiletools.notes.pro.models -data class ChecklistItem(val id: Int, val dateCreated: Long = 0L, var title: String, var isDone: Boolean) +import com.simplemobiletools.commons.helpers.AlphanumericComparator +import com.simplemobiletools.commons.helpers.SORT_BY_TITLE +import com.simplemobiletools.commons.helpers.SORT_DESCENDING + +data class ChecklistItem(val id: Int, val dateCreated: Long = 0L, var title: String, var isDone: Boolean) : Comparable { + companion object { + var sorting = 0 + } + + override fun compareTo(other: ChecklistItem): Int { + var result = when { + sorting and SORT_BY_TITLE != 0 -> AlphanumericComparator().compare(title.lowercase(), other.title.lowercase()) + else -> dateCreated.compareTo(other.dateCreated) + } + + if (sorting and SORT_DESCENDING != 0) { + result *= -1 + } + + return result + } +} diff --git a/app/src/main/res/layout/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml index 0d46d608..a8d7e200 100644 --- a/app/src/main/res/layout/dialog_sort_checklist.xml +++ b/app/src/main/res/layout/dialog_sort_checklist.xml @@ -9,13 +9,13 @@ android:paddingEnd="@dimen/activity_margin"> + 2048 + From bfadeedacf00946fce3f83cea6b095de50ee3dfe Mon Sep 17 00:00:00 2001 From: darthpaul Date: Wed, 6 Oct 2021 23:32:55 +0100 Subject: [PATCH 11/12] remove used classes --- app/proguard-rules.pro | 3 --- .../notes/pro/models/ChecklistSort.kt | 21 ------------------- .../pro/models/ChecklistSortDirection.kt | 6 ------ .../notes/pro/models/ChecklistSortField.kt | 6 ------ 4 files changed, 36 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index e9eb2553..ca6d111a 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,6 +1,3 @@ -keep class com.simplemobiletools.notes.pro.models.ChecklistItem { ; } --keep class com.simplemobiletools.notes.pro.models.ChecklistSort { - ; -} 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 deleted file mode 100644 index 0a43f586..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.simplemobiletools.notes.pro.models - -data class ChecklistSort( - val field: ChecklistSortField, - val direction: ChecklistSortDirection, -) { - - fun getSortComparator(): Comparator { - return when (field) { - ChecklistSortField.TITLE -> compareWithSortDirection { it.title } - ChecklistSortField.DATE_CREATED -> compareWithSortDirection { it.dateCreated } - } - } - - private fun compareWithSortDirection(compareFunc: (ChecklistItem) -> Comparable<*>): Comparator { - return when (direction) { - ChecklistSortDirection.ASCENDING -> compareBy(compareFunc) - ChecklistSortDirection.DESCENDING -> compareByDescending(compareFunc) - } - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt deleted file mode 100644 index fb52e458..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortDirection.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.simplemobiletools.notes.pro.models - -enum class ChecklistSortDirection { - ASCENDING, - DESCENDING, -} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt deleted file mode 100644 index 39eef3ea..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSortField.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.simplemobiletools.notes.pro.models - -enum class ChecklistSortField { - TITLE, - DATE_CREATED, -} From a26ae224125fba0cd8155a6a251281721fefb44e Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Fri, 8 Oct 2021 18:29:56 +0200 Subject: [PATCH 12/12] adding a space --- .../simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt index 55b93fc7..d9a07f85 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt @@ -96,7 +96,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity (fragments[position] as? ChecklistFragment)?.removeDoneItems() } - fun refreshChecklist(position: Int){ + fun refreshChecklist(position: Int) { (fragments[position] as? ChecklistFragment)?.refreshItems() } }