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 1/3] 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 @@ + + + + + + Date: Wed, 11 Jan 2023 15:25:46 +0100 Subject: [PATCH 2/3] 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) -> 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 @@ - - - - - - + + From af38da35a16d26b8efb716accb55451400d06889 Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 15 Jan 2023 12:07:01 +0100 Subject: [PATCH 3/3] Changed string --- app/src/main/res/layout/dialog_new_checklist_item.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4733f730..8a97d254 100644 --- a/app/src/main/res/layout/dialog_new_checklist_item.xml +++ b/app/src/main/res/layout/dialog_new_checklist_item.xml @@ -36,7 +36,7 @@ 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:text="@string/add_to_the_top" android:visibility="gone" />