[MERGE] #202 -> develop

[UI/#202] 마이페이지 뷰 / UI 수정
teamterning · Aug 31, 2024 · bec02ce · bec02ce
2 parents db6f6e0 + 5c887ac
commit bec02ce
Show file tree

Hide file tree

Showing 14 changed files with 275 additions and 384 deletions.
diff --git a/.../main/java/com/terning/core/designsystem/component/bottomsheet/MyPageLogoutBottomSheet.kt b/.../main/java/com/terning/core/designsystem/component/bottomsheet/MyPageLogoutBottomSheet.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.unit.dp
 import com.terning.core.R
 import com.terning.core.designsystem.component.button.DeleteRoundButton
 import com.terning.core.designsystem.component.button.RoundButton
+import com.terning.core.designsystem.theme.Grey400
 import com.terning.core.designsystem.theme.TerningTheme
 import kotlinx.coroutines.launch
 
@@ -48,7 +49,8 @@ fun MyPageLogoutBottomSheet(
                 )
                 Text(
                     text = stringResource(id = R.string.my_page_logout_sub),
-                    style = TerningTheme.typography.body3,
+                    style = TerningTheme.typography.body4,
+                    color = Grey400,
                     modifier = modifier.padding(top = 54.dp)
                 )
                 RoundButton(
@@ -63,7 +65,7 @@ fun MyPageLogoutBottomSheet(
                         start = 24.dp,
                         top = 72.dp,
                         end = 24.dp
-                    )
+                    ),
                 )
                 DeleteRoundButton(
                     style = TerningTheme.typography.button2,

diff --git a/...rc/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageQuitBottomSheet.kt b/...rc/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageQuitBottomSheet.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.unit.dp
 import com.terning.core.R
 import com.terning.core.designsystem.component.button.DeleteRoundButton
 import com.terning.core.designsystem.component.button.RoundButton
+import com.terning.core.designsystem.theme.Grey400
 import com.terning.core.designsystem.theme.TerningTheme
 import kotlinx.coroutines.launch
 
@@ -51,7 +52,8 @@ fun MyPageQuitBottomSheet(
                     text = stringResource(id = R.string.my_page_quit_sub),
                     style = TerningTheme.typography.body3,
                     modifier = modifier.padding(top = 54.dp),
-                    textAlign = TextAlign.Center
+                    textAlign = TextAlign.Center,
+                    color = Grey400
                 )
                 RoundButton(
                     style = TerningTheme.typography.button2,

diff --git a/core/src/main/java/com/terning/core/designsystem/component/button/DeleteRoundButton.kt b/core/src/main/java/com/terning/core/designsystem/component/button/DeleteRoundButton.kt
@@ -1,7 +1,6 @@
 package com.terning.core.designsystem.component.button
 
 import androidx.annotation.StringRes
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -20,9 +19,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.terning.core.R
+import com.terning.core.designsystem.theme.Grey150
 import com.terning.core.designsystem.theme.Grey400
 import com.terning.core.designsystem.theme.TerningPointTheme
-import com.terning.core.designsystem.theme.White
 import com.terning.core.util.NoRippleTheme
 
 /**
@@ -55,12 +54,11 @@ fun DeleteRoundButton(
             interactionSource = interactionSource,
             enabled = isEnabled,
             colors = ButtonDefaults.buttonColors(
-                containerColor = White,
+                containerColor = Grey150,
                 contentColor = Grey400,
             ),
             shape = RoundedCornerShape(cornerRadius),
             onClick = { onButtonClick() },
-            border = BorderStroke(width = 1.dp, color = Grey400)
         ) {
             Text(
                 text = stringResource(id = text),