설정 화면 구현

Prezel/app/build.gradle.kts

@@ -50,6 +50,8 @@ dependencies {
     implementation(projects.featureHistoryImpl)
     implementation(projects.featureMyApi)
     implementation(projects.featureMyImpl)
+    implementation(projects.featureSettingApi)
+    implementation(projects.featureSettingImpl)
     implementation(projects.featureProfileImpl)
 
     implementation(libs.androidx.core.ktx)

Prezel/app/src/main/java/com/team/prezel/ui/DoubleBackToExitHandler.kt

@@ -45,9 +45,8 @@ internal fun DoubleBackToExitHandler(navigationState: NavigationState) {
         snackbarState.showPrezelSnackbar(
             id = SNACKBAR_IDENTIFIER,
             message = resources.getString(R.string.double_back_to_exit_snackbar_message),
-            actionLabel = resources.getString(R.string.double_back_to_exit_snackbar_action_label),
-            onAction = { backPressState = BackPressState.Idle },
             onDismiss = { backPressState = BackPressState.Idle },
+            useRaisedPosition = false,
         )
     }
 

Prezel/app/src/main/res/values/strings.xml

@@ -5,6 +5,5 @@
     <string name="bottom_nav_history">히스토리</string>
     <string name="bottom_nav_profile">프로필</string>
 
-    <string name="double_back_to_exit_snackbar_message">한 번 더 누르면 앱을 종료합니다</string>
-    <string name="double_back_to_exit_snackbar_action_label">닫기</string>
+    <string name="double_back_to_exit_snackbar_message">한 번 더 누르면 앱을 종료합니다.</string>
 </resources>

Prezel/core/data/src/main/java/com/team/prezel/core/data/repository/AuthRepositoryImpl.kt

@@ -37,30 +37,24 @@ internal class AuthRepositoryImpl @Inject constructor(
     override suspend fun withdraw(reason: WithdrawReason): Result<Unit> =
         runCatching {
             authRemoteDataSource.withdraw(
-                reasonCategory = reason.toCategory(),
-                reasonText = reason.toReasonText(),
+                reasonCategory = reason.toReasonCategory(),
+                reasonText = (reason as? WithdrawReason.Etc)?.text,
             )
             clearLocalSession()
         }.mapDomainFailure()
 
-    private fun WithdrawReason.toCategory(): String =
-        when (this) {
-            WithdrawReason.NotUsedOften -> "NOT_USED_OFTEN"
-            WithdrawReason.NoLongerNeeded -> "NO_LONGER_NEEDED"
-            WithdrawReason.TooDifficultOrComplex -> "TOO_COMPLEX"
-            WithdrawReason.AnalysisResultInaccurate -> "INACCURATE_ANALYSIS"
-            WithdrawReason.TooManyErrors -> "MANY_ERRORS"
-            is WithdrawReason.Other -> "ETC"
-        }
-
-    private fun WithdrawReason.toReasonText(): String =
-        when (this) {
-            is WithdrawReason.Other -> text
-            else -> ""
-        }
-
     private suspend fun clearLocalSession() {
         authLocalDataSource.clearTokens()
         authSessionCache.clear()
     }
+
+    private fun WithdrawReason.toReasonCategory(): String =
+        when (this) {
+            WithdrawReason.NotUsedOften -> "NOT_USED_OFTEN"
+            WithdrawReason.NoLongerNeeded -> "NO_LONGER_NEEDED"
+            WithdrawReason.TooComplex -> "TOO_COMPLEX"
+            WithdrawReason.InaccurateAnalysis -> "INACCURATE_ANALYSIS"
+            WithdrawReason.ManyErrors -> "MANY_ERRORS"
+            is WithdrawReason.Etc -> "ETC"
+        }
 }

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/actions/area/PrezelButtonArea.kt

@@ -22,6 +22,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.team.prezel.core.designsystem.component.PrezelDividerType
 import com.team.prezel.core.designsystem.component.PrezelHorizontalDivider
+import com.team.prezel.core.designsystem.component.actions.button.PrezelButton
+import com.team.prezel.core.designsystem.component.actions.button.config.ButtonHierarchy
+import com.team.prezel.core.designsystem.component.actions.button.config.ButtonType
 import com.team.prezel.core.designsystem.icon.PrezelIcons
 import com.team.prezel.core.designsystem.preview.PreviewSection
 import com.team.prezel.core.designsystem.theme.PrezelTheme
@@ -40,16 +43,9 @@ fun PrezelButtonArea(
     showBackground: Boolean = false,
     isNested: Boolean = false,
     config: PrezelButtonAreaDefault = PrezelButtonAreaDefaults.getDefault(),
-    content: ButtonAreaScope.() -> Unit,
+    mainButton: @Composable (Modifier) -> Unit,
+    subButton: @Composable ((Modifier) -> Unit)? = null,
 ) {
-    val scope = DefaultButtonAreaScope().apply {
-        this.content()
-    }
-
-    val mainButton = requireNotNull(scope.buttons.firstOrNull()) {
-        "PrezelButtonArea에는 최소 1개의 버튼이 필요합니다."
-    }
-    val subButton = scope.buttons.getOrNull(1)
     val contentModifier = if (isNested) Modifier else Modifier.padding(config.contentPadding)
 
     Column(
@@ -247,21 +243,29 @@ private fun ButtonAreaPreviewSample(
         isVertical = variant.isVertical,
         isStrongStrength = variant.isStrongStrength,
         showBackground = showBackground,
-    ) {
-        MainButton(
-            iconResId = PrezelIcons.Blank,
-            label = "Label",
-            enabled = enabled,
-            onClick = {},
-        )
-
-        SubButton(
-            iconResId = PrezelIcons.Blank,
-            label = "Label",
-            enabled = enabled,
-            onClick = {},
-        )
-    }
+        mainButton = { modifier ->
+            PrezelButton(
+                modifier = modifier,
+                text = "Label",
+                iconResId = PrezelIcons.Blank,
+                onClick = { },
+                enabled = enabled,
+                type = ButtonType.FILLED,
+                hierarchy = ButtonHierarchy.PRIMARY,
+            )
+        },
+        subButton = { modifier ->
+            PrezelButton(
+                modifier = modifier,
+                text = "Label",
+                iconResId = PrezelIcons.Blank,
+                onClick = { },
+                enabled = enabled,
+                type = ButtonType.FILLED,
+                hierarchy = ButtonHierarchy.SECONDARY,
+            )
+        },
+    )
 }
 
 @Composable

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/datepicker/PrezelDatePicker.kt

@@ -33,6 +33,9 @@ import com.team.prezel.core.designsystem.component.PrezelDividerType
 import com.team.prezel.core.designsystem.component.PrezelHorizontalDivider
 import com.team.prezel.core.designsystem.component.PrezelTopAppBar
 import com.team.prezel.core.designsystem.component.actions.area.PrezelButtonArea
+import com.team.prezel.core.designsystem.component.actions.button.PrezelButton
+import com.team.prezel.core.designsystem.component.actions.button.config.ButtonHierarchy
+import com.team.prezel.core.designsystem.component.actions.button.config.ButtonType
 import com.team.prezel.core.designsystem.component.datepicker.config.DatePickerDefault
 import com.team.prezel.core.designsystem.component.datepicker.config.DatePickerDefaults
 import com.team.prezel.core.designsystem.component.datepicker.config.DatePickerMonth
@@ -120,18 +123,20 @@ private fun DatePickerFooter(
     enabled: Boolean,
     onClick: () -> Unit,
 ) {
-    val buttonLabel = stringResource(R.string.core_designsystem_date_picker_confirm_btn)
-
     PrezelButtonArea(
         isVertical = false,
         showBackground = true,
-    ) {
-        MainButton(
-            label = buttonLabel,
-            enabled = enabled,
-            onClick = onClick,
-        )
-    }
+        mainButton = { modifier ->
+            PrezelButton(
+                modifier = modifier,
+                text = stringResource(R.string.core_designsystem_date_picker_confirm_btn),
+                onClick = onClick,
+                enabled = enabled,
+                type = ButtonType.FILLED,
+                hierarchy = ButtonHierarchy.PRIMARY,
+            )
+        },
+    )
 }
 
 @Composable

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/feedback/dialog/PrezelDialog.kt

@@ -24,9 +24,9 @@ import com.team.prezel.core.designsystem.theme.PrezelTheme
 @Composable
 fun PrezelDialog(
     title: String,
-    description: String,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
+    description: String? = null,
     content: @Composable PrezelDialogScope.() -> Unit,
 ) {
     val scope = remember { PrezelDialogScope() }
@@ -59,15 +59,17 @@ fun PrezelDialog(
 @Composable
 private fun DialogContent(
     title: String,
-    description: String,
+    description: String?,
     modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = modifier.padding(vertical = PrezelTheme.spacing.V24),
     ) {
         Text(text = title, style = PrezelTheme.typography.title2Bold, color = PrezelTheme.colors.textLarge)
         Spacer(modifier = Modifier.height(PrezelTheme.spacing.V12))
-        Text(text = description, style = PrezelTheme.typography.body3Medium, color = PrezelTheme.colors.textRegular)
+        description?.let { text ->
+            Text(text = text, style = PrezelTheme.typography.body3Medium, color = PrezelTheme.colors.textRegular)
+        }
     }
 }
 

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/feedback/snackbar/SnackbarHost.kt

@@ -28,7 +28,7 @@ suspend fun SnackbarHostState.showPrezelSnackbar(
     @DrawableRes leadingIconResId: Int? = null,
     duration: SnackbarDuration = SnackbarDuration.Short,
     id: String? = null,
-    offsetY: Dp = 0.dp,
+    useRaisedPosition: Boolean = true,
     onDismiss: (() -> Unit)? = null,
 ) {
     val result = showSnackbar(
@@ -38,7 +38,7 @@ suspend fun SnackbarHostState.showPrezelSnackbar(
             duration = duration,
             id = id,
             leadingIconResId = leadingIconResId,
-            offsetY = offsetY,
+            offsetY = if (useRaisedPosition) (-98).dp else 0.dp,
         ),
     )
 

Prezel/core/model/src/main/java/com/team/prezel/core/model/auth/WithdrawReason.kt

@@ -5,13 +5,13 @@ sealed interface WithdrawReason {
 
     data object NoLongerNeeded : WithdrawReason
 
-    data object TooDifficultOrComplex : WithdrawReason
+    data object TooComplex : WithdrawReason
 
-    data object AnalysisResultInaccurate : WithdrawReason
+    data object InaccurateAnalysis : WithdrawReason
 
-    data object TooManyErrors : WithdrawReason
+    data object ManyErrors : WithdrawReason
 
-    data class Other(
+    data class Etc(
         val text: String,
     ) : WithdrawReason
 }

Prezel/core/network/src/main/java/com/team/prezel/core/network/datasource/AuthRemoteDataSource.kt

@@ -12,6 +12,6 @@ interface AuthRemoteDataSource {
 
     suspend fun withdraw(
         reasonCategory: String,
-        reasonText: String,
+        reasonText: String?,
     )
 }

Prezel/core/network/src/main/java/com/team/prezel/core/network/datasource/AuthRemoteDataSourceImpl.kt

@@ -24,11 +24,10 @@ internal class AuthRemoteDataSourceImpl @Inject constructor(
 
     override suspend fun withdraw(
         reasonCategory: String,
-        reasonText: String,
+        reasonText: String?,
     ) {
         authService
-            .withdraw(
-                request = WithdrawRequest(reasonCategory = reasonCategory, reasonText = reasonText),
-            ).requireSuccess()
+            .withdraw(request = WithdrawRequest(reasonCategory = reasonCategory, reasonText = reasonText))
+            .requireSuccess()
     }
 }

Prezel/core/network/src/main/java/com/team/prezel/core/network/model/auth/WithdrawRequest.kt

@@ -8,5 +8,5 @@ data class WithdrawRequest(
     @SerialName("reasonCategory")
     val reasonCategory: String,
     @SerialName("reasonText")
-    val reasonText: String,
+    val reasonText: String?,
 )

Prezel/core/ui/src/main/java/com/team/prezel/core/ui/util/NoRippleClickable.kt

@@ -0,0 +1,16 @@
+package com.team.prezel.core.ui.util
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+
+fun Modifier.noRippleClickable(onClick: () -> Unit): Modifier =
+    composed {
+        clickable(
+            indication = null,
+            interactionSource = remember { MutableInteractionSource() },
+            onClick = onClick,
+        )
+    }

Prezel/feature/login/impl/src/main/java/com/team/prezel/feature/login/impl/LoginScreen.kt

@@ -31,6 +31,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
 import com.team.prezel.core.auth.AuthManager
 import com.team.prezel.core.designsystem.component.actions.area.PrezelButtonArea
+import com.team.prezel.core.designsystem.component.actions.button.PrezelButton
 import com.team.prezel.core.designsystem.component.actions.button.config.ButtonHierarchy
 import com.team.prezel.core.designsystem.component.actions.button.config.ButtonSize
 import com.team.prezel.core.designsystem.component.actions.button.config.ButtonType
@@ -153,16 +154,6 @@ private fun LoginFooter(
     modifier: Modifier = Modifier,
 ) {
     var isButtonVisible by remember { mutableStateOf(false) }
-    val startWithKakaoLabel = stringResource(R.string.feature_login_impl_start_with_kakao)
-    val kakaoButtonConfig = PrezelButtonDefaults.getDefault(
-        isIconOnly = false,
-        type = ButtonType.FILLED,
-        size = ButtonSize.REGULAR,
-        hierarchy = ButtonHierarchy.SECONDARY,
-        isRounded = false,
-        backgroundColor = Color(0xFFFEE500),
-        contentColor = PrezelTheme.colors.textLarge,
-    )
 
     LaunchedEffect(Unit) {
         isButtonVisible = true
@@ -180,15 +171,26 @@ private fun LoginFooter(
         ),
         exit = ExitTransition.None,
     ) {
-        PrezelButtonArea {
-            CustomButton(
-                iconResId = PrezelIcons.Kakao,
-                label = startWithKakaoLabel,
-                enabled = enabled,
-                onClick = onLogin,
-                config = kakaoButtonConfig,
-            )
-        }
+        PrezelButtonArea(
+            mainButton = { modifier ->
+                PrezelButton(
+                    modifier = modifier,
+                    text = stringResource(R.string.feature_login_impl_start_with_kakao),
+                    iconResId = PrezelIcons.Kakao,
+                    enabled = enabled,
+                    onClick = onLogin,
+                    config = PrezelButtonDefaults.getDefault(
+                        isIconOnly = false,
+                        type = ButtonType.FILLED,
+                        size = ButtonSize.REGULAR,
+                        hierarchy = ButtonHierarchy.SECONDARY,
+                        isRounded = false,
+                        backgroundColor = Color(0xFFFEE500),
+                        contentColor = PrezelTheme.colors.textLarge,
+                    ),
+                )
+            },
+        )
     }
 }
 

Prezel/feature/login/impl/src/main/java/com/team/prezel/feature/login/impl/navigation/LoginEntryBuilder.kt

@@ -27,7 +27,7 @@ internal fun EntryProviderScope<NavKey>.featureLoginEntryBuilder(authManager: Au
                     navigator.replaceRoot(HomeNavKey)
                 },
                 navigateToTerms = {
-                    navigator.navigate(TermsNavKey)
+                    navigator.navigate(TermsNavKey.List)
                 },
                 navigateToCreateProfile = {
                     navigator.navigate(ProfileNavKey.Create)

Prezel/feature/my/impl/build.gradle.kts

@@ -11,6 +11,7 @@ dependencies {
     implementation(projects.coreModel)
 
     implementation(projects.featureMyApi)
+    implementation(projects.featureSettingApi)
     implementation(projects.featureProfileApi)
 
     implementation(libs.kotlinx.collections.immutable)