[FEAT/#53] DialogContent 색상 버튼 추가

teamterning · Jul 12, 2024 · 3681836 · 3681836
1 parent 8539876
commit 3681836
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 2 deletions.
diff --git a/core/src/main/java/com/terning/core/designsystem/component/button/SortingButton.kt b/core/src/main/java/com/terning/core/designsystem/component/button/SortingButton.kt
@@ -39,7 +39,7 @@ fun SortingButton(
                 )
         )
         Image(
-            painter = painterResource(id = R.drawable.ic_down),
+            painter = painterResource(id = R.drawable.ic_down_18),
             contentDescription = stringResource(id = R.string.sort_button_description),
             modifier = modifier
                 .padding(vertical = 5.dp)

diff --git a/core/src/main/java/com/terning/core/designsystem/component/dialog/TerningDialog.kt b/core/src/main/java/com/terning/core/designsystem/component/dialog/TerningDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
@@ -21,19 +22,22 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.terning.core.R
+import com.terning.core.designsystem.theme.CalGreen2
 import com.terning.core.designsystem.theme.Grey200
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.Grey350
 import com.terning.core.designsystem.theme.Grey500
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.designsystem.theme.White
+import com.terning.core.extension.noRippleClickable
 
 @Composable
 fun TerningDialog(
@@ -128,8 +132,56 @@ fun DialogContent(
                     text = "공고를 캘린더에 스크랩하시겠어요?",
                     style = TerningTheme.typography.body5,
                     color = Grey350,
-                    modifier = Modifier.padding(top = 4.dp)
+                    modifier = Modifier.padding(
+                        top = 4.dp,
+                        bottom = 13.dp
+                    )
                 )
+                Column(
+                    horizontalAlignment = Alignment.Start,
+                    verticalArrangement = Arrangement.Top,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 13.dp)
+                ) {
+                    Row(
+                        modifier = Modifier
+                            .background(
+                                color = CalGreen2,
+                                shape = RoundedCornerShape(14.dp)
+                            )
+                            .noRippleClickable { },
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Start
+                    ) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_down_22),
+                            contentDescription = stringResource(
+                                id = R.string.dialog_content_color_button
+                            ),
+                            tint = White,
+                            modifier = Modifier.padding(
+                                start = 7.dp,
+                                top = 2.dp,
+                                bottom = 2.dp
+                            )
+                        )
+                        Text(
+                            text = stringResource(id = R.string.dialog_content_color_button),
+                            style = TerningTheme.typography.body5,
+                            color = White,
+                            modifier = Modifier.padding(end = 13.dp)
+                        )
+                    }
+                    HorizontalDivider(
+                        thickness = 1.dp,
+                        color = Grey200,
+                        modifier = Modifier.padding(
+                            top = 11.dp,
+                            bottom = 8.dp
+                        )
+                    )
+                }
             }
         }
     }

diff --git a/core/src/main/res/drawable/ic_down.xml → core/src/main/res/drawable/ic_down_18.xml b/core/src/main/res/drawable/ic_down.xml → core/src/main/res/drawable/ic_down_18.xml
diff --git a/core/src/main/res/drawable/ic_down_22.xml b/core/src/main/res/drawable/ic_down_22.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11.492,14.707C11.102,15.098 10.47,15.098 10.08,14.707L4.865,9.48C4.475,9.089 4.475,8.455 4.865,8.064C5.255,7.673 5.887,7.673 6.278,8.064L10.786,12.583L15.294,8.064C15.684,7.673 16.317,7.673 16.707,8.064C17.097,8.455 17.097,9.089 16.707,9.48L11.492,14.707Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -36,4 +36,6 @@
     <string name="sign_up_bottom_sheet_description">회원가입 바텀시트</string>
     <string name="sign_up_dialog_start">저장하기</string>
 
+    <!--Dialog-->
+    <string name="dialog_content_color_button">색상</string>
 </resources>