diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5608fc1f..3c75e386 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -62,7 +62,6 @@ dependencies { implementation(project(":feature:mentoring-mentee")) implementation(project(":feature:mentoring-mentor")) implementation(project(":feature:storage")) - implementation(project(":feature:shop")) implementation(project(":feature:profile")) implementation(libs.firebase.analytics) diff --git a/app/src/main/java/com/tgyuu/baekyounge/main/MainActivity.kt b/app/src/main/java/com/tgyuu/baekyounge/main/MainActivity.kt index c4398700..324008cc 100644 --- a/app/src/main/java/com/tgyuu/baekyounge/main/MainActivity.kt +++ b/app/src/main/java/com/tgyuu/baekyounge/main/MainActivity.kt @@ -65,7 +65,6 @@ import com.tgyuu.feature.mentee.navigation.findMentorNavigationRoute import com.tgyuu.feature.mentoring.mentee.navigation.mentoringMenteeNavigationRoute import com.tgyuu.feature.mentoring.mentor.navigation.mentoringMentorNavigationRoute import com.tgyuu.feature.profile.setting.navigation.settingNavigationRoute -import com.tgyuu.feature.shop.navigation.shopNavigationRoute import com.tgyuu.feature.splash.navigation.splashNavigationRoute import com.tgyuu.feature.storage.R import dagger.hilt.android.AndroidEntryPoint @@ -252,23 +251,16 @@ internal fun BaekyoungBottomBar( modifier = modifier, ) { TopLevelDestination.entries.forEach { destination -> - if ((currentRoute == com.tgyuu.feature.home.navigation.homeNavigationRoute) && - (destination.route == com.tgyuu.feature.home.navigation.homeNavigationRoute) - ) { - return@forEach - } - - if ((currentRoute != com.tgyuu.feature.home.navigation.homeNavigationRoute) && - (destination.route == shopNavigationRoute) - ) { - return@forEach - } BottomNavigationItem( selected = (currentRoute == destination.route), modifier = Modifier.background(Color.Transparent), onClick = { onNavigateToDestination(destination) }, - selectedContentColor = BaekyoungTheme.colors.black, + selectedContentColor = if (currentRoute == com.tgyuu.feature.home.navigation.homeNavigationRoute) { + BaekyoungTheme.colors.blueFB + } else { + BaekyoungTheme.colors.black + }, unselectedContentColor = if (currentRoute == com.tgyuu.feature.home.navigation.homeNavigationRoute) { BaekyoungTheme.colors.blueFB } else { diff --git a/app/src/main/java/com/tgyuu/baekyounge/main/navigation/BaekyoungNavHost.kt b/app/src/main/java/com/tgyuu/baekyounge/main/navigation/BaekyoungNavHost.kt index de24cea1..99e9be79 100644 --- a/app/src/main/java/com/tgyuu/baekyounge/main/navigation/BaekyoungNavHost.kt +++ b/app/src/main/java/com/tgyuu/baekyounge/main/navigation/BaekyoungNavHost.kt @@ -38,7 +38,6 @@ import com.tgyuu.feature.profile.navigation.profileScreen import com.tgyuu.feature.profile.setting.navigation.navigateToSetting import com.tgyuu.feature.profile.setting.navigation.settingNavigationRoute import com.tgyuu.feature.profile.setting.navigation.settingScreen -import com.tgyuu.feature.shop.navigation.shopScreen import com.tgyuu.feature.splash.navigation.splashNavigationRoute import com.tgyuu.feature.splash.navigation.splashScreen import com.tgyuu.feature.storage.navigation.storageNavigationRoute @@ -114,7 +113,6 @@ fun BaekyoungNavHost( }, ) homeScreen() - shopScreen() storageScreen( navigateToChatting = { navController.navigateToAiChatting( diff --git a/app/src/main/java/com/tgyuu/baekyounge/main/navigation/TopLevelDestination.kt b/app/src/main/java/com/tgyuu/baekyounge/main/navigation/TopLevelDestination.kt index 5a3ba0ff..752dc280 100644 --- a/app/src/main/java/com/tgyuu/baekyounge/main/navigation/TopLevelDestination.kt +++ b/app/src/main/java/com/tgyuu/baekyounge/main/navigation/TopLevelDestination.kt @@ -3,10 +3,9 @@ package com.tgyuu.baekyounge.main.navigation import androidx.annotation.DrawableRes import androidx.annotation.StringRes import com.tgyuu.baekyounge.R -import com.tgyuu.feature.mentoring.navigation.mentoringNavigationRoute import com.tgyuu.feature.consulting.consultinginformation.navigation.consultingNavigationRoute +import com.tgyuu.feature.mentoring.navigation.mentoringNavigationRoute import com.tgyuu.feature.profile.navigation.profileNavigationRoute -import com.tgyuu.feature.shop.navigation.shopNavigationRoute import com.tgyuu.feature.storage.navigation.storageNavigationRoute enum class TopLevelDestination( @@ -33,14 +32,6 @@ enum class TopLevelDestination( iconTextId = R.string.storage, titleTextId = R.string.storage, ), - SHOP( - route = shopNavigationRoute, - homeIcon = R.drawable.ic_selected_shop, - selectedIcon = R.drawable.ic_selected_shop, - unselectedIcon = R.drawable.ic_selected_shop, - iconTextId = R.string.shop, - titleTextId = R.string.shop, - ), HOME( route = com.tgyuu.feature.home.navigation.homeNavigationRoute, homeIcon = R.drawable.ic_home_home, diff --git a/feature/consulting/src/main/java/com/tgyuu/feature/consulting/ConsultingScreen.kt b/feature/consulting/src/main/java/com/tgyuu/feature/consulting/ConsultingScreen.kt index 45dcc968..483b1d7c 100644 --- a/feature/consulting/src/main/java/com/tgyuu/feature/consulting/ConsultingScreen.kt +++ b/feature/consulting/src/main/java/com/tgyuu/feature/consulting/ConsultingScreen.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -73,22 +74,27 @@ internal fun ConsultingScreen( Scaffold( topBar = { - BaekyoungTopBar( - titleTextId = string.consulting, - titleImageId = R.drawable.ic_consulting_note, - contentDescriptionId = string.consulting, - ) + Column { + BaekyoungTopBar( + titleTextId = string.consulting, + titleImageId = R.drawable.ic_consulting_note, + contentDescriptionId = string.consulting, + ) + + HorizontalDivider(color = BaekyoungTheme.colors.grayDC) + } }, containerColor = BaekyoungTheme.colors.grayF5, ) { paddingValues -> Box( modifier = Modifier .fillMaxSize() - .padding(paddingValues), + .padding(paddingValues) + .padding(top = 20.dp), ) { Text( text = generateUserNameSpan(userInformation.nickName), - style = BaekyoungTheme.typography.labelRegular.copy(fontSize = 9.sp), + style = BaekyoungTheme.typography.labelRegular, color = BaekyoungTheme.colors.gray95, modifier = Modifier .align(Alignment.TopStart) @@ -127,6 +133,7 @@ internal fun ConsultingScreen( } } } + is UiState.Error -> Log.d("test", userInformationState.message) } } @@ -138,7 +145,7 @@ private fun generateUserNameSpan(userName: String): AnnotatedString = buildAnnot style = SpanStyle( color = BaekyoungTheme.colors.black, fontWeight = FontWeight.Bold, - fontSize = 13.sp, + fontSize = 16.sp, ), ) { append(userName, " ")