[FEATURE] #79 링크 추가와 관련된 Toast UI 추가(저장완료, 실패, 저장공간 부족)

YAPP-Github · Nov 2, 2024 · 58096b3 · 58096b3
1 parent fa0369b
commit 58096b3
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 8 deletions.
diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokittoast/PokitToast.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokittoast/PokitToast.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import pokitmons.pokit.core.ui.R
+import pokitmons.pokit.core.ui.components.block.pokittoast.attributes.PokitToastType
 import pokitmons.pokit.core.ui.theme.PokitTheme
 
 @Composable
@@ -27,25 +28,38 @@ fun PokitToast(
     text: String,
     onClick: (() -> Unit)? = null,
     onClickClose: () -> Unit = {},
+    type: PokitToastType = PokitToastType.Normal
 ) {
     Row(
         modifier = modifier
             .clip(RoundedCornerShape(9999.dp))
-            .background(PokitTheme.colors.backgroundTertiary)
+            .background(type.color)
             .clickable(
                 enabled = onClick != null,
                 onClick = onClick ?: {}
             )
             .padding(start = 20.dp, end = 14.dp, top = 12.dp, bottom = 12.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Text(
-            text = text,
-            style = PokitTheme.typography.body3Medium.copy(color = PokitTheme.colors.inverseWh),
-            maxLines = 2,
-            overflow = TextOverflow.Ellipsis,
-            modifier = Modifier.weight(1f)
-        )
+        Row(
+            modifier = Modifier.weight(1f),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = text,
+                style = PokitTheme.typography.body3Medium.copy(color = PokitTheme.colors.inverseWh),
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+            type.iconResourceId?.let { resourceId ->
+                Spacer(modifier = Modifier.width(8.dp))
+                Icon(
+                    painter = painterResource(id = resourceId),
+                    contentDescription = null,
+                    tint = PokitTheme.colors.inverseWh
+                )
+            }
+        }
 
         Spacer(modifier = Modifier.width(12.dp))
 

diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokittoast/Preview.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokittoast/Preview.kt
@@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import pokitmons.pokit.core.ui.components.block.pokittoast.attributes.PokitToastType
 import pokitmons.pokit.core.ui.theme.PokitTheme
 
 @Preview(showBackground = true)
@@ -23,6 +24,24 @@ private fun Preview() {
                 text = "최대 30개의 포킷을 생성할 수 있습니다.\n포킷을 삭제한 뒤에 추가해주세요.",
                 onClick = {}
             )
+            PokitToast(
+                modifier = Modifier.padding(20.dp),
+                text = "링크 저장 완료",
+                onClick = {},
+                type = PokitToastType.Success
+            )
+            PokitToast(
+                modifier = Modifier.padding(20.dp),
+                text = "링크 저장 실패",
+                onClick = {},
+                type = PokitToastType.Error
+            )
+            PokitToast(
+                modifier = Modifier.padding(20.dp),
+                text = "저장 공간 부족",
+                onClick = {},
+                type = PokitToastType.Warning
+            )
         }
     }
 }
diff --git a/...ain/java/pokitmons/pokit/core/ui/components/block/pokittoast/attributes/PokitToastType.kt b/...ain/java/pokitmons/pokit/core/ui/components/block/pokittoast/attributes/PokitToastType.kt
@@ -0,0 +1,18 @@
+package pokitmons.pokit.core.ui.components.block.pokittoast.attributes
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import pokitmons.pokit.core.ui.R
+import pokitmons.pokit.core.ui.theme.PokitTheme
+
+enum class PokitToastType(
+    private val getColor: @Composable () -> Color,
+    val iconResourceId : Int? = null,
+) {
+    Normal(getColor = { PokitTheme.colors.backgroundTertiary }),
+    Success(getColor = { PokitTheme.colors.success }, iconResourceId = R.drawable.icon_24_check),
+    Error(getColor = { PokitTheme.colors.error }),
+    Warning(getColor = { PokitTheme.colors.warning });
+
+    val color: Color @Composable get() = getColor()
+}