Refactor: 로그아웃, 회원탈퇴 다이얼로그 기능 분리

- 로그아웃 다이얼로그 디자인 수정
- 회원탈퇴 로직 제거

Author: wjdrjs00

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilTextButton.kt

@@ -110,6 +110,16 @@ data class BitnagilTextButtonColor(
             pressedTextColor = BitnagilTheme.colors.navy500,
             disabledTextColor = BitnagilTheme.colors.navy500,
         )
+
+        @Composable
+        fun cancel(): BitnagilTextButtonColor = BitnagilTextButtonColor(
+            defaultBackgroundColor = BitnagilTheme.colors.coolGray97,
+            pressedBackgroundColor = BitnagilTheme.colors.coolGray97,
+            disabledBackgroundColor = BitnagilTheme.colors.coolGray97,
+            defaultTextColor = BitnagilTheme.colors.coolGray40,
+            pressedTextColor = BitnagilTheme.colors.coolGray40,
+            disabledTextColor = BitnagilTheme.colors.coolGray40,
+        )
     }
 }
 

core/designsystem/src/main/res/drawable/ic_modal_warning.xml

@@ -29,7 +29,7 @@ import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
 import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
 import com.threegap.bitnagil.presentation.common.flow.collectAsEffect
 import com.threegap.bitnagil.presentation.setting.component.atom.settingtitle.SettingTitle
-import com.threegap.bitnagil.presentation.setting.component.block.ConfirmDialog
+import com.threegap.bitnagil.presentation.setting.component.block.LogoutConfirmDialog
 import com.threegap.bitnagil.presentation.setting.model.mvi.SettingSideEffect
 import com.threegap.bitnagil.presentation.setting.model.mvi.SettingState
 
@@ -49,11 +49,10 @@ fun SettingScreenContainer(
         }
     }
 
-    state.showConfirmDialog?.let { dialogType ->
-        ConfirmDialog(
-            type = dialogType,
+    if (state.logoutConfirmDialogVisible) {
+        LogoutConfirmDialog(
             onDismiss = viewModel::hideConfirmDialog,
-            onConfirm = viewModel::confirmDialogAction,
+            onConfirm = viewModel::logout,
         )
     }
 
@@ -66,7 +65,7 @@ fun SettingScreenContainer(
         onClickTermsOfService = navigateToTermsOfService,
         onClickPrivacyPolicy = navigateToPrivacyPolicy,
         onClickLogout = viewModel::showLogoutDialog,
-        onClickWithdrawal = viewModel::showWithdrawalDialog,
+        onClickWithdrawal = {},
     )
 }
 
@@ -181,7 +180,7 @@ fun SettingScreenPreview() {
             version = "1.0.1",
             latestVersion = "1.0.0",
             loading = false,
-            showConfirmDialog = null,
+            logoutConfirmDialogVisible = false,
         ),
         toggleServiceAlarm = {},
         togglePushAlarm = {},

presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingScreen.kt

@@ -3,9 +3,7 @@ package com.threegap.bitnagil.presentation.setting
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.threegap.bitnagil.domain.auth.usecase.LogoutUseCase
-import com.threegap.bitnagil.domain.auth.usecase.WithdrawalUseCase
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel
-import com.threegap.bitnagil.presentation.setting.model.ConfirmDialogType
 import com.threegap.bitnagil.presentation.setting.model.mvi.SettingIntent
 import com.threegap.bitnagil.presentation.setting.model.mvi.SettingSideEffect
 import com.threegap.bitnagil.presentation.setting.model.mvi.SettingState
@@ -20,7 +18,6 @@ import javax.inject.Inject
 class SettingViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val logoutUseCase: LogoutUseCase,
-    private val withdrawalUseCase: WithdrawalUseCase,
 ) : MviViewModel<SettingState, SettingSideEffect, SettingIntent>(
     initState = SettingState.Init,
     savedStateHandle = savedStateHandle,
@@ -49,57 +46,45 @@ class SettingViewModel @Inject constructor(
             }
 
             is SettingIntent.ShowConfirmDialog -> {
-                return state.copy(showConfirmDialog = intent.type)
+                return state.copy(logoutConfirmDialogVisible = true)
             }
 
             is SettingIntent.HideConfirmDialog -> {
-                return state.copy(showConfirmDialog = null)
+                return state.copy(logoutConfirmDialogVisible = false)
             }
 
             SettingIntent.LogoutSuccess -> {
                 sendSideEffect(SettingSideEffect.NavigateToLogin)
                 return null
             }
+
             SettingIntent.LogoutLoading -> {
                 return state.copy(loading = true)
             }
+
             SettingIntent.LogoutFailure -> {
                 return state.copy(loading = false)
             }
-            SettingIntent.WithdrawalSuccess -> {
-                sendSideEffect(SettingSideEffect.NavigateToLogin)
-                return null
-            }
-            SettingIntent.WithdrawalLoading -> {
-                return state.copy(loading = true)
-            }
-            SettingIntent.WithdrawalFailure -> {
-                return state.copy(loading = false)
-            }
         }
     }
 
     fun showLogoutDialog() {
-        sendIntent(SettingIntent.ShowConfirmDialog(ConfirmDialogType.LOGOUT))
-    }
-
-    fun showWithdrawalDialog() {
-        sendIntent(SettingIntent.ShowConfirmDialog(ConfirmDialogType.WITHDRAW))
+        sendIntent(SettingIntent.ShowConfirmDialog)
     }
 
     fun hideConfirmDialog() {
         sendIntent(SettingIntent.HideConfirmDialog)
     }
 
-    fun confirmDialogAction() {
-        val currentDialogType = container.stateFlow.value.showConfirmDialog
-
+    fun logout() {
         sendIntent(SettingIntent.HideConfirmDialog)
-
-        when (currentDialogType) {
-            ConfirmDialogType.LOGOUT -> executeLogout()
-            ConfirmDialogType.WITHDRAW -> executeWithdrawal()
-            null -> {}
+        viewModelScope.launch {
+            sendIntent(SettingIntent.LogoutLoading)
+            logoutUseCase().onSuccess {
+                sendIntent(SettingIntent.LogoutSuccess)
+            }.onFailure {
+                sendIntent(SettingIntent.LogoutFailure)
+            }
         }
     }
 
@@ -118,26 +103,4 @@ class SettingViewModel @Inject constructor(
             delay(1000L)
         }
     }
-
-    private fun executeLogout() {
-        viewModelScope.launch {
-            sendIntent(SettingIntent.LogoutLoading)
-            logoutUseCase().onSuccess {
-                sendIntent(SettingIntent.LogoutSuccess)
-            }.onFailure {
-                sendIntent(SettingIntent.LogoutFailure)
-            }
-        }
-    }
-
-    private fun executeWithdrawal() {
-        viewModelScope.launch {
-            sendIntent(SettingIntent.WithdrawalLoading)
-            withdrawalUseCase().onSuccess {
-                sendIntent(SettingIntent.WithdrawalSuccess)
-            }.onFailure {
-                sendIntent(SettingIntent.WithdrawalFailure)
-            }
-        }
-    }
 }