Made moveDoneChecklistItems a global setting

Aga-C · Aga-C · commit fdf9e452ab11 · 2025-04-23T19:45:56.000+02:00
diff --git a/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
@@ -161,7 +161,6 @@ class MainActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         appLaunched(BuildConfig.APPLICATION_ID)
-        config.migrateMoveDoneChecklistItems()
         setupOptionsMenu()
         refreshMenuItems()
 
diff --git a/app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt
@@ -111,6 +111,7 @@ class SettingsActivity : SimpleActivity() {
         setupMonospacedFont()
         setupShowKeyboard()
         setupShowNotePicker()
+        setupMoveUndoneChecklistItems()
         setupShowWordCount()
         setupEnableLineWrap()
         setupFontSize()
@@ -247,6 +248,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupMoveUndoneChecklistItems() {
+        binding.settingsMoveUndoneChecklistItems.isChecked = config.moveDoneChecklistItems
+        binding.settingsMoveUndoneChecklistItemsHolder.setOnClickListener {
+            binding.settingsMoveUndoneChecklistItems.toggle()
+            config.moveDoneChecklistItems = binding.settingsMoveUndoneChecklistItems.isChecked
+        }
+    }
+
     private fun setupShowWordCount() {
         binding.settingsShowWordCount.isChecked = config.showWordCount
         binding.settingsShowWordCountHolder.setOnClickListener {
diff --git a/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt
@@ -131,7 +131,7 @@ class OpenNoteAdapter(
                     if (Task.sorting and SORT_BY_CUSTOM == 0) {
                         result = result.sorted()
                     }
-                    if (context.config.getMoveDoneChecklistItems(id)) {
+                    if (context.config.moveDoneChecklistItems) {
                         result = result.sortedBy { it.isDone }
                     }
                     result
diff --git a/app/src/main/kotlin/org/fossify/notes/adapters/TasksAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/TasksAdapter.kt
@@ -100,9 +100,9 @@ class TasksAdapter(
 
         menu.findItem(R.id.cab_rename).isVisible = isOneItemSelected()
         menu.findItem(R.id.cab_move_to_top).isVisible = selectedItems.none { it.isDone }
-            || !activity.config.getMoveDoneChecklistItems(noteId)
+            || !activity.config.moveDoneChecklistItems
         menu.findItem(R.id.cab_move_to_bottom).isVisible = selectedItems.none { it.isDone }
-            || !activity.config.getMoveDoneChecklistItems(noteId)
+            || !activity.config.moveDoneChecklistItems
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -177,7 +177,7 @@ class TasksAdapter(
             checklistCheckbox.isChecked = task.isDone
             checklistHolder.isSelected = isSelected
 
-            val canMoveTask = !task.isDone || !activity.config.getMoveDoneChecklistItems(noteId)
+            val canMoveTask = !task.isDone || !activity.config.moveDoneChecklistItems
             checklistDragHandle.beVisibleIf(beVisible = canMoveTask && selectedKeys.isNotEmpty())
             checklistDragHandle.applyColorFilter(textColor)
             checklistDragHandle.setOnTouchListener { _, event ->
diff --git a/app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt
@@ -134,7 +134,7 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi
                 Task.sorting = sorting
                 tasks.sort()
             }
-            if (context.config.getMoveDoneChecklistItems(noteId)) {
+            if (context.config.moveDoneChecklistItems) {
                 tasks.sortBy { it.isDone }
             }
         }
diff --git a/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt
@@ -12,7 +12,6 @@ import org.fossify.notes.R
 import org.fossify.notes.activities.SimpleActivity
 import org.fossify.notes.databinding.DialogSortChecklistBinding
 import org.fossify.notes.extensions.config
-import org.fossify.notes.helpers.SORT_MOVE_DONE_ITEMS
 
 class SortChecklistDialog(
     private val activity: SimpleActivity,
@@ -27,7 +26,6 @@ class SortChecklistDialog(
     init {
         setupSortRadio()
         setupOrderRadio()
-        setupMoveUndoneChecklistItems()
 
         activity.getAlertDialogBuilder()
             .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> dialogConfirmed() }
@@ -74,13 +72,6 @@ class SortChecklistDialog(
         orderBtn.isChecked = true
     }
 
-    private fun setupMoveUndoneChecklistItems() {
-        binding.settingsMoveUndoneChecklistItems.isChecked = config.getMoveDoneChecklistItems(noteId)
-        binding.settingsMoveUndoneChecklistItemsHolder.setOnClickListener {
-            binding.settingsMoveUndoneChecklistItems.toggle()
-        }
-    }
-
     private fun dialogConfirmed() {
         val sortingRadio = binding.sortingDialogRadioSorting
         var sorting = when (sortingRadio.checkedRadioButtonId) {
@@ -95,10 +86,6 @@ class SortChecklistDialog(
             sorting = sorting or SORT_DESCENDING
         }
 
-        if (binding.settingsMoveUndoneChecklistItems.isChecked) {
-            sorting = sorting or SORT_MOVE_DONE_ITEMS
-        }
-
         if (binding.sortingDialogUseForThisChecklist.isChecked) {
             config.saveOwnSorting(noteId!!, sorting)
         } else {
diff --git a/app/src/main/kotlin/org/fossify/notes/fragments/TasksFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/TasksFragment.kt
@@ -162,7 +162,7 @@ class TasksFragment : NoteFragment(), TasksActionListener {
     }
 
     private fun prepareTaskItems(): List<NoteItem> {
-        return if (config?.getMoveDoneChecklistItems(noteId) == true) {
+        return if (config?.moveDoneChecklistItems == true) {
             mutableListOf<NoteItem>().apply {
                 val (checked, unchecked) = tasks.partition { it.isDone }
                 this += unchecked
diff --git a/app/src/main/kotlin/org/fossify/notes/helpers/Config.kt b/app/src/main/kotlin/org/fossify/notes/helpers/Config.kt
@@ -75,6 +75,10 @@ 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 moveDoneChecklistItems: Boolean
+        get() = prefs.getBoolean(MOVE_DONE_CHECKLIST_ITEMS, true)
+        set(moveDoneChecklistItems) = prefs.edit().putBoolean(MOVE_DONE_CHECKLIST_ITEMS, moveDoneChecklistItems).apply()
+
     fun getTextGravity() = when (gravity) {
         GRAVITY_CENTER -> Gravity.CENTER_HORIZONTAL
         GRAVITY_END -> Gravity.END
@@ -96,18 +100,4 @@ class Config(context: Context) : BaseConfig(context) {
     fun saveOwnSorting(noteId: Long, sorting: Int) = saveCustomSorting(noteId.toString(), sorting)
 
     fun removeOwnSorting(noteId: Long) = removeCustomSorting(noteId.toString())
-
-    fun getMoveDoneChecklistItems(noteId: Long?): Boolean = getSorting(noteId) and SORT_MOVE_DONE_ITEMS != 0
-
-    fun migrateMoveDoneChecklistItems() {
-        val isMigrated = prefs.getBoolean(MIGRATED_MOVE_DONE_CHECKLIST_ITEMS, false)
-        if (isMigrated) {
-            return
-        }
-        val oldValue = prefs.getBoolean(MOVE_DONE_CHECKLIST_ITEMS, true)
-        if (oldValue) {
-            sorting = sorting or SORT_MOVE_DONE_ITEMS
-        }
-        prefs.edit().putBoolean(MIGRATED_MOVE_DONE_CHECKLIST_ITEMS, true).apply()
-    }
 }
diff --git a/app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt
@@ -81,5 +81,3 @@ const val FONT_SIZE_175_PERCENT = 175
 const val FONT_SIZE_200_PERCENT = 200
 const val FONT_SIZE_250_PERCENT = 250
 const val FONT_SIZE_300_PERCENT = 300
-
-const val SORT_MOVE_DONE_ITEMS = 524288
diff --git 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_move_undone_checklist_items_holder"
+                style="@style/SettingsHolderCheckboxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <org.fossify.commons.views.MyAppCompatCheckbox
+                    android:id="@+id/settings_move_undone_checklist_items"
+                    style="@style/SettingsCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/move_done_checklist_items" />
+
+            </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/settings_gravity_holder"
                 style="@style/SettingsHolderTextViewStyle"
diff --git a/app/src/main/res/layout/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml
@@ -75,25 +75,6 @@
         android:id="@+id/move_undone_checklist_items_divider"
         layout="@layout/divider" />
 
-    <RelativeLayout
-        android:id="@+id/settings_move_undone_checklist_items_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/medium_margin"
-        android:background="?attr/selectableItemBackground"
-        android:paddingTop="@dimen/medium_margin"
-        android:paddingBottom="@dimen/medium_margin">
-
-        <org.fossify.commons.views.MyAppCompatCheckbox
-            android:id="@+id/settings_move_undone_checklist_items"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:clickable="false"
-            android:text="@string/move_done_checklist_items" />
-
-    </RelativeLayout>
-
     <org.fossify.commons.views.MyAppCompatCheckbox
         android:id="@+id/sorting_dialog_use_for_this_checklist"
         android:layout_width="match_parent"

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class OpenNoteAdapter(`
`131`	`131`	`if (Task.sorting and SORT_BY_CUSTOM == 0) {`
`132`	`132`	`result = result.sorted()`
`133`	`133`	`}`
`134`		`- if (context.config.getMoveDoneChecklistItems(id)) {`
	`134`	`+ if (context.config.moveDoneChecklistItems) {`
`135`	`135`	`result = result.sortedBy { it.isDone }`
`136`	`136`	`}`
`137`	`137`	`result`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi`
`134`	`134`	`Task.sorting = sorting`
`135`	`135`	`tasks.sort()`
`136`	`136`	`}`
`137`		`- if (context.config.getMoveDoneChecklistItems(noteId)) {`
	`137`	`+ if (context.config.moveDoneChecklistItems) {`
`138`	`138`	`tasks.sortBy { it.isDone }`
`139`	`139`	`}`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ class TasksFragment : NoteFragment(), TasksActionListener {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`private fun prepareTaskItems(): List<NoteItem> {`
`165`		`- return if (config?.getMoveDoneChecklistItems(noteId) == true) {`
	`165`	`+ return if (config?.moveDoneChecklistItems == true) {`
`166`	`166`	`mutableListOf<NoteItem>().apply {`
`167`	`167`	`val (checked, unchecked) = tasks.partition { it.isDone }`
`168`	`168`	`this += unchecked`