[chore] #134 피그마에 맞춰 icon 변경, 수정 후 이동

Team-Recordy · Oct 26, 2024 · 8a6ccc0 · 8a6ccc0
1 parent 752592e
commit 8a6ccc0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/core/designsystem/src/main/res/drawable/img_profileedit.png b/core/designsystem/src/main/res/drawable/img_profileedit.png
diff --git a/feature/setting/src/main/java/com/record/setting/profileedit/ProfileEditRoute.kt b/feature/setting/src/main/java/com/record/setting/profileedit/ProfileEditRoute.kt
@@ -46,7 +46,9 @@ import com.record.designsystem.component.button.RecordyButton
 import com.record.designsystem.component.textfield.RecordyValidateTextfield
 import com.record.designsystem.theme.RecordyTheme
 import com.record.ui.extension.customClickable
+import com.record.ui.lifecycle.LaunchedEffectWithLifecycle
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
 
 @Composable
 fun ProfileEditRoute(
@@ -85,6 +87,13 @@ fun ProfileScreen(
         }
     }
 
+    LaunchedEffectWithLifecycle {
+        viewModel.sideEffect.collectLatest {
+            when (it) {
+                ProfileEditSideEffect.BackToSetting -> { popBackStack() }
+            }
+        }
+    }
     Column(
         modifier = modifier
             .fillMaxSize()
@@ -212,7 +221,6 @@ fun ProfileScreen(
             onClick = {
                 uiState.value.profileImgUrl?.let {
                     viewModel.updateUserProfile()
-                    popBackStack()
                 }
             },
         )

diff --git a/feature/setting/src/main/java/com/record/setting/profileedit/ProfileEditState.kt b/feature/setting/src/main/java/com/record/setting/profileedit/ProfileEditState.kt
@@ -11,4 +11,6 @@ data class ProfileEditState(
     val btnEnable: Boolean = false,
 ) : UiState
 
-sealed interface ProfileEditSideEffect : SideEffect
+sealed interface ProfileEditSideEffect : SideEffect {
+    data object BackToSetting : ProfileEditSideEffect
+}
diff --git a/feature/setting/src/main/java/com/record/setting/profileedit/ProfileEditViewModel.kt b/feature/setting/src/main/java/com/record/setting/profileedit/ProfileEditViewModel.kt
@@ -17,7 +17,7 @@ class ProfileEditViewModel @Inject constructor(
     private val authRepository: AuthRepository,
 ) : BaseViewModel<ProfileEditState, ProfileEditSideEffect>(ProfileEditState()) {
     init {
-        getProfile()
+//        getProfile()
     }
 
     private fun getProfile() = viewModelScope.launch {
@@ -56,7 +56,9 @@ class ProfileEditViewModel @Inject constructor(
     }
 
     fun updateUserProfile() = viewModelScope.launch {
-        userRepository.updateUser(uiState.value.username, uiState.value.profileImgUrl ?: "")
+        userRepository.updateUser(uiState.value.username, uiState.value.profileImgUrl ?: "").onSuccess {
+            postSideEffect(ProfileEditSideEffect.BackToSetting)
+        }
     }
 
     fun updateImgUrl(url: String?) = intent { copy(profileImgUrl = url) }