Skip to content

Commit 62254c6

Browse files
l5x5ll5x5l
committed
CHORE: ktlint 적용
1 parent 490e179 commit 62254c6

11 files changed

Lines changed: 70 additions & 65 deletions

File tree

‎presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private fun WriteRoutineScreen(
169169
Spacer(modifier = Modifier.height(40.dp))
170170

171171
Column(
172-
verticalArrangement = Arrangement.spacedBy(12.dp)
172+
verticalArrangement = Arrangement.spacedBy(12.dp),
173173
) {
174174
ExpandableContent(
175175
expand = state.subRoutineUiExpanded,
@@ -178,12 +178,12 @@ private fun WriteRoutineScreen(
178178
title = "세부루틴",
179179
placeHolder = "ex) 일어나자마자 이불 개기",
180180
valueText = state.subRoutinesText,
181-
onClick = onClickSubRoutineExpand
181+
onClick = onClickSubRoutineExpand,
182182
) {
183183
Column(
184184
modifier = Modifier.fillMaxWidth().padding(horizontal = 18.dp, vertical = 20.dp),
185185
verticalArrangement = Arrangement.spacedBy(24.dp),
186-
horizontalAlignment = Alignment.End
186+
horizontalAlignment = Alignment.End,
187187
) {
188188
SubRoutineField(
189189
resourceId = R.drawable.img_circle_1,
@@ -212,7 +212,7 @@ private fun WriteRoutineScreen(
212212
LabeledCheckBox(
213213
label = "세부 루틴 설정 안함",
214214
checked = state.selectNotUseSUbRoutines,
215-
onClick = selectNotUseSubRoutines
215+
onClick = selectNotUseSubRoutines,
216216
)
217217
}
218218
}
@@ -224,10 +224,10 @@ private fun WriteRoutineScreen(
224224
title = "반복 요일",
225225
placeHolder = "ex) 매주 월,화,수.목,금",
226226
valueText = state.repeatDaysText,
227-
onClick = onClickRepeatDaysExpand
227+
onClick = onClickRepeatDaysExpand,
228228
) {
229229
Column(
230-
modifier = Modifier.fillMaxWidth().padding(top = 14.dp, bottom = 18.dp, start = 18.dp, end = 18.dp)
230+
modifier = Modifier.fillMaxWidth().padding(top = 14.dp, bottom = 18.dp, start = 18.dp, end = 18.dp),
231231
) {
232232
Row {
233233
WriteRoutineButton.Text(
@@ -280,11 +280,11 @@ private fun WriteRoutineScreen(
280280
title = "목표 기간",
281281
placeHolder = "ex) 25.08.06 - 25.08.06",
282282
valueText = state.periodText,
283-
onClick = onClickPeriodExpand
283+
onClick = onClickPeriodExpand,
284284
) {
285285
Column(
286286
modifier = Modifier.fillMaxWidth().padding(top = 14.dp, bottom = 18.dp, start = 18.dp, end = 18.dp),
287-
verticalArrangement = Arrangement.spacedBy(12.dp)
287+
verticalArrangement = Arrangement.spacedBy(12.dp),
288288
) {
289289
RoutineDetailRow(
290290
title = "시작일",
@@ -309,11 +309,11 @@ private fun WriteRoutineScreen(
309309
title = "시간",
310310
placeHolder = "ex) 오전 9:40부터 시작",
311311
valueText = state.startTimeText,
312-
onClick = onClickStartTimeExpand
312+
onClick = onClickStartTimeExpand,
313313
) {
314314
Column(
315315
modifier = Modifier.fillMaxWidth().padding(top = 14.dp, bottom = 18.dp, start = 18.dp, end = 18.dp),
316-
horizontalAlignment = Alignment.End
316+
horizontalAlignment = Alignment.End,
317317
) {
318318
RoutineDetailRow(
319319
title = "시작 시간",
@@ -327,10 +327,9 @@ private fun WriteRoutineScreen(
327327
LabeledCheckBox(
328328
label = "하루 종일",
329329
checked = state.selectAllTime,
330-
onClick = selectAllTime
330+
onClick = selectAllTime,
331331
)
332332
}
333-
334333
}
335334
}
336335
}
@@ -375,7 +374,7 @@ fun WriteRoutineScreenPreview() {
375374
onClickPeriodExpand = {},
376375
showStartDatePickerBottomSheet = {},
377376
showEndDatePickerBottomSheet = {},
378-
selectNotUseSubRoutines = {}
377+
selectNotUseSubRoutines = {},
379378
)
380379
}
381380
}

‎presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/namefield/NameField.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ fun NameField(
5454
if (onClickRemove != null) {
5555
Box(
5656
modifier = Modifier.clickableWithoutRipple(onClick = onClickRemove),
57-
contentAlignment = Alignment.Center
57+
contentAlignment = Alignment.Center,
5858
) {
5959
BitnagilIcon(
6060
id = R.drawable.ic_close_circle,
6161
tint = null,
62-
modifier = Modifier.size(24.dp).padding(top = 4.dp, bottom = 4.dp, start = 8.dp)
62+
modifier = Modifier.size(24.dp).padding(top = 4.dp, bottom = 4.dp, start = 8.dp),
6363
)
6464
}
6565
}
@@ -80,7 +80,7 @@ fun NameField(
8080
@Composable
8181
@Preview(showBackground = true, widthDp = 300, heightDp = 300)
8282
fun NameFieldPreview() {
83-
BitnagilTheme{
83+
BitnagilTheme {
8484
NameField(
8585
value = "value",
8686
onValueChange = {},

‎presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/selectcell/SelectCell.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,49 +51,49 @@ fun SelectCell(
5151
private fun SelectCellPreview() {
5252
BitnagilTheme {
5353
Row(
54-
horizontalArrangement = Arrangement.spacedBy(4.dp)
54+
horizontalArrangement = Arrangement.spacedBy(4.dp),
5555
) {
5656
SelectCell(
5757
text = "월",
5858
selected = true,
5959
onClick = {},
60-
modifier = Modifier.weight(1f)
60+
modifier = Modifier.weight(1f),
6161
)
6262
SelectCell(
6363
text = "화",
6464
selected = false,
6565
onClick = {},
66-
modifier = Modifier.weight(1f)
66+
modifier = Modifier.weight(1f),
6767
)
6868
SelectCell(
6969
text = "수",
7070
selected = false,
7171
onClick = {},
72-
modifier = Modifier.weight(1f)
72+
modifier = Modifier.weight(1f),
7373
)
7474
SelectCell(
7575
text = "목",
7676
selected = false,
7777
onClick = {},
78-
modifier = Modifier.weight(1f)
78+
modifier = Modifier.weight(1f),
7979
)
8080
SelectCell(
8181
text = "금",
8282
selected = false,
8383
onClick = {},
84-
modifier = Modifier.weight(1f)
84+
modifier = Modifier.weight(1f),
8585
)
8686
SelectCell(
8787
text = "토",
8888
selected = false,
8989
onClick = {},
90-
modifier = Modifier.weight(1f)
90+
modifier = Modifier.weight(1f),
9191
)
9292
SelectCell(
9393
text = "일",
9494
selected = false,
9595
onClick = {},
96-
modifier = Modifier.weight(1f)
96+
modifier = Modifier.weight(1f),
9797
)
9898
}
9999
}

‎presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/expandablecontent/ExpandableContent.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fun ExpandableContent(
5454
modifier = Modifier
5555
.fillMaxWidth()
5656
.clip(RoundedCornerShape(12.dp))
57-
.background(color = BitnagilTheme.colors.coolGray99)
57+
.background(color = BitnagilTheme.colors.coolGray99),
5858
) {
5959
Row(
6060
modifier = Modifier
@@ -81,12 +81,13 @@ fun ExpandableContent(
8181
style = if (showValueText && !expand) subTextStyle else mainTextStyle,
8282
)
8383

84-
if (required)
84+
if (required) {
8585
BitnagilIcon(
8686
id = R.drawable.ic_routine_success,
8787
tint = null,
8888
modifier = Modifier.size(12.dp),
8989
)
90+
}
9091
}
9192
if (!expand) {
9293
Text(
@@ -107,7 +108,7 @@ fun ExpandableContent(
107108
}
108109

109110
AnimatedVisibility(visible = expand) {
110-
Column{
111+
Column {
111112
HorizontalDivider(
112113
modifier = Modifier.fillMaxWidth().padding(horizontal = 18.dp),
113114
color = BitnagilTheme.colors.coolGray96,
@@ -118,7 +119,6 @@ fun ExpandableContent(
118119
}
119120
}
120121
}
121-
122122
}
123123

124124
@Preview(heightDp = 300)

‎presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/routinedetailrow/RoutineDetailRow.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fun RoutineDetailRow(
2525
Row(
2626
modifier = Modifier.fillMaxWidth(),
2727
horizontalArrangement = Arrangement.SpaceBetween,
28-
verticalAlignment = Alignment.CenterVertically
28+
verticalAlignment = Alignment.CenterVertically,
2929
) {
3030
Text(title, style = BitnagilTheme.typography.body2SemiBold.copy(color = BitnagilTheme.colors.coolGray30))
3131

@@ -35,10 +35,11 @@ fun RoutineDetailRow(
3535
isSelected = false,
3636
) {
3737
Box(
38-
modifier = Modifier.padding(vertical = 10.dp)
38+
modifier = Modifier.padding(vertical = 10.dp),
3939
) {
40-
if (value.isEmpty())
40+
if (value.isEmpty()) {
4141
Text(placeHolder, style = BitnagilTheme.typography.body2Medium.copy(color = BitnagilTheme.colors.coolGray90))
42+
}
4243

4344
Text(value, style = BitnagilTheme.typography.body2Medium.copy(color = BitnagilTheme.colors.coolGray30))
4445
}

‎presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/block/subroutinefield/SubRoutineField.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fun SubRoutineField(
3030
) {
3131
Row(
3232
modifier = Modifier.fillMaxWidth(),
33-
verticalAlignment = Alignment.CenterVertically
33+
verticalAlignment = Alignment.CenterVertically,
3434
) {
3535
Image(
3636
painter = painterResource(resourceId),
@@ -50,11 +50,12 @@ fun SubRoutineField(
5050
decorationBox = { innerTextField ->
5151
Column {
5252
Box {
53-
if (value.isEmpty())
53+
if (value.isEmpty()) {
5454
Text(
5555
text = placeHolder,
5656
style = BitnagilTheme.typography.body2Medium.copy(color = BitnagilTheme.colors.coolGray90),
5757
)
58+
}
5859
innerTextField()
5960
}
6061

@@ -66,21 +67,21 @@ fun SubRoutineField(
6667
color = BitnagilTheme.colors.coolGray90,
6768
)
6869
}
69-
}
70+
},
7071
)
7172
}
7273
}
7374

7475
@Composable
7576
@Preview(showBackground = true, widthDp = 300, heightDp = 300)
7677
fun NameFieldPreview() {
77-
BitnagilTheme{
78+
BitnagilTheme {
7879
SubRoutineField(
7980
resourceId = com.threegap.bitnagil.designsystem.R.drawable.img_circle_1,
8081
placeHolder = "세부루틴을 설정해주세요.",
8182
value = "TEXT",
8283
onValueChange = {},
83-
enabled = true
84+
enabled = true,
8485
)
8586
}
8687
}

0 commit comments

Comments
 (0)