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

Remove unnecessary strings, remove separate done from/undone

Browse Source
This commit is contained in:
darthpaul
2021-10-03 14:53:40 +01:00
parent 1ea4f0bf04
commit 9d60d27e53
35 changed files with 11 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt
View File

@ -30,23 +30,19 @@ class SortChecklistDialog(private val activity: SimpleActivity, val callback: (C
ChecklistSortDirection.DESCENDING -> sort_direction_desc.id
}
)
separate_done_from_undone.isChecked = config.checklistSeparateDoneFromUndone
}
AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.cancel, null)
.create().apply {
activity.setupDialogStuff(view, this, R.string.sort_checklist) {
activity.setupDialogStuff(view, this, R.string.sort_by) {
getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener {
val sortField = getSortField(view)
val sortDirection = getSortDirection(view)
val separateDoneFromUndone = view.separate_done_from_undone.isChecked
config.checklistSortField = sortField
config.checklistSortDirection = sortDirection
config.checklistSeparateDoneFromUndone = separateDoneFromUndone
callback.invoke(ChecklistSort(sortField, sortDirection, separateDoneFromUndone))
callback.invoke(ChecklistSort(sortField, sortDirection))
dismiss()
}
}

7
app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistSort.kt
View File

@ -3,7 +3,6 @@ package com.simplemobiletools.notes.pro.models
data class ChecklistSort(
val field: ChecklistSortField,
val direction: ChecklistSortDirection,
val separateDoneFromUndone: Boolean,
) {
fun getSortComparator(): Comparator<ChecklistItem> {
@ -15,10 +14,8 @@ data class ChecklistSort(
private fun compareWithSortDirection(compareFunc: (ChecklistItem) -> Comparable<*>): Comparator<ChecklistItem> {
return when (direction) {
ChecklistSortDirection.ASCENDING -> if (separateDoneFromUndone) compareBy({ it.isDone }, compareFunc) else compareBy(compareFunc)
ChecklistSortDirection.DESCENDING -> if (separateDoneFromUndone) compareByDescending<ChecklistItem> { it.isDone }.thenByDescending(compareFunc) else compareByDescending(
compareFunc
)
ChecklistSortDirection.ASCENDING -> compareBy(compareFunc)
ChecklistSortDirection.DESCENDING -> compareByDescending(compareFunc)
}
}
}