Merge branch 'develop' into dependabot/gradle/androidx.compose-compos…

…e-bom-2024.10.01

.github/workflows/create-beta.yml

@@ -53,7 +53,7 @@ jobs:
         run: cp app/build/outputs/apk/ose/release/app-ose-release.apk jtxBoard-${{ github.ref_name }}.apk
 
       - name: Create Github release
-        uses: softprops/action-gh-release@v2.0.8
+        uses: softprops/action-gh-release@v2.0.9
         with:
           prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
           files: | 

.github/workflows/create-release.yml

@@ -66,7 +66,7 @@ jobs:
         run: cp app/build/outputs/apk/ose/release/app-ose-release.apk jtxBoard-${{ github.ref_name }}.apk
 
       - name: Create Github release
-        uses: softprops/action-gh-release@v2.0.8
+        uses: softprops/action-gh-release@v2.0.9
         with:
           prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
           files: | 

app/build.gradle.kts

@@ -29,8 +29,8 @@ android {
         buildConfigField("long", "buildTime", "${System.currentTimeMillis()}L")
         minSdk = 23
         targetSdk = 34
-        versionCode = 209020004
-        versionName = "2.09.02-beta03"      // keep -release as a suffix also for release, build flavor adds the suffix e.g. .gplay (e.g. 1.00.00-rc0.gplay)
+        versionCode = 209030003
+        versionName = "2.09.03-beta01"      // keep -release as a suffix also for release, build flavor adds the suffix e.g. .gplay (e.g. 1.00.00-rc0.gplay)
         buildConfigField("String", "versionCodename", "\"Pride is a protest \uD83C\uDF08\"")
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/at/techbee/jtx/database/relations/ICal4ListRel.kt

@@ -97,7 +97,12 @@ data class ICal4ListRel(
                                 this[context.getString(R.string.filter_no_category)] = mutableListOf(sortedEntry)
                         }
                     }
-                }
+                }.toSortedMap(
+                    if(sortOrder == SortOrder.DESC)
+                        compareByDescending { it.uppercase() }
+                    else
+                        compareBy { it.uppercase() }
+                )
                 GroupBy.RESOURCE -> mutableMapOf<String, MutableList<ICal4ListRel>>().apply {
                     sortedList.forEach { sortedEntry ->
                         if (sortedEntry.resources.isNotEmpty()) {
@@ -114,7 +119,12 @@ data class ICal4ListRel(
                                 this[context.getString(R.string.filter_no_resource)] = mutableListOf(sortedEntry)
                         }
                     }
-                }
+                }.toSortedMap(
+                    if(sortOrder == SortOrder.DESC)
+                        compareByDescending { it.uppercase() }
+                    else
+                        compareBy { it.uppercase() }
+                )
                 //GroupBy.CATEGORY -> sortedList.groupBy { if(it.categories.isEmpty()) context.getString(R.string.filter_no_category) else it.categories.joinToString(separator = ", ") { category -> category.text } }.toSortedMap()
                 //GroupBy.RESOURCE -> sortedList.groupBy { if(it.resources.isEmpty()) context.getString(R.string.filter_no_resource) else it.resources.joinToString(separator = ", ") { resource -> resource.text?:"" } }.toSortedMap()
                 GroupBy.STATUS -> sortedList.groupBy {

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

@@ -0,0 +1,2 @@
+- Open filtered list from collections overview
+- Added setting to automatically collapse/expand parents in list

gradle/libs.versions.toml

@@ -3,56 +3,56 @@
 [versions]
 amazonAppstoreSdk = "3.0.5"
 android-agp = "8.5.2"
-android-desugaring = "2.0.4"
-androidx-activityCompose = "1.9.1"
+android-desugaring = "2.1.2"
+androidx-activityCompose = "1.9.3"
 androidx-appcompat = "1.7.0"
 androidx-arch = "2.2.0"
 androidx-core = "1.13.1"
-androidx-lifecycle = "2.8.4"
+androidx-lifecycle = "2.8.7"
 androidx-preference = "1.2.1"
 androidx-test-core = "1.6.1"
 androidx-test-runner = "1.6.2"
 androidx-test-rules = "1.6.1"
 androidx-test-junit = "1.2.1"
 androidx-work = "2.9.1"
-annotation = "1.8.2"
+annotation = "1.9.1"
 biometricKtx = "1.2.0-alpha05"
 bitfire-ical4android = "83cda23ceb"
-calendarCompose = "2.5.4"
+calendarCompose = "2.6.0"
 coilCompose = "2.7.0"
 compose-accompanist = "0.34.0"
 compose-bom = "2024.10.01"
 compose-navigation = "2.7.7"
-glance = "1.1.0"
+glance = "1.1.1"
 godaddy-colorpicker = "0.7.0"
 #huawei = "1.8.1.300"
 #huawei-iap = "6.10.0.300"
-kotlin = "2.0.10"
-kotlinx-coroutines = "1.8.1"
-kotlinxSerializationJson = "1.7.1"
+kotlin = "2.0.21"
+kotlinx-coroutines = "1.9.0"
+kotlinxSerializationJson = "1.7.3"
 # see https://github.com/google/ksp/releases for version numbers
-ksp = "2.0.10-1.0.24"
+ksp = "2.0.21-1.0.26"
 libphonenumber = "8.13.49"
 mapsCompose = "6.1.1"
 markdowntext = "1.3.2"
-mikepenz-aboutLibraries = "11.2.2"
+mikepenz-aboutLibraries = "11.2.3"
 mockitoCore = "5.12.0"
-osmdroidAndroid = "6.1.18"
+osmdroidAndroid = "6.1.20"
 playServicesLocation = "21.3.0"
 playServicesMaps = "19.0.0"
-profileinstaller = "1.3.1"
-reorderable = "2.3.0"
-uiTextGoogleFonts = "1.6.8"
+profileinstaller = "1.4.1"
+reorderable = "2.4.0"
+uiTextGoogleFonts = "1.7.5"
 room = "2.6.1"
 volley = "1.2.1"
 
 # gplay and managed build variants
-android-billing = "7.0.0"
-android-review = "2.0.1"
+android-billing = "7.1.1"
+android-review = "2.0.2"
 espressoCore = "3.6.1"
 uiautomator = "2.3.0"
-benchmarkMacroJunit4 = "1.2.4"
-baselineprofile = "1.2.4"
+benchmarkMacroJunit4 = "1.3.3"
+baselineprofile = "1.3.3"
 
 [libraries]
 amazon-appstore-sdk = { module = "com.amazon.device:amazon-appstore-sdk", version.ref = "amazonAppstoreSdk" }