Skip to content

Commit 56fddf5

Browse files
committed
[fix] Fix crash when opening add screen
1 parent 2857482 commit 56fddf5

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
minSdk = 24
2222
targetSdk = 35
2323
versionCode = 8
24-
versionName = "1.7-beta02"
24+
versionName = "1.7-beta03"
2525

2626
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2727
vectorDrawables {

app/src/main/java/com/skyd/raca/ui/screen/add/AddScreen.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,11 @@ import kotlinx.coroutines.launch
6565
import kotlinx.serialization.Serializable
6666
import org.koin.compose.viewmodel.koinViewModel
6767

68-
const val ADD_SCREEN_ROUTE = "addScreen"
6968

7069
@Serializable
7170
data class AddRoute(
72-
val initArticleUuid: String?,
73-
val article: String?,
71+
val initArticleUuid: String? = null,
72+
val article: String? = null,
7473
) {
7574
companion object {
7675
val deepLinks = listOf(navDeepLink { mimeType = "text/*" })

app/src/main/java/com/skyd/raca/ui/screen/home/HomeScreen.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ import com.skyd.raca.ui.component.dialog.DeleteWarningDialog
8888
import com.skyd.raca.ui.local.LocalCurrentArticleUuid
8989
import com.skyd.raca.ui.local.LocalNavController
9090
import com.skyd.raca.ui.local.LocalQuery
91-
import com.skyd.raca.ui.screen.add.ADD_SCREEN_ROUTE
91+
import com.skyd.raca.ui.screen.add.AddRoute
9292
import com.skyd.raca.ui.screen.settings.searchconfig.SearchConfigRoute
9393
import kotlinx.coroutines.launch
9494
import kotlinx.serialization.Serializable
@@ -275,7 +275,7 @@ private fun RacaSearchBar(
275275
RacaIconButton(
276276
imageVector = Icons.Outlined.Add,
277277
contentDescription = stringResource(R.string.home_screen_add),
278-
onClick = { navController.navigate(ADD_SCREEN_ROUTE) }
278+
onClick = { navController.navigate(AddRoute()) }
279279
)
280280
}
281281
},
@@ -442,7 +442,7 @@ private fun HomeMenu(
442442
enabled = editMenuItemEnabled,
443443
text = { Text(stringResource(R.string.home_screen_edit)) },
444444
onClick = {
445-
navController.navigate("$ADD_SCREEN_ROUTE?articleUuid=${currentArticleUuid}")
445+
navController.navigate(AddRoute(initArticleUuid = currentArticleUuid))
446446
onDismissRequest()
447447
},
448448
leadingIcon = { Icon(Icons.Outlined.Edit, contentDescription = null) }
@@ -501,7 +501,7 @@ private fun MainCard(articleWithTags: ArticleWithTags, snackbarHostState: Snackb
501501
}
502502
},
503503
onDoubleClick = {
504-
navController.navigate("$ADD_SCREEN_ROUTE?articleUuid=${currentArticleUuid}")
504+
navController.navigate(AddRoute(initArticleUuid = currentArticleUuid))
505505
},
506506
onClick = {}
507507
)

0 commit comments

Comments
 (0)