From 249eba4f59be2ab4b5409cc75bd8615e4504e7ec Mon Sep 17 00:00:00 2001
From: Agnieszka C <85929121+Aga-C@users.noreply.github.com>
Date: Wed, 11 Jan 2023 15:25:46 +0100
Subject: [PATCH] Moved the checkbox into the dialog

---
 .../notes/pro/activities/SettingsActivity.kt      |  9 ---------
 .../notes/pro/dialogs/NewChecklistItemDialog.kt   |  6 ++++++
 app/src/main/res/layout/activity_settings.xml     | 15 ---------------
 .../main/res/layout/dialog_new_checklist_item.xml |  7 +++++++
 4 files changed, 13 insertions(+), 24 deletions(-)

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 e87dd7ed..39e34ede 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,7 +50,6 @@ class SettingsActivity : SimpleActivity() {
         setupCursorPlacement()
         setupIncognitoMode()
         setupCustomizeWidgetColors()
-        setupAddNewChecklistItemsTop()
         updateTextColors(settings_nested_scrollview)
 
         arrayOf(
@@ -258,12 +257,4 @@ 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/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
index 1d3165b7..8e9b773e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
@@ -9,8 +9,11 @@ import android.view.inputmethod.EditorInfo
 import androidx.appcompat.widget.AppCompatEditText
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.DARK_GREY
+import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
 import com.simplemobiletools.notes.pro.R
+import com.simplemobiletools.notes.pro.extensions.config
 import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.*
+import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder
 import kotlinx.android.synthetic.main.item_add_checklist.view.*
 
 class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) {
@@ -31,6 +34,8 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
             add_item.setOnClickListener {
                 addNewEditText()
             }
+            settings_add_checklist_top.beVisibleIf(activity.config.sorting == SORT_BY_CUSTOM)
+            settings_add_checklist_top.isChecked = activity.config.addNewChecklistItemsTop
         }
 
         activity.getAlertDialogBuilder()
@@ -40,6 +45,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
                 activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { alertDialog ->
                     alertDialog.showKeyboard(titles.first())
                     alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
+                        activity.config.addNewChecklistItemsTop = view.settings_add_checklist_top.isChecked
                         when {
                             titles.all { it.text!!.isEmpty() } -> activity.toast(R.string.empty_name)
                             else -> {
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index a904037e..29ce1c5f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -227,21 +227,6 @@
 
             </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"
diff --git a/app/src/main/res/layout/dialog_new_checklist_item.xml b/app/src/main/res/layout/dialog_new_checklist_item.xml
index e358a6f0..4733f730 100644
--- a/app/src/main/res/layout/dialog_new_checklist_item.xml
+++ b/app/src/main/res/layout/dialog_new_checklist_item.xml
@@ -32,5 +32,12 @@
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus_vector" />
 
+        <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+            android:id="@+id/settings_add_checklist_top"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/add_new_checklist_items_top"
+            android:visibility="gone" />
+
     </LinearLayout>
 </ScrollView>