[CHORE]#29: SideEffect으로 대체

wespot-bff · Jul 16, 2024 · 497f69c · 497f69c
1 parent bf662b2
commit 497f69c
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 75 deletions.
diff --git a/app/src/main/kotlin/com/bff/wespot/MainActivity.kt b/app/src/main/kotlin/com/bff/wespot/MainActivity.kt
@@ -20,24 +20,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            val navController = rememberNavController()
-            val engine = rememberNavHostEngine()
-            val viewModel: AuthViewModel = viewModel()
 
-            WeSpotTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                ) {
-                    DestinationsNavHost(
-                        navGraph = NavGraphs.root,
-                        navController = navController,
-                        engine = engine,
-                        dependenciesContainerBuilder = {
-                            dependency(viewModel)
-                        },
-                    )
-                }
-            }
         }
     }
 }
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/AuthActivity.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/AuthActivity.kt
@@ -2,10 +2,87 @@ package com.bff.wespot.auth
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Surface
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.compose.rememberNavController
+import com.bff.wespot.auth.screen.NavGraphs
+import com.bff.wespot.auth.screen.destinations.ClassScreenDestination
+import com.bff.wespot.auth.screen.destinations.CompleteScreenDestination
+import com.bff.wespot.auth.screen.destinations.EditScreenDestination
+import com.bff.wespot.auth.screen.destinations.GenderScreenDestination
+import com.bff.wespot.auth.screen.destinations.GradeScreenDestination
+import com.bff.wespot.auth.screen.destinations.NameScreenDestination
+import com.bff.wespot.auth.screen.destinations.SchoolScreenDestination
+import com.bff.wespot.auth.state.AuthSideEffect
+import com.bff.wespot.auth.viewmodel.AuthViewModel
+import com.bff.wespot.designsystem.theme.WeSpotTheme
+import com.ramcosta.composedestinations.DestinationsNavHost
+import com.ramcosta.composedestinations.navigation.dependency
+import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.rememberNavHostEngine
+import org.orbitmvi.orbit.compose.collectSideEffect
 
 class AuthActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        setContent {
+            val navController = rememberNavController()
+            val engine = rememberNavHostEngine()
+            val viewModel: AuthViewModel = viewModel()
+
+            viewModel.collectSideEffect {
+                when (it) {
+                    AuthSideEffect.PopBackStack -> navController.popBackStack()
+                    is AuthSideEffect.NavigateToGradeScreen -> {
+                        navController.navigate(GradeScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToSchoolScreen -> {
+                        navController.navigate(SchoolScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToClassScreen -> {
+                        navController.navigate(ClassScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToGenderScreen -> {
+                        navController.navigate(GenderScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToNameScreen -> {
+                        navController.navigate(NameScreenDestination(it.edit))
+                    }
+
+                    AuthSideEffect.NavigateToEditScreen -> {
+                        navController.navigate(EditScreenDestination)
+                    }
+
+                    AuthSideEffect.NavigateToCompleteScreen -> {
+                        navController.navigate(CompleteScreenDestination, navOptionsBuilder = {
+                            popUpTo(SchoolScreenDestination.route) { inclusive = true }
+                        })
+                    }
+                }
+            }
+
+
+            WeSpotTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                ) {
+                    DestinationsNavHost(
+                        navGraph = NavGraphs.root,
+                        navController = navController,
+                        engine = engine,
+                        dependenciesContainerBuilder = {
+                            dependency(viewModel)
+                        },
+                    )
+                }
+            }
+        }
     }
 }
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/ClassScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/ClassScreen.kt
@@ -23,16 +23,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.bff.wespot.auth.R
-import com.bff.wespot.auth.screen.destinations.GenderScreenDestination
 import com.bff.wespot.auth.state.AuthAction
+import com.bff.wespot.auth.state.NavigationAction
 import com.bff.wespot.auth.viewmodel.AuthViewModel
 import com.bff.wespot.designsystem.component.button.WSButton
 import com.bff.wespot.designsystem.component.header.WSTopBar
 import com.bff.wespot.designsystem.component.input.WsTextField
 import com.bff.wespot.designsystem.theme.StaticTypeScale
 import com.bff.wespot.designsystem.theme.WeSpotThemeManager
 import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.delay
 import org.orbitmvi.orbit.compose.collectAsState
 
@@ -42,7 +41,6 @@ import org.orbitmvi.orbit.compose.collectAsState
 fun ClassScreen(
     viewModel: AuthViewModel,
     edit: Boolean,
-    navigator: DestinationsNavigator,
 ) {
     val keyboard = LocalSoftwareKeyboardController.current
 
@@ -56,7 +54,7 @@ fun ClassScreen(
                 title = stringResource(id = R.string.register),
                 canNavigateBack = true,
                 navigateUp = {
-                    navigator.navigateUp()
+                    action(AuthAction.Navigation(NavigationAction.PopBackStack))
                 },
             )
         },
@@ -120,10 +118,10 @@ fun ClassScreen(
         WSButton(
             onClick = {
                 if (edit) {
-                    navigator.popBackStack()
+                    action(AuthAction.Navigation(NavigationAction.PopBackStack))
                     return@WSButton
                 }
-                navigator.navigate(GenderScreenDestination(edit = false))
+                action(AuthAction.Navigation(NavigationAction.NavigateToGenderScreen(false)))
             },
             text = stringResource(
                 id = if (edit) {

diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/EditScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/EditScreen.kt
@@ -29,14 +29,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavOptions
 import com.bff.wespot.auth.R
-import com.bff.wespot.auth.screen.destinations.ClassScreenDestination
-import com.bff.wespot.auth.screen.destinations.CompleteScreenDestination
-import com.bff.wespot.auth.screen.destinations.GenderScreenDestination
-import com.bff.wespot.auth.screen.destinations.GradeScreenDestination
-import com.bff.wespot.auth.screen.destinations.NameScreenDestination
-import com.bff.wespot.auth.screen.destinations.SchoolScreenDestination
+import com.bff.wespot.auth.state.AuthAction
+import com.bff.wespot.auth.state.NavigationAction
 import com.bff.wespot.auth.viewmodel.AuthViewModel
 import com.bff.wespot.designsystem.component.button.WSButton
 import com.bff.wespot.designsystem.component.button.WSButtonType
@@ -45,17 +40,16 @@ import com.bff.wespot.designsystem.theme.StaticTypeScale
 import com.bff.wespot.designsystem.theme.WeSpotThemeManager
 import com.bff.wespot.ui.WSBottomSheet
 import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import org.orbitmvi.orbit.compose.collectAsState
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Destination
 @Composable
 fun EditScreen(
     viewModel: AuthViewModel,
-    navigator: DestinationsNavigator,
 ) {
     val state by viewModel.collectAsState()
+    val action = viewModel::onAction
 
     var firstEnter by remember {
         mutableStateOf(true)
@@ -70,7 +64,7 @@ fun EditScreen(
                 title = stringResource(id = R.string.register),
                 canNavigateBack = true,
                 navigateUp = {
-                    navigator.navigateUp()
+                    action(AuthAction.Navigation(NavigationAction.PopBackStack))
                 },
             )
         },
@@ -83,7 +77,7 @@ fun EditScreen(
                 title = stringResource(id = R.string.name),
                 value = state.name,
             ) {
-                navigator.navigate(NameScreenDestination(edit = true))
+                action(AuthAction.Navigation(NavigationAction.NavigateToNameScreen(true)))
             }
 
             EditField(
@@ -94,28 +88,28 @@ fun EditScreen(
                     stringResource(id = R.string.female_student)
                 },
             ) {
-                navigator.navigate(GenderScreenDestination(edit = true))
+                action(AuthAction.Navigation(NavigationAction.NavigateToGenderScreen(true)))
             }
 
             EditField(
                 title = stringResource(id = R.string.get_class),
                 value = state.classNumber.toString(),
             ) {
-                navigator.navigate(ClassScreenDestination(edit = true))
+                action(AuthAction.Navigation(NavigationAction.NavigateToClassScreen(true)))
             }
 
             EditField(
                 title = stringResource(id = R.string.grade),
                 value = "${state.grade}학년",
             ) {
-                navigator.navigate(GradeScreenDestination(edit = true))
+                action(AuthAction.Navigation(NavigationAction.NavigateToGradeScreen(true)))
             }
 
             EditField(
                 title = stringResource(id = R.string.school),
                 value = state.selectedSchool?.name ?: "",
             ) {
-                navigator.navigate(SchoolScreenDestination(edit = true))
+                action(AuthAction.Navigation(NavigationAction.NavigateToSchoolScreen(true)))
             }
         }
     }
@@ -148,13 +142,7 @@ fun EditScreen(
     if (register) {
         WSBottomSheet(closeSheet = { register = true }) {
             RegisterBottomSheetContent {
-                navigator.navigate(
-                    CompleteScreenDestination,
-                    navOptions = NavOptions
-                        .Builder()
-                        .setPopUpTo(SchoolScreenDestination.route, inclusive = true)
-                        .build(),
-                )
+                action(AuthAction.Navigation(NavigationAction.NavigateToCompleteScreen))
             }
         }
     }

diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GenderScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GenderScreen.kt
@@ -27,14 +27,13 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bff.wespot.auth.R
-import com.bff.wespot.auth.screen.destinations.NameScreenDestination
 import com.bff.wespot.auth.state.AuthAction
+import com.bff.wespot.auth.state.NavigationAction
 import com.bff.wespot.auth.viewmodel.AuthViewModel
 import com.bff.wespot.designsystem.component.header.WSTopBar
 import com.bff.wespot.designsystem.theme.StaticTypeScale
 import com.bff.wespot.designsystem.theme.WeSpotThemeManager
 import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import org.orbitmvi.orbit.compose.collectAsState
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -43,7 +42,6 @@ import org.orbitmvi.orbit.compose.collectAsState
 fun GenderScreen(
     viewModel: AuthViewModel,
     edit: Boolean,
-    navigator: DestinationsNavigator,
 ) {
     val state by viewModel.collectAsState()
     val action = viewModel::onAction
@@ -54,7 +52,7 @@ fun GenderScreen(
                 title = stringResource(id = R.string.register),
                 canNavigateBack = true,
                 navigateUp = {
-                    navigator.navigateUp()
+                    action(AuthAction.Navigation(NavigationAction.PopBackStack))
                 },
             )
         },
@@ -87,10 +85,10 @@ fun GenderScreen(
                     onClicked = {
                         action(AuthAction.OnGenderChanged("male"))
                         if (edit) {
-                            navigator.popBackStack()
+                            action(AuthAction.Navigation(NavigationAction.PopBackStack))
                             return@GenderBox
                         }
-                        navigator.navigate(NameScreenDestination(edit = false))
+                        action(AuthAction.Navigation(NavigationAction.NavigateToNameScreen(false)))
                     },
                 )
                 GenderBox(
@@ -102,10 +100,10 @@ fun GenderScreen(
                     onClicked = {
                         action(AuthAction.OnGenderChanged("female"))
                         if (edit) {
-                            navigator.popBackStack()
+                            action(AuthAction.Navigation(NavigationAction.PopBackStack))
                             return@GenderBox
                         }
-                        navigator.navigate(NameScreenDestination(edit = false))
+                        action(AuthAction.Navigation(NavigationAction.NavigateToNameScreen(false)))
                     },
                 )
             }

diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GradeScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GradeScreen.kt
@@ -25,8 +25,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bff.wespot.auth.R
-import com.bff.wespot.auth.screen.destinations.ClassScreenDestination
 import com.bff.wespot.auth.state.AuthAction
+import com.bff.wespot.auth.state.NavigationAction
 import com.bff.wespot.auth.viewmodel.AuthViewModel
 import com.bff.wespot.designsystem.component.button.WSButton
 import com.bff.wespot.designsystem.component.button.WSOutlineButton
@@ -37,7 +37,6 @@ import com.bff.wespot.designsystem.theme.StaticTypeScale
 import com.bff.wespot.designsystem.theme.WeSpotThemeManager
 import com.bff.wespot.ui.WSBottomSheet
 import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import org.orbitmvi.orbit.compose.collectAsState
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -46,7 +45,6 @@ import org.orbitmvi.orbit.compose.collectAsState
 fun GradeScreen(
     viewModel: AuthViewModel,
     edit: Boolean,
-    navigator: DestinationsNavigator,
 ) {
     val state by viewModel.collectAsState()
     val action = viewModel::onAction
@@ -60,7 +58,7 @@ fun GradeScreen(
                 title = stringResource(id = R.string.register),
                 canNavigateBack = true,
                 navigateUp = {
-                    navigator.navigateUp()
+                    action(AuthAction.Navigation(NavigationAction.PopBackStack))
                 },
             )
         },
@@ -141,10 +139,10 @@ fun GradeScreen(
 
                         action(AuthAction.OnGradeChanged(grade))
                         if (edit) {
-                            navigator.popBackStack()
+                            action(AuthAction.Navigation(NavigationAction.PopBackStack))
                             return@BottomSheetContent
                         }
-                        navigator.navigate(ClassScreenDestination(edit = false))
+                        action(AuthAction.Navigation(NavigationAction.NavigateToClassScreen(false)))
                     },
                 )
             }
@@ -154,10 +152,10 @@ fun GradeScreen(
             WSButton(
                 onClick = {
                     if (edit) {
-                        navigator.popBackStack()
+                        action(AuthAction.Navigation(NavigationAction.PopBackStack))
                         return@WSButton
                     }
-                    navigator.navigate(ClassScreenDestination(edit = false))
+                    action(AuthAction.Navigation(NavigationAction.NavigateToClassScreen(false)))
                 },
                 text = stringResource(
                     id = if (edit) {