Refactor: MyPageViewModel 에서 MviViewModel 구현 제거 및 orbit ContainerHost 직접 사용

Author: l5x5l

presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageScreen.kt

@@ -14,7 +14,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -30,6 +29,7 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton
 import com.threegap.bitnagil.designsystem.component.block.BitnagilOptionButton
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
 import com.threegap.bitnagil.presentation.mypage.model.MyPageState
+import org.orbitmvi.orbit.compose.collectAsState
 
 @Composable
 fun MyPageScreenContainer(
@@ -39,7 +39,7 @@ fun MyPageScreenContainer(
     navigateToQnA: () -> Unit,
     navigateToOnBoarding: () -> Unit,
 ) {
-    val state by myPageViewModel.stateFlow.collectAsState()
+    val state by myPageViewModel.collectAsState()
 
     MyPageScreen(
         state = state,

presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt

@@ -1,57 +1,37 @@
 package com.threegap.bitnagil.presentation.mypage
 
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.ViewModel
 import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel
-import com.threegap.bitnagil.presentation.mypage.model.MyPageIntent
 import com.threegap.bitnagil.presentation.mypage.model.MyPageSideEffect
 import com.threegap.bitnagil.presentation.mypage.model.MyPageState
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-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 MyPageViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
     private val fetchUserProfileUseCase: FetchUserProfileUseCase,
-) : MviViewModel<MyPageState, MyPageSideEffect, MyPageIntent>(
-    MyPageState.Init,
-    savedStateHandle,
-) {
+) : ContainerHost<MyPageState, MyPageSideEffect>, ViewModel() {
+    override val container: Container<MyPageState, MyPageSideEffect> = container(initialState = MyPageState.Init)
+
     init {
         loadMyPageInfo()
     }
 
-    private fun loadMyPageInfo() {
-        viewModelScope.launch {
-            fetchUserProfileUseCase().fold(
-                onSuccess = {
-                    sendIntent(
-                        MyPageIntent.LoadMyPageSuccess(
-                            name = it.nickname,
-                            profileUrl = "profileUrl",
-                        ),
+    private fun loadMyPageInfo() = intent {
+        fetchUserProfileUseCase().fold(
+            onSuccess = {
+                reduce {
+                    state.copy(
+                        name = it.nickname,
+                        profileUrl = "profileUrl",
                     )
-                },
-                onFailure = {
-                },
-            )
-        }
-    }
-
-    override suspend fun Syntax<MyPageState, MyPageSideEffect>.reduceState(
-        intent: MyPageIntent,
-        state: MyPageState,
-    ): MyPageState {
-        when (intent) {
-            is MyPageIntent.LoadMyPageSuccess -> {
-                return state.copy(
-                    name = intent.name,
-                    profileUrl = intent.profileUrl,
-                )
-            }
-        }
+                }
+            },
+            onFailure = {
+            },
+        )
     }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/model/MyPageIntent.kt

@@ -1,5 +1,3 @@
 package com.threegap.bitnagil.presentation.mypage.model
 
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
-
-sealed class MyPageSideEffect : MviSideEffect
+sealed class MyPageSideEffect

presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/model/MyPageSideEffect.kt

@@ -1,13 +1,9 @@
 package com.threegap.bitnagil.presentation.mypage.model
 
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviState
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
 data class MyPageState(
     val name: String,
     val profileUrl: String,
-) : MviState {
+) {
     companion object {
         val Init = MyPageState(name = "", profileUrl = "")
     }