Skip to content

Commit b3ea5cd

Browse files
committed
CHORE: ktlint 적용
1 parent 55e0863 commit b3ea5cd

5 files changed

Lines changed: 14 additions & 15 deletions

File tree

presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/dpToPx.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/DpToPx.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ import androidx.compose.runtime.Composable
44
import androidx.compose.ui.platform.LocalDensity
55
import androidx.compose.ui.unit.Dp
66

7-
87
@Composable
98
fun Dp.dpToPx() = with(LocalDensity.current) { this@dpToPx.toPx() }

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/EmotionMarbleImage.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import com.threegap.bitnagil.presentation.emotion.model.EmotionImageUiModel
1212

1313
@Composable
1414
fun EmotionMarbleImage(
15-
modifier: Modifier,
16-
image: EmotionImageUiModel,
17-
contentDescription: String? = null,
18-
alpha: Float = 1f,
15+
modifier: Modifier,
16+
image: EmotionImageUiModel,
17+
contentDescription: String? = null,
18+
alpha: Float = 1f,
1919
) {
2020
when (image) {
2121
is EmotionImageUiModel.Url -> {

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SimpleEmotionSelectionScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fun SimpleEmotionSelectionScreen(
4848

4949
Box(
5050
modifier = Modifier.fillMaxHeight(),
51-
contentAlignment = Alignment.Center
51+
contentAlignment = Alignment.Center,
5252
) {
5353
LazyVerticalGrid(
5454
columns = GridCells.Fixed(3),

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/SwipeEmotionSelectionScreen.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ fun SwipeEmotionSelectionScreen(
124124
EmotionMarbleImage(
125125
modifier = Modifier.size(40.dp),
126126
image = emotion.image,
127-
alpha = if (emotion.emotionType == currentItem.emotionType) 1f else 0.3f
127+
alpha = if (emotion.emotionType == currentItem.emotionType) 1f else 0.3f,
128128
)
129129
}
130130
}
@@ -135,7 +135,7 @@ fun SwipeEmotionSelectionScreen(
135135
emotion = currentItem,
136136
showText = showText,
137137
enterTransition = fadeInTransition,
138-
exitTransition = fadeOutTransition
138+
exitTransition = fadeOutTransition,
139139
)
140140

141141
Spacer(modifier = Modifier.height(16.dp))
@@ -197,7 +197,7 @@ private fun EmotionDescriptionText(
197197
exitTransition: ExitTransition,
198198
) {
199199
Box(
200-
modifier = Modifier.height(102.dp)
200+
modifier = Modifier.height(102.dp),
201201
) {
202202
AnimatedVisibility(
203203
visible = emotion.message != null && showText,
@@ -247,7 +247,7 @@ private fun GestureDescriptionText(
247247
) {
248248
if (currentEmotionSelectable) {
249249
Column(
250-
horizontalAlignment = Alignment.CenterHorizontally
250+
horizontalAlignment = Alignment.CenterHorizontally,
251251
) {
252252
Text("선택한 감정 구슬을 아래로 놓아주세요", style = BitnagilTheme.typography.body2Medium.copy(color = BitnagilTheme.colors.coolGray50))
253253

@@ -262,7 +262,7 @@ private fun GestureDescriptionText(
262262
} else {
263263
Row(
264264
horizontalArrangement = Arrangement.spacedBy(26.dp),
265-
verticalAlignment = Alignment.CenterVertically
265+
verticalAlignment = Alignment.CenterVertically,
266266
) {
267267
Image(
268268
painter = painterResource(R.drawable.ic_double_left_arrow_24),
@@ -401,7 +401,7 @@ private fun EmotionPagerItem(
401401

402402
offsetY.animateTo(
403403
targetValue = targetOffsetY,
404-
animationSpec = tween(durationMillis = 300)
404+
animationSpec = tween(durationMillis = 300),
405405
)
406406
}
407407
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ data class EmotionUiModel(
2121
emotionMarbleName = emotion.emotionMarbleName,
2222
image = EmotionImageUiModel.Url(
2323
url = emotion.imageUrl,
24-
offlineBackupImageResourceId = getOfflineBackupImageResourceId(emotion.emotionType)
24+
offlineBackupImageResourceId = getOfflineBackupImageResourceId(emotion.emotionType),
2525
),
2626
message = getMessage(emotion.emotionType),
2727
symbolBackgroundColor = getSymbolBackgroundColorString(emotion.emotionType),
28-
symbolColor = getSymbolColorString(emotion.emotionType)
28+
symbolColor = getSymbolColorString(emotion.emotionType),
2929
)
3030

3131
private fun getOfflineBackupImageResourceId(emotionType: String): Int? {
@@ -83,7 +83,7 @@ data class EmotionUiModel(
8383
selectable = false,
8484
message = "오늘 기분 어때요?\n기록해 두면 내 루틴에 도움 돼요!",
8585
symbolBackgroundColor = 0xFFEAEBEC,
86-
symbolColor = 0xFF171719
86+
symbolColor = 0xFF171719,
8787
)
8888
}
8989
}

0 commit comments

Comments
 (0)