feat: 내서재의 로그아웃 기능을 설정 화면으로 이동

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/ReedDialog.kt

@@ -0,0 +1,126 @@
+package com.ninecraft.booket.core.designsystem.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Dialog
+import com.ninecraft.booket.core.designsystem.component.button.ReedButton
+import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
+import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
+import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+
+@Composable
+fun ReedDialog(
+    title: String,
+    confirmButtonText: String,
+    onConfirmRequest: () -> Unit,
+    modifier: Modifier = Modifier,
+    description: String? = null,
+    dismissButtonText: String? = null,
+    onDismissRequest: () -> Unit = {},
+) {
+    Dialog(
+        onDismissRequest = {
+            onDismissRequest()
+        },
+    ) {
+        Column(
+            modifier = modifier
+                .fillMaxWidth()
+                .background(
+                    color = ReedTheme.colors.basePrimary,
+                    shape = RoundedCornerShape(
+                        ReedTheme.radius.lg,
+                    ),
+                )
+                .padding(
+                    start = ReedTheme.spacing.spacing5,
+                    top = ReedTheme.spacing.spacing8,
+                    end = ReedTheme.spacing.spacing5,
+                    bottom = ReedTheme.spacing.spacing5,
+                ),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text(
+                text = title,
+                color = ReedTheme.colors.contentPrimary,
+                textAlign = TextAlign.Center,
+                style = ReedTheme.typography.headline1SemiBold,
+            )
+            description?.let {
+                Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2))
+                Text(
+                    text = description,
+                    color = ReedTheme.colors.contentSecondary,
+                    textAlign = TextAlign.Center,
+                    style = ReedTheme.typography.body2Medium,
+                )
+            }
+            Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing6))
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                dismissButtonText?.let {
+                    ReedButton(
+                        onClick = {
+                            onDismissRequest()
+                        },
+                        sizeStyle = largeButtonStyle,
+                        colorStyle = ReedButtonColorStyle.SECONDARY,
+                        modifier = Modifier.weight(1f),
+                        text = dismissButtonText,
+                    )
+                    Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))
+                }
+                ReedButton(
+                    onClick = {
+                        onConfirmRequest()
+                    },
+                    sizeStyle = largeButtonStyle,
+                    colorStyle = ReedButtonColorStyle.PRIMARY,
+                    modifier = Modifier.weight(1f),
+                    text = confirmButtonText,
+                )
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun ReedConfirmDialogPreview() {
+    ReedTheme {
+        ReedDialog(
+            title = "Title",
+            confirmButtonText = "확인",
+            onConfirmRequest = {},
+            description = "subtext",
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun ReedChoiceDialogPreview() {
+    ReedTheme {
+        ReedDialog(
+            title = "Title",
+            confirmButtonText = "확인",
+            onConfirmRequest = {},
+            description = "subtext",
+            dismissButtonText = "취소",
+        )
+    }
+}

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt

@@ -6,7 +6,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import com.ninecraft.booket.core.common.utils.handleException
-import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.screens.LibraryScreen
 import com.ninecraft.booket.screens.LoginScreen
@@ -25,7 +24,6 @@ import kotlinx.coroutines.launch
 
 class LibraryPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
-    private val authRepository: AuthRepository,
     private val userRepository: UserRepository,
 ) : Presenter<LibraryUiState> {
 
@@ -80,35 +78,6 @@ class LibraryPresenter @AssistedInject constructor(
                 is LibraryUiEvent.OnSettingsClick -> {
                     navigator.goTo(SettingsScreen)
                 }
-
-                is LibraryUiEvent.OnLogoutButtonClick -> {
-                    scope.launch {
-                        try {
-                            isLoading = true
-                            authRepository.logout()
-                                .onSuccess {
-                                    navigator.resetRoot(LoginScreen)
-                                }
-                                .onFailure { exception ->
-                                    val handleErrorMessage = { message: String ->
-                                        Logger.e(message)
-                                        sideEffect = LibrarySideEffect.ShowToast(message)
-                                    }
-
-                                    handleException(
-                                        exception = exception,
-                                        onServerError = handleErrorMessage,
-                                        onNetworkError = handleErrorMessage,
-                                        onLoginRequired = {
-                                            navigator.resetRoot(LoginScreen)
-                                        },
-                                    )
-                                }
-                        } finally {
-                            isLoading = false
-                        }
-                    }
-                }
             }
         }
 

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt

@@ -5,9 +5,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -17,13 +15,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.DevicePreview
-import com.ninecraft.booket.core.designsystem.component.button.ReedButton
-import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
-import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.screens.LibraryScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
@@ -86,19 +80,6 @@ internal fun LibraryContent(
                 Spacer(modifier = Modifier.height(16.dp))
                 Text(text = state.email)
             }
-            ReedButton(
-                onClick = {
-                    state.eventSink(LibraryUiEvent.OnLogoutButtonClick)
-                },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 32.dp, end = 32.dp, bottom = 32.dp)
-                    .height(56.dp)
-                    .align(Alignment.BottomCenter),
-                colorStyle = ReedButtonColorStyle.PRIMARY,
-                sizeStyle = largeButtonStyle,
-                text = stringResource(id = R.string.logout),
-            )
 
             if (state.isLoading) {
                 CircularProgressIndicator(

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUiState.kt

@@ -18,5 +18,4 @@ sealed interface LibrarySideEffect {
 sealed interface LibraryUiEvent : CircuitUiEvent {
     data object InitSideEffect : LibraryUiEvent
     data object OnSettingsClick : LibraryUiEvent
-    data object OnLogoutButtonClick : LibraryUiEvent
 }

feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsPresenter.kt

@@ -3,9 +3,14 @@ package com.ninecraft.booket.feature.settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import com.ninecraft.booket.core.common.utils.handleException
+import com.ninecraft.booket.core.data.api.repository.AuthRepository
+import com.ninecraft.booket.screens.LoginScreen
 import com.ninecraft.booket.screens.OssLicensesScreen
 import com.ninecraft.booket.screens.SettingsScreen
+import com.orhanobut.logger.Logger
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
@@ -14,19 +19,28 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.components.ActivityRetainedComponent
+import kotlinx.coroutines.launch
 
 class SettingsPresenter @AssistedInject constructor(
     @Assisted val navigator: Navigator,
+    private val authRepository: AuthRepository,
 ) : Presenter<SettingsUiState> {
 
     @Composable
     override fun present(): SettingsUiState {
-        var isLogoutBottomSheetVisible by rememberRetained { mutableStateOf(false) }
+        val scope = rememberCoroutineScope()
+        var isLoading by rememberRetained { mutableStateOf(false) }
+        var sideEffect by rememberRetained { mutableStateOf<SettingsSideEffect?>(null) }
+        var isLogoutDialogVisible by rememberRetained { mutableStateOf(false) }
         var isWithdrawBottomSheetVisible by rememberRetained { mutableStateOf(false) }
         var isWithdrawConfirmed by rememberRetained { mutableStateOf(false) }
 
         fun handleEvent(event: SettingsUiEvent) {
             when (event) {
+                is SettingsUiEvent.InitSideEffect -> {
+                    sideEffect = null
+                }
+
                 is SettingsUiEvent.OnBackClick -> {
                     navigator.pop()
                 }
@@ -40,15 +54,15 @@ class SettingsPresenter @AssistedInject constructor(
                 }
 
                 is SettingsUiEvent.OnLogoutClick -> {
-                    isLogoutBottomSheetVisible = true
+                    isLogoutDialogVisible = true
                 }
 
                 is SettingsUiEvent.OnWithdrawClick -> {
                     isWithdrawBottomSheetVisible = true
                 }
 
                 is SettingsUiEvent.OnBottomSheetDismissed -> {
-                    isLogoutBottomSheetVisible = false
+                    isLogoutDialogVisible = false
                     isWithdrawBottomSheetVisible = false
                     isWithdrawConfirmed = false
                 }
@@ -58,7 +72,33 @@ class SettingsPresenter @AssistedInject constructor(
                 }
 
                 is SettingsUiEvent.Logout -> {
-                    // TODO: 로그아웃 처리 -> 성공 시 로그인 화면으로 이동
+                    scope.launch {
+                        try {
+                            isLoading = true
+                            authRepository.logout()
+                                .onSuccess {
+                                    navigator.resetRoot(LoginScreen)
+                                }
+                                .onFailure { exception ->
+                                    val handleErrorMessage = { message: String ->
+                                        Logger.e(message)
+                                        sideEffect = SettingsSideEffect.ShowToast(message)
+                                    }
+
+                                    handleException(
+                                        exception = exception,
+                                        onServerError = handleErrorMessage,
+                                        onNetworkError = handleErrorMessage,
+                                        onLoginRequired = {
+                                            navigator.resetRoot(LoginScreen)
+                                        },
+                                    )
+                                }
+                        } finally {
+                            isLoading = false
+                        }
+                    }
+                    isLogoutDialogVisible = false
                 }
 
                 is SettingsUiEvent.Withdraw -> {
@@ -67,9 +107,11 @@ class SettingsPresenter @AssistedInject constructor(
             }
         }
         return SettingsUiState(
-            isLogoutBottomSheetVisible = isLogoutBottomSheetVisible,
+            isLoading = isLoading,
+            isLogoutDialogVisible = isLogoutDialogVisible,
             isWithdrawBottomSheetVisible = isWithdrawBottomSheetVisible,
             isWithdrawConfirmed = isWithdrawConfirmed,
+            sideEffect = sideEffect,
             eventSink = ::handleEvent,
         )
     }