From ba07d6b01d59095f1707e053040fb690f8cdabea Mon Sep 17 00:00:00 2001
From: Agnieszka C <85929121+Aga-C@users.noreply.github.com>
Date: Wed, 11 Jan 2023 10:27:28 +0100
Subject: [PATCH] Added new checklist items at the top (#583)

---
 .../notes/pro/activities/SettingsActivity.kt      |  9 +++++++++
 .../notes/pro/fragments/ChecklistFragment.kt      |  7 ++++++-
 .../simplemobiletools/notes/pro/helpers/Config.kt |  4 ++++
 .../notes/pro/helpers/Constants.kt                |  1 +
 app/src/main/res/layout/activity_settings.xml     | 15 +++++++++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

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 39e34ede..e87dd7ed 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
@@ -50,6 +50,7 @@ class SettingsActivity : SimpleActivity() {
         setupCursorPlacement()
         setupIncognitoMode()
         setupCustomizeWidgetColors()
+        setupAddNewChecklistItemsTop()
         updateTextColors(settings_nested_scrollview)
 
         arrayOf(
@@ -257,4 +258,12 @@ class SettingsActivity : SimpleActivity() {
             config.useIncognitoMode = settings_use_incognito_mode.isChecked
         }
     }
+
+    private fun setupAddNewChecklistItemsTop() {
+        settings_add_checklist_top.isChecked = config.addNewChecklistItemsTop
+        settings_add_checklist_top_holder.setOnClickListener {
+            settings_add_checklist_top.toggle()
+            config.addNewChecklistItemsTop = settings_add_checklist_top.isChecked
+        }
+    }
 }
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 7e671707..ffd1c840 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
@@ -152,7 +152,12 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
                 }
             }
 
-            items.addAll(newItems)
+            if (config?.addNewChecklistItemsTop == true) {
+                items.addAll(0, newItems)
+            } else {
+                items.addAll(newItems)
+            }
+
             saveNote()
             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 fec09284..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
@@ -89,4 +89,8 @@ class Config(context: Context) : BaseConfig(context) {
     var fontSizePercentage: Int
         get() = prefs.getInt(FONT_SIZE_PERCENTAGE, 100)
         set(fontSizePercentage) = prefs.edit().putInt(FONT_SIZE_PERCENTAGE, fontSizePercentage).apply()
+
+    var addNewChecklistItemsTop: Boolean
+        get() = prefs.getBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, false)
+        set(addNewCheckListItemsTop) = prefs.edit().putBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, addNewCheckListItemsTop).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 442f4aad..bcfc706f 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
@@ -37,6 +37,7 @@ 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 EXPORT_MIME_TYPE = "text/plain"
+const val ADD_NEW_CHECKLIST_ITEMS_TOP = "add_new_checklist_items_top"
 
 // gravity
 const val GRAVITY_LEFT = 0
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 29ce1c5f..a904037e 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -227,6 +227,21 @@
 
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/settings_add_checklist_top_holder"
+                style="@style/SettingsHolderCheckboxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                    android:id="@+id/settings_add_checklist_top"
+                    style="@style/SettingsCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/add_new_checklist_items_top" />
+
+            </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/settings_gravity_holder"
                 style="@style/SettingsHolderTextViewStyle"