From e40c0553e1a2f34ab9a0466cb98236b7df3f07d5 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 30 Mar 2025 00:10:35 -0500 Subject: [PATCH 1/4] Preserve previous sort defaults for existing users --- .../main/java/com/todoroo/astrid/service/Upgrader.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt index 4818959cf..5f37f4513 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt +++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt @@ -135,6 +135,16 @@ class Upgrader @Inject constructor( } } } + run(from, V14_6_1) { + if (preferences.installVersion < V14_5_4) { + if (preferences.getInt(R.string.p_sort_mode, -1) == -1) { + preferences.sortMode = SortHelper.SORT_AUTO + } + if (preferences.getInt(R.string.p_group_mode, -2) == -2) { + preferences.groupMode = SortHelper.GROUP_NONE + } + } + } preferences.setBoolean(R.string.p_just_updated, true) } else { setInstallDetails(to) @@ -396,6 +406,7 @@ class Upgrader @Inject constructor( const val V12_6 = 120601 const val V12_8 = 120800 const val V14_5_4 = 140516 + const val V14_6_1 = 140602 @JvmStatic fun getAndroidColor(context: Context, index: Int): Int { From f63632e2230e38e9c52f8a082995ff8a19625897 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 30 Mar 2025 00:44:01 -0500 Subject: [PATCH 2/4] Sort group ascending by default --- app/src/main/java/org/tasks/preferences/Preferences.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 1377bbd22..061433813 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -507,7 +507,7 @@ class Preferences @JvmOverloads constructor( set(value) { setBoolean(R.string.p_sort_ascending, value) } override var groupAscending: Boolean - get() = getBoolean(R.string.p_group_ascending, false) + get() = getBoolean(R.string.p_group_ascending, true) set(value) { setBoolean(R.string.p_group_ascending, value) } override var completedAscending: Boolean From 291cad4e5af454764cc29e4f3a53b02d69eb9995 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 30 Mar 2025 00:55:49 -0500 Subject: [PATCH 3/4] Fix grouping by due date descending --- .../kotlin/org/tasks/tasklist/SectionedDataSource.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kmp/src/commonMain/kotlin/org/tasks/tasklist/SectionedDataSource.kt b/kmp/src/commonMain/kotlin/org/tasks/tasklist/SectionedDataSource.kt index c9d1c6877..64f625e9d 100644 --- a/kmp/src/commonMain/kotlin/org/tasks/tasklist/SectionedDataSource.kt +++ b/kmp/src/commonMain/kotlin/org/tasks/tasklist/SectionedDataSource.kt @@ -141,9 +141,9 @@ class SectionedDataSource( sections.add(AdapterSection(i, header, 0, isCollapsed)) } groupMode == SortHelper.SORT_DUE -> { - val previousOverdue = previous < startOfToday + val previousOverdue = previous in 1.. 0 && + if ( ((currentOverdue != previousOverdue) || (!currentOverdue && header != previous.startOfDay())) ) { From 9fd50c117cfd7820850cce79e1aa046b632215ad Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 30 Mar 2025 00:19:19 -0500 Subject: [PATCH 4/4] Update version and changelog --- CHANGELOG.md | 6 ++++++ fastlane/metadata/android/en-US/changelogs/140602.txt | 3 +++ fastlane/metadata/android/en-US/changelogs/140603.txt | 1 + gradle/libs.versions.toml | 4 ++-- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/140602.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/140603.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 579ee1085..84b24b389 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### 14.6.1 (2025-03-30) + +* Restore default sort mode for existing installs +* Fix grouping by due date descending +* Remove shadow from launcher icons + ### 14.6 (2025-03-25) * Add dynamic theme color - requires pro subscription diff --git a/fastlane/metadata/android/en-US/changelogs/140602.txt b/fastlane/metadata/android/en-US/changelogs/140602.txt new file mode 100644 index 000000000..65b2208c7 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/140602.txt @@ -0,0 +1,3 @@ +* Restore default sort mode for existing installs +* Fix grouping by due date descending +* Remove shadow from launcher icons diff --git a/fastlane/metadata/android/en-US/changelogs/140603.txt b/fastlane/metadata/android/en-US/changelogs/140603.txt new file mode 100644 index 000000000..9cdae6d2d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/140603.txt @@ -0,0 +1 @@ +Initial WearOS release - work in progress! diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index db58ab966..07c4ef5aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -versionCode = "140600" # increment by 2 -versionName = "14.6" +versionCode = "140602" # increment by 2 +versionName = "14.6.1" agp = "8.9.1" android-compileSdk = "35" android-minSdk = "24"