From c4e0549b63c1f6719fabf8b62055f39fb80e476a Mon Sep 17 00:00:00 2001 From: wjdrjs00 Date: Sat, 28 Feb 2026 09:10:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Chore:=20offset=20->=20padding=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 버튼과 제보완료 content 영역 겹침 문제 해결을 위해 padding으로 변경 --- .../reportwrite/component/template/CompleteReportContent.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt index a8b2f99f..612712b8 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/template/CompleteReportContent.kt @@ -6,7 +6,6 @@ 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.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState @@ -76,9 +75,7 @@ fun CompleteReportContent( ) CompleteReportCard( - modifier = Modifier - .offset(y = 115.dp) - .padding(horizontal = 18.dp), + modifier = Modifier.padding(top = 115.dp, start = 18.dp, end = 18.dp), title = uiState.reportTitle, category = uiState.selectedCategory, address = uiState.currentAddress, From a76b1dd53dea353c61e38cc3f37ce7dc4a44f412 Mon Sep 17 00:00:00 2001 From: wjdrjs00 Date: Sat, 28 Feb 2026 09:11:35 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Chore:=20=EC=A0=9C=EB=B3=B4=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20content=20text=20=EC=A0=95=EB=A0=AC=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 --- .../screen/reportwrite/component/CompleteReportCard.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt index 71a64904..7fe07664 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportwrite/component/CompleteReportCard.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -34,8 +33,6 @@ fun CompleteReportCard( images: List, modifier: Modifier = Modifier, ) { - val context = LocalContext.current - Column( modifier = modifier .background( @@ -59,6 +56,7 @@ fun CompleteReportCard( text = title, color = BitnagilTheme.colors.coolGray10, style = BitnagilTheme.typography.body1Medium, + textAlign = TextAlign.End, ) } @@ -69,6 +67,7 @@ fun CompleteReportCard( text = category?.displayTitle ?: "카테고리 없음", color = BitnagilTheme.colors.coolGray10, style = BitnagilTheme.typography.body1Medium, + textAlign = TextAlign.End, ) } @@ -79,6 +78,7 @@ fun CompleteReportCard( text = address ?: "주소 없음", color = BitnagilTheme.colors.coolGray10, style = BitnagilTheme.typography.body1Medium, + textAlign = TextAlign.End, ) } @@ -124,7 +124,7 @@ private fun CompleteReportCardItem( Row( modifier = modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically, + verticalAlignment = Alignment.Top, ) { Text( text = title,