Skip to content

Commit

Permalink
[FIX/#8] Route 중복 라이팅 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
arinming committed Jul 5, 2024
1 parent 6c31f2b commit 954ab25
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ fun CalendarRoute() {
@Composable
fun CalendarScreen() {
Column(modifier = Modifier.fillMaxSize()) {
Text(text = "탐색 스크린")
Text(text = "캘린더 스크린")
}
}
7 changes: 3 additions & 4 deletions feature/src/main/java/com/terning/feature/main/MainScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -17,7 +17,7 @@ fun NavController.navigateSearch(navOptions: NavOptions? = null) {

fun NavGraphBuilder.searchNavGraph() {
composable<Search> {
CalendarRoute()
SearchRoute()
}
}

Expand Down

0 comments on commit 954ab25

Please sign in to comment.