[fix|build] Fix intent handling issue; update dependencies

SkyD666 · Feb 14, 2025 · 167d068 · 167d068
1 parent 84c6f76
commit 167d068
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,8 +22,8 @@ android {
         applicationId = "com.skyd.rays"
         minSdk = 24
         targetSdk = 35
-        versionCode = 67
-        versionName = "2.3-rc15"
+        versionCode = 68
+        versionName = "2.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/skyd/rays/ui/activity/MainActivity.kt b/app/src/main/java/com/skyd/rays/ui/activity/MainActivity.kt
@@ -130,6 +130,7 @@ class MainActivity : BaseComposeActivity() {
     private val dispatch = { intent: MainIntent ->
         intentChannel.trySend(intent).getOrThrow()
     }
+    private var needHandleIntent = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
@@ -160,22 +161,22 @@ class MainActivity : BaseComposeActivity() {
                 dispatch(MainIntent.UpdateThemeColor(stickerUuid))
             }
 
-            CompositionLocalProvider(LocalNavController provides navController) {
-                AppContent()
-                var needHandleIntent by rememberSaveable { mutableStateOf(true) }
-                if (needHandleIntent) {
-                    LaunchedEffect(Unit) {
-                        needHandleIntent = false
-                        navController.handleDeepLink(intent)
-                    }
+            if (needHandleIntent) {
+                LaunchedEffect(Unit) {
+                    needHandleIntent = false
+                    navController.handleDeepLink(intent)
                 }
-                DisposableEffect(navController) {
-                    val listener = Consumer<Intent> { newIntent ->
-                        navController.handleDeepLink(newIntent)/*initIntent(newIntent)*/
-                    }
-                    addOnNewIntentListener(listener)
-                    onDispose { removeOnNewIntentListener(listener) }
+            }
+            DisposableEffect(navController) {
+                val listener = Consumer<Intent> { newIntent ->
+                    navController.handleDeepLink(newIntent)
                 }
+                addOnNewIntentListener(listener)
+                onDispose { removeOnNewIntentListener(listener) }
+            }
+
+            CompositionLocalProvider(LocalNavController provides navController) {
+                AppContent()
             }
         }
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 coil = "3.0.4"
 hilt = "2.55"
-composeMaterial = "1.7.7"
+composeMaterial = "1.7.8"
 composeMaterial3 = "1.4.0-alpha07"
 room = "2.6.1"
 textRecognition = "16.0.1"
@@ -12,7 +12,7 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
 androidx-compose-ui-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "composeMaterial" }
 androidx-compose-ui-ui-tooling3 = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeMaterial" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.8.6" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.8.7" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version = "2.8.7" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "composeMaterial" }
 androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "composeMaterial" }
@@ -27,7 +27,7 @@ androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref =
 androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "composeMaterial" }
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version = "1.1.2" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
-androidx-paging-compose = { module = "androidx.paging:paging-compose", version = "3.3.5" }
+androidx-paging-compose = { module = "androidx.paging:paging-compose", version = "3.3.6" }
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version = "1.2.0" }
 androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version = "1.4.1" }
 androidx-security-crypto = { module = "androidx.security:security-crypto", version = "1.1.0-alpha06" }
@@ -60,8 +60,8 @@ text-recognition-chinese = { module = "com.google.mlkit:text-recognition-chinese
 image-labeling-custom = { module = "com.google.mlkit:image-labeling-custom", version = "17.0.3" }
 segmentation-selfie = { module = "com.google.mlkit:segmentation-selfie", version = "16.0.0-beta6" }
 
-ai-edge-litert-support = { module = "com.google.ai.edge.litert:litert-support", version = "1.1.0" }
-ai-edge-litert = { module = "com.google.ai.edge.litert:litert", version = "1.1.0" }
+ai-edge-litert-support = { module = "com.google.ai.edge.litert:litert-support", version = "1.1.2" }
+ai-edge-litert = { module = "com.google.ai.edge.litert:litert", version = "1.1.2" }
 
 junit = { module = "junit:junit", version = "4.13.2" }