From 31738b2bcab63c8575c242f088d0de9c61d4d553 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 24 Aug 2024 17:48:05 +0900 Subject: [PATCH 01/12] =?UTF-8?q?[FIX]#128=20:=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=A7=A4=EB=A6=BC=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt index 91bf271b..c4cedb0a 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt @@ -123,12 +123,15 @@ fun ProfileEditScreen( .verticalScroll(scrollState), horizontalAlignment = Alignment.CenterHorizontally, ) { - Box(modifier = Modifier.clickable { navigator.navigateToCharacterEditScreen() }) { + Box( + modifier = Modifier + .padding(top = 16.dp) + .clickable { navigator.navigateToCharacterEditScreen() }, + ) { Box( modifier = Modifier .size(90.dp) .clip(CircleShape) - .padding(top = 16.dp) .background(hexToColor(state.profile.profileCharacter.backgroundColor)), contentAlignment = Alignment.Center, ) { From b1119b08b25e38e9957d664069af6d76f44ebed1 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 24 Aug 2024 21:27:39 +0900 Subject: [PATCH 02/12] =?UTF-8?q?[FIX]#128=20:=20=EC=AA=BD=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=ED=83=88=20=EC=8B=9C,=20=EB=94=94=EC=95=8C=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=EB=8B=AB=EC=9D=80=20=ED=9B=84=20=EC=A0=84=ED=99=98?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bff/wespot/message/screen/send/MessageEditScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt index 8a7e1fb5..a802d428 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt @@ -224,6 +224,7 @@ fun MessageEditScreen( SendExitDialog( isReservedMessage = state.isReservedMessage, okButtonClick = { + exitDialog = false navigator.navigateMessageScreen(args = MessageScreenArgs(isMessageSent = false)) }, cancelButtonClick = { exitDialog = false }, From 282eb857be7168fea7a7f00c2b1a0983d3c79bfc Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 24 Aug 2024 21:29:03 +0900 Subject: [PATCH 03/12] =?UTF-8?q?[FIX]#128=20:=20=EC=AA=BD=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=ED=83=88=20=EC=8B=9C,=20=EB=94=94=EC=95=8C=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=EB=8B=AB=EC=9D=80=20=ED=9B=84=20=EC=A0=84=ED=99=98?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bff/wespot/message/screen/send/MessageWriteScreen.kt | 1 + .../bff/wespot/message/screen/send/ReceiverSelectionScreen.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt index d2556a86..d732d2d9 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt @@ -166,6 +166,7 @@ fun MessageWriteScreen( SendExitDialog( isReservedMessage = state.isReservedMessage, okButtonClick = { + dialogState = false navigator.navigateMessageScreen(args = MessageScreenArgs(isMessageSent = false)) }, cancelButtonClick = { dialogState = false }, diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt index 35ff5288..3f36325a 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt @@ -249,6 +249,7 @@ fun ReceiverSelectionScreen( SendExitDialog( isReservedMessage = state.isReservedMessage, okButtonClick = { + dialogState = false navigator.navigateMessageScreen(args = MessageScreenArgs(isMessageSent = false)) }, cancelButtonClick = { dialogState = false }, From 0d2c01b1dc64e5fe95f9c5412cb696157757d567 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 24 Aug 2024 21:35:31 +0900 Subject: [PATCH 04/12] =?UTF-8?q?[FIX]#128=20:=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=98=A4=EB=A5=B8=EC=AA=BD=20=ED=86=B1?= =?UTF-8?q?=EB=8B=88=EB=B0=94=ED=80=B4=20=ED=8C=A8=EB=94=A9=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 --- .../src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt index b58830a2..c3b67a30 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt @@ -77,7 +77,7 @@ internal fun EntireScreen( Icon( modifier = Modifier .clickable { navigator.navigateToSetting() } - .padding(end = 16.dp), + .padding(end = 8.dp), imageVector = ImageVector.vectorResource( com.bff.wespot.designsystem.R.drawable.icn_settings, ), From 6ac5b3da1d99c192230aed8e11458539d080bdda Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 24 Aug 2024 22:25:56 +0900 Subject: [PATCH 05/12] =?UTF-8?q?[FIX]#128=20:=20restoreState=20/=20saveSt?= =?UTF-8?q?ate=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/kotlin/com/bff/wespot/MainActivity.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/bff/wespot/MainActivity.kt b/app/src/main/kotlin/com/bff/wespot/MainActivity.kt index e40c2a14..df8513c7 100644 --- a/app/src/main/kotlin/com/bff/wespot/MainActivity.kt +++ b/app/src/main/kotlin/com/bff/wespot/MainActivity.kt @@ -390,14 +390,6 @@ private fun navigateScreenFromNavArgs(navArgs: MainScreenNavArgs, navigator: Not private fun NavController.navigateToNavGraph(navGraph: NavGraphSpec) { this.navigate(navGraph) { launchSingleTop = true - restoreState = when (navGraph.route) { - AppNavGraphs.message.route, - AppNavGraphs.notification.route -> false - else -> true - } - - popUpTo(this@navigateToNavGraph.graph.findStartDestination().id ) { - saveState = true - } + popUpTo(this@navigateToNavGraph.graph.findStartDestination().id) } } From 31224155c01d755e697bab91e58963a09fdf6743 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 24 Aug 2024 23:37:09 +0900 Subject: [PATCH 06/12] =?UTF-8?q?[FIX]#128=20:=20Chip=20=EB=82=B4=EB=B6=80?= =?UTF-8?q?=20=ED=8C=A8=EB=94=A9=20=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bff/wespot/ui/ReservedMessageItem.kt | 45 ++++++++++--------- .../bff/wespot/entire/screen/EntireScreen.kt | 31 ++++++------- 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/core/ui/src/main/kotlin/com/bff/wespot/ui/ReservedMessageItem.kt b/core/ui/src/main/kotlin/com/bff/wespot/ui/ReservedMessageItem.kt index 46cae4e5..a51f067a 100644 --- a/core/ui/src/main/kotlin/com/bff/wespot/ui/ReservedMessageItem.kt +++ b/core/ui/src/main/kotlin/com/bff/wespot/ui/ReservedMessageItem.kt @@ -1,14 +1,13 @@ package com.bff.wespot.ui import androidx.compose.foundation.background +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.FilterChip -import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -81,25 +80,29 @@ fun ReservedMessageItem( ) } - FilterChip( - shape = WeSpotThemeManager.shapes.extraLarge, - onClick = { onClick() }, - selected = false, - label = { - Text( - text = if (chipEnabled) chipText else chipDisabledText, - style = StaticTypeScale.Default.body6, - ) - }, - enabled = chipEnabled, - border = null, - colors = FilterChipDefaults.filterChipColors( - containerColor = WeSpotThemeManager.colors.secondaryBtnColor, - labelColor = Color(0xFFF7F7F8), - disabledContainerColor = Gray600, - disabledLabelColor = Gray400, - ), - ) + Box( + modifier = Modifier + .clip(WeSpotThemeManager.shapes.extraLarge) + .clickable { onClick() } + .let { + if (chipEnabled) { + it.background(WeSpotThemeManager.colors.secondaryBtnColor) + } else { + it.background(Gray600) + } + }, + ) { + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp), + text = if (chipEnabled) chipText else chipDisabledText, + style = StaticTypeScale.Default.body9, + color = if (chipEnabled) { + Color(0xFFF7F7F8) + } else { + Gray400 + }, + ) + } } HorizontalDivider( diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt index c3b67a30..8e356e43 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt @@ -14,8 +14,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilterChip -import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.Scaffold @@ -253,21 +251,18 @@ fun ProfileContent( ) } - FilterChip( - shape = WeSpotThemeManager.shapes.extraLarge, - onClick = { onClick() }, - selected = false, - label = { - Text( - text = stringResource(R.string.profile_edit), - style = StaticTypeScale.Default.body9, - ) - }, - border = null, - colors = FilterChipDefaults.filterChipColors( - containerColor = WeSpotThemeManager.colors.secondaryBtnColor, - labelColor = WeSpotThemeManager.colors.txtTitleColor, - ), - ) + Box( + modifier = Modifier + .clip(WeSpotThemeManager.shapes.extraLarge) + .clickable { onClick() } + .background(WeSpotThemeManager.colors.secondaryBtnColor), + ) { + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp), + text = stringResource(R.string.profile_edit), + style = StaticTypeScale.Default.body9, + color = Color(0xFFF7F7F8), + ) + } } } From e6c96ea72dcad9acba2cf8c9050b625f30b273f9 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 24 Aug 2024 23:47:46 +0900 Subject: [PATCH 07/12] =?UTF-8?q?[FIX]#128=20:=20=EB=B0=B0=EB=84=88=20QA?= =?UTF-8?q?=20=EB=B0=98=EC=98=81=20=EC=8A=A4=ED=86=A0=EB=A1=9C=ED=81=AC=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=AC=20=EB=B0=8F=20=EA=B0=84=EA=B2=A9=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 --- .../com/bff/wespot/designsystem/component/banner/WSBanner.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt b/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt index 8af609ad..9704e606 100644 --- a/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt +++ b/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt @@ -34,6 +34,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import com.bff.wespot.designsystem.R +import com.bff.wespot.designsystem.theme.Primary400 import com.bff.wespot.designsystem.theme.StaticTypeScale import com.bff.wespot.designsystem.theme.WeSpotTheme import com.bff.wespot.designsystem.theme.WeSpotThemeManager @@ -169,8 +170,8 @@ fun WSBanner( .let { if (hasBorder) { it.border( - width = 1.dp, - color = WeSpotThemeManager.colors.primaryColor, + width = (0.6).dp, + color = Primary400, shape = WeSpotThemeManager.shapes.medium, ) } else { From d47edf71f1ae298286367183b1d027175aebefc0 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sun, 25 Aug 2024 00:05:09 +0900 Subject: [PATCH 08/12] =?UTF-8?q?[FIX]#128=20:=20=EC=AA=BD=EC=A7=80=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=20=EB=B2=84=ED=8A=BC=20=EC=95=84=EB=9E=98=20?= =?UTF-8?q?=EA=B3=A0=EC=A0=95=EB=90=98=EB=8F=84=EB=A1=9D=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 --- .../wespot/message/screen/send/MessageEditScreen.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt index a802d428..6b028151 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt @@ -196,8 +196,10 @@ fun MessageEditScreen( } } - Spacer(modifier = Modifier.weight(1f)) + Spacer(modifier = Modifier.height(68.dp)) + } + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) { WSButton( onClick = { if (state.isReservedMessage) { @@ -206,12 +208,6 @@ fun MessageEditScreen( reserveDialog = true } }, - paddingValues = PaddingValues( - start = 20.dp, - end = 20.dp, - top = 32.dp, - bottom = 12.dp, - ), text = stringResource( if (state.isReservedMessage) R.string.edit_done else R.string.message_send, ), From 4fb59135e1fcae67d1dceb60872540930c7b0541 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sun, 25 Aug 2024 00:16:19 +0900 Subject: [PATCH 09/12] [FIX]#128 : Circle ProgressBar to Loading Lottie --- .../entire/screen/setting/NotificationSettingScreen.kt | 7 ++----- .../com/bff/wespot/message/screen/MessageStorageScreen.kt | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/NotificationSettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/NotificationSettingScreen.kt index 4683206a..494d2b9f 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/NotificationSettingScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/NotificationSettingScreen.kt @@ -1,12 +1,10 @@ package com.bff.wespot.entire.screen.setting import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -27,6 +25,7 @@ import com.bff.wespot.designsystem.theme.WeSpotThemeManager import com.bff.wespot.entire.R import com.bff.wespot.entire.screen.state.notification.NotificationSettingAction import com.bff.wespot.entire.viewmodel.NotificationSettingViewModel +import com.bff.wespot.ui.LoadingAnimation import com.bff.wespot.util.OnLifecycleEvent import com.ramcosta.composedestinations.annotation.Destination import org.orbitmvi.orbit.compose.collectAsState @@ -46,9 +45,7 @@ fun NotificationSettingScreen( val state by viewModel.collectAsState() if (state.isLoading) { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - CircularProgressIndicator() - } + LoadingAnimation() return } diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/MessageStorageScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/MessageStorageScreen.kt index cef4c809..48dd18ad 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/MessageStorageScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/MessageStorageScreen.kt @@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.GridItemSpan import androidx.compose.foundation.lazy.grid.LazyVerticalGrid -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Text @@ -60,6 +59,7 @@ import com.bff.wespot.message.viewmodel.MessageViewModel import com.bff.wespot.model.ToastState import com.bff.wespot.model.message.request.MessageType import com.bff.wespot.model.notification.NotificationType +import com.bff.wespot.ui.LoadingAnimation import com.bff.wespot.ui.WSBottomSheet import com.bff.wespot.ui.WSHomeChipGroup import kotlinx.collections.immutable.persistentListOf @@ -330,9 +330,7 @@ fun MessageStorageScreen( } if (state.isLoading) { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - CircularProgressIndicator() - } + LoadingAnimation() } LaunchedEffect(Unit) { From 5689c4b42ab5f08f43e16bf1694c6cea4dcfcbd6 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sun, 25 Aug 2024 00:19:46 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[FIX]#128=20:=20=EC=AA=BD=EC=A7=80=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=ED=95=98=EA=B8=B0=20PlaceHolder=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 --- feature/message/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/message/src/main/res/values/strings.xml b/feature/message/src/main/res/values/strings.xml index a78c119b..457985f0 100644 --- a/feature/message/src/main/res/values/strings.xml +++ b/feature/message/src/main/res/values/strings.xml @@ -32,7 +32,7 @@ 네 그만할래요 받는 사람 쪽지 내용을 작성해주세요\n상대에게 익명으로 전달해 드릴게요 - 오늘 바나나 우유 고마웠어! 점심 시간에 경기하는 거 봤는데 잘 하더라! 다치지 말고 화이팅 해! + 나랑 등교 같이할래? 200자 이내로 입력해 주세요 작성 완료 닉네임은 직접 수정이 어려워요 From 72228b7ee8771a8575ebf3bba252da5a3ff243d7 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sun, 25 Aug 2024 00:50:31 +0900 Subject: [PATCH 11/12] =?UTF-8?q?[FEATURE]#128=20:=20=ED=81=B4=EB=A6=AD=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt index 118b4f45..92a8098f 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt @@ -2,6 +2,7 @@ package com.bff.wespot.entire.screen import android.graphics.Color.parseColor import androidx.compose.foundation.background +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row From 3ec4d5e36cf769bfa5595eefeb6b8610cc18f8bc Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sun, 25 Aug 2024 19:42:03 +0900 Subject: [PATCH 12/12] =?UTF-8?q?[FIX]#133=20:=200.6=20->=201dp=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 --- .../com/bff/wespot/designsystem/component/banner/WSBanner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt b/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt index 9704e606..8aae67e4 100644 --- a/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt +++ b/designsystem/src/main/kotlin/com/bff/wespot/designsystem/component/banner/WSBanner.kt @@ -170,7 +170,7 @@ fun WSBanner( .let { if (hasBorder) { it.border( - width = (0.6).dp, + width = 1.dp, color = Primary400, shape = WeSpotThemeManager.shapes.medium, )