Merge pull request #92 from YAPP-Github/feature/MZ-201-vote-list-ui

Feature/mz 201 vote list UI
YAPP-Github · Jan 25, 2024 · a093f7e · a093f7e
2 parents 8cfa319 + 9a86525
commit a093f7e
Show file tree

Hide file tree

Showing 17 changed files with 491 additions and 51 deletions.
diff --git a/core/designsystem/src/main/java/com/susu/core/designsystem/component/button/BasicButton.kt b/core/designsystem/src/main/java/com/susu/core/designsystem/component/button/BasicButton.kt
@@ -28,6 +28,7 @@ import com.susu.core.ui.extension.susuClickable
 fun BasicButton(
     modifier: Modifier = Modifier,
     shape: Shape = RectangleShape,
+    textModifier: Modifier = Modifier,
     text: String? = null,
     textStyle: TextStyle = TextStyle.Default,
     contentColor: Color = Color.Unspecified,
@@ -72,6 +73,7 @@ fun BasicButton(
 
             text?.let {
                 Text(
+                    modifier = textModifier,
                     text = it,
                     style = textStyle,
                     color = contentColor,

diff --git a/...esignsystem/src/main/java/com/susu/core/designsystem/component/button/SusuFilledButton.kt b/...esignsystem/src/main/java/com/susu/core/designsystem/component/button/SusuFilledButton.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.susu.core.designsystem.R
@@ -49,6 +50,8 @@ enum class FilledButtonColor(
 fun SusuFilledButton(
     modifier: Modifier = Modifier,
     shape: Shape = RoundedCornerShape(4.dp),
+    textModifier: Modifier = Modifier,
+    textAlign: TextAlign = TextAlign.Unspecified,
     text: String? = null,
     color: FilledButtonColor,
     style: @Composable () -> ButtonStyle,
@@ -63,8 +66,9 @@ fun SusuFilledButton(
         BasicButton(
             modifier = modifier,
             shape = shape,
+            textModifier = textModifier,
             text = text,
-            textStyle = textStyle,
+            textStyle = textStyle.copy(textAlign = textAlign),
             contentColor = if (isActive) activeContentColor else inactiveContentColor,
             rippleColor = rippleColor,
             backgroundColor = if (isActive) activeBackgroundColor else inactiveBackgroundColor,

diff --git a/...ignsystem/src/main/java/com/susu/core/designsystem/component/button/SusuFloatingButton.kt b/...ignsystem/src/main/java/com/susu/core/designsystem/component/button/SusuFloatingButton.kt
@@ -1,5 +1,6 @@
 package com.susu.core.designsystem.component.button
 
+import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -12,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.susu.core.designsystem.R
@@ -23,6 +25,7 @@ import com.susu.core.ui.extension.susuClickable
 @Composable
 fun SusuFloatingButton(
     modifier: Modifier = Modifier,
+    @DrawableRes imageResId: Int = R.drawable.ic_floating_button_add,
     onClick: () -> Unit = {},
 ) {
     Box(
@@ -34,7 +37,10 @@ fun SusuFloatingButton(
             .susuClickable(rippleColor = Gray10, onClick = onClick),
         contentAlignment = Alignment.Center,
     ) {
-        Image(painter = painterResource(id = R.drawable.ic_floating_button_add), contentDescription = "추가 아이콘")
+        Image(
+            painter = painterResource(id = imageResId),
+            contentDescription = stringResource(id = com.susu.core.ui.R.string.content_description_add_button),
+        )
     }
 }
 

diff --git a/...designsystem/src/main/java/com/susu/core/designsystem/component/button/SusuGhostButton.kt b/...designsystem/src/main/java/com/susu/core/designsystem/component/button/SusuGhostButton.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.susu.core.designsystem.R
@@ -49,6 +50,8 @@ enum class GhostButtonColor(
 fun SusuGhostButton(
     modifier: Modifier = Modifier,
     shape: Shape = RoundedCornerShape(4.dp),
+    textModifier: Modifier = Modifier,
+    textAlign: TextAlign = TextAlign.Unspecified,
     text: String? = null,
     color: GhostButtonColor,
     style: @Composable () -> ButtonStyle,
@@ -64,8 +67,9 @@ fun SusuGhostButton(
         BasicButton(
             modifier = modifier,
             shape = shape,
+            textModifier = textModifier,
             text = text,
-            textStyle = textStyle,
+            textStyle = textStyle.copy(textAlign = textAlign),
             contentColor = if (isActive) activeContentColor else inactiveContentColor,
             rippleColor = rippleColor,
             backgroundColor = if (isActive) activeBackgroundColor else inactiveBackgroundColor,

diff --git a/...designsystem/src/main/java/com/susu/core/designsystem/component/button/SusuLinedButton.kt b/...designsystem/src/main/java/com/susu/core/designsystem/component/button/SusuLinedButton.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.susu.core.designsystem.R
@@ -56,6 +57,8 @@ enum class LinedButtonColor(
 fun SusuLinedButton(
     modifier: Modifier = Modifier,
     shape: Shape = RoundedCornerShape(4.dp),
+    textModifier: Modifier = Modifier,
+    textAlign: TextAlign = TextAlign.Unspecified,
     text: String? = null,
     color: LinedButtonColor,
     style: @Composable () -> ButtonStyle,
@@ -70,8 +73,9 @@ fun SusuLinedButton(
         BasicButton(
             modifier = modifier,
             shape = shape,
+            textModifier = textModifier,
             text = text,
-            textStyle = textStyle,
+            textStyle = textStyle.copy(textAlign = textAlign),
             borderWidth = 1.dp,
             borderColor = if (isActive) activeBorderColor else inactiveBorderColor,
             contentColor = if (isActive) activeContentColor else inactiveContentColor,

diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
@@ -44,4 +44,5 @@
     <string name="word_memo">메모</string>
     <string name="word_register">등록</string>
     <string name="word_free">자유</string>
+    <string name="content_description_report_button">신고 버튼</string>
 </resources>
diff --git a/feature/community/src/main/java/com/susu/feature/community/CommunityScreen.kt b/feature/community/src/main/java/com/susu/feature/community/CommunityScreen.kt