From b7d263ca0d188d6d03c839dafbcf1b86e2f53969 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 4 Sep 2024 07:26:33 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT/#218]=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filtering/filteringthree/FilteringThreeRoute.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt b/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt index 2a872fe94..6e19a291a 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -48,8 +49,6 @@ fun FilteringThreeRoute( with(viewModel) { updateGrade(grade = grade) updateWorkingPeriod(workingPeriod = workingPeriod) - updateStartYear(startYear = Calendar.getInstance().currentYear) - updateStartMonth(startMonth = Calendar.getInstance().currentMonth) } } @@ -73,8 +72,8 @@ fun FilteringThreeRoute( FilteringThreeScreen( navigateUp = viewModel::navigateUp, - chosenYear = state.startYear, - chosenMonth = state.startMonth, + chosenYear = Calendar.getInstance().currentYear, + chosenMonth = Calendar.getInstance().currentMonth, onNextClick = viewModel::postFilteringWithServer, onYearChosen = { viewModel.updateStartYear(it) }, onMonthChosen = { viewModel.updateStartMonth(it) } @@ -124,14 +123,14 @@ fun FilteringThreeScreen( start = 24.dp, ) ) - Spacer(modifier = Modifier.weight(1f)) + Spacer(modifier = Modifier.height(61.dp)) YearMonthPicker( chosenYear = chosenYear, chosenMonth = chosenMonth, onYearChosen = { onYearChosen(it) }, onMonthChosen = { onMonthChosen(it) }, ) - Spacer(modifier = Modifier.weight(7f)) + Spacer(modifier = Modifier.weight(1f)) RectangleButton( style = TerningTheme.typography.button0, paddingVertical = 20.dp,