From 7376a4d8d7d74e06fee8040f03dc6294457e7833 Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 14 May 2023 10:12:51 +0200 Subject: [PATCH] Added sorting to the widget (#624) --- .../notes/pro/activities/MainActivity.kt | 1 + .../simplemobiletools/notes/pro/adapters/WidgetAdapter.kt | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index a44a47f6..54e2dd8e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -1487,6 +1487,7 @@ class MainActivity : SimpleActivity() { private fun displaySortChecklistDialog() { SortChecklistDialog(this) { getPagerAdapter().refreshChecklist(view_pager.currentItem) + updateWidgets() } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt index b270d307..52e8a16a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt @@ -11,6 +11,7 @@ import com.google.gson.reflect.TypeToken import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.setText import com.simplemobiletools.commons.extensions.setTextSize +import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R.id.widget_text_holder @@ -129,6 +130,13 @@ 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 checklistItems = checklistItems.filter { it.title != null }.toMutableList() as ArrayList + val sorting = context.config?.sorting ?: 0 + if (sorting and SORT_BY_CUSTOM == 0) { + checklistItems.sort() + if (context?.config?.moveDoneChecklistItems == true) { + checklistItems.sortBy { it.isDone } + } + } } }