Upgrade

Tiebe · Jun 26, 2024 · c66a752 · c66a752
1 parent 9057307
commit c66a752
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 72 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -2,8 +2,9 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    id("kotlin-parcelize")
     id("kotlinx-serialization")
+    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -33,9 +34,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
 }
 
 dependencies {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
     alias(libs.plugins.complete.kotlin)
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 buildscript {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #Gradle
-org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M -Xexpect-actual-classes"
+org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xexpect-actual-classes -Xmx8192M"
 
 kotlin.code.style=official
 android.useAndroidX=true

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jul 01 15:07:58 CEST 2023
+#Wed Jun 26 03:48:15 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-app-version-string = "4.2.1"
-app-version-code = "46"
+app-version-string = "4.2.2"
+app-version-code = "47"
 
 android_sdk-min = "21"
 android_sdk-compile = "34"
@@ -13,37 +13,36 @@ magister = "1.3.0"
 
 work-android = "2.9.0"
 
-kotlin = "1.9.21"
+kotlin = "2.0.0"
 gradle = "8.2.2"
-appcompat = "1.6.1"
-material = "1.11.0"
-compose = "1.5.11"
-compose-android = "1.6.1"
-compose-compiler = "1.5.7"
-compose-activity = "1.8.2"
-material3 = "1.2.0"
-ktor = "2.3.7"
+appcompat = "1.7.0"
+material = "1.12.0"
+compose = "1.6.11"
+compose-android = "1.6.8"
+compose-activity = "1.9.0"
+material3 = "1.2.1"
+ktor = "2.3.10"
 decompose = "2.2.0-compose-experimental-alpha05"
-moko = "0.24.0-alpha-2"
+moko = "0.24.1"
 buildkonfig = "0.13.3"
 multiplatform-settings = "1.1.1"
 #noinspection GradleDependency # it thinks the jre version is higher than the android version. remove this line to allow IDE checking for version updates again
 guava = "31.1-android"
-guava-coroutines = "1.7.3"
+guava-coroutines = "1.8.0"
 
 complete-kotlin = "1.1.0"
 colormath = "3.4.0"
 
 kotlin-datetime = "0.5.0"
 horologist = "0.5.21"
-skiko = "0.7.85.4"
-agp = "8.2.2"
+skiko = "0.7.97"
+agp = "8.2.0"
 kotlin190 = "1.9.0"
-play-services-wearable = "18.1.0"
-wear-compose-bom = "2024.02.00"
-compose-material = "1.3.0"
-compose-material3 = "1.0.0-alpha17"
-compose-foundation = "1.3.0"
+play-services-wearable = "18.2.0"
+wear-compose-bom = "2024.06.00"
+compose-material = "1.3.1"
+compose-material3 = "1.0.0-alpha23"
+compose-foundation = "1.3.1"
 core-splashscreen = "1.0.1"
 wear-phone-interactions = "1.0.1"
 richeditor = "1.0.0-rc04"
@@ -116,4 +115,5 @@ complete_kotlin = { id = "com.louiscad.complete-kotlin", version.ref = "complete
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfig" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
-kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin190" }
+kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -8,10 +8,10 @@ plugins {
     kotlin("native.cocoapods")
     id("com.android.library")
     id("kotlinx-serialization")
-    id("kotlin-parcelize")
     alias(libs.plugins.compose)
     id(libs.plugins.buildkonfig.get().pluginId)
     id(libs.plugins.mokoresources.get().pluginId)
+    alias(libs.plugins.compose.compiler)
     //id(libs.plugins.google.services.get().pluginId)
 }
 

diff --git a/shared/shared.podspec b/shared/shared.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'shared'
-    spec.version                  = '4.2.0'
+    spec.version                  = '4.2.2'
     spec.homepage                 = 'https://otarium.groosman.nl'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''
     spec.license                  = ''
     spec.summary                  = 'Otarium'
     spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
     spec.libraries                = 'c++'
-    spec.ios.deployment_target = '11.0'
+    spec.ios.deployment_target    = '11.0'
 
 
     if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
@@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
         Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
     end
 
+    spec.xcconfig = {
+        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
+    }
+
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':shared',
         'PRODUCT_MODULE_NAME' => 'shared',
@@ -46,5 +50,5 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-                
+    spec.resources = ['build\compose\cocoapods\compose-resources']
 end
diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/default/home/DefaultHomeComponent.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/default/home/DefaultHomeComponent.kt
@@ -36,20 +36,20 @@ class DefaultHomeComponent(componentContext: ComponentContext, override val navi
         MenuItems.Settings
     )
 
-    override val dialog: Value<ChildSlot<MenuItems, HomeComponent.MenuItemComponent>> = childSlot<MenuItems, HomeComponent.MenuItemComponent>(
-        dialogNavigation,
-        "HomeComponentChildOverlay",
-        { MenuItems.Timetable },
-        persistent = true,
+    override val dialog: Value<ChildSlot<MenuItems, HomeComponent.MenuItemComponent>> = childSlot(
+        source = dialogNavigation,
+        serializer = MenuItems.serializer(),
+        key = "HomeComponentChildOverlay",
+        initialConfiguration = { MenuItems.Timetable },
         handleBackButton = false
-    ) { config, componentContext ->
-        when (config) {
-            is MenuItems.Timetable -> timetableComponent(componentContext)
-            is MenuItems.Grades -> gradesComponent(componentContext)
-            is MenuItems.Messages -> messagesComponent(componentContext)
-            is MenuItems.ELO -> eloComponent(componentContext)
-            is MenuItems.Settings -> settingsComponent(componentContext)
-            is MenuItems.Debug -> debugComponent(componentContext)
+    ) { item, componentContext ->
+        when (item) {
+            MenuItems.Timetable -> timetableComponent(componentContext)
+            MenuItems.Grades -> gradesComponent(componentContext)
+            MenuItems.Messages -> messagesComponent(componentContext)
+            MenuItems.ELO -> eloComponent(componentContext)
+            MenuItems.Settings -> settingsComponent(componentContext)
+            MenuItems.Debug -> debugComponent(componentContext)
         }
     }
 

diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/root/home/MenuItems.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/root/home/MenuItems.kt
@@ -7,16 +7,15 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState
 import com.arkivanov.decompose.value.MutableValue
-import com.arkivanov.essenty.parcelable.Parcelable
-import com.arkivanov.essenty.parcelable.Parcelize
-import dev.icerock.moko.resources.StringResource
+import kotlinx.serialization.Serializable
 import nl.tiebe.otarium.Data
 import nl.tiebe.otarium.MR
 import nl.tiebe.otarium.utils.OtariumIcons
 import nl.tiebe.otarium.utils.calculateAverageGrade
 import nl.tiebe.otarium.utils.otariumicons.Bottombar
 import nl.tiebe.otarium.utils.otariumicons.bottombar.*
 import nl.tiebe.otarium.utils.otariumicons.bottombar.grades.*
+import nl.tiebe.otarium.utils.ui.getLocalizedString
 import kotlin.math.roundToInt
 
 val unreadMessages = MutableValue(Data.selectedAccount.messageFolders.sumOf { it.unreadCount })
@@ -46,17 +45,16 @@ val outlineIcons = listOf(
     OtariumIcons.Bottombar.Grades.Box10Outline,
 )
 
-@Parcelize
-sealed class MenuItems(val resourceId: StringResource, val icon: @Composable () -> Unit, val iconSelected: @Composable () -> Unit):
-    Parcelable {
-    object Timetable: MenuItems(
-        MR.strings.agendaItem,
+@Serializable
+sealed class MenuItems(val text: () -> String, val icon: @Composable () -> Unit, val iconSelected: @Composable () -> Unit) {
+    data object Timetable: MenuItems(
+        { getLocalizedString(MR.strings.agendaItem) },
         { Icon(OtariumIcons.Bottombar.CalendarTodayOutline, "Timetable") },
         { Icon(OtariumIcons.Bottombar.CalendarTodayFilled, "Timetable") },
     )
 
-    object Grades: MenuItems(
-        MR.strings.gradesItem,
+    data object Grades: MenuItems(
+        { getLocalizedString(MR.strings.gradesItem) },
         {
             val average = calculateAverageGrade(Data.selectedAccount.fullGradeList).roundToInt()
             if (average < 1 || average > 10) Icon(OtariumIcons.Bottombar.Grades.Box10Outline, "Grades")
@@ -69,8 +67,8 @@ sealed class MenuItems(val resourceId: StringResource, val icon: @Composable ()
         },
     )
 
-    object Messages: MenuItems(
-        MR.strings.messagesItem,
+    data object Messages: MenuItems(
+        { getLocalizedString(MR.strings.messagesItem) },
         { BadgedBox(badge = {
             if (unreadMessages.subscribeAsState().value > 0) {
                 Badge(
@@ -87,20 +85,20 @@ sealed class MenuItems(val resourceId: StringResource, val icon: @Composable ()
         }) { Icon(OtariumIcons.Bottombar.EmailFilled, "Messages") } },
     )
 
-    object ELO: MenuItems(
-        MR.strings.eloItem,
+    data object ELO: MenuItems(
+        { getLocalizedString(MR.strings.eloItem) },
         { Icon(OtariumIcons.Bottombar.BookOpenOutline, "ELO") },
         { Icon(OtariumIcons.Bottombar.BookOpenFilled, "ELO") },
     )
 
-    object Settings: MenuItems(
-        MR.strings.settingsItem,
+    data object Settings: MenuItems(
+        { getLocalizedString(MR.strings.settingsItem) },
         { Icon(OtariumIcons.Bottombar.CogOutline, "Settings") },
         { Icon(OtariumIcons.Bottombar.CogFilled, "Settings") },
     )
 
-    object Debug: MenuItems(
-        MR.strings.settingsItem,
+    data object Debug: MenuItems(
+        { getLocalizedString(MR.strings.settingsItem) },
         { Icon(OtariumIcons.Bottombar.Box10Outline, "Debug") },
         { Icon(OtariumIcons.Bottombar.Box10Filled, "Debug") },
     )

diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/store/StoreHomeComponent.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/store/StoreHomeComponent.kt
@@ -20,11 +20,11 @@ class StoreHomeComponent(componentContext: ComponentContext, override val naviga
         MenuItems.Grades
     )
 
-    override val dialog: Value<ChildSlot<MenuItems, HomeComponent.MenuItemComponent>> = childSlot<MenuItems, HomeComponent.MenuItemComponent>(
+    override val dialog: Value<ChildSlot<MenuItems, HomeComponent.MenuItemComponent>> = childSlot(
         dialogNavigation,
-        "HomeComponentChildOverlay",
-        { MenuItems.Timetable },
-        persistent = true,
+        serializer = MenuItems.serializer(),
+        key = "HomeComponentChildOverlay",
+        initialConfiguration = { MenuItems.Timetable },
         handleBackButton = false
     ) { config, componentContext ->
         when (config) {

diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/ui/home/HomeScreen.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/ui/home/HomeScreen.kt
@@ -39,7 +39,7 @@ internal fun HomeScreen(component: HomeComponent) {
                         icon = if (overlay.configuration == screen) screen.iconSelected else screen.icon,
                         label = {
                             Text(
-                                getLocalizedString(screen.resourceId),
+                                screen.text(),
                                 modifier = Modifier.wrapContentWidth(unbounded = true)
                             )
                         },

diff --git a/wearApp/build.gradle.kts b/wearApp/build.gradle.kts
@@ -1,8 +1,9 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    id("kotlin-parcelize")
     id("kotlinx-serialization")
+    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -39,9 +40,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
 }
 
 dependencies {