fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-06-05 17:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added custom sorting (#464)

Browse Source
This commit is contained in:
Agnieszka C
2021-10-12 15:49:30 +02:00
parent fd14f01f1f
commit 23cdd2511b
4 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
View File

@ -7,6 +7,7 @@ import android.view.ViewGroup
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity
@ -65,7 +66,8 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
migrateCheckListOnFailure(storedNote)
}
if (config?.moveDoneChecklistItems == true) {
val sorting = config?.sorting ?: 0
if (sorting and SORT_BY_CUSTOM == 0 && config?.moveDoneChecklistItems == true) {
items.sortBy { it.isDone }
}
@ -159,9 +161,11 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
private fun setupAdapter() {
updateUIVisibility()
ChecklistItem.sorting = requireContext().config.sorting
items.sort()
if (context?.config?.moveDoneChecklistItems == true) {
items.sortBy { it.isDone }
if (ChecklistItem.sorting and SORT_BY_CUSTOM == 0) {
items.sort()
if (context?.config?.moveDoneChecklistItems == true) {
items.sortBy { it.isDone }
}
}
ChecklistAdapter(
activity = activity as SimpleActivity,
@ -217,6 +221,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
}
override fun refreshItems() {
loadNoteById(noteId)
setupAdapter()
}
}