From 710ddb5726c283122724b05709c27822bfbcf810 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Thu, 12 Sep 2024 03:10:33 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[FIX/#238]=20=ED=95=84=ED=84=B0=EB=A7=81=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/terning/core/type/Grade.kt | 3 ++ .../com/terning/core/type/WorkingPeriod.kt | 3 ++ .../data/dto/request/FilteringRequestDto.kt | 4 +-- .../domain/entity/filtering/Filtering.kt | 4 +-- .../filteringone/FilteringOneRoute.kt | 21 ++++++------- .../filteringone/FilteringOneSideEffect.kt | 1 + .../filteringone/FilteringOneState.kt | 2 +- .../filteringone/FilteringOneViewModel.kt | 11 ++++++- .../component/StatusOneRadioGroup.kt | 13 ++++---- .../filteringthree/FilteringThreeRoute.kt | 4 +-- .../filteringthree/FilteringThreeState.kt | 4 +-- .../filteringthree/FilteringThreeViewModel.kt | 7 +++-- .../navigation/FilteringThreeNavigation.kt | 8 ++--- .../filteringtwo/FilteringTwoRoute.kt | 30 +++++++++++-------- .../filteringtwo/FilteringTwoSideEffect.kt | 2 ++ .../filteringtwo/FilteringTwoState.kt | 2 +- .../filteringtwo/FilteringTwoViewModel.kt | 12 +++++++- .../component/StatusTwoRadioGroup.kt | 11 +++---- .../navigation/FilteringTwoNavigation.kt | 4 +-- 19 files changed, 91 insertions(+), 55 deletions(-) diff --git a/core/src/main/java/com/terning/core/type/Grade.kt b/core/src/main/java/com/terning/core/type/Grade.kt index 99fef5432..81a976739 100644 --- a/core/src/main/java/com/terning/core/type/Grade.kt +++ b/core/src/main/java/com/terning/core/type/Grade.kt @@ -20,5 +20,8 @@ enum class Grade( "senior" -> SENIOR else -> FRESHMAN } + + fun toIndex(grade: Grade): Int = + Grade.entries.indexOf(grade) } } \ No newline at end of file diff --git a/core/src/main/java/com/terning/core/type/WorkingPeriod.kt b/core/src/main/java/com/terning/core/type/WorkingPeriod.kt index d7a7328c8..99e476b2a 100644 --- a/core/src/main/java/com/terning/core/type/WorkingPeriod.kt +++ b/core/src/main/java/com/terning/core/type/WorkingPeriod.kt @@ -18,5 +18,8 @@ enum class WorkingPeriod( "long" -> LONG else -> SHORT } + + fun toIndex(workingPeriod: WorkingPeriod): Int = + WorkingPeriod.entries.indexOf(workingPeriod) } } \ No newline at end of file diff --git a/data/src/main/java/com/terning/data/dto/request/FilteringRequestDto.kt b/data/src/main/java/com/terning/data/dto/request/FilteringRequestDto.kt index df9012860..d0ba0abe3 100644 --- a/data/src/main/java/com/terning/data/dto/request/FilteringRequestDto.kt +++ b/data/src/main/java/com/terning/data/dto/request/FilteringRequestDto.kt @@ -6,9 +6,9 @@ import kotlinx.serialization.Serializable @Serializable data class FilteringRequestDto( @SerialName("grade") - val grade: Int, + val grade: String, @SerialName("workingPeriod") - val workingPeriod: Int, + val workingPeriod: String, @SerialName("startYear") val startYear: Int, @SerialName("startMonth") diff --git a/domain/src/main/java/com/terning/domain/entity/filtering/Filtering.kt b/domain/src/main/java/com/terning/domain/entity/filtering/Filtering.kt index c1db28c06..113dd46a3 100644 --- a/domain/src/main/java/com/terning/domain/entity/filtering/Filtering.kt +++ b/domain/src/main/java/com/terning/domain/entity/filtering/Filtering.kt @@ -1,8 +1,8 @@ package com.terning.domain.entity.filtering data class Filtering( - val grade: Int, - val workingPeriod: Int, + val grade: String, + val workingPeriod: String, val startYear: Int, val startMonth: Int ) \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt index 930e81fb7..e3cd9d226 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt @@ -32,7 +32,7 @@ import com.terning.feature.filtering.filteringone.component.StatusOneRadioGroup @Composable fun FilteringOneRoute( name: String, - onNextClick: (Int) -> Unit, + onNextClick: (String) -> Unit, navigateUp: () -> Unit, paddingValues: PaddingValues, viewModel: FilteringOneViewModel = hiltViewModel(), @@ -46,16 +46,17 @@ fun FilteringOneRoute( .collect { sideEffect -> when (sideEffect) { is FilteringOneSideEffect.NavigateUp -> navigateUp() + is FilteringOneSideEffect.NavigateToFilteringTwo -> onNextClick(sideEffect.grade) } } } FilteringOneScreen( name = name, - onButtonClick = { index -> - viewModel.updateGradeAndButton(index) + onButtonClick = { grade -> + viewModel.updateGradeAndButton(grade) }, - onNextClick = onNextClick, + onNextClick = viewModel::navigateToFilteringTwo, navigateUp = viewModel::navigateUp, buttonState = state.isButtonValid, gradeState = state.grade, @@ -66,11 +67,11 @@ fun FilteringOneRoute( @Composable fun FilteringOneScreen( name: String, - onNextClick: (Int) -> Unit, + onNextClick: (String) -> Unit, navigateUp: () -> Unit, - onButtonClick: (Int) -> Unit, + onButtonClick: (String) -> Unit, buttonState: Boolean, - gradeState: Int, + gradeState: String, paddingValues: PaddingValues = PaddingValues(), ) { Column( @@ -117,8 +118,8 @@ fun FilteringOneScreen( ) ) StatusOneRadioGroup( - onButtonClick = { index -> - onButtonClick(index) + onButtonClick = { grade -> + onButtonClick(grade) } ) Text( @@ -152,7 +153,7 @@ fun FilteringOneScreenPreview() { onNextClick = {}, navigateUp = {}, buttonState = true, - gradeState = 1 + gradeState = "freshman" ) } } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneSideEffect.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneSideEffect.kt index 5fdbaaaa6..ac9a6343f 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneSideEffect.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneSideEffect.kt @@ -2,4 +2,5 @@ package com.terning.feature.filtering.filteringone sealed class FilteringOneSideEffect { data object NavigateUp : FilteringOneSideEffect() + data class NavigateToFilteringTwo(val grade: String) : FilteringOneSideEffect() } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneState.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneState.kt index 06c28b481..72c5ba11c 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneState.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneState.kt @@ -2,5 +2,5 @@ package com.terning.feature.filtering.filteringone data class FilteringOneState( val isButtonValid: Boolean = false, - val grade: Int = -1 + val grade: String = "" ) \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneViewModel.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneViewModel.kt index 93829d006..60704bd02 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneViewModel.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneViewModel.kt @@ -18,7 +18,7 @@ class FilteringOneViewModel : ViewModel() { private val _sideEffects = MutableSharedFlow() val sideEffects: SharedFlow get() = _sideEffects.asSharedFlow() - fun updateGradeAndButton(grade: Int) { + fun updateGradeAndButton(grade: String) { _state.value = _state.value.copy( grade = grade, isButtonValid = true @@ -27,4 +27,13 @@ class FilteringOneViewModel : ViewModel() { fun navigateUp() = viewModelScope.launch { _sideEffects.emit(FilteringOneSideEffect.NavigateUp) } + + fun navigateToFilteringTwo(grade: String) = + viewModelScope.launch { + _sideEffects.emit( + FilteringOneSideEffect.NavigateToFilteringTwo( + grade + ) + ) + } } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt index 80608aa73..c0c537db2 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt @@ -13,18 +13,19 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.terning.core.designsystem.component.button.FilteringButton +import com.terning.core.type.Grade import com.terning.feature.R @Composable fun StatusOneRadioGroup( - onButtonClick: (Int) -> Unit, + onButtonClick: (String) -> Unit, modifier: Modifier = Modifier, ) { val options = listOf( - R.string.filtering_status1_button1, - R.string.filtering_status1_button2, - R.string.filtering_status1_button3, - R.string.filtering_status1_button4 + Grade.FRESHMAN.stringResId, + Grade.SOPHOMORE.stringResId, + Grade.JUNIOR.stringResId, + Grade.SENIOR.stringResId ) val selectedOptions = listOf( @@ -52,7 +53,7 @@ fun StatusOneRadioGroup( selectedIndex.intValue = option selectedButton.indices.forEach { i -> selectedButton[i] = false } selectedButton[index] = true - onButtonClick(index) + onButtonClick(Grade.entries[index].stringValue) }, cornerRadius = 15.dp, paddingVertical = 14.dp 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 09ef94e01..59a24ebd6 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 @@ -37,8 +37,8 @@ import java.util.Calendar @Composable fun FilteringThreeRoute( - grade: Int, - workingPeriod: Int, + grade: String, + workingPeriod: String, navigateUp: () -> Unit, navigateToStartHome: () -> Unit, paddingValues: PaddingValues, diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeState.kt b/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeState.kt index d907353f9..78334b856 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeState.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeState.kt @@ -1,8 +1,8 @@ package com.terning.feature.filtering.filteringthree data class FilteringThreeState( - val grade: Int = -1, - val workingPeriod: Int = -1, + val grade: String = "", + val workingPeriod: String = "", val startYear: Int = -1, val startMonth: Int = -1 ) \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeViewModel.kt b/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeViewModel.kt index 9c31c3c86..85263f4f7 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeViewModel.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeViewModel.kt @@ -28,11 +28,11 @@ class FilteringThreeViewModel @Inject constructor( private val _sideEffects = MutableSharedFlow() val sideEffects: SharedFlow get() = _sideEffects.asSharedFlow() - fun updateGrade(grade: Int) { + fun updateGrade(grade: String) { _state.value = _state.value.copy(grade = grade) } - fun updateWorkingPeriod(workingPeriod: Int) { + fun updateWorkingPeriod(workingPeriod: String) { _state.value = _state.value.copy(workingPeriod = workingPeriod) } @@ -64,6 +64,7 @@ class FilteringThreeViewModel @Inject constructor( } } - fun navigateUp() = viewModelScope.launch { _sideEffects.emit(FilteringThreeSideEffect.NavigateUp) } + fun navigateUp() = + viewModelScope.launch { _sideEffects.emit(FilteringThreeSideEffect.NavigateUp) } } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringthree/navigation/FilteringThreeNavigation.kt b/feature/src/main/java/com/terning/feature/filtering/filteringthree/navigation/FilteringThreeNavigation.kt index 448a71d78..d1213c9bd 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringthree/navigation/FilteringThreeNavigation.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringthree/navigation/FilteringThreeNavigation.kt @@ -13,8 +13,8 @@ import com.terning.feature.filtering.starthome.navigation.navigateStartHome import kotlinx.serialization.Serializable fun NavController.navigateFilteringThree( - grade: Int, - workingPeriod: Int, + grade: String, + workingPeriod: String, navOptions: NavOptions? = null ) { navigate( @@ -41,6 +41,6 @@ fun NavGraphBuilder.filteringThreeNavGraph( @Serializable data class FilteringThree( - val grade: Int, - val workingPeriod: Int + val grade: String, + val workingPeriod: String ) : Route \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt index 21361bdb5..2f4dc26fc 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt @@ -31,8 +31,8 @@ import com.terning.feature.filtering.filteringtwo.component.StatusTwoRadioGroup @Composable fun FilteringTwoRoute( - grade: Int, - onNextClick: (Int, Int) -> Unit, + grade: String, + onNextClick: (String, String) -> Unit, navigateUp: () -> Unit, paddingValues: PaddingValues, viewModel: FilteringTwoViewModel = hiltViewModel(), @@ -46,16 +46,20 @@ fun FilteringTwoRoute( .collect { sideEffect -> when (sideEffect) { is FilteringTwoSideEffect.NavigateUp -> navigateUp() + is FilteringTwoSideEffect.NavigateToFilteringThree -> onNextClick( + sideEffect.grade, + sideEffect.workingPeriod + ) } } } FilteringTwoScreen( grade = grade, - onNextClick = onNextClick, + onNextClick = viewModel::navigateToFilteringThree, navigateUp = viewModel::navigateUp, - onButtonClick = { index -> - viewModel.updateWorkingPeriodAndButton(index) + onButtonClick = { workingPeriod -> + viewModel.updateWorkingPeriodAndButton(workingPeriod) }, buttonState = state.isButtonValid, workingPeriod = state.workingPeriod, @@ -65,12 +69,12 @@ fun FilteringTwoRoute( @Composable fun FilteringTwoScreen( - grade: Int, - onNextClick: (Int, Int) -> Unit, + grade: String, + onNextClick: (String, String) -> Unit, navigateUp: () -> Unit, - onButtonClick: (Int) -> Unit, + onButtonClick: (String) -> Unit, buttonState: Boolean, - workingPeriod: Int, + workingPeriod: String, paddingValues: PaddingValues = PaddingValues(), ) { Column( @@ -111,8 +115,8 @@ fun FilteringTwoScreen( ) ) StatusTwoRadioGroup( - onButtonClick = { index -> - onButtonClick(index) + onButtonClick = { workingPeriod -> + onButtonClick(workingPeriod) } ) Spacer(modifier = Modifier.weight(1f)) @@ -133,12 +137,12 @@ fun FilteringTwoScreen( fun FilteringTwoScreenPreview() { TerningPointTheme { FilteringTwoScreen( - grade = 1, + grade = "freshman", onNextClick = { _, _ -> }, navigateUp = { }, onButtonClick = { }, buttonState = true, - workingPeriod = 1 + workingPeriod = "short" ) } } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoSideEffect.kt b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoSideEffect.kt index a858577c1..cb22f3e42 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoSideEffect.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoSideEffect.kt @@ -2,4 +2,6 @@ package com.terning.feature.filtering.filteringtwo sealed class FilteringTwoSideEffect { data object NavigateUp : FilteringTwoSideEffect() + data class NavigateToFilteringThree(val grade: String, val workingPeriod: String) : + FilteringTwoSideEffect() } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoState.kt b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoState.kt index 383049e07..d75e9139d 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoState.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoState.kt @@ -2,5 +2,5 @@ package com.terning.feature.filtering.filteringtwo data class FilteringTwoState( val isButtonValid: Boolean = false, - val workingPeriod: Int = -1 + val workingPeriod: String = "" ) \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoViewModel.kt b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoViewModel.kt index 2076a5221..495fd3fd1 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoViewModel.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoViewModel.kt @@ -18,7 +18,7 @@ class FilteringTwoViewModel : ViewModel() { private val _sideEffects = MutableSharedFlow() val sideEffects: SharedFlow get() = _sideEffects.asSharedFlow() - fun updateWorkingPeriodAndButton(workingPeriod: Int) { + fun updateWorkingPeriodAndButton(workingPeriod: String) { _state.value = _state.value.copy( workingPeriod = workingPeriod, isButtonValid = true @@ -27,4 +27,14 @@ class FilteringTwoViewModel : ViewModel() { fun navigateUp() = viewModelScope.launch { _sideEffects.emit(FilteringTwoSideEffect.NavigateUp) } + + fun navigateToFilteringThree(grade: String, workingPeriod: String) = + viewModelScope.launch { + _sideEffects.emit( + FilteringTwoSideEffect.NavigateToFilteringThree( + grade, workingPeriod + ) + ) + } + } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt index ed06f467b..72579da5e 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt @@ -13,17 +13,18 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.terning.core.designsystem.component.button.FilteringButton +import com.terning.core.type.WorkingPeriod import com.terning.feature.R @Composable fun StatusTwoRadioGroup( - onButtonClick: (Int) -> Unit, + onButtonClick: (String) -> Unit, modifier: Modifier = Modifier, ) { val options = listOf( - R.string.filtering_status2_button1, - R.string.filtering_status2_button2, - R.string.filtering_status2_button3, + WorkingPeriod.SHORT.stringResId, + WorkingPeriod.MIDDLE.stringResId, + WorkingPeriod.LONG.stringResId ) val selectedOptions = listOf( @@ -50,7 +51,7 @@ fun StatusTwoRadioGroup( selectedIndex.intValue = option selectedButton.indices.forEach { i -> selectedButton[i] = false } selectedButton[index] = true - onButtonClick(index) + onButtonClick(WorkingPeriod.entries[index].stringValue) }, cornerRadius = 15.dp, paddingVertical = 24.dp diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/navigation/FilteringTwoNavigation.kt b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/navigation/FilteringTwoNavigation.kt index d23c3a75d..205233c12 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/navigation/FilteringTwoNavigation.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/navigation/FilteringTwoNavigation.kt @@ -13,7 +13,7 @@ import com.terning.feature.filtering.filteringtwo.FilteringTwoRoute import kotlinx.serialization.Serializable fun NavController.navigateFilteringTwo( - grade: Int, + grade: String, navOptions: NavOptions? = null ) { navigate( @@ -44,5 +44,5 @@ fun NavGraphBuilder.filteringTwoNavGraph( @Serializable data class FilteringTwo( - val grade: Int + val grade: String ) : Route \ No newline at end of file From a3399ec5b65501e9804d5bf1b9dca81fc5ee2caf Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Thu, 12 Sep 2024 03:38:29 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[CHORE/#233]=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filtering/filteringone/navigation/FilteringOneNavigation.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt index d771d018f..f6a233db2 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt @@ -8,8 +8,8 @@ import androidx.navigation.NavOptions import androidx.navigation.compose.composable import androidx.navigation.toRoute import com.terning.core.navigation.Route -import com.terning.feature.filtering.filteringone.FilteringOneRoute import kotlinx.serialization.Serializable +import com.terning.feature.filtering.filteringone.FilteringOneRoute fun NavController.navigateFilteringOne( name: String, From 9d7b73767ecda7b245f0279e8ec18a7eebb3fa65 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Thu, 12 Sep 2024 03:39:46 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[CHORE/#233]=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filtering/filteringone/navigation/FilteringOneNavigation.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt index f6a233db2..d771d018f 100644 --- a/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt +++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt @@ -8,8 +8,8 @@ import androidx.navigation.NavOptions import androidx.navigation.compose.composable import androidx.navigation.toRoute import com.terning.core.navigation.Route -import kotlinx.serialization.Serializable import com.terning.feature.filtering.filteringone.FilteringOneRoute +import kotlinx.serialization.Serializable fun NavController.navigateFilteringOne( name: String, From 8b1bd6e4afd114ea337c8603b6fabc991d3db0e6 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Thu, 12 Sep 2024 04:28:11 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[CHORE/#233]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/com/terning/core/type/Grade.kt | 3 --- core/src/main/java/com/terning/core/type/WorkingPeriod.kt | 3 --- 2 files changed, 6 deletions(-) diff --git a/core/src/main/java/com/terning/core/type/Grade.kt b/core/src/main/java/com/terning/core/type/Grade.kt index 81a976739..99fef5432 100644 --- a/core/src/main/java/com/terning/core/type/Grade.kt +++ b/core/src/main/java/com/terning/core/type/Grade.kt @@ -20,8 +20,5 @@ enum class Grade( "senior" -> SENIOR else -> FRESHMAN } - - fun toIndex(grade: Grade): Int = - Grade.entries.indexOf(grade) } } \ No newline at end of file diff --git a/core/src/main/java/com/terning/core/type/WorkingPeriod.kt b/core/src/main/java/com/terning/core/type/WorkingPeriod.kt index 99e476b2a..d7a7328c8 100644 --- a/core/src/main/java/com/terning/core/type/WorkingPeriod.kt +++ b/core/src/main/java/com/terning/core/type/WorkingPeriod.kt @@ -18,8 +18,5 @@ enum class WorkingPeriod( "long" -> LONG else -> SHORT } - - fun toIndex(workingPeriod: WorkingPeriod): Int = - WorkingPeriod.entries.indexOf(workingPeriod) } } \ No newline at end of file