Skip to content

Commit f6820de

Browse files
authored
Merge pull request #96 from YAPP-Github/ui/#95-start-up-ui-redesign
[UI/#95] 로그인, 약관동의 화면 리디자인 변경사항 반영
2 parents 8149ca8 + 9237e2a commit f6820de

File tree

28 files changed

+35
-209
lines changed

28 files changed

+35
-209
lines changed

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import androidx.navigation.compose.composable
88
import androidx.navigation.toRoute
99
import com.threegap.bitnagil.navigation.home.HomeNavHost
1010
import com.threegap.bitnagil.presentation.emotion.EmotionScreenContainer
11-
import com.threegap.bitnagil.presentation.intro.IntroScreenContainer
1211
import com.threegap.bitnagil.presentation.login.LoginScreenContainer
1312
import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
1413
import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel
@@ -33,8 +32,8 @@ fun MainNavHost(
3332
) {
3433
composable<Route.Splash> {
3534
SplashScreenContainer(
36-
navigateToIntro = {
37-
navigator.navController.navigate(Route.Intro) {
35+
navigateToLogin = {
36+
navigator.navController.navigate(Route.Login) {
3837
popUpTo<Route.Splash> { inclusive = true }
3938
}
4039
},
@@ -52,12 +51,6 @@ fun MainNavHost(
5251
)
5352
}
5453

55-
composable<Route.Intro> {
56-
IntroScreenContainer(
57-
navigateToLogin = { navigator.navController.navigate(Route.Login) },
58-
)
59-
}
60-
6154
composable<Route.Login> {
6255
LoginScreenContainer(
6356
navigateToHome = navigator::navigateToHomeAndClearStack,
@@ -166,8 +159,8 @@ fun MainNavHost(
166159
),
167160
)
168161
},
169-
navigateToIntro = {
170-
navigator.navController.navigate(Route.Intro) {
162+
navigateToLogin = {
163+
navigator.navController.navigate(Route.Login) {
171164
popUpTo(0) {
172165
inclusive = true
173166
}

app/src/main/java/com/threegap/bitnagil/Route.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ sealed interface Route {
77
@Serializable
88
data object Splash : Route
99

10-
@Serializable
11-
data object Intro : Route
12-
1310
@Serializable
1411
data object TermsAgreement : Route
1512

Binary file not shown.
61.8 KB
Loading
Binary file not shown.
33.2 KB
Loading
Binary file not shown.
93.5 KB
Loading
Binary file not shown.
173 KB
Loading

0 commit comments

Comments
 (0)