Added possibility to set own sorting for each checklist (#81)

Aga-C · Aga-C · commit 67859325121d · 2024-11-30T12:08:27.000+01: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
@@ -91,6 +91,7 @@ class MainActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         appLaunched(BuildConfig.APPLICATION_ID)
+        config.migrateMoveDoneChecklistItems()
         setupOptionsMenu()
         refreshMenuItems()
 
@@ -1117,6 +1118,9 @@ class MainActivity : SimpleActivity() {
                 doDeleteNote(mCurrentNote, deleteFile)
             }
         }
+        if (note.type == NoteType.TYPE_CHECKLIST) {
+            config.removeCustomSorting(note.id.toString())
+        }
     }
 
     private fun doDeleteNote(note: Note, deleteFile: Boolean) {
@@ -1306,7 +1310,7 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun displaySortChecklistDialog() {
-        SortChecklistDialog(this) {
+        SortChecklistDialog(this, mCurrentNote.id) {
             getPagerAdapter().refreshChecklist(binding.viewPager.currentItem)
             updateWidgets()
         }
diff --git a/app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt
@@ -171,7 +171,7 @@ class WidgetConfigureActivity : SimpleActivity() {
                 }
             }
 
-            TasksAdapter(this, null, binding.checklistNoteView).apply {
+            TasksAdapter(this, null, binding.checklistNoteView, mCurrentNoteId).apply {
                 updateTextColor(mTextColor)
                 binding.checklistNoteView.adapter = this
                 submitList(items.toList())
diff --git a/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt
@@ -129,7 +129,7 @@ class OpenNoteAdapter(
                     Task.sorting = sorting
                     if (Task.sorting and SORT_BY_CUSTOM == 0) {
                         it.sorted().let {
-                            if (context.config.moveDoneChecklistItems) {
+                            if (context.config.getMoveDoneChecklistItems(null)) {
                                 it.sortedBy { it.isDone }
                             } else {
                                 it
diff --git a/app/src/main/kotlin/org/fossify/notes/adapters/TasksAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/TasksAdapter.kt
@@ -38,6 +38,7 @@ class TasksAdapter(
     activity: BaseSimpleActivity,
     val listener: TasksActionListener?,
     recyclerView: MyRecyclerView,
+    val noteId: Long,
     itemClick: (Any) -> Unit = {},
 ) : MyRecyclerViewListAdapter<NoteItem>(
     activity = activity, recyclerView = recyclerView, diffUtil = TaskDiffCallback(), itemClick = itemClick
@@ -98,8 +99,8 @@ 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.moveDoneChecklistItems
-        menu.findItem(R.id.cab_move_to_bottom).isVisible = selectedItems.none { it.isDone } || !activity.config.moveDoneChecklistItems
+        menu.findItem(R.id.cab_move_to_top).isVisible = selectedItems.none { it.isDone } || !activity.config.getMoveDoneChecklistItems(noteId)
+        menu.findItem(R.id.cab_move_to_bottom).isVisible = selectedItems.none { it.isDone } || !activity.config.getMoveDoneChecklistItems(noteId)
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -174,7 +175,7 @@ class TasksAdapter(
             checklistCheckbox.isChecked = task.isDone
             checklistHolder.isSelected = isSelected
 
-            val canMoveTask = !task.isDone || !activity.config.moveDoneChecklistItems
+            val canMoveTask = !task.isDone || !activity.config.getMoveDoneChecklistItems(noteId)
             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
@@ -129,10 +129,11 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi
 
             // checklist title can be null only because of the glitch in upgrade to 6.6.0, remove this check in the future
             tasks = tasks.toMutableList() as ArrayList<Task>
-            val sorting = context.config.sorting
+            val sorting = context.config.getSorting(noteId)
             if (sorting and SORT_BY_CUSTOM == 0) {
+                Task.sorting = sorting
                 tasks.sort()
-                if (context.config.moveDoneChecklistItems) {
+                if (context.config.getMoveDoneChecklistItems(noteId)) {
                     tasks.sortBy { it.isDone }
                 }
             }
diff --git a/app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt
@@ -14,7 +14,7 @@ import org.fossify.notes.databinding.DialogNewChecklistItemBinding
 import org.fossify.notes.databinding.ItemAddChecklistBinding
 import org.fossify.notes.extensions.config
 
-class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) {
+class NewChecklistItemDialog(val activity: Activity, private val noteId: Long, callback: (titles: ArrayList<String>) -> Unit) {
     private val titles = mutableListOf<AppCompatEditText>()
     private val binding = DialogNewChecklistItemBinding.inflate(activity.layoutInflater)
     private val view = binding.root
@@ -32,7 +32,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
             addItem.setOnClickListener {
                 addNewEditText()
             }
-            settingsAddChecklistTop.beVisibleIf(activity.config.sorting == SORT_BY_CUSTOM)
+            settingsAddChecklistTop.beVisibleIf(activity.config.getSorting(noteId) == SORT_BY_CUSTOM)
             settingsAddChecklistTop.isChecked = activity.config.addNewChecklistItemsTop
         }
 
diff --git a/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt
@@ -1,5 +1,6 @@
 package org.fossify.notes.dialogs
 
+import org.fossify.commons.extensions.beGone
 import org.fossify.commons.extensions.beGoneIf
 import org.fossify.commons.extensions.getAlertDialogBuilder
 import org.fossify.commons.extensions.setupDialogStuff
@@ -11,12 +12,13 @@ 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, private val callback: () -> Unit) {
+class SortChecklistDialog(private val activity: SimpleActivity, private val noteId: Long?, private val callback: () -> Unit) {
     private val binding = DialogSortChecklistBinding.inflate(activity.layoutInflater)
     private val view = binding.root
     private val config = activity.config
-    private var currSorting = config.sorting
+    private var currSorting = config.getSorting(noteId)
 
     init {
         setupSortRadio()
@@ -49,6 +51,12 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
             fieldBtn = binding.sortingDialogRadioCustom
         }
 
+        if (noteId == null) {
+            binding.sortingDialogUseForThisChecklist.beGone()
+        } else {
+            binding.sortingDialogUseForThisChecklist.isChecked = config.hasOwnSorting(noteId)
+        }
+
         fieldBtn.isChecked = true
     }
 
@@ -63,7 +71,7 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
     }
 
     private fun setupMoveUndoneChecklistItems() {
-        binding.settingsMoveUndoneChecklistItems.isChecked = config.moveDoneChecklistItems
+        binding.settingsMoveUndoneChecklistItems.isChecked = config.getMoveDoneChecklistItems(noteId)
         binding.settingsMoveUndoneChecklistItemsHolder.setOnClickListener {
             binding.settingsMoveUndoneChecklistItems.toggle()
         }
@@ -83,11 +91,19 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
             sorting = sorting or SORT_DESCENDING
         }
 
-        if (currSorting != sorting) {
+        if (binding.settingsMoveUndoneChecklistItems.isChecked) {
+            sorting = sorting or SORT_MOVE_DONE_ITEMS
+        }
+
+        if (binding.sortingDialogUseForThisChecklist.isChecked) {
+            config.saveOwnSorting(noteId!!, sorting)
+        } else {
+            if (noteId != null) {
+                config.removeOwnSorting(noteId)
+            }
             config.sorting = sorting
         }
 
-        config.moveDoneChecklistItems = binding.settingsMoveUndoneChecklistItems.isChecked
         callback()
     }
 }
diff --git a/app/src/main/kotlin/org/fossify/notes/fragments/TasksFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/TasksFragment.kt
@@ -139,7 +139,7 @@ class TasksFragment : NoteFragment(), TasksActionListener {
     }
 
     private fun showNewItemDialog() {
-        NewChecklistItemDialog(activity as SimpleActivity) { titles ->
+        NewChecklistItemDialog(activity as SimpleActivity, noteId) { titles ->
             var currentMaxId = tasks.maxByOrNull { item -> item.id }?.id ?: 0
             val newItems = ArrayList<Task>()
 
@@ -162,7 +162,7 @@ class TasksFragment : NoteFragment(), TasksActionListener {
     }
 
     private fun prepareTaskItems(): List<NoteItem> {
-        return if (config?.moveDoneChecklistItems == true) {
+        return if (config?.getMoveDoneChecklistItems(noteId) == true) {
             mutableListOf<NoteItem>().apply {
                 val (checked, unchecked) = tasks.partition { it.isDone }
                 this += unchecked
@@ -191,6 +191,7 @@ class TasksFragment : NoteFragment(), TasksActionListener {
                 activity = activity as SimpleActivity,
                 listener = this,
                 recyclerView = binding.checklistList,
+                noteId = noteId,
                 itemClick = ::itemClicked
             )
             binding.checklistList.adapter = adapter
@@ -201,7 +202,7 @@ class TasksFragment : NoteFragment(), TasksActionListener {
 
     private fun setupAdapter() {
         updateUIVisibility()
-        Task.sorting = requireContext().config.sorting
+        Task.sorting = requireContext().config.getSorting(noteId)
         if (Task.sorting and SORT_BY_CUSTOM == 0) {
             tasks.sort()
         }
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,10 +75,6 @@ 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
@@ -92,4 +88,26 @@ class Config(context: Context) : BaseConfig(context) {
     var addNewChecklistItemsTop: Boolean
         get() = prefs.getBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, false)
         set(addNewCheckListItemsTop) = prefs.edit().putBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, addNewCheckListItemsTop).apply()
+
+    fun getSorting(noteId: Long?) = if (noteId == null) sorting else getFolderSorting(noteId.toString())
+
+    fun hasOwnSorting(noteId: Long?) = noteId != null && hasCustomSorting(noteId.toString())
+
+    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
@@ -39,6 +39,7 @@ const val MOVE_DONE_CHECKLIST_ITEMS = "move_undone_checklist_items"     // it ha
 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"
+const val MIGRATED_MOVE_DONE_CHECKLIST_ITEMS = "migrated_move_undone_checklist_items"
 
 // auto backups
 const val AUTOMATIC_BACKUP_REQUEST_CODE = 10001
@@ -80,3 +81,5 @@ 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/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml
@@ -93,4 +93,12 @@
             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"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/min_radio_checkbox_height"
+        android:text="@string/use_for_this_checklist" />
+
 </LinearLayout>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -67,6 +67,7 @@
     <string name="checklist_is_empty">Lista kontrolna jest pusta</string>
     <string name="delete_checked_items">Usuń odhaczone elementy</string>
     <string name="add_to_the_top">Dodaj na górze</string>
+    <string name="use_for_this_checklist">Tylko w tej liście kontrolnej</string>
     <plurals name="num_checked_items">
         <item quantity="one">%d odhaczony element</item>
         <item quantity="few">%d odhaczone elementy</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -72,6 +72,7 @@
     <string name="checklist_is_empty">The checklist is empty</string>
     <string name="delete_checked_items">Delete checked items</string>
     <string name="add_to_the_top">Add to the top</string>
+    <string name="use_for_this_checklist">Use for this checklist only</string>
     <plurals name="num_checked_items">
         <item quantity="one">%d checked item</item>
         <item quantity="other">%d checked items</item>

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ class MainActivity : SimpleActivity() {`
`91`	`91`	`super.onCreate(savedInstanceState)`
`92`	`92`	`setContentView(binding.root)`
`93`	`93`	`appLaunched(BuildConfig.APPLICATION_ID)`
	`94`	`+ config.migrateMoveDoneChecklistItems()`
`94`	`95`	`setupOptionsMenu()`
`95`	`96`	`refreshMenuItems()`
`96`	`97`
`@@ -1117,6 +1118,9 @@ class MainActivity : SimpleActivity() {`
`1117`	`1118`	`doDeleteNote(mCurrentNote, deleteFile)`
`1118`	`1119`	`}`
`1119`	`1120`	`}`
	`1121`	`+ if (note.type == NoteType.TYPE_CHECKLIST) {`
	`1122`	`+ config.removeCustomSorting(note.id.toString())`
	`1123`	`+ }`
`1120`	`1124`	`}`
`1121`	`1125`
`1122`	`1126`	`private fun doDeleteNote(note: Note, deleteFile: Boolean) {`
`@@ -1306,7 +1310,7 @@ class MainActivity : SimpleActivity() {`
`1306`	`1310`	`}`
`1307`	`1311`
`1308`	`1312`	`private fun displaySortChecklistDialog() {`
`1309`		`- SortChecklistDialog(this) {`
	`1313`	`+ SortChecklistDialog(this, mCurrentNote.id) {`
`1310`	`1314`	`getPagerAdapter().refreshChecklist(binding.viewPager.currentItem)`
`1311`	`1315`	`updateWidgets()`
`1312`	`1316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ class WidgetConfigureActivity : SimpleActivity() {`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`- TasksAdapter(this, null, binding.checklistNoteView).apply {`
	`174`	`+ TasksAdapter(this, null, binding.checklistNoteView, mCurrentNoteId).apply {`
`175`	`175`	`updateTextColor(mTextColor)`
`176`	`176`	`binding.checklistNoteView.adapter = this`
`177`	`177`	`submitList(items.toList())`
Original file line number	Diff line number	Diff line change
`@@ -129,10 +129,11 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi`
`129`	`129`
`130`	`130`	`// checklist title can be null only because of the glitch in upgrade to 6.6.0, remove this check in the future`
`131`	`131`	`tasks = tasks.toMutableList() as ArrayList<Task>`
`132`		`- val sorting = context.config.sorting`
	`132`	`+ val sorting = context.config.getSorting(noteId)`
`133`	`133`	`if (sorting and SORT_BY_CUSTOM == 0) {`
	`134`	`+ Task.sorting = sorting`
`134`	`135`	`tasks.sort()`
`135`		`- if (context.config.moveDoneChecklistItems) {`
	`136`	`+ if (context.config.getMoveDoneChecklistItems(noteId)) {`
`136`	`137`	`tasks.sortBy { it.isDone }`
`137`	`138`	`}`
`138`	`139`	`}`