feat: 스낵바 구현

WithPeace · Jul 3, 2024 · 972e307 · 972e307
1 parent aea42b0
commit 972e307
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 27 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         applicationId = "com.withpeace.withpeace"
         targetSdk = 34
-        versionCode = 7
-        versionName = "1.0.2"
+        versionCode = 8
+        versionName = "1.1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/withpeace/withpeace/WithpeaceApp.kt b/app/src/main/java/com/withpeace/withpeace/WithpeaceApp.kt
@@ -1,32 +1,25 @@
 package com.withpeace.withpeace
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
-import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.withpeace.withpeace.core.designsystem.theme.WithpeaceTheme
+import com.withpeace.withpeace.core.designsystem.ui.snackbar.CheonghaSnackbar
 import com.withpeace.withpeace.core.designsystem.ui.snackbar.SnackbarState
 import com.withpeace.withpeace.core.designsystem.ui.snackbar.SnackbarType
 import com.withpeace.withpeace.navigation.WithpeaceNavHost
@@ -81,22 +74,7 @@ fun WithpeaceApp(
                 when (snackBarState.snackbarType) {
                     is SnackbarType.Navigator -> {}
                     is SnackbarType.Normal -> {
-                        Row(
-                            modifier = Modifier
-                                .padding(horizontal = 24.dp)
-                                .padding(bottom = 16.dp)
-                                .imePadding()
-                                .fillMaxWidth()
-                                .clip(RoundedCornerShape(4.dp))
-                                .background(WithpeaceTheme.colors.SnackbarBlack),
-                        ) {
-                            Text(
-                                modifier = Modifier.padding(vertical = 16.dp, horizontal = 24.dp),
-                                style = WithpeaceTheme.typography.caption,
-                                text = it.visuals.message,
-                                color = WithpeaceTheme.colors.SystemWhite,
-                            )
-                        }
+                        CheonghaSnackbar(data = it)
                     }
                 }
             }

diff --git a/...m/src/main/java/com/withpeace/withpeace/core/designsystem/ui/snackbar/CheonghaSnackbar.kt b/...m/src/main/java/com/withpeace/withpeace/core/designsystem/ui/snackbar/CheonghaSnackbar.kt
@@ -1,7 +1,35 @@
 package com.withpeace.withpeace.core.designsystem.ui.snackbar
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.SnackbarData
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import com.withpeace.withpeace.core.designsystem.theme.WithpeaceTheme
 
 @Composable
-fun CheonghaSnackbar() {
+fun CheonghaSnackbar(data: SnackbarData) {
+    Row(
+        modifier = Modifier
+            .padding(horizontal = 24.dp)
+            .padding(bottom = 16.dp)
+            .imePadding()
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(4.dp))
+            .background(WithpeaceTheme.colors.SnackbarBlack),
+    ) {
+        Text(
+            modifier = Modifier.padding(vertical = 16.dp, horizontal = 24.dp),
+            style = WithpeaceTheme.typography.caption,
+            text = data.visuals.message,
+            color = WithpeaceTheme.colors.SystemWhite,
+        )
+    }
 }
diff --git a/.../src/main/java/com/withpeace/withpeace/core/designsystem/ui/snackbar/NavigatorSnackbar.kt b/.../src/main/java/com/withpeace/withpeace/core/designsystem/ui/snackbar/NavigatorSnackbar.kt
@@ -0,0 +1,44 @@
+package com.withpeace.withpeace.core.designsystem.ui.snackbar
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.unit.dp
+import com.withpeace.withpeace.core.designsystem.theme.WithpeaceTheme
+
+@Composable
+fun NavigatorSnackbar(data: SnackbarState) {
+    Row(
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier = Modifier
+            .padding(horizontal = 24.dp)
+            .padding(bottom = 16.dp)
+            .imePadding()
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(4.dp))
+            .background(WithpeaceTheme.colors.SnackbarBlack),
+    ) {
+        Text(
+            modifier = Modifier.padding(vertical = 16.dp, horizontal = 24.dp),
+            style = WithpeaceTheme.typography.caption,
+            text = data.message,
+            color = WithpeaceTheme.colors.SystemWhite,
+        )
+        Text(
+            modifier = Modifier.padding(vertical = 16.dp, horizontal = 24.dp),
+            style = WithpeaceTheme.typography.caption,
+            text = data.message,
+            color = WithpeaceTheme.colors.SubSkyBlue,
+            textDecoration = TextDecoration.Underline,
+        )
+    }
+}