Skip to content

Commit

Permalink
[MOD/#204] 데이트피커 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
Hyobeen-Park committed Sep 9, 2024
1 parent a4b1cab commit f3ba7bc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.flowWithLifecycle
import androidx.navigation.NavHostController
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.terning.core.designsystem.component.bottomsheet.HomeFilteringBottomSheet
import com.terning.feature.home.home.component.HomeFilteringBottomSheet
import com.terning.core.designsystem.component.bottomsheet.SortingBottomSheet
import com.terning.core.designsystem.component.button.SortingButton
import com.terning.core.designsystem.component.image.TerningImage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.terning.core.designsystem.component.bottomsheet
package com.terning.feature.home.home.component

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
Expand All @@ -22,16 +22,17 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.terning.core.R
import com.terning.core.designsystem.component.bottomsheet.TerningBasicBottomSheet
import com.terning.core.designsystem.component.button.ChangeFilterButton
import com.terning.core.designsystem.component.button.RoundButton
import com.terning.core.designsystem.component.datepicker.DatePickerUI
import com.terning.core.designsystem.theme.Black
import com.terning.core.designsystem.theme.Grey200
import com.terning.core.designsystem.theme.TerningTheme
import com.terning.core.extension.currentMonth
import com.terning.core.extension.currentYear
import com.terning.core.type.Grade
import com.terning.core.type.WorkingPeriod
import com.terning.feature.filtering.filteringthree.component.YearMonthPicker
import java.util.Calendar

@OptIn(ExperimentalMaterial3Api::class)
Expand Down Expand Up @@ -123,14 +124,13 @@ fun HomeFilteringBottomSheet(
.padding(top = 32.dp, bottom = 49.dp)
)

DatePickerUI(
YearMonthPicker(
chosenYear = defaultStartYear ?: Calendar.getInstance().currentYear,
chosenMonth = defaultStartMonth?.minus(1)
?: Calendar.getInstance().currentMonth.minus(1),
onYearChosen = { currentStartYear = it },
onMonthChosen = { currentStartMonth = it },
onMonthChosen = { currentStartMonth = it }
)

RoundButton(
style = TerningTheme.typography.button0,
paddingVertical = 19.dp,
Expand Down

0 comments on commit f3ba7bc

Please sign in to comment.