[MOD/#309] 변수명 수정 및 NULL_DATE 상수화

teamterning · Dec 20, 2024 · 26a9bb5 · 26a9bb5
1 parent 4222935
commit 26a9bb5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/feature/home/src/main/java/com/terning/feature/home/component/HomeFilteringBottomSheet.kt b/feature/home/src/main/java/com/terning/feature/home/component/HomeFilteringBottomSheet.kt
@@ -67,17 +67,17 @@ fun HomeFilteringBottomSheet(
     // todo: year와 month의 서버통신 값이 null이면 true로 넣어주세요!
     var isCheckBoxChecked by remember { mutableStateOf(false) }
 
-    var isFirstNullAndFirstChange by remember { mutableStateOf(false) }
+    var isInitialNullState by remember { mutableStateOf(false) }
 
     val yearsList by remember(isYearNull) {
         mutableStateOf(
-            if (isYearNull || isFirstNullAndFirstChange) years + "-"
+            if (isYearNull || isInitialNullState) years + NULL_DATE
             else years
         )
     }
     val monthsList by remember(isMonthNull) {
         mutableStateOf(
-            if (isMonthNull || isFirstNullAndFirstChange) months + "-"
+            if (isMonthNull || isInitialNullState) months + NULL_DATE
             else months
         )
     }
@@ -167,31 +167,30 @@ fun HomeFilteringBottomSheet(
                     modifier = Modifier.padding(start = 20.dp)
                 )
 
-                //  todo: null 처리 제대로
                 HomeYearMonthPicker(
                     chosenYear = defaultStartYear ?: Calendar.getInstance().currentYear,
                     chosenMonth = defaultStartMonth ?: Calendar.getInstance().currentMonth,
-                    onYearChosen = { year, isFirst ->
+                    onYearChosen = { year, isInitialSelection ->
                         if (year != null) {
                             currentStartYear = year
                             isCheckBoxChecked = false
                             isYearNull = false
-                            isFirstNullAndFirstChange = isFirst
+                            isInitialNullState = isInitialSelection
                         }
                     },
-                    onMonthChosen = { month, isFirst ->
+                    onMonthChosen = { month, isInitialSelection ->
                         if (month != null) {
                             currentStartMonth = month
                             isCheckBoxChecked = false
                             isMonthNull = false
-                            isFirstNullAndFirstChange = isFirst
+                            isInitialNullState = isInitialSelection
                         }
                     },
                     isYearNull = isYearNull,
                     isMonthNull = isMonthNull,
                     yearsList = yearsList,
                     monthsList = monthsList,
-                    isFirstNullAndFirstChange = isFirstNullAndFirstChange
+                    isInitialNullState = isInitialNullState
                 )
 
                 RoundButton(

diff --git a/feature/home/src/main/java/com/terning/feature/home/component/HomeYearMonthPicker.kt b/feature/home/src/main/java/com/terning/feature/home/component/HomeYearMonthPicker.kt
@@ -46,6 +46,8 @@ val years = (START_YEAR..END_YEAR).map { "${it}년" }.toImmutableList()
 
 val months = (START_MONTH..END_MONTH).map { "${it}월" }.toImmutableList()
 
+const val NULL_DATE = "-"
+
 class PickerState {
     var selectedItem by mutableStateOf("")
 }
@@ -64,16 +66,16 @@ fun HomeYearMonthPicker(
     isMonthNull: Boolean,
     yearsList: List<String>,
     monthsList: List<String>,
-    isFirstNullAndFirstChange: Boolean
+    isInitialNullState: Boolean
 ) {
     val yearPickerState = rememberPickerState()
     val monthPickerState = rememberPickerState()
 
-    var isFirst = isFirstNullAndFirstChange
+    var isInitialSelection by remember { mutableStateOf(isInitialNullState) }
 
     val startYearIndex =
         if (isYearNull) yearsList.lastIndex else yearsList.indexOf("${chosenYear ?: "-"}년")
-        .takeIf { it >= 0 } ?: 0
+            .takeIf { it >= 0 } ?: 0
 
     val startMonthIndex =
         if (isMonthNull) monthsList.lastIndex else monthsList.indexOf("${chosenMonth ?: "-"}월")
@@ -91,8 +93,11 @@ fun HomeYearMonthPicker(
             items = yearsList,
             startIndex = startYearIndex,
             onItemSelected = { year ->
-                if (year == "-" && !isFirst) isFirst = true
-                onYearChosen(if (year == "-") null else year.dropLast(1).toInt(), isFirst)
+                if (year == NULL_DATE && !isInitialSelection) isInitialSelection = true
+                onYearChosen(
+                    if (year == NULL_DATE) null else year.dropLast(1).toInt(),
+                    isInitialSelection
+                )
             }
         )
         Spacer(modifier = Modifier.width(18.dp))
@@ -102,8 +107,11 @@ fun HomeYearMonthPicker(
             items = monthsList,
             startIndex = startMonthIndex,
             onItemSelected = { month ->
-                if (month == "-" && !isFirst) isFirst = true
-                onMonthChosen(if (month == "-") null else month.dropLast(1).toInt(), isFirst)
+                if (month == NULL_DATE && !isInitialSelection) isInitialSelection = true
+                onMonthChosen(
+                    if (month == NULL_DATE) null else month.dropLast(1).toInt(),
+                    isInitialSelection
+                )
             }
         )
     }
@@ -138,7 +146,7 @@ fun DatePicker(
         snapshotFlow { scrollState.firstVisibleItemIndex }
             .map { index ->
                 var newItem = items
-                if (isNullSize) newItem = items + "-"
+                if (isNullSize) newItem = items + NULL_DATE
                 newItem.getOrNull(index)
             }
             .distinctUntilChanged()