From 31ba7f056ca396fb56214b135551bd927f39c0f6 Mon Sep 17 00:00:00 2001 From: beom84 Date: Wed, 15 Jan 2025 22:22:38 +0900 Subject: [PATCH 01/10] =?UTF-8?q?[feat]=20#26=20icon=20svg=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/ic_balloon_tail_down.xml | 9 +++++++++ app/src/main/res/drawable/ic_balloon_tail_up.xml | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 app/src/main/res/drawable/ic_balloon_tail_down.xml create mode 100644 app/src/main/res/drawable/ic_balloon_tail_up.xml diff --git a/app/src/main/res/drawable/ic_balloon_tail_down.xml b/app/src/main/res/drawable/ic_balloon_tail_down.xml new file mode 100644 index 00000000..7fd90d9a --- /dev/null +++ b/app/src/main/res/drawable/ic_balloon_tail_down.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_balloon_tail_up.xml b/app/src/main/res/drawable/ic_balloon_tail_up.xml new file mode 100644 index 00000000..5e2d100d --- /dev/null +++ b/app/src/main/res/drawable/ic_balloon_tail_up.xml @@ -0,0 +1,9 @@ + + + From 6752c5373c661fc8476aff60d6d1957c0b97a6da Mon Sep 17 00:00:00 2001 From: beom84 Date: Wed, 15 Jan 2025 22:22:53 +0900 Subject: [PATCH 02/10] =?UTF-8?q?[feat]=20#26=20ballonContainer=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/balloon/BalloonContainer.kt | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt new file mode 100644 index 00000000..0155781c --- /dev/null +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt @@ -0,0 +1,52 @@ +package org.android.bbangzip.presentation.component.balloon + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import org.android.bbangzip.ui.theme.BbangZipTheme + +@Composable +fun BalloonContainer( + text: String, + leadingIcon: @Composable () -> Unit = {}, + trailingIcon: @Composable () -> Unit = {}, + modifier: Modifier = Modifier, +) { + Box( + modifier = + modifier + .fillMaxWidth() + .background( + color = BbangZipTheme.colors.staticWhite_FFFFFF, + shape = RoundedCornerShape(size = 20.dp), + ) + .padding(horizontal = 16.dp, vertical = 8.dp), + contentAlignment = Alignment.Center, + ) { + Row { + leadingIcon() + + Spacer(modifier = Modifier.width(6.dp)) + + Text( + text = text, + style = BbangZipTheme.typography.body1Bold, + color = BbangZipTheme.colors.labelNormal_282119, + ) + + Spacer(modifier = Modifier.width(6.dp)) + + trailingIcon() + } + } +} From 92ae4bb47ba928c3a9b0ef76dba3d1ca86737f85 Mon Sep 17 00:00:00 2001 From: beom84 Date: Wed, 15 Jan 2025 22:23:33 +0900 Subject: [PATCH 03/10] =?UTF-8?q?[feat]=20#26=20top=20,=20bottom=20balloon?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/balloon/BottomTailBalloon.kt | 41 ++++++++++++ .../component/balloon/TopTailBalloon.kt | 67 +++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt create mode 100644 app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt new file mode 100644 index 00000000..6d7e764c --- /dev/null +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt @@ -0,0 +1,41 @@ +package org.android.bbangzip.presentation.component.balloon + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.unit.dp +import org.android.bbangzip.R +import org.android.bbangzip.ui.theme.BbangZipTheme + +@Composable +fun BottomTailBalloon( + text: String, + leadingIcon: @Composable () -> Unit = {}, + trailingIcon: @Composable () -> Unit = {}, + horizontalPadding: Int = 0, + modifier: Modifier = Modifier, +) { + Column( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = horizontalPadding.dp), + ) { + Icon( + imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_up), + contentDescription = null, + modifier = Modifier.padding(start = 24.dp), + tint = BbangZipTheme.colors.staticWhite_FFFFFF, + ) + BalloonContainer( + leadingIcon = leadingIcon, + text = text, + trailingIcon = trailingIcon, + ) + } +} diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt new file mode 100644 index 00000000..3505e440 --- /dev/null +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt @@ -0,0 +1,67 @@ +package org.android.bbangzip.presentation.component.balloon + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import org.android.bbangzip.R +import org.android.bbangzip.ui.theme.BbangZipTheme +import org.android.bbangzip.ui.theme.defaultBbangZipColors + +@Composable +fun TopTailBalloon( + text: String, + leadingIcon: @Composable () -> Unit = {}, + trailingIcon: @Composable () -> Unit = {}, + horizontalPadding: Dp = 0.dp, + modifier: Modifier = Modifier, +) { + Column( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = horizontalPadding), + ) { + Icon( + imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_up), + contentDescription = null, + modifier = Modifier.padding(start = 24.dp), + tint = BbangZipTheme.colors.staticWhite_FFFFFF, + ) + BalloonContainer( + leadingIcon = leadingIcon, + text = text, + trailingIcon = trailingIcon, + ) + } +} + +@Preview(showBackground = true) +@Composable +private fun TopBalloonPreview() { + Column( + Modifier + .fillMaxSize() + .background(color = defaultBbangZipColors.staticBlack_000000), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Spacer(modifier = Modifier.height(10.dp)) + + TopTailBalloon( + text = "사장님의 과제 빵점 탈출을 위해서", + horizontalPadding = 16.dp, + ) + } +} From a51cc6b866758c7a6fc112784b022ee608d70ab4 Mon Sep 17 00:00:00 2001 From: beom84 Date: Wed, 15 Jan 2025 22:40:51 +0900 Subject: [PATCH 04/10] =?UTF-8?q?[feat]=20#26=20shadow=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9,=20shadow=20=ED=99=95=EC=9E=A5=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/balloon/BalloonContainer.kt | 3 +++ .../presentation/component/balloon/TopTailBalloon.kt | 2 +- .../presentation/util/modifier/ModifierExt.kt | 11 +++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt index 0155781c..6d2a5132 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt @@ -13,6 +13,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import org.android.bbangzip.presentation.type.BbangZipShadowType +import org.android.bbangzip.presentation.util.modifier.applyShadows import org.android.bbangzip.ui.theme.BbangZipTheme @Composable @@ -25,6 +27,7 @@ fun BalloonContainer( Box( modifier = modifier + .applyShadows(BbangZipShadowType.STRONG, shape = RoundedCornerShape(size = 20.dp)) .fillMaxWidth() .background( color = BbangZipTheme.colors.staticWhite_FFFFFF, diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt index 3505e440..0f4b3304 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt @@ -54,7 +54,7 @@ private fun TopBalloonPreview() { Column( Modifier .fillMaxSize() - .background(color = defaultBbangZipColors.staticBlack_000000), + .background(color = defaultBbangZipColors.backgroundAccent_FFDAA0), horizontalAlignment = Alignment.CenterHorizontally, ) { Spacer(modifier = Modifier.height(10.dp)) diff --git a/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt b/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt index 0e538cb6..0f47cd7e 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt @@ -16,6 +16,7 @@ import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.android.bbangzip.presentation.type.BbangZipShadowType @Composable fun Modifier.noRippleClickable( @@ -63,3 +64,13 @@ fun Modifier.dropShadow( canvas.restore() } } + +@Composable +fun Modifier.applyShadows( + shadowType: BbangZipShadowType, + shape: Shape, +): Modifier { + return shadowType.shadowOptions.fold(this) { acc, shadowOption -> + acc.dropShadow(shape = shape, color = shadowOption.color, blur = shadowOption.blur, offsetY = shadowOption.offsetY, offsetX = shadowOption.offsetX, spread = shadowOption.spread) + } +} From 549d20eeacf34e991c2ec2ba9a42a7329c225966 Mon Sep 17 00:00:00 2001 From: beom84 Date: Wed, 15 Jan 2025 23:40:40 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[feat]=20#26=20BottomTailBalloon=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/balloon/BottomTailBalloon.kt | 18 ++++++++++-------- .../component/balloon/TopTailBalloon.kt | 7 +++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt index 6d7e764c..cafbec0d 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import org.android.bbangzip.R import org.android.bbangzip.ui.theme.BbangZipTheme @@ -17,25 +18,26 @@ fun BottomTailBalloon( text: String, leadingIcon: @Composable () -> Unit = {}, trailingIcon: @Composable () -> Unit = {}, - horizontalPadding: Int = 0, + horizontalPadding: Dp = 0.dp, modifier: Modifier = Modifier, ) { Column( modifier = modifier .fillMaxWidth() - .padding(horizontal = horizontalPadding.dp), + .padding(horizontal = horizontalPadding), ) { - Icon( - imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_up), - contentDescription = null, - modifier = Modifier.padding(start = 24.dp), - tint = BbangZipTheme.colors.staticWhite_FFFFFF, - ) BalloonContainer( leadingIcon = leadingIcon, text = text, trailingIcon = trailingIcon, ) + + Icon( + imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_down), + contentDescription = null, + modifier = Modifier.padding(start = 24.dp), + tint = BbangZipTheme.colors.staticWhite_FFFFFF, + ) } } diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt index 0f4b3304..a1594191 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt @@ -63,5 +63,12 @@ private fun TopBalloonPreview() { text = "사장님의 과제 빵점 탈출을 위해서", horizontalPadding = 16.dp, ) + + Spacer(modifier = Modifier.height(10.dp)) + + BottomTailBalloon( + text = "사장님의 과제 빵점 탈출을 위해서", + horizontalPadding = 16.dp, + ) } } From 898983320a0833965a393a9cdc774acd0a0068cf Mon Sep 17 00:00:00 2001 From: beom84 Date: Thu, 16 Jan 2025 00:52:03 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[fix]=20#29=20preview=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/balloon/BottomTailBalloon.kt | 25 +++++++++++++++++++ .../component/balloon/TopTailBalloon.kt | 7 ------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt index cafbec0d..e2635820 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt @@ -1,17 +1,24 @@ package org.android.bbangzip.presentation.component.balloon +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.Icon import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import org.android.bbangzip.R import org.android.bbangzip.ui.theme.BbangZipTheme +import org.android.bbangzip.ui.theme.defaultBbangZipColors @Composable fun BottomTailBalloon( @@ -41,3 +48,21 @@ fun BottomTailBalloon( ) } } + +@Preview(showBackground = true) +@Composable +private fun TopBalloonPreview() { + Column( + Modifier + .fillMaxSize() + .background(color = defaultBbangZipColors.backgroundAccent_FFDAA0), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Spacer(modifier = Modifier.height(10.dp)) + + BottomTailBalloon( + text = "사장님의 과제 빵점 탈출을 위해서", + horizontalPadding = 16.dp, + ) + } +} diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt index a1594191..0f4b3304 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt @@ -63,12 +63,5 @@ private fun TopBalloonPreview() { text = "사장님의 과제 빵점 탈출을 위해서", horizontalPadding = 16.dp, ) - - Spacer(modifier = Modifier.height(10.dp)) - - BottomTailBalloon( - text = "사장님의 과제 빵점 탈출을 위해서", - horizontalPadding = 16.dp, - ) } } From 03f48f407b105ca2a5eefb71b5ef8e08dfeead23 Mon Sep 17 00:00:00 2001 From: beom84 Date: Thu, 16 Jan 2025 00:56:11 +0900 Subject: [PATCH 07/10] =?UTF-8?q?[fix]=20#29=20ic=20=EB=84=A4=EC=9E=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/component/balloon/BottomTailBalloon.kt | 2 +- .../bbangzip/presentation/component/balloon/TopTailBalloon.kt | 2 +- .../{ic_balloon_tail_down.xml => ic_balloon_tail_down_8.xml} | 0 .../{ic_balloon_tail_up.xml => ic_balloon_tail_up_8.xml} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename app/src/main/res/drawable/{ic_balloon_tail_down.xml => ic_balloon_tail_down_8.xml} (100%) rename app/src/main/res/drawable/{ic_balloon_tail_up.xml => ic_balloon_tail_up_8.xml} (100%) diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt index e2635820..7f56f129 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BottomTailBalloon.kt @@ -41,7 +41,7 @@ fun BottomTailBalloon( ) Icon( - imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_down), + imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_down_8), contentDescription = null, modifier = Modifier.padding(start = 24.dp), tint = BbangZipTheme.colors.staticWhite_FFFFFF, diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt index 0f4b3304..7535ccd0 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt @@ -35,7 +35,7 @@ fun TopTailBalloon( .padding(horizontal = horizontalPadding), ) { Icon( - imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_up), + imageVector = ImageVector.vectorResource(R.drawable.ic_balloon_tail_up_8), contentDescription = null, modifier = Modifier.padding(start = 24.dp), tint = BbangZipTheme.colors.staticWhite_FFFFFF, diff --git a/app/src/main/res/drawable/ic_balloon_tail_down.xml b/app/src/main/res/drawable/ic_balloon_tail_down_8.xml similarity index 100% rename from app/src/main/res/drawable/ic_balloon_tail_down.xml rename to app/src/main/res/drawable/ic_balloon_tail_down_8.xml diff --git a/app/src/main/res/drawable/ic_balloon_tail_up.xml b/app/src/main/res/drawable/ic_balloon_tail_up_8.xml similarity index 100% rename from app/src/main/res/drawable/ic_balloon_tail_up.xml rename to app/src/main/res/drawable/ic_balloon_tail_up_8.xml From 538491e417d69ffd82f5727f134314df4ac2b29f Mon Sep 17 00:00:00 2001 From: beom84 Date: Thu, 16 Jan 2025 03:23:25 +0900 Subject: [PATCH 08/10] =?UTF-8?q?[fix]=20#26=20balloonContainer=20?= =?UTF-8?q?=EA=B8=B0=EA=B8=B0=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/component/balloon/BalloonContainer.kt | 6 ------ .../presentation/component/balloon/TopTailBalloon.kt | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt index 6d2a5132..70d362bb 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt @@ -3,10 +3,8 @@ package org.android.bbangzip.presentation.component.balloon import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -39,16 +37,12 @@ fun BalloonContainer( Row { leadingIcon() - Spacer(modifier = Modifier.width(6.dp)) - Text( text = text, style = BbangZipTheme.typography.body1Bold, color = BbangZipTheme.colors.labelNormal_282119, ) - Spacer(modifier = Modifier.width(6.dp)) - trailingIcon() } } diff --git a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt index 7535ccd0..c8c2c253 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/component/balloon/TopTailBalloon.kt @@ -40,6 +40,7 @@ fun TopTailBalloon( modifier = Modifier.padding(start = 24.dp), tint = BbangZipTheme.colors.staticWhite_FFFFFF, ) + BalloonContainer( leadingIcon = leadingIcon, text = text, From c057d46f97d23ea9a77bc0bbae863b85c9aa13b6 Mon Sep 17 00:00:00 2001 From: beom84 Date: Thu, 16 Jan 2025 03:31:20 +0900 Subject: [PATCH 09/10] =?UTF-8?q?[fix]=20#28=20applyShadows=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EA=B0=80=EB=8F=85=EC=84=B1=ED=96=A5=EC=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/util/modifier/ModifierExt.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt b/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt index 1349110d..0f077e99 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt @@ -100,7 +100,16 @@ fun Modifier.applyShadows( shadowType: BbangZipShadowType, shape: Shape, ): Modifier { - return shadowType.shadowOptions.fold(this) { acc, shadowOption -> - acc.dropShadow(shape = shape, color = shadowOption.color, blur = shadowOption.blur, offsetY = shadowOption.offsetY, offsetX = shadowOption.offsetX, spread = shadowOption.spread) - } + return shadowType + .shadowOptions + .fold(this) { acc, shadowOption -> + acc.dropShadow( + shape = shape, + color = shadowOption.color, + blur = shadowOption.blur, + offsetY = shadowOption.offsetY, + offsetX = shadowOption.offsetX, + spread = shadowOption.spread + ) + } } From 1275760397d1390b7752b0952da2bbb45a69d2bf Mon Sep 17 00:00:00 2001 From: beom84 Date: Thu, 16 Jan 2025 03:33:55 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[fix]=20#28=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/bbangzip/presentation/util/modifier/ModifierExt.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt b/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt index 0f077e99..d5e18d03 100644 --- a/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt +++ b/app/src/main/java/org/android/bbangzip/presentation/util/modifier/ModifierExt.kt @@ -109,7 +109,7 @@ fun Modifier.applyShadows( blur = shadowOption.blur, offsetY = shadowOption.offsetY, offsetX = shadowOption.offsetX, - spread = shadowOption.spread + spread = shadowOption.spread, ) } }