Merge branch '14.6.1'

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

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 {

app/src/main/java/org/tasks/preferences/Preferences.kt

@@ -489,7 +489,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

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

fastlane/metadata/android/en-US/changelogs/140603.txt

@@ -0,0 +1 @@
+Initial WearOS release - work in progress!

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-versionCode = "140600" # increment by 2
+versionCode = "140602" # increment by 2
-versionName = "14.6"
+versionName = "14.6.1"
 agp = "8.9.1"
 android-compileSdk = "35"
 android-minSdk = "26"

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..<startOfToday
                         val currentOverdue = header == HEADER_OVERDUE
-                        if (previous > 0 &&
+                        if (
                             ((currentOverdue != previousOverdue) ||
                                     (!currentOverdue && header != previous.startOfDay()))
                         ) {