From cea5cef4a2ce2080df3f1cd7a27d06f3fa432a3d Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sat, 21 Sep 2024 18:48:10 +0900 Subject: [PATCH] feature #866: fix navigation error --- .../java/org/sopt/official/feature/fortune/MainScreen.kt | 6 +++--- .../fortune/feature/fortundDetail/FortuneDetailScreen.kt | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt index 12c36fc7..94d9f5eb 100644 --- a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt +++ b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt @@ -38,7 +38,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.navigation.NavController +import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController @@ -51,7 +51,7 @@ import org.sopt.official.feature.fortune.feature.home.HomeRoute @Composable fun MainScreen( - navController: NavController = rememberNavController(), + navController: NavHostController = rememberNavController(), ) { Scaffold( modifier = Modifier.fillMaxSize(), @@ -77,7 +77,7 @@ fun MainScreen( .padding(paddingValue) ) { NavHost( - navController = rememberNavController(), + navController = navController, startDestination = Home ) { composable { diff --git a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortundDetail/FortuneDetailScreen.kt b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortundDetail/FortuneDetailScreen.kt index c8ea0e6b..3941217d 100644 --- a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortundDetail/FortuneDetailScreen.kt +++ b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortundDetail/FortuneDetailScreen.kt @@ -27,6 +27,7 @@ package org.sopt.official.feature.fortune.feature.fortundDetail import androidx.compose.material3.Text import androidx.compose.runtime.Composable import kotlinx.serialization.Serializable +import org.sopt.official.designsystem.SoptTheme @Serializable data class FortuneDetail(val date: String) @@ -44,5 +45,8 @@ fun FortuneDetailRoute( fun FortuneDetailScreen( date: String, ) { - Text(text = "Fortune Detail Screen: $date") + Text( + text = "Fortune Detail Screen: $date", + color = SoptTheme.colors.onBackground + ) }