Skip to content

Commit 982a0fb

Browse files
committed
Chore: 인트로 화면 제거
1 parent 8149ca8 commit 982a0fb

File tree

14 files changed

+16
-192
lines changed

14 files changed

+16
-192
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

presentation/src/main/java/com/threegap/bitnagil/presentation/intro/IntroScreen.kt

Lines changed: 0 additions & 114 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/intro/IntroViewModel.kt

Lines changed: 0 additions & 29 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/intro/model/IntroIntent.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/intro/model/IntroSideEffect.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/intro/model/IntroState.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ fun SettingScreenContainer(
3939
navigateToBack: () -> Unit,
4040
navigateToTermsOfService: () -> Unit,
4141
navigateToPrivacyPolicy: () -> Unit,
42-
navigateToIntro: () -> Unit,
42+
navigateToLogin: () -> Unit,
4343
) {
4444
val state by viewModel.stateFlow.collectAsState()
4545

4646
viewModel.sideEffectFlow.collectAsEffect { sideEffect ->
4747
when (sideEffect) {
48-
SettingSideEffect.NavigateToIntro -> navigateToIntro()
48+
SettingSideEffect.NavigateToLogin -> navigateToLogin()
4949
}
5050
}
5151

presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class SettingViewModel @Inject constructor(
5757
}
5858

5959
SettingIntent.LogoutSuccess -> {
60-
sendSideEffect(SettingSideEffect.NavigateToIntro)
60+
sendSideEffect(SettingSideEffect.NavigateToLogin)
6161
return null
6262
}
6363
SettingIntent.LogoutLoading -> {
@@ -67,7 +67,7 @@ class SettingViewModel @Inject constructor(
6767
return state.copy(loading = false)
6868
}
6969
SettingIntent.WithdrawalSuccess -> {
70-
sendSideEffect(SettingSideEffect.NavigateToIntro)
70+
sendSideEffect(SettingSideEffect.NavigateToLogin)
7171
return null
7272
}
7373
SettingIntent.WithdrawalLoading -> {

presentation/src/main/java/com/threegap/bitnagil/presentation/setting/model/mvi/SettingSideEffect.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ package com.threegap.bitnagil.presentation.setting.model.mvi
33
import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
44

55
sealed class SettingSideEffect : MviSideEffect {
6-
data object NavigateToIntro : SettingSideEffect()
6+
data object NavigateToLogin : SettingSideEffect()
77
}

0 commit comments

Comments
 (0)