Skip to content

Commit faaf271

Browse files
committed
FIX: 제보 상세 화면 상단 toolbar에 적용된 horizontal 패딩 제거
1 parent d51fc2a commit faaf271

File tree

1 file changed

+54
-49
lines changed

1 file changed

+54
-49
lines changed

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailScreen.kt

Lines changed: 54 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -57,74 +57,79 @@ private fun ReportDetailScreen(
5757
Column(
5858
modifier = modifier
5959
.fillMaxSize()
60-
.verticalScroll(verticalScrollState)
6160
.background(color = BitnagilTheme.colors.white)
62-
.statusBarsPadding()
63-
.padding(horizontal = 20.dp),
61+
.statusBarsPadding(),
6462
) {
6563
BitnagilTopBar(
6664
title = "제보하기",
6765
showBackButton = true,
6866
onBackClick = onClickPreviousButton,
6967
)
7068

71-
Spacer(modifier = Modifier.height(20.dp))
69+
Column(
70+
modifier = Modifier
71+
.weight(1f)
72+
.verticalScroll(verticalScrollState)
73+
.padding(horizontal = 20.dp),
74+
) {
75+
Spacer(modifier = Modifier.height(20.dp))
7276

73-
ReportProcessBadge(reportProcess = state.reportProcess)
77+
ReportProcessBadge(reportProcess = state.reportProcess)
7478

75-
Spacer(modifier = Modifier.height(6.dp))
79+
Spacer(modifier = Modifier.height(6.dp))
7680

77-
Text(
78-
text = state.date.toPresentationFormatInReportDetail(),
79-
style = BitnagilTheme.typography.subtitle1SemiBold,
80-
)
81+
Text(
82+
text = state.date.toPresentationFormatInReportDetail(),
83+
style = BitnagilTheme.typography.subtitle1SemiBold,
84+
)
8185

82-
Spacer(modifier = Modifier.height(14.dp))
83-
84-
Row {
85-
state.imageUrls.forEach { imageUrl ->
86-
AsyncImage(
87-
model = ImageRequest.Builder(LocalContext.current)
88-
.data(imageUrl)
89-
.build(),
90-
modifier = Modifier
91-
.size(74.dp)
92-
.clip(shape = RoundedCornerShape(9.dp))
93-
.background(color = BitnagilTheme.colors.black),
94-
contentScale = ContentScale.Crop,
95-
contentDescription = null,
96-
)
86+
Spacer(modifier = Modifier.height(14.dp))
87+
88+
Row {
89+
state.imageUrls.forEach { imageUrl ->
90+
AsyncImage(
91+
model = ImageRequest.Builder(LocalContext.current)
92+
.data(imageUrl)
93+
.build(),
94+
modifier = Modifier
95+
.size(74.dp)
96+
.clip(shape = RoundedCornerShape(9.dp))
97+
.background(color = BitnagilTheme.colors.black),
98+
contentScale = ContentScale.Crop,
99+
contentDescription = null,
100+
)
101+
}
97102
}
98-
}
99103

100-
Spacer(modifier = Modifier.height(24.dp))
104+
Spacer(modifier = Modifier.height(24.dp))
101105

102-
Column(
103-
modifier = Modifier.fillMaxWidth(),
104-
verticalArrangement = Arrangement.spacedBy(28.dp),
105-
) {
106-
ReportDetailLabeledContent(
107-
label = "제목",
108-
content = state.reportTitle,
109-
)
106+
Column(
107+
modifier = Modifier.fillMaxWidth(),
108+
verticalArrangement = Arrangement.spacedBy(28.dp),
109+
) {
110+
ReportDetailLabeledContent(
111+
label = "제목",
112+
content = state.reportTitle,
113+
)
110114

111-
ReportDetailLabeledContent(
112-
label = "카테고리",
113-
content = state.reportCategory.title,
114-
)
115+
ReportDetailLabeledContent(
116+
label = "카테고리",
117+
content = state.reportCategory.title,
118+
)
115119

116-
ReportDetailLabeledContent(
117-
label = "상세 제목 내용",
118-
content = state.reportContent,
119-
)
120+
ReportDetailLabeledContent(
121+
label = "상세 제목 내용",
122+
content = state.reportContent,
123+
)
120124

121-
ReportDetailLabeledContent(
122-
label = "내 위치",
123-
content = state.location,
124-
)
125-
}
125+
ReportDetailLabeledContent(
126+
label = "내 위치",
127+
content = state.location,
128+
)
129+
}
126130

127-
Spacer(modifier = Modifier.height(36.dp))
131+
Spacer(modifier = Modifier.height(36.dp))
132+
}
128133
}
129134
}
130135

0 commit comments

Comments
 (0)