Skip to content

Commit 1a2b05c

Browse files
committed
CHORE: ktlint 적용
1 parent 80ce18c commit 1a2b05c

File tree

8 files changed

+22
-21
lines changed

8 files changed

+22
-21
lines changed

data/src/main/java/com/threegap/bitnagil/data/emotion/model/dto/EmotionRecommendedRoutineDto.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ data class EmotionRecommendedRoutineDto(
1515
@SerialName("recommendedSubRoutineSearchResult")
1616
val recommendedSubRoutineSearchResult: List<EmotionRecommendedSubRoutineDto>,
1717
) {
18-
fun toEmotionRecommendRoutine() : EmotionRecommendRoutine {
18+
fun toEmotionRecommendRoutine(): EmotionRecommendRoutine {
1919
return EmotionRecommendRoutine(
2020
routineId = recommendedRoutineId.toString(),
2121
routineName = recommendedRoutineName,

data/src/main/java/com/threegap/bitnagil/data/emotion/repositoryImpl/EmotionRepositoryImpl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class EmotionRepositoryImpl @Inject constructor(
3939

4040
return emotionDataSource.registerEmotion(selectedEmotion).map {
4141
it.recommendedRoutines.map {
42-
emotionRecommendedRoutineDto -> emotionRecommendedRoutineDto.toEmotionRecommendRoutine()
42+
emotionRecommendedRoutineDto ->
43+
emotionRecommendedRoutineDto.toEmotionRecommendRoutine()
4344
}
4445
}
4546
}

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ fun EmotionScreenContainer(
5858
}
5959
}
6060

61-
when(state.step) {
62-
EmotionScreenStep.Emotion -> EmotionScreen(
61+
when (state.step) {
62+
EmotionScreenStep.Emotion -> EmotionScreen(
6363
state = state,
6464
onClickPreviousButton = navigateToBack,
6565
onClickEmotion = viewModel::selectEmotion,
@@ -69,7 +69,7 @@ fun EmotionScreenContainer(
6969
onClickPreviousButton = viewModel::moveToPrev,
7070
onClickRoutine = viewModel::selectRecommendRoutine,
7171
onClickRegisterRecommendRoutines = viewModel::registerRecommendRoutines,
72-
onClickSkip = navigateToBack
72+
onClickSkip = navigateToBack,
7373
)
7474
}
7575
}
@@ -164,7 +164,6 @@ private fun EmotionRecommendRoutineScreen(
164164
style = BitnagilTheme.typography.title2Bold,
165165
)
166166

167-
168167
Spacer(modifier = Modifier.height(10.dp))
169168

170169
Text(
@@ -173,7 +172,6 @@ private fun EmotionRecommendRoutineScreen(
173172
style = BitnagilTheme.typography.body2Medium,
174173
)
175174

176-
177175
Spacer(modifier = Modifier.height(28.dp))
178176

179177
val scrollState = rememberScrollState()
@@ -249,8 +247,8 @@ private fun EmotionRecommendRoutineScreenPreview() {
249247
name = "루틴 이름",
250248
description = "루틴 설명",
251249
selected = true,
252-
)
253-
)
250+
),
251+
),
254252
),
255253
onClickPreviousButton = {},
256254
onClickRoutine = {},

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class EmotionViewModel @Inject constructor(
135135
viewModelScope.launch {
136136
val currentState = stateFlow.value
137137

138-
when(currentState.step) {
138+
when (currentState.step) {
139139
EmotionScreenStep.Emotion -> sendIntent(EmotionIntent.NavigateToBack)
140140
EmotionScreenStep.RecommendRoutines -> sendIntent(EmotionIntent.BackToSelectEmotionStep)
141141
}

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionRecommendRoutineUiModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ data class EmotionRecommendRoutineUiModel(
1313
) : Parcelable {
1414
companion object {
1515
fun fromEmotionRecommendRoutine(
16-
emotionRecommendRoutine: EmotionRecommendRoutine
17-
) : EmotionRecommendRoutineUiModel {
16+
emotionRecommendRoutine: EmotionRecommendRoutine,
17+
): EmotionRecommendRoutineUiModel {
1818
return EmotionRecommendRoutineUiModel(
1919
id = emotionRecommendRoutine.routineId,
2020
name = emotionRecommendRoutine.routineName,

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionIntent.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ sealed class EmotionIntent : MviIntent {
88
data class EmotionListLoadSuccess(val emotions: List<Emotion>) : EmotionIntent()
99
data class RegisterEmotionSuccess(val recommendRoutines: List<EmotionRecommendRoutineUiModel>) : EmotionIntent()
1010
data object RegisterEmotionLoading : EmotionIntent()
11-
data object RegisterRecommendRoutinesLoading: EmotionIntent()
12-
data object RegisterRecommendRoutinesSuccess: EmotionIntent()
13-
data object RegisterRecommendRoutinesFailure: EmotionIntent()
14-
data object BackToSelectEmotionStep: EmotionIntent()
11+
data object RegisterRecommendRoutinesLoading : EmotionIntent()
12+
data object RegisterRecommendRoutinesSuccess : EmotionIntent()
13+
data object RegisterRecommendRoutinesFailure : EmotionIntent()
14+
data object BackToSelectEmotionStep : EmotionIntent()
1515
data class SelectRecommendRoutine(val recommendRoutineId: String) : EmotionIntent()
16-
data object NavigateToBack: EmotionIntent()
16+
data object NavigateToBack : EmotionIntent()
1717
}

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data class EmotionState(
1919
val Init = EmotionState(
2020
emotions = emptyList(),
2121
isLoading = true,
22-
step = EmotionScreenStep.Emotion
22+
step = EmotionScreenStep.Emotion,
2323
)
2424
}
2525

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,11 @@ fun OnBoardingScreenPreview() {
131131
OnBoardingScreen(
132132
state = OnBoardingState.Idle(
133133
nextButtonEnable = false,
134-
currentOnBoardingPageInfo = OnBoardingPageInfo.RecommendRoutines(listOf(
135-
OnBoardingItem("1", "루틴명", "세부 루틴 한 줄 설명", null),
136-
)),
134+
currentOnBoardingPageInfo = OnBoardingPageInfo.RecommendRoutines(
135+
listOf(
136+
OnBoardingItem("1", "루틴명", "세부 루틴 한 줄 설명", null),
137+
),
138+
),
137139
totalStep = 5,
138140
currentStep = 1,
139141
onBoardingSetType = OnBoardingSetType.RESET,

0 commit comments

Comments
 (0)