From e41f8ec38783c1000a713abf827eed4b62f6326f Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Wed, 11 Sep 2024 12:50:19 +0900 Subject: [PATCH 1/5] [chore] #249 change button vertical padding value --- .../component/CourseDetailBottomBar.kt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt index 6c438f1e..1c3c6e3f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt @@ -1,14 +1,17 @@ package org.sopt.dateroad.presentation.ui.coursedetail.component 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.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import org.sopt.dateroad.R import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton @@ -38,7 +41,7 @@ fun CourseDetailBottomBar( onClick = onLikeButtonClicked, cornerRadius = 14.dp, paddingHorizontal = 23.dp, - paddingVertical = 18.dp + paddingVertical = 16.5.dp ) Spacer(modifier = Modifier.width(12.dp)) DateRoadBasicButton( @@ -48,3 +51,14 @@ fun CourseDetailBottomBar( ) } } + +@Preview +@Composable +fun ButtonPreview(modifier: Modifier = Modifier) { + Box(modifier = Modifier){ + CourseDetailBottomBar(modifier = Modifier.align(Alignment.BottomCenter), + isUserLiked = true, + onLikeButtonClicked = { }, + onEnrollButtonClicked = { }) + } +} \ No newline at end of file From f15442a4a2c7c82337d66e61c521a85f7b26e6bf Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Wed, 11 Sep 2024 12:50:47 +0900 Subject: [PATCH 2/5] [chore] #249 ktlint Format --- .../coursedetail/component/CourseDetailBottomBar.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt index 1c3c6e3f..300ac3be 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt @@ -55,10 +55,12 @@ fun CourseDetailBottomBar( @Preview @Composable fun ButtonPreview(modifier: Modifier = Modifier) { - Box(modifier = Modifier){ - CourseDetailBottomBar(modifier = Modifier.align(Alignment.BottomCenter), + Box(modifier = Modifier) { + CourseDetailBottomBar( + modifier = Modifier.align(Alignment.BottomCenter), isUserLiked = true, - onLikeButtonClicked = { }, - onEnrollButtonClicked = { }) + onLikeButtonClicked = { }, + onEnrollButtonClicked = { } + ) } -} \ No newline at end of file +} From ca4516f502196e4dc58757753a536de148c3ca08 Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Fri, 13 Sep 2024 16:19:38 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[chore]=20#249=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EA=B8=B0?= =?UTF-8?q?=EA=B8=B0=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/CourseDetailBottomBar.kt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt index 300ac3be..b8b1d417 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt @@ -5,11 +5,18 @@ 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.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -25,6 +32,8 @@ fun CourseDetailBottomBar( onLikeButtonClicked: () -> Unit, onEnrollButtonClicked: () -> Unit ) { + var buttonHeight by remember { mutableStateOf(0.dp) } // 버튼 크기를 저장하는 상태 변수 + val density = LocalDensity.current Row( modifier = modifier .fillMaxWidth() @@ -32,6 +41,7 @@ fun CourseDetailBottomBar( .padding(horizontal = 16.dp, vertical = 16.dp) ) { DateRoadImageButton( + modifier = Modifier.height(buttonHeight), iconResId = R.drawable.ic_coures_detail_heart_default, enabledContentColor = DateRoadTheme.colors.purple600, disabledContentColor = DateRoadTheme.colors.gray200, @@ -45,7 +55,11 @@ fun CourseDetailBottomBar( ) Spacer(modifier = Modifier.width(12.dp)) DateRoadBasicButton( - modifier = Modifier.weight(1f), + modifier = Modifier + .weight(1f) + .onSizeChanged { size -> + buttonHeight = with(density) { size.height.toDp() } + }, textContent = stringResource(id = R.string.course_detail_get_course), onClick = onEnrollButtonClicked ) From 3a974e57b1a5ab96cfbec47c6ba5576d5582b8fb Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Fri, 13 Sep 2024 16:20:38 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[chore]=20#249=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/coursedetail/component/CourseDetailBottomBar.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt index b8b1d417..d7bb8a32 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt @@ -32,8 +32,7 @@ fun CourseDetailBottomBar( onLikeButtonClicked: () -> Unit, onEnrollButtonClicked: () -> Unit ) { - var buttonHeight by remember { mutableStateOf(0.dp) } // 버튼 크기를 저장하는 상태 변수 - val density = LocalDensity.current + var buttonHeight by remember { mutableStateOf(0.dp) } val density = LocalDensity.current Row( modifier = modifier .fillMaxWidth() From 9aa01b246b61721b88f38ca5cea3f22736c5d7d7 Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Fri, 13 Sep 2024 16:22:40 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[chore]=20#249=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=ED=8C=A8=EB=94=A9=EA=B0=92=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/coursedetail/component/CourseDetailBottomBar.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt index d7bb8a32..d5750d66 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt @@ -32,7 +32,8 @@ fun CourseDetailBottomBar( onLikeButtonClicked: () -> Unit, onEnrollButtonClicked: () -> Unit ) { - var buttonHeight by remember { mutableStateOf(0.dp) } val density = LocalDensity.current + var buttonHeight by remember { mutableStateOf(0.dp) } + val density = LocalDensity.current Row( modifier = modifier .fillMaxWidth() @@ -50,7 +51,7 @@ fun CourseDetailBottomBar( onClick = onLikeButtonClicked, cornerRadius = 14.dp, paddingHorizontal = 23.dp, - paddingVertical = 16.5.dp + paddingVertical = 0.dp ) Spacer(modifier = Modifier.width(12.dp)) DateRoadBasicButton(