From 7b058ab29876b5bb4ca93ceb3c290ebec0a7eb14 Mon Sep 17 00:00:00 2001 From: Gael-Android Date: Thu, 1 Feb 2024 13:19:55 +0900 Subject: [PATCH 1/5] =?UTF-8?q?add=20:=20=EC=8B=B1=EA=B8=80=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EB=B0=94=EC=97=90=20=EB=84=A4=EB=B9=84?= =?UTF-8?q?=EA=B2=8C=EC=9D=B4=EC=85=98=20=EC=95=84=EC=9D=B4=EC=BD=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/topbar/SingleTitleTopBar.kt | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt index 1bb92e2f..39825ece 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt @@ -24,6 +24,7 @@ import com.yourssu.design.system.compose.base.YdsText fun SingleTitleTopBar( modifier: Modifier = Modifier, title: String = "", + navigationIcon: @Composable () -> Unit = {}, actions: @Composable RowScope.() -> Unit = {}, ) { TopAppBar( @@ -36,14 +37,17 @@ fun SingleTitleTopBar( modifier = Modifier .fillMaxWidth() ) { - YdsText( - modifier = Modifier - .padding(16.dp, 17.dp, 16.dp, 8.dp) - .wrapContentHeight(), - text = title, - style = YdsTheme.typography.title2, - color = YdsTheme.colors.textPrimary - ) + Row { + navigationIcon() + YdsText( + modifier = Modifier + .padding(16.dp, 17.dp, 16.dp, 8.dp) + .wrapContentHeight(), + text = title, + style = YdsTheme.typography.title2, + color = YdsTheme.colors.textPrimary + ) + } Row( modifier = Modifier @@ -66,6 +70,12 @@ private fun PreviewSingleTitleTopBar() { topBar = { SingleTitleTopBar( title = "타이틀", + navigationIcon = { + TopBarButton( + icon = R.drawable.ic_arrow_left_line, + isDisabled = false, + ) + }, actions = { TopBarButton( icon = R.drawable.ic_ground_filled, From d2373b281baab422fb9089b84298de2d3c3082b4 Mon Sep 17 00:00:00 2001 From: Gael-Android Date: Thu, 1 Feb 2024 13:20:11 +0900 Subject: [PATCH 2/5] =?UTF-8?q?add=20:=20=EB=8D=94=EB=B8=94=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=EB=B0=94=EC=97=90=20=EB=84=A4=EB=B9=84?= =?UTF-8?q?=EA=B2=8C=EC=9D=B4=EC=85=98=20=EC=95=84=EC=9D=B4=EC=BD=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/topbar/DoubleTitleTopBar.kt | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt index ddca7747..71b596a3 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt @@ -24,6 +24,7 @@ fun DoubleTitleTopBar( modifier: Modifier = Modifier, title: String = "", subtitle: String = "", + navigationIcon: @Composable () -> Unit = {}, actions: @Composable RowScope.() -> Unit = {}, ) { TopAppBar( @@ -36,24 +37,27 @@ fun DoubleTitleTopBar( modifier = Modifier.fillMaxWidth() ) { - Column( - modifier = Modifier.padding( - start = 16.dp, - top = 12.dp, - end = 16.dp, - bottom = 8.dp - ) - ) { - YdsText( - text = subtitle, - style = YdsTheme.typography.body2, - color = YdsTheme.colors.textPrimary - ) - YdsText( - text = title, - style = YdsTheme.typography.title2, - color = YdsTheme.colors.textPrimary - ) + Row { + navigationIcon() + Column( + modifier = Modifier.padding( + start = 16.dp, + top = 12.dp, + end = 16.dp, + bottom = 8.dp + ) + ) { + YdsText( + text = subtitle, + style = YdsTheme.typography.body2, + color = YdsTheme.colors.textPrimary + ) + YdsText( + text = title, + style = YdsTheme.typography.title2, + color = YdsTheme.colors.textPrimary + ) + } } Row( @@ -77,6 +81,12 @@ private fun PreviewDoubleTitleTopBar() { DoubleTitleTopBar( title = "타이틀", subtitle = "서브타이틀", + navigationIcon = { + TopBarButton( + icon = R.drawable.ic_arrow_left_line, + isDisabled = false, + ) + }, actions = { TopBarButton( icon = R.drawable.ic_ground_filled, From cc899e0e2a7a2e72c20d89e0b23be7a9bf55c184 Mon Sep 17 00:00:00 2001 From: Gael-Android Date: Sat, 3 Feb 2024 20:38:06 +0900 Subject: [PATCH 3/5] =?UTF-8?q?chore=20:=20=ED=9B=84=ED=96=89=20=EC=89=BC?= =?UTF-8?q?=ED=91=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/topbar/DoubleTitleTopBar.kt | 20 +++++++++---------- .../component/topbar/SingleTitleTopBar.kt | 16 +++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt index 71b596a3..6c3c55d5 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt @@ -31,10 +31,10 @@ fun DoubleTitleTopBar( modifier = modifier .fillMaxWidth() .height(72.dp), - contentPadding = PaddingValues(end = 4.dp) + contentPadding = PaddingValues(end = 4.dp), ) { Box( - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth(), ) { Row { @@ -44,18 +44,18 @@ fun DoubleTitleTopBar( start = 16.dp, top = 12.dp, end = 16.dp, - bottom = 8.dp + bottom = 8.dp, ) ) { YdsText( text = subtitle, style = YdsTheme.typography.body2, - color = YdsTheme.colors.textPrimary + color = YdsTheme.colors.textPrimary, ) YdsText( text = title, style = YdsTheme.typography.title2, - color = YdsTheme.colors.textPrimary + color = YdsTheme.colors.textPrimary, ) } } @@ -64,7 +64,7 @@ fun DoubleTitleTopBar( modifier = Modifier .padding(top = 16.dp) .align(Alignment.BottomEnd), - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, ) { actions() } @@ -90,17 +90,17 @@ private fun PreviewDoubleTitleTopBar() { actions = { TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false + isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false + isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false + isDisabled = false, ) - } + }, ) } ) { diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt index 39825ece..75a00a56 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt @@ -31,11 +31,11 @@ fun SingleTitleTopBar( modifier = modifier .fillMaxWidth() .height(56.dp), - contentPadding = PaddingValues(end = 4.dp) + contentPadding = PaddingValues(end = 4.dp), ) { Box( modifier = Modifier - .fillMaxWidth() + .fillMaxWidth(), ) { Row { navigationIcon() @@ -45,7 +45,7 @@ fun SingleTitleTopBar( .wrapContentHeight(), text = title, style = YdsTheme.typography.title2, - color = YdsTheme.colors.textPrimary + color = YdsTheme.colors.textPrimary, ) } @@ -54,7 +54,7 @@ fun SingleTitleTopBar( .fillMaxHeight() .padding(0.dp) .align(Alignment.TopEnd), - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, ) { actions() } @@ -79,17 +79,17 @@ private fun PreviewSingleTitleTopBar() { actions = { TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false + isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false + isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false + isDisabled = false, ) - } + }, ) } ) { From 412bdf876399d8cd8c5fa0d36925bf2af0274f05 Mon Sep 17 00:00:00 2001 From: Gael-Android Date: Mon, 5 Feb 2024 00:50:31 +0900 Subject: [PATCH 4/5] =?UTF-8?q?chore=20:=20=ED=83=91=EB=B0=94=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EB=93=A4=20=EC=A4=91=20isDisabled=EC=9E=88=EB=8A=94?= =?UTF-8?q?=EA=B1=B0=20=EC=A0=9C=EA=B1=B0,=20=EA=B8=B0=EB=B3=B8=EA=B0=92?= =?UTF-8?q?=EC=9D=B4=EA=B8=B0=20=EB=95=8C=EB=AC=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yourssu/design/system/compose/atom/TopBarButton.kt | 4 ---- .../com/yourssu/design/system/compose/base/YdsScaffold.kt | 3 --- .../com/yourssu/design/system/compose/component/BottomBar.kt | 3 --- .../system/compose/component/topbar/DoubleTitleTopBar.kt | 4 ---- .../design/system/compose/component/topbar/SearchTopBar.kt | 1 - .../system/compose/component/topbar/SingleTitleTopBar.kt | 4 ---- .../yourssu/design/system/compose/component/topbar/TopBar.kt | 3 --- 7 files changed, 22 deletions(-) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt b/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt index 81a90d06..9c039656 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt @@ -93,14 +93,12 @@ private fun PreviewTopBarButton() { onClick() }, icon = R.drawable.ic_ground_filled, - isDisabled = false, ) TopBarButton( onClick = { onClick() }, icon = R.drawable.ic_ground_filled, - isDisabled = true, ) } Column( @@ -113,14 +111,12 @@ private fun PreviewTopBarButton() { onClick() }, text = "닫기", - isDisabled = false, ) TopBarButton( onClick = { onClick() }, text = "닫기", - isDisabled = true, ) } } diff --git a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsScaffold.kt b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsScaffold.kt index efaa5e98..b29f2eeb 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsScaffold.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsScaffold.kt @@ -134,17 +134,14 @@ private fun YdsScaffoldPreview() { navigationIcon = { TopBarButton( icon = R.drawable.ic_arrow_left_line, - isDisabled = false, ) }, actions = { TopBarButton( icon = R.drawable.ic_bell_line, - isDisabled = false, ) TopBarButton( icon = R.drawable.ic_search_line, - isDisabled = false, onClick = { scope.launch { toastHostState.showToast( diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/BottomBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/BottomBar.kt index 474bf54c..a4b4446a 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/BottomBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/BottomBar.kt @@ -320,17 +320,14 @@ private fun PreviewNavigation() { navigationIcon = { TopBarButton( icon = R.drawable.ic_arrow_left_line, - isDisabled = false, ) }, actions = { TopBarButton( icon = R.drawable.ic_bell_line, - isDisabled = false, ) TopBarButton( icon = R.drawable.ic_search_line, - isDisabled = false, onClick = { }, ) }, diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt index 6c3c55d5..ede95aa1 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/DoubleTitleTopBar.kt @@ -84,21 +84,17 @@ private fun PreviewDoubleTitleTopBar() { navigationIcon = { TopBarButton( icon = R.drawable.ic_arrow_left_line, - isDisabled = false, ) }, actions = { TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false, ) }, ) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SearchTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SearchTopBar.kt index e5369b69..d1d6807b 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SearchTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SearchTopBar.kt @@ -95,7 +95,6 @@ private fun PreviewSearchTopBar() { navigationIcon = { TopBarButton( icon = R.drawable.ic_arrow_left_line, - isDisabled = false, onClick = { Toast.makeText( context, diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt index 75a00a56..6c936e69 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/SingleTitleTopBar.kt @@ -73,21 +73,17 @@ private fun PreviewSingleTitleTopBar() { navigationIcon = { TopBarButton( icon = R.drawable.ic_arrow_left_line, - isDisabled = false, ) }, actions = { TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false, ) TopBarButton( icon = R.drawable.ic_ground_filled, - isDisabled = false, ) }, ) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/TopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/TopBar.kt index 6ae82c6d..f5d1c2c2 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/TopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/topbar/TopBar.kt @@ -82,17 +82,14 @@ private fun PreviewTopBar() { navigationIcon = { TopBarButton( icon = R.drawable.ic_arrow_left_line, - isDisabled = false, ) }, actions = { TopBarButton( icon = R.drawable.ic_bell_line, - isDisabled = false, ) TopBarButton( icon = R.drawable.ic_search_line, - isDisabled = false, ) } ) From b5bb452a752467743236c5ee35f97db5d37226b1 Mon Sep 17 00:00:00 2001 From: Gael-Android Date: Mon, 5 Feb 2024 01:10:13 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EB=B2=84=EC=A0=84=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 789d42cf..4e0aa412 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=2.5.2 +versionName=2.5.3 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다