diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt index be20698e..2e2ce58d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt @@ -132,10 +132,10 @@ class SettingsActivity : SimpleActivity() { } private fun setupMoveUndoneChecklistItems() { - settings_move_undone_checklist_items.isChecked = config.moveUndoneChecklistItems + settings_move_undone_checklist_items.isChecked = config.moveDoneChecklistItems settings_move_undone_checklist_items_holder.setOnClickListener { settings_move_undone_checklist_items.toggle() - config.moveUndoneChecklistItems = settings_move_undone_checklist_items.isChecked + config.moveDoneChecklistItems = settings_move_undone_checklist_items.isChecked } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt index db0abc72..45bde63f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt @@ -94,7 +94,7 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi if (note?.type == NoteType.TYPE_CHECKLIST.value) { val checklistItemType = object : TypeToken>() {}.type checklistItems = Gson().fromJson>(note!!.value, checklistItemType) ?: ArrayList(1) - if (context.config.moveUndoneChecklistItems) { + if (context.config.moveDoneChecklistItems) { checklistItems.sortBy { it.isDone } } } 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 81e653e7..65b694de 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 @@ -66,7 +66,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { migrateCheckListOnFailure(storedNote) } - if (config?.moveUndoneChecklistItems == true) { + if (config?.moveDoneChecklistItems == true) { items.sortBy { it.isDone } } 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 79e19af4..fec09284 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 @@ -75,9 +75,9 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getInt(LAST_CREATED_NOTE_TYPE, NoteType.TYPE_TEXT.value) set(lastCreatedNoteType) = prefs.edit().putInt(LAST_CREATED_NOTE_TYPE, lastCreatedNoteType).apply() - var moveUndoneChecklistItems: Boolean - get() = prefs.getBoolean(MOVE_UNDONE_CHECKLIST_ITEMS, false) - set(moveUndoneChecklistItems) = prefs.edit().putBoolean(MOVE_UNDONE_CHECKLIST_ITEMS, moveUndoneChecklistItems).apply() + var moveDoneChecklistItems: Boolean + get() = prefs.getBoolean(MOVE_DONE_CHECKLIST_ITEMS, false) + set(moveDoneChecklistItems) = prefs.edit().putBoolean(MOVE_DONE_CHECKLIST_ITEMS, moveDoneChecklistItems).apply() @SuppressLint("RtlHardcoded") fun getTextGravity() = when (gravity) { 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 7102c39c..07a5fcb9 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 @@ -29,7 +29,7 @@ const val LAST_USED_SAVE_PATH = "last_used_save_path" const val ENABLE_LINE_WRAP = "enable_line_wrap" const val USE_INCOGNITO_MODE = "use_incognito_mode" const val LAST_CREATED_NOTE_TYPE = "last_created_note_type" -const val MOVE_UNDONE_CHECKLIST_ITEMS = "move_undone_checklist_items" +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" // gravity diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index cf234f86..d309c888 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -341,7 +341,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/move_undone_checklist_items" + android:text="@string/move_done_checklist_items" app:switchPadding="@dimen/medium_margin" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ca35265b..80ab4210 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -48,7 +48,7 @@ حفظ الملاحظات تلقائيا تفعيل التفاف الخط استخدام وضع التصفح المتخفي للوحات المفاتيح - Move undone checklist items at the top + Move done checklist items to the bottom قائمة تدقيق diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 0d9f5505..e3eb902e 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -48,7 +48,7 @@ Qeydləri avtomatik saxla Cız sarğısını göstər Use Incognito mode of keyboards - Move undone checklist items at the top + Move done checklist items to the bottom Checklist diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0384f8cb..a7640b9d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -48,7 +48,7 @@ Automaticky ukládat poznámky Povolit zalamování řádků Použít Inkognito mód klávesnic - Přesunout nesplněné položky seznamu položek nahoru + Přesunout splněné položky seznamu položek nadol Seznam položek diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index fa14a758..ae39067e 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -48,7 +48,7 @@ Awto-gadw nodiadau Galluogi amlapio llinellau Defnyddio modd cyfrinachol bysellfyrddau - Move undone checklist items at the top + Move done checklist items to the bottom Rhestr wirio diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 53865748..06e3ca56 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -48,7 +48,7 @@ Autogem noter Aktiver tekstombrydning Anvend inkognito-tilstand til tastatur - Move undone checklist items at the top + Move done checklist items to the bottom Tjekliste diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d29c6235..1e1c987e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -48,7 +48,7 @@ Notizen automatisch speichern Zeilenumbruch aktivieren Benutze den Inkognitomodus von Tastaturen - Verschiebe erledigte Checklisteneinträge nach unten + Verschiebe erledigte Checklisteneinträge nach unten Checkliste diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 993a4e46..d4ba1581 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -48,7 +48,7 @@ Αυτόματη αποθήκευση σημειώσεων Ενεργοποίηση αναδίπλωσης γραμμής Χρήση λειτουργίας Incognito πληκτρολόγιου - Μετακίνηση ανεπιτυχών λίστας ελέγχου στο επάνω μέρος + Μετακίνηση ανεπιτυχών λίστας ελέγχου στο επάνω μέρος Λίστα ελέγχου diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ea44ce12..9a790545 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -48,7 +48,7 @@ Guardado automático de notas Activar ajuste de línea Usar modo incógnito de los teclados - Mover Elementos sin erminar de una lista al inicio + Mover Elementos sin erminar de una lista al inicio Lista diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0379172f..f3776609 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -48,7 +48,7 @@ Muistiinpanojen automaattinen tallennus Ota käyttöön automaattinen rivitys Käytä näppäimistöjen Incognito-tilaa - Siirrä tekemättömät kohdat muistilistasta ylimmäksi + Siirrä tekemättömät kohdat muistilistasta ylimmäksi Muistilista diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2efc2365..32d0c4eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -48,7 +48,7 @@ Sauvegarder automatiquement les notes Activer le retour à la ligne Utiliser le mode incognito des claviers - Déplacer les éléments de cheklist inachevés en haut + Déplacer les éléments de cheklist inachevés en haut Checklist diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index de51d9d1..80b91c11 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -48,7 +48,7 @@ Gardado automático Habilitar sangrado de liña Usar o modo incógnito dos teclados - Mover os elementos dunha lista de verificación non rematada a arriba + Mover os elementos dunha lista de verificación non rematada a arriba Lista de verificación diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 943df4ff..1e9d283c 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -48,7 +48,7 @@ Automatsko spremanje bilješki Omogući omotavanje linije Use Incognito mode of keyboards - Move undone checklist items at the top + Move done checklist items to the bottom Spisak diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c768b421..364f6475 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -48,7 +48,7 @@ Autosave notes Enable line wrap Use Incognito mode of keyboards - Move undone checklist items at the top + Move done checklist items to the bottom Checklist diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 433bedc6..f4caa061 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -48,7 +48,7 @@ Otomatis simpan catatan Aktifkan baris berlibat Gunakan mode papan ketik incognito - Pindah checklist yang belum selesai ke urutan atas + Pindah checklist yang belum selesai ke urutan atas Checklist diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 433bedc6..f4caa061 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -48,7 +48,7 @@ Otomatis simpan catatan Aktifkan baris berlibat Gunakan mode papan ketik incognito - Pindah checklist yang belum selesai ke urutan atas + Pindah checklist yang belum selesai ke urutan atas Checklist diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bee6b69a..b084a478 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -48,7 +48,7 @@ Salva automaticamente le note Abilita a capo automatico Usa la modalità incognito per le tastiere - Sposta gli elementi non spuntati in cima + Sposta gli elementi non spuntati in cima Scaletta diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 649fbdd1..1cfe68b8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -48,7 +48,7 @@ メモを自動保存する 行の折り返しを有効にする キーボードのシークレットモードを使用する - チェックリストの未完了リストを上に移動 + チェックリストの未完了リストを上に移動 チェックリスト diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 5daa0558..1a4c9152 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -48,7 +48,7 @@ Automatiškai išsaugoti užrašus naudoti eilutės perkėlimą Use Incognito mode of keyboards - Move undone checklist items at the top + Move done checklist items to the bottom Kontrolinis sąrašas diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c98faf18..8ba904b5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -48,7 +48,7 @@ Notities automatisch opslaan Automatische terugloop inschakelen Incognito-modus van toetsenbord gebruiken - Afgewerkte items naar onderen verplaatsen + Afgewerkte items naar onderen verplaatsen Lijst diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 966bd434..4ef86511 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -48,7 +48,7 @@ Autozapis notatek Zawijanie linii Use Incognito mode of keyboards - Move undone checklist items at the top + Move done checklist items to the bottom Checklist diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index fe525633..f5bbc5dd 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -48,7 +48,7 @@ Salvar notas automaticamente Ativar quebra de linha Usar o teclado no modo de Navegação Anônima - Move undone checklist items at the top + Move done checklist items to the bottom Lista de verificação diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 858a6660..f4d2ba91 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -48,7 +48,7 @@ Guardar nota automaticamente Ativar quebra de linha Utilizar modo incógnito no teclado - Mover itens não realizados para o topo + Mover itens não realizados para o topo Lista de verificação diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8c84ef63..f0f23c87 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -48,7 +48,7 @@ Автосохранение заметок Переносить строки Использовать режим инкогнито для клавиатур - Move undone checklist items at the top + Move done checklist items to the bottom Список diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 4e0a71f2..b7ae157a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -48,7 +48,7 @@ Automaticky ukladať poznámky Povoliť zalamovanie riadkov Použiť Inkognito mód klávesníc - Presunúť nesplnené položky zo zoznamu položiek na vrch + Presunúť splnené položky zo zoznamu položiek na spodok Zoznam položiek diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index cf99e37b..24fd78dc 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -48,7 +48,7 @@ Spara anteckningar automatiskt Aktivera radbrytning Använd tangentbordets inkognitoläge - Move undone checklist items at the top + Move done checklist items to the bottom Checklista diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9b59354c..af759458 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -48,7 +48,7 @@ Notları otomatik kaydet Sözcük kaydırmayı etkinleştir Klavyelerin Gizli modunu kullan - Tamamlanmamış yapılacak listesi öğelerini en üste taşı + Tamamlanmamış yapılacak listesi öğelerini en üste taşı Yapılacak listesi diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bb8757fd..ed1b4743 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -48,7 +48,7 @@ Автозбереження нотаток Продовжувати друк з нового рядка Використовувати режим Приватності в клавіатурі - Move undone checklist items at the top + Move done checklist items to the bottom Список diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d8907f7b..79e864bf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -48,7 +48,7 @@ 自动保存笔记 启用行折叠 对于键盘使用隐私模式 - 移动未完成的清单至顶端 + 移动未完成的清单至顶端 清单 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 83ace3db..a2d1213a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -48,7 +48,7 @@ 自動儲存筆記 自動換行 使用無痕模式的鍵盤 - 將未完成的核對清單項目移動至頂端 + 將未完成的核對清單項目移動至頂端 核對清單 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f66e5bf..3d6fda08 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -48,7 +48,7 @@ Autosave notes Enable line wrap Use Incognito mode of keyboards - Move done checklist items to the bottom + Move done checklist items to the bottom Checklist diff --git a/build.gradle b/build.gradle index c44eed22..db03aed7 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong