Skip to content

Commit 167d068

Browse files
committed
[fix|build] Fix intent handling issue; update dependencies
1 parent 84c6f76 commit 167d068

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId = "com.skyd.rays"
2323
minSdk = 24
2424
targetSdk = 35
25-
versionCode = 67
26-
versionName = "2.3-rc15"
25+
versionCode = 68
26+
versionName = "2.3"
2727

2828
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2929
vectorDrawables {

app/src/main/java/com/skyd/rays/ui/activity/MainActivity.kt

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ class MainActivity : BaseComposeActivity() {
130130
private val dispatch = { intent: MainIntent ->
131131
intentChannel.trySend(intent).getOrThrow()
132132
}
133+
private var needHandleIntent = true
133134

134135
override fun onCreate(savedInstanceState: Bundle?) {
135136
installSplashScreen()
@@ -160,22 +161,22 @@ class MainActivity : BaseComposeActivity() {
160161
dispatch(MainIntent.UpdateThemeColor(stickerUuid))
161162
}
162163

163-
CompositionLocalProvider(LocalNavController provides navController) {
164-
AppContent()
165-
var needHandleIntent by rememberSaveable { mutableStateOf(true) }
166-
if (needHandleIntent) {
167-
LaunchedEffect(Unit) {
168-
needHandleIntent = false
169-
navController.handleDeepLink(intent)
170-
}
164+
if (needHandleIntent) {
165+
LaunchedEffect(Unit) {
166+
needHandleIntent = false
167+
navController.handleDeepLink(intent)
171168
}
172-
DisposableEffect(navController) {
173-
val listener = Consumer<Intent> { newIntent ->
174-
navController.handleDeepLink(newIntent)/*initIntent(newIntent)*/
175-
}
176-
addOnNewIntentListener(listener)
177-
onDispose { removeOnNewIntentListener(listener) }
169+
}
170+
DisposableEffect(navController) {
171+
val listener = Consumer<Intent> { newIntent ->
172+
navController.handleDeepLink(newIntent)
178173
}
174+
addOnNewIntentListener(listener)
175+
onDispose { removeOnNewIntentListener(listener) }
176+
}
177+
178+
CompositionLocalProvider(LocalNavController provides navController) {
179+
AppContent()
179180
}
180181
}
181182
}

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
coil = "3.0.4"
33
hilt = "2.55"
4-
composeMaterial = "1.7.7"
4+
composeMaterial = "1.7.8"
55
composeMaterial3 = "1.4.0-alpha07"
66
room = "2.6.1"
77
textRecognition = "16.0.1"
@@ -12,7 +12,7 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
1212
androidx-compose-ui-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "composeMaterial" }
1313
androidx-compose-ui-ui-tooling3 = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeMaterial" }
1414
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
15-
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.8.6" }
15+
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.8.7" }
1616
androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version = "2.8.7" }
1717
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "composeMaterial" }
1818
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 =
2727
androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "composeMaterial" }
2828
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version = "1.1.2" }
2929
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
30-
androidx-paging-compose = { module = "androidx.paging:paging-compose", version = "3.3.5" }
30+
androidx-paging-compose = { module = "androidx.paging:paging-compose", version = "3.3.6" }
3131
androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version = "1.2.0" }
3232
androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version = "1.4.1" }
3333
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
6060
image-labeling-custom = { module = "com.google.mlkit:image-labeling-custom", version = "17.0.3" }
6161
segmentation-selfie = { module = "com.google.mlkit:segmentation-selfie", version = "16.0.0-beta6" }
6262

63-
ai-edge-litert-support = { module = "com.google.ai.edge.litert:litert-support", version = "1.1.0" }
64-
ai-edge-litert = { module = "com.google.ai.edge.litert:litert", version = "1.1.0" }
63+
ai-edge-litert-support = { module = "com.google.ai.edge.litert:litert-support", version = "1.1.2" }
64+
ai-edge-litert = { module = "com.google.ai.edge.litert:litert", version = "1.1.2" }
6565

6666
junit = { module = "junit:junit", version = "4.13.2" }
6767

0 commit comments

Comments
 (0)