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 index 03c8b573..d0b5522a 100644 --- 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 @@ -156,8 +156,8 @@ fun HomeFilteringBottomSheet( // todo: null 처리 제대로 HomeYearMonthPicker( - chosenYear = if (isYearNull) null else currentStartYear, - chosenMonth = if (isMonthNull) null else currentStartMonth, + chosenYear = defaultStartYear ?: Calendar.getInstance().currentYear, + chosenMonth = defaultStartMonth ?: Calendar.getInstance().currentMonth, onYearChosen = { year, isNull -> isYearNull = isNull if (year != null) { 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 index 06bfd993..6ba8a821 100644 --- 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 @@ -55,6 +55,7 @@ class PickerState { @Composable fun rememberPickerState() = remember { PickerState() } + @Composable fun HomeYearMonthPicker( modifier: Modifier = Modifier,