From 954ab25e3b4f159b19eea78974add52462cdf115 Mon Sep 17 00:00:00 2001 From: arinming Date: Fri, 5 Jul 2024 23:57:27 +0900 Subject: [PATCH] =?UTF-8?q?[FIX/#8]=20Route=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=ED=8C=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/terning/feature/calendar/CalendarRouth.kt | 2 +- .../src/main/java/com/terning/feature/main/MainScreen.kt | 7 +++---- .../terning/feature/search/navigation/SearchNavigation.kt | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/feature/src/main/java/com/terning/feature/calendar/CalendarRouth.kt b/feature/src/main/java/com/terning/feature/calendar/CalendarRouth.kt index 19c0bc4f9..76ef0be7f 100644 --- a/feature/src/main/java/com/terning/feature/calendar/CalendarRouth.kt +++ b/feature/src/main/java/com/terning/feature/calendar/CalendarRouth.kt @@ -14,6 +14,6 @@ fun CalendarRoute() { @Composable fun CalendarScreen() { Column(modifier = Modifier.fillMaxSize()) { - Text(text = "탐색 스크린") + Text(text = "캘린더 스크린") } } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/main/MainScreen.kt b/feature/src/main/java/com/terning/feature/main/MainScreen.kt index ccb45229d..1c605f7f5 100644 --- a/feature/src/main/java/com/terning/feature/main/MainScreen.kt +++ b/feature/src/main/java/com/terning/feature/main/MainScreen.kt @@ -14,12 +14,12 @@ import androidx.compose.material3.Text import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.compose.NavHost +import com.terning.core.designsystem.theme.TerningMain import com.terning.feature.calendar.navigation.calendarNavGraph import com.terning.feature.home.navigation.homeNavGraph import com.terning.feature.myPage.navigation.myPageNavGraph @@ -88,9 +88,8 @@ private fun MainBottomBar( }, colors = androidx.compose.material3.NavigationBarItemDefaults .colors( - // TODO 디자인 시스템 색상으로 변경하기 - selectedIconColor = Color(0xFF1EA65E), - selectedTextColor = Color(0xFF1EA65E), + selectedIconColor = TerningMain, + selectedTextColor = TerningMain, indicatorColor = MaterialTheme.colorScheme.surfaceColorAtElevation( LocalAbsoluteTonalElevation.current ) diff --git a/feature/src/main/java/com/terning/feature/search/navigation/SearchNavigation.kt b/feature/src/main/java/com/terning/feature/search/navigation/SearchNavigation.kt index e11003094..26e2036b6 100644 --- a/feature/src/main/java/com/terning/feature/search/navigation/SearchNavigation.kt +++ b/feature/src/main/java/com/terning/feature/search/navigation/SearchNavigation.kt @@ -5,7 +5,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.terning.core.navigation.MainTabRoute -import com.terning.feature.calendar.CalendarRoute +import com.terning.feature.search.SearchRoute import kotlinx.serialization.Serializable fun NavController.navigateSearch(navOptions: NavOptions? = null) { @@ -17,7 +17,7 @@ fun NavController.navigateSearch(navOptions: NavOptions? = null) { fun NavGraphBuilder.searchNavGraph() { composable { - CalendarRoute() + SearchRoute() } }