Skip to content

Commit 3cb9ea7

Browse files
l5x5ll5x5l
committed
CHORE: ktlint 적용
1 parent dfc29cf commit 3cb9ea7

File tree

8 files changed

+42
-38
lines changed

8 files changed

+42
-38
lines changed

‎core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilProgressTopBar.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ fun BitnagilProgressTopBar(
3636
tint = BitnagilTheme.colors.coolGray10,
3737
)
3838

39-
if (showProgress)
39+
if (showProgress) {
4040
BitnagilProgressBar(
4141
progress = progress,
4242
modifier = Modifier,
4343
)
44+
}
4445
}
4546
}
4647

@@ -50,6 +51,6 @@ private fun BitnagilProgressTopBarPreview() {
5051
BitnagilProgressTopBar(
5152
progress = 1f,
5253
onBackClick = {},
53-
showProgress = true
54+
showProgress = true,
5455
)
5556
}

‎presentation/src/main/java/com/threegap/bitnagil/presentation/common/ninepatch/NinePatchBackground.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.threegap.bitnagil.presentation.common.ninepatch
22

33
import android.graphics.drawable.NinePatchDrawable
4+
import androidx.compose.runtime.Composable
5+
import androidx.compose.runtime.remember
46
import androidx.compose.ui.Modifier
57
import androidx.compose.ui.draw.drawBehind
68
import androidx.compose.ui.graphics.nativeCanvas
79
import androidx.compose.ui.platform.LocalContext
8-
import androidx.compose.runtime.Composable
9-
import androidx.compose.runtime.remember
1010
import androidx.core.content.ContextCompat
1111
import androidx.core.graphics.drawable.updateBounds
1212

@@ -22,7 +22,7 @@ fun Modifier.ninePatchBackgroundNode(drawableResId: Int): Modifier {
2222
Modifier.drawBehind {
2323
ninePatchDrawable.updateBounds(0, 0, size.width.toInt(), size.height.toInt())
2424
ninePatchDrawable.draw(drawContext.canvas.nativeCanvas)
25-
}
25+
},
2626
)
2727
} else {
2828
this

‎presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,22 @@ private fun OnBoardingScreen(
7878
.background(BitnagilTheme.colors.white)
7979
.statusBarsPadding(),
8080
) {
81-
if (!state.hideToolbar)
81+
if (!state.hideToolbar) {
8282
BitnagilProgressTopBar(
8383
modifier = Modifier,
8484
onBackClick = onClickPreviousInSelectOnBoarding,
8585
progress = state.progress,
86-
showProgress = state.showProgress
86+
showProgress = state.showProgress,
8787
)
88+
}
8889

8990
when (state) {
9091
is OnBoardingState.Idle -> {
9192
when (val currentOnBoardingPageInfo = state.currentOnBoardingPageInfo) {
9293
OnBoardingPageInfo.Intro -> {
9394
OnBoardingIntroTemplate(
9495
userName = state.userName,
95-
onClickNextButton = onClickLoadOnBoarding
96+
onClickNextButton = onClickLoadOnBoarding,
9697
)
9798
}
9899
is OnBoardingPageInfo.Abstract -> {
@@ -172,7 +173,7 @@ fun OnBoardingScreenPreview() {
172173
totalStep = 5,
173174
currentStep = 1,
174175
onBoardingSetType = OnBoardingSetType.RESET,
175-
userName = "안드로이드"
176+
userName = "안드로이드",
176177
),
177178
onClickNext = {},
178179
onClickLoadOnBoarding = {},

‎presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class OnBoardingViewModel @AssistedInject constructor(
5858
private fun loadInitData() {
5959
val onBoardingSetType = OnBoardingSetType.fromOnBoardingScreenArg(onBoardingArg)
6060

61-
when(onBoardingSetType) {
61+
when (onBoardingSetType) {
6262
OnBoardingSetType.NEW -> {
6363
loadIntro()
6464
}
@@ -84,7 +84,7 @@ class OnBoardingViewModel @AssistedInject constructor(
8484
onFailure = {
8585
sendIntent(OnBoardingIntent.LoadUserOnBoardingFailure(message = it.message ?: "에러가 발생했습니다. 잠시 후 시도해주세요."))
8686
return@launch
87-
}
87+
},
8888
)
8989

9090
val onBoardingAbstract = getOnBoardingAbstractUseCase(selectedItemIdsWithOnBoardingId = userOnBoarding)
@@ -96,13 +96,15 @@ class OnBoardingViewModel @AssistedInject constructor(
9696
}
9797
}
9898

99-
sendIntent(OnBoardingIntent.LoadUserOnBoardingSuccess(
100-
onBoardingAbstract = OnBoardingPageInfo.ExistedOnBoardingAbstract(
101-
prefix = abstractPagePrefixText,
102-
abstractTexts = abstractTexts,
99+
sendIntent(
100+
OnBoardingIntent.LoadUserOnBoardingSuccess(
101+
onBoardingAbstract = OnBoardingPageInfo.ExistedOnBoardingAbstract(
102+
prefix = abstractPagePrefixText,
103+
abstractTexts = abstractTexts,
104+
),
105+
userName = userName,
103106
),
104-
userName = userName,
105-
))
107+
)
106108
}
107109
}
108110

@@ -131,7 +133,7 @@ class OnBoardingViewModel @AssistedInject constructor(
131133
totalStep = 1,
132134
currentStep = 0,
133135
onBoardingSetType = OnBoardingSetType.RESET,
134-
userName = intent.userName
136+
userName = intent.userName,
135137
)
136138
}
137139

@@ -142,7 +144,7 @@ class OnBoardingViewModel @AssistedInject constructor(
142144
totalStep = 1,
143145
currentStep = 0,
144146
onBoardingSetType = OnBoardingSetType.NEW,
145-
userName = intent.userName
147+
userName = intent.userName,
146148
)
147149
}
148150

@@ -203,7 +205,7 @@ class OnBoardingViewModel @AssistedInject constructor(
203205
return currentState.copy(
204206
currentStep = 0,
205207
currentOnBoardingPageInfo = OnBoardingPageInfo.Intro,
206-
nextButtonEnable = true
208+
nextButtonEnable = true,
207209
)
208210
}
209211

‎presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingAbstractTemplate.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ fun OnBoardingAbstractTemplate(
7474
.fillMaxWidth()
7575
.zIndex(1f)
7676
.widthIn(min = 311.dp)
77-
.offset(y = 2.dp)
77+
.offset(y = 2.dp),
7878
)
7979

8080
Column(
8181
modifier = Modifier
8282
.fillMaxWidth()
8383
.ninePatchBackgroundNode(R.drawable.img_texture_rectangle_4)
8484
.padding(30.dp),
85-
verticalArrangement = Arrangement.spacedBy(13.dp)
85+
verticalArrangement = Arrangement.spacedBy(13.dp),
8686
) {
8787
Text(
8888
text = "${userName}님은 ...",
@@ -93,7 +93,7 @@ fun OnBoardingAbstractTemplate(
9393
onBoardingAbstractTexts.forEachIndexed { index, onBoardingAbstractTextItemList ->
9494
OnBoardingAbstractText(
9595
onBoardingAbstractTextList = onBoardingAbstractTextItemList,
96-
iconResourceId = getIndexIconResourceId(index)
96+
iconResourceId = getIndexIconResourceId(index),
9797
)
9898
}
9999
}
@@ -151,7 +151,7 @@ private fun OnBoardingAbstractText(
151151
UnderLinedText(
152152
text = annotatedString,
153153
dividerColor = BitnagilTheme.colors.coolGray90,
154-
modifier = Modifier.weight(1f)
154+
modifier = Modifier.weight(1f),
155155
)
156156
}
157157
}
@@ -160,7 +160,7 @@ private fun OnBoardingAbstractText(
160160
private fun UnderLinedText(
161161
text: AnnotatedString,
162162
dividerColor: Color,
163-
modifier: Modifier = Modifier
163+
modifier: Modifier = Modifier,
164164
) {
165165
var textLayoutResult by remember { mutableStateOf<TextLayoutResult?>(null) }
166166
val density = LocalDensity.current
@@ -176,7 +176,7 @@ private fun UnderLinedText(
176176
lineHeight = lineHeight,
177177
lineHeightStyle = LineHeightStyle(
178178
alignment = LineHeightStyle.Alignment.Center,
179-
trim = LineHeightStyle.Trim.None
179+
trim = LineHeightStyle.Trim.None,
180180
),
181181
),
182182
lineHeight = lineHeight,
@@ -200,7 +200,7 @@ private fun UnderLinedText(
200200
)
201201
}
202202
}
203-
}
203+
},
204204
)
205205
}
206206

@@ -242,7 +242,7 @@ private fun OnBoardingAbstractTemplatePreview() {
242242
text = "텍스트2",
243243
isBold = false,
244244
),
245-
)
245+
),
246246
),
247247
onDispose = {},
248248
onClickNextButton = {},

‎presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingIntroTemplate.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import androidx.compose.ui.res.painterResource
1616
import androidx.compose.ui.tooling.preview.Preview
1717
import androidx.compose.ui.unit.dp
1818
import com.threegap.bitnagil.designsystem.BitnagilTheme
19-
import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton
2019
import com.threegap.bitnagil.designsystem.R
20+
import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton
2121
import com.threegap.bitnagil.presentation.common.ninepatch.ninePatchBackgroundNode
2222

2323
@Composable
@@ -26,20 +26,20 @@ fun OnBoardingIntroTemplate(
2626
onClickNextButton: () -> Unit,
2727
) {
2828
Column(
29-
modifier = Modifier.padding(horizontal = 16.dp, vertical = 20.dp)
29+
modifier = Modifier.padding(horizontal = 16.dp, vertical = 20.dp),
3030
) {
3131
Spacer(modifier = Modifier.height(64.dp))
3232

3333
Text(
3434
text = "포모는 ${userName}님을 알고 싶어요!",
3535
style = BitnagilTheme.typography.title1Bold,
36-
color = BitnagilTheme.colors.coolGray10
36+
color = BitnagilTheme.colors.coolGray10,
3737
)
3838

3939
Spacer(modifier = Modifier.weight(1f))
4040

4141
Column(
42-
modifier = Modifier.fillMaxWidth()
42+
modifier = Modifier.fillMaxWidth(),
4343
) {
4444
Text(
4545
modifier = Modifier
@@ -67,7 +67,7 @@ fun OnBoardingIntroTemplate(
6767
.padding(horizontal = 27.dp, vertical = 20.dp),
6868
text = "얼마나 바깥 바람을 쐬고 싶은지",
6969
style = BitnagilTheme.typography.button1,
70-
color = BitnagilTheme.colors.coolGray10
70+
color = BitnagilTheme.colors.coolGray10,
7171
)
7272
}
7373

@@ -78,7 +78,7 @@ fun OnBoardingIntroTemplate(
7878
contentDescription = null,
7979
modifier = Modifier
8080
.widthIn(min = 263.dp)
81-
.align(Alignment.End)
81+
.align(Alignment.End),
8282
)
8383

8484
Spacer(modifier = Modifier.height(40.dp))

‎presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingPageInfo.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ sealed class OnBoardingPageInfo : Parcelable {
1414
data class ExistedOnBoardingAbstract(
1515
val prefix: String,
1616
@Stable val abstractTexts: List<List<OnBoardingAbstractTextItem>>,
17-
): OnBoardingPageInfo()
17+
) : OnBoardingPageInfo()
1818

1919
@Parcelize
2020
data class SelectOnBoarding(

‎presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/mvi/OnBoardingIntent.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sealed class OnBoardingIntent : MviIntent {
1313
data object SelectNext : OnBoardingIntent()
1414
data object SelectPrevious : OnBoardingIntent()
1515
data object NavigateToHome : OnBoardingIntent()
16-
data class LoadUserOnBoardingSuccess(val onBoardingAbstract: OnBoardingPageInfo.ExistedOnBoardingAbstract, val userName: String): OnBoardingIntent()
17-
data class LoadUserOnBoardingFailure(val message: String): OnBoardingIntent()
18-
data class LoadIntroSuccess(val userName: String): OnBoardingIntent()
16+
data class LoadUserOnBoardingSuccess(val onBoardingAbstract: OnBoardingPageInfo.ExistedOnBoardingAbstract, val userName: String) : OnBoardingIntent()
17+
data class LoadUserOnBoardingFailure(val message: String) : OnBoardingIntent()
18+
data class LoadIntroSuccess(val userName: String) : OnBoardingIntent()
1919
}

0 commit comments

Comments
 (0)