Refacor: Guide MviviewModel 제거

Author: wjdrjs00

presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideScreen.kt

@@ -1,6 +1,5 @@
 package com.threegap.bitnagil.presentation.guide
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -14,24 +13,22 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
-import com.threegap.bitnagil.presentation.common.flow.collectAsEffect
 import com.threegap.bitnagil.presentation.guide.component.atom.GuideButton
 import com.threegap.bitnagil.presentation.guide.component.template.GuideBottomSheet
-import com.threegap.bitnagil.presentation.guide.model.GuideIntent
 import com.threegap.bitnagil.presentation.guide.model.GuideSideEffect
 import com.threegap.bitnagil.presentation.guide.model.GuideType
+import org.orbitmvi.orbit.compose.collectAsState
+import org.orbitmvi.orbit.compose.collectSideEffect
 
 @Composable
 fun GuideScreenContainer(
     navigateToBack: () -> Unit,
     viewModel: GuideViewModel = hiltViewModel(),
 ) {
-    val uiState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
+    val uiState by viewModel.collectAsState()
 
-    viewModel.sideEffectFlow.collectAsEffect { sideEffect ->
+    viewModel.collectSideEffect { sideEffect ->
         when (sideEffect) {
             is GuideSideEffect.NavigateToBack -> navigateToBack()
         }
@@ -41,27 +38,25 @@ fun GuideScreenContainer(
         uiState.guideType?.let { guideType ->
             GuideBottomSheet(
                 guideType = guideType,
-                onDismissRequest = { viewModel.sendIntent(GuideIntent.OnHideGuideBottomSheet) },
+                onDismissRequest = viewModel::onHideGuideBottomSheet,
             )
         }
     }
 
     GuideScreen(
-        onClickGuideButton = { viewModel.sendIntent(GuideIntent.OnClickGuideButton(it)) },
-        onBackClick = { viewModel.sendIntent(GuideIntent.OnBackClick) },
+        onClickGuideButton = viewModel::onShowGuideBottomSheet,
+        onBackClick = viewModel::navigateToBack,
     )
 }
 
 @Composable
 private fun GuideScreen(
     onClickGuideButton: (GuideType) -> Unit,
     onBackClick: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxSize()
-            .background(BitnagilTheme.colors.white)
             .statusBarsPadding(),
     ) {
         BitnagilTopBar(
@@ -85,7 +80,7 @@ private fun GuideScreen(
     }
 }
 
-@Preview
+@Preview(showBackground = true)
 @Composable
 private fun GuideScreenPreview() {
     GuideScreen(

presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideViewModel.kt

@@ -1,46 +1,39 @@
 package com.threegap.bitnagil.presentation.guide
 
-import androidx.lifecycle.SavedStateHandle
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel
-import com.threegap.bitnagil.presentation.guide.model.GuideIntent
+import androidx.lifecycle.ViewModel
 import com.threegap.bitnagil.presentation.guide.model.GuideSideEffect
 import com.threegap.bitnagil.presentation.guide.model.GuideState
+import com.threegap.bitnagil.presentation.guide.model.GuideType
 import dagger.hilt.android.lifecycle.HiltViewModel
-import org.orbitmvi.orbit.syntax.Syntax
+import org.orbitmvi.orbit.Container
+import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.viewmodel.container
 import javax.inject.Inject
 
 @HiltViewModel
-class GuideViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-) : MviViewModel<GuideState, GuideSideEffect, GuideIntent>(
-    initState = GuideState(),
-    savedStateHandle = savedStateHandle,
-) {
-    override suspend fun Syntax<GuideState, GuideSideEffect>.reduceState(
-        intent: GuideIntent,
-        state: GuideState,
-    ): GuideState? {
-        val newState = when (intent) {
-            is GuideIntent.OnClickGuideButton -> {
-                state.copy(
-                    guideType = intent.guideType,
-                    guideBottomSheetVisible = true,
-                )
-            }
+class GuideViewModel @Inject constructor() : ContainerHost<GuideState, GuideSideEffect>, ViewModel() {
+
+    override val container: Container<GuideState, GuideSideEffect> = container(initialState = GuideState.INIT)
 
-            is GuideIntent.OnHideGuideBottomSheet -> {
-                state.copy(
-                    guideType = null,
-                    guideBottomSheetVisible = false,
-                )
+    fun onShowGuideBottomSheet(guideType: GuideType) {
+        intent {
+            reduce {
+                state.copy(guideType = guideType, guideBottomSheetVisible = true)
             }
+        }
+    }
 
-            is GuideIntent.OnBackClick -> {
-                sendSideEffect(GuideSideEffect.NavigateToBack)
-                null
+    fun onHideGuideBottomSheet() {
+        intent {
+            reduce {
+                state.copy(guideType = null, guideBottomSheetVisible = false)
             }
         }
+    }
 
-        return newState
+    fun navigateToBack() {
+        intent {
+            postSideEffect(GuideSideEffect.NavigateToBack)
+        }
     }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/guide/model/GuideIntent.kt

@@ -1,7 +1,5 @@
 package com.threegap.bitnagil.presentation.guide.model
 
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
-
-sealed interface GuideSideEffect : MviSideEffect {
+sealed interface GuideSideEffect {
     data object NavigateToBack : GuideSideEffect
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/guide/model/GuideSideEffect.kt

@@ -1,10 +1,13 @@
 package com.threegap.bitnagil.presentation.guide.model
 
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviState
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
 data class GuideState(
-    val guideType: GuideType? = null,
-    val guideBottomSheetVisible: Boolean = false,
-) : MviState
+    val guideType: GuideType?,
+    val guideBottomSheetVisible: Boolean,
+) {
+    companion object {
+        val INIT = GuideState(
+            guideType = null,
+            guideBottomSheetVisible = false,
+        )
+    }
+}