File tree Expand file tree Collapse file tree 5 files changed +16
-15
lines changed
presentation/src/main/java/com/threegap/bitnagil/presentation
routinelist/component/template Expand file tree Collapse file tree 5 files changed +16
-15
lines changed Original file line number Diff line number Diff line change @@ -2,8 +2,8 @@ package com.threegap.bitnagil.presentation.common.extension
22
33import com.threegap.bitnagil.domain.routine.model.DayOfWeek
44
5- fun DayOfWeek.displayTitle () : String =
6- when (this ) {
5+ val DayOfWeek .displayTitle: String
6+ get() = when (this ) {
77 DayOfWeek .MONDAY -> " 월"
88 DayOfWeek .TUESDAY -> " 화"
99 DayOfWeek .WEDNESDAY -> " 수"
@@ -13,8 +13,9 @@ fun DayOfWeek.displayTitle(): String =
1313 DayOfWeek .SUNDAY -> " 일"
1414 }
1515
16- fun List<DayOfWeek>.displayTitle (): String {
17- if (this .isEmpty()) return " x"
18- return this .sortedBy { it.ordinal }
19- .joinToString(" , " ) { it.displayTitle() }
20- }
16+ val List <DayOfWeek >.displayTitle: String
17+ get() {
18+ if (this .isEmpty()) return " x"
19+ return this .sortedBy { it.ordinal }
20+ .joinToString(" , " ) { it.displayTitle }
21+ }
Original file line number Diff line number Diff line change @@ -2,15 +2,15 @@ package com.threegap.bitnagil.presentation.common.extension
22
33import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel
44
5- fun RecommendLevel.displayLevel () : String =
6- when (this ) {
5+ val RecommendLevel .displayLevel: String
6+ get() = when (this ) {
77 RecommendLevel .LEVEL1 -> " 하"
88 RecommendLevel .LEVEL2 -> " 중"
99 RecommendLevel .LEVEL3 -> " 상"
1010 }
1111
12- fun RecommendLevel.displayTitle () : String =
13- when (this ) {
12+ val RecommendLevel .displayTitle: String
13+ get() = when (this ) {
1414 RecommendLevel .LEVEL1 -> " 가볍게 할 수 있어요"
1515 RecommendLevel .LEVEL2 -> " 조금 신경써서 할 수 있어요"
1616 RecommendLevel .LEVEL3 -> " 의지를 다 잡고 할 수 있어요"
Original file line number Diff line number Diff line change @@ -155,7 +155,7 @@ private fun RecommendRoutineScreen(
155155 .clickableWithoutRipple { onShowDifficultyBottomSheet() },
156156 ) {
157157 Text (
158- text = " 난이도 ${uiState.selectedRecommendLevel?.displayLevel() ? : " 선택" } " ,
158+ text = " 난이도 ${uiState.selectedRecommendLevel?.displayLevel ? : " 선택" } " ,
159159 color = BitnagilTheme .colors.coolGray40,
160160 style = BitnagilTheme .typography.body2Medium,
161161 modifier = Modifier .padding(start = 10 .dp),
Original file line number Diff line number Diff line change @@ -49,8 +49,8 @@ fun RecommendLevelBottomSheet(
4949 ) {
5050 RecommendLevel .entries.forEachIndexed { index, recommendLevel ->
5151 LevelOption (
52- optionLevel = recommendLevel.displayLevel() ,
53- optionText = recommendLevel.displayTitle() ,
52+ optionLevel = recommendLevel.displayLevel,
53+ optionText = recommendLevel.displayTitle,
5454 isSelected = selectedRecommendLevel == recommendLevel,
5555 onClick = {
5656 val newLevel = if (selectedRecommendLevel == recommendLevel) null else recommendLevel
Original file line number Diff line number Diff line change @@ -132,7 +132,7 @@ fun RoutineDetailsCard(
132132 verticalArrangement = Arrangement .spacedBy(2 .dp),
133133 ) {
134134 Text (
135- text = " 반복: ${routine.repeatDay.displayTitle() } " ,
135+ text = " 반복: ${routine.repeatDay.displayTitle} " ,
136136 color = BitnagilTheme .colors.coolGray40,
137137 style = infoTextStyle,
138138 )
You can’t perform that action at this time.
0 commit comments