[feat/#12] 7주차 과제 구현

presentation/src/main/java/org/sopt/and/presentation/my/MyScreen.kt

@@ -41,6 +41,7 @@ import org.sopt.and.presentation.component.ContentsView
 import org.sopt.and.presentation.component.PairTextView
 import org.sopt.and.presentation.delegate.NetworkState
 import org.sopt.and.presentation.extension.noRippleClickable
+import org.sopt.and.presentation.my.contract.MyEvent
 import org.sopt.and.presentation.my.sideeffect.MySideEffect
 import org.sopt.and.presentation.my.viewmodel.MyViewModel
 import org.sopt.and.presentation.ui.theme.FirstGrey
@@ -55,33 +56,33 @@ fun MyScreen(
     modifier: Modifier = Modifier,
     viewModel: MyViewModel = hiltViewModel()
 ) {
-    LaunchedEffect(viewModel.state) {
-        if(viewModel.state.value.hobby == DEFAULT_STRING) viewModel.getMyHobby()
+    LaunchedEffect(viewModel.uiState) {
+        if(viewModel.uiState.value.hobby == DEFAULT_STRING) viewModel.getMyHobby()
     }
 
     Column(
         modifier = modifier.fillMaxSize()
     ) {
 
-        val state by viewModel.state.collectAsStateWithLifecycle()
+        val state by viewModel.uiState.collectAsStateWithLifecycle()
 
         val lifecycleOwner = LocalLifecycleOwner.current
         val context = LocalContext.current
         val snackBarHostState = remember { SnackbarHostState() }
 
-        LaunchedEffect(viewModel.intent, lifecycleOwner){
-            viewModel.intent.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle)
-                .collect{ intent ->
-                    when(intent) {
-                        MySideEffect.Logout -> {
+        LaunchedEffect(viewModel.sideEffect, lifecycleOwner){
+            viewModel.sideEffect.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle)
+                .collect{ sideEffect ->
+                    when(sideEffect) {
+                        MySideEffect.NavigateToSignIn -> {
                             viewModel.clearUserPreference()
                             snackBarHostState.showSnackbar(
                                 message = context.getString(R.string.my_logout_text)
                             )
                             onLogout()
                         }
-                        is MySideEffect.SnackBar -> snackBarHostState.showSnackbar(context.getString(intent.message))
-                        is MySideEffect.SnackBarText -> snackBarHostState.showSnackbar(intent.message)
+                        is MySideEffect.SnackBar -> snackBarHostState.showSnackbar(context.getString(sideEffect.message))
+                        is MySideEffect.SnackBarText -> snackBarHostState.showSnackbar(sideEffect.message)
                     }
                 }
         }
@@ -183,7 +184,7 @@ fun MyScreen(
                 .align(Alignment.CenterHorizontally)
                 .noRippleClickable(
                     onClick = {
-                        viewModel.onLogOutButtonClick()
+                        viewModel.setEvent(MyEvent.OnLogoutButtonClick)
                     }
                 )
         )

presentation/src/main/java/org/sopt/and/presentation/my/contract/MyEvent.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.presentation.my.contract
+
+import org.sopt.and.presentation.util.base.UiEvent
+
+sealed class MyEvent: UiEvent {
+    data class GetMyHobby(val token: String): MyEvent()
+    data object OnLogoutButtonClick: MyEvent()
+}

presentation/src/main/java/org/sopt/and/presentation/my/model/MyState.kt

@@ -1,7 +1,8 @@
 package org.sopt.and.presentation.my.model
 
 import org.sopt.and.presentation.util.KeyUtil.DEFAULT_STRING
+import org.sopt.and.presentation.util.base.UiState
 
 data class MyState(
     val hobby: String = DEFAULT_STRING
-)
+): UiState

presentation/src/main/java/org/sopt/and/presentation/my/sideeffect/MySideEffect.kt

@@ -1,9 +1,10 @@
 package org.sopt.and.presentation.my.sideeffect
 
 import androidx.annotation.StringRes
+import org.sopt.and.presentation.util.base.UiSideEffect
 
-sealed class MySideEffect {
+sealed class MySideEffect: UiSideEffect {
     data class SnackBar(@StringRes val message: Int): MySideEffect()
     data class SnackBarText(val message: String): MySideEffect()
-    data object Logout: MySideEffect()
+    data object NavigateToSignIn: MySideEffect()
 }

presentation/src/main/java/org/sopt/and/presentation/my/viewmodel/MyViewModel.kt

@@ -1,59 +1,61 @@
 package org.sopt.and.presentation.my.viewmodel
 
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.sopt.and.domain.exception.onError
 import org.sopt.and.domain.exception.onSuccess
 import org.sopt.and.domain.repository.UserRepository
 import org.sopt.and.presentation.delegate.NetworkDelegate
+import org.sopt.and.presentation.my.contract.MyEvent
 import org.sopt.and.presentation.my.model.MyState
 import org.sopt.and.presentation.my.sideeffect.MySideEffect
-import org.sopt.and.presentation.sign.signin.sideeffect.SignInSideEffect
+import org.sopt.and.presentation.util.base.BaseViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class MyViewModel @Inject constructor(
     private val userRepository: UserRepository,
     private val networkDelegate: NetworkDelegate
-): ViewModel() {
+): BaseViewModel<MyState, MyEvent, MySideEffect>() {
 
-    private val _state = MutableStateFlow(MyState())
-    val state = _state.asStateFlow()
+    override fun createInitialState(): MyState = MyState()
 
-    private val _intent = MutableSharedFlow<MySideEffect>()
-    val intent = _intent.asSharedFlow()
+    override suspend fun handleEvent(event: MyEvent) {
+        when(event) {
+            MyEvent.OnLogoutButtonClick -> {
+                navigateToSignIn()
+            }
+            is MyEvent.GetMyHobby -> {
+                getMyHobby()
+            }
+        }
+    }
 
     val networkState get() = networkDelegate.networkState
 
     fun getMyHobby() = viewModelScope.launch {
         val token = userRepository.getToken()
         userRepository.getMyHobby(token).onSuccess { result ->
-            _state.update {
-                it.copy(hobby = result.hobby)
-            }
+            setState { copy(hobby = result.hobby) }
             networkDelegate.handleNetworkSuccess()
         }.onError {
             networkDelegate.handleGetMyHobbyError(it)
         }
     }
 
-    fun onLogOutButtonClick() = viewModelScope.launch {
-        _intent.emit(MySideEffect.Logout)
+    private fun navigateToSignIn() = viewModelScope.launch {
+        delay(100)
+        setSideEffect(MySideEffect.NavigateToSignIn)
     }
 
     fun clearUserPreference() = viewModelScope.launch {
         userRepository.clearUserPreference()
     }
 
-    suspend fun handleMyIntentError(message: String) {
-        _intent.emit(MySideEffect.SnackBarText(message))
+    fun handleMyIntentError(message: String) = viewModelScope.launch {
+        setSideEffect(MySideEffect.SnackBarText(message))
     }
 
 }

presentation/src/main/java/org/sopt/and/presentation/sign/signin/SignInScreen.kt

@@ -37,7 +37,8 @@ import org.sopt.and.presentation.component.WavveActionTextField
 import org.sopt.and.presentation.component.WavveTextField
 import org.sopt.and.presentation.delegate.NetworkState
 import org.sopt.and.presentation.extension.noRippleClickable
-import org.sopt.and.presentation.sign.signin.sideeffect.SignInSideEffect
+import org.sopt.and.presentation.sign.signin.contract.SignInEvent
+import org.sopt.and.presentation.sign.signin.contract.SignInSideEffect
 import org.sopt.and.presentation.sign.signin.viewmodel.SignInViewModel
 import org.sopt.and.presentation.ui.theme.FirstGrey
 import org.sopt.and.presentation.ui.theme.SecondGrey
@@ -56,20 +57,21 @@ fun SignInScreen(
     viewModel: SignInViewModel = hiltViewModel()
 ){
 
-    val state by viewModel.state.collectAsStateWithLifecycle()
+    val state by viewModel.uiState.collectAsStateWithLifecycle()
     val context = rememberUpdatedState(LocalContext.current).value
     val snackBarHostState = remember { SnackbarHostState() }
 
-    LaunchedEffect(viewModel.intent) {
-       viewModel.intent.collect{ intent ->
-           when(intent) {
-               SignInSideEffect.SignIn -> {
-                   viewModel.saveUser(state.id, state.password)
+    LaunchedEffect(viewModel.sideEffect) {
+       viewModel.sideEffect.collect{ sideEffect ->
+           when(sideEffect) {
+               is SignInSideEffect.SnackBar -> snackBarHostState.showSnackbar(context.getString(sideEffect.message))
+               is SignInSideEffect.SnackBarText -> snackBarHostState.showSnackbar(sideEffect.message)
+               SignInSideEffect.NavigateToSignUp -> {
+                   navigateToSignUp()
+               }
+               SignInSideEffect.NavigateToMy -> {
                    navigateToMy()
                }
-               SignInSideEffect.SignUp -> navigateToSignUp()
-               is SignInSideEffect.SnackBar -> snackBarHostState.showSnackbar(context.getString(intent.message))
-               is SignInSideEffect.SnackBarText -> snackBarHostState.showSnackbar(intent.message)
            }
        }
     }
@@ -93,7 +95,9 @@ fun SignInScreen(
         WavveTextField(
             value = state.id,
             hint = stringResource(R.string.signup_login_hint),
-            onValueChange = viewModel::updateId,
+            onValueChange = {
+                viewModel.setEvent(SignInEvent.OnIdChanged(it))
+            },
             modifier = Modifier.padding(horizontal = 8.dp)
         )
 
@@ -102,7 +106,9 @@ fun SignInScreen(
         WavveActionTextField(
             value = state.password,
             hint = stringResource(R.string.signin_password_hint),
-            onValueChange = viewModel::updatePassword,
+            onValueChange = {
+                viewModel.setEvent(SignInEvent.OnPasswordChanged(it))
+            },
             modifier = Modifier.padding(horizontal = 8.dp)
         )
 
@@ -175,7 +181,7 @@ fun SignInScreen(
                 modifier = Modifier
                     .noRippleClickable(
                         onClick = {
-                            viewModel.onSignUpButtonClick()
+                            viewModel.setEvent(SignInEvent.OnSignUpButtonClick)
                         }
                     )
             )
@@ -214,10 +220,10 @@ private suspend fun collectNetworkState(viewModel: SignInViewModel) {
                 // TODO 로딩 추가
             }
             is NetworkState.Error -> {
-                viewModel.handleSignInIntentError(networkState.title + networkState.msg)
+                viewModel.handleSignInSideEffectError(networkState.title + networkState.msg)
             }
             is NetworkState.Success -> {
-                viewModel.handleSignInIntentSuccess()
+                viewModel.handleSignInSideEffectSuccess()
             }
         }
     }

presentation/src/main/java/org/sopt/and/presentation/sign/signin/contract/SignInEvent.kt

@@ -0,0 +1,10 @@
+package org.sopt.and.presentation.sign.signin.contract
+
+import org.sopt.and.presentation.util.base.UiEvent
+
+sealed class SignInEvent: UiEvent {
+    data class OnIdChanged(val id: String) : SignInEvent()
+    data class OnPasswordChanged(val password: String) : SignInEvent()
+    data object OnSignInButtonClick : SignInEvent()
+    data object OnSignUpButtonClick : SignInEvent()
+}

presentation/src/main/java/org/sopt/and/presentation/sign/signin/contract/SignInSideEffect.kt

@@ -0,0 +1,11 @@
+package org.sopt.and.presentation.sign.signin.contract
+
+import androidx.annotation.StringRes
+import org.sopt.and.presentation.util.base.UiSideEffect
+
+sealed class SignInSideEffect: UiSideEffect {
+    data class SnackBar(@StringRes val message: Int) : SignInSideEffect()
+    data class SnackBarText(val message: String) : SignInSideEffect()
+    data object NavigateToSignUp: SignInSideEffect()
+    data object NavigateToMy: SignInSideEffect()
+}

presentation/src/main/java/org/sopt/and/presentation/sign/signin/model/SignInState.kt → presentation/src/main/java/org/sopt/and/presentation/sign/signin/contract/SignInState.kt

@@ -1,8 +1,9 @@
-package org.sopt.and.presentation.sign.signin.model
+package org.sopt.and.presentation.sign.signin.contract
 
 import org.sopt.and.presentation.util.KeyUtil.DEFAULT_STRING
+import org.sopt.and.presentation.util.base.UiState
 
 data class SignInState(
     val id: String = DEFAULT_STRING,
     val password: String = DEFAULT_STRING,
-)
+): UiState