[MERGE] #218 -> develop

[UI/#218] 온보딩 / UI 수정

core/src/main/java/com/terning/core/designsystem/component/button/FilteringButton.kt

@@ -23,13 +23,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.terning.core.R
-import com.terning.core.designsystem.theme.Grey400
+import com.terning.core.designsystem.theme.Grey150
+import com.terning.core.designsystem.theme.Grey200
+import com.terning.core.designsystem.theme.Grey375
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.TerningPointTheme
-import com.terning.core.designsystem.theme.TerningSub1
-import com.terning.core.designsystem.theme.TerningSub3
-import com.terning.core.designsystem.theme.TerningSub4
-import com.terning.core.designsystem.theme.TerningSub5
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.designsystem.theme.White
 import com.terning.core.util.NoRippleTheme
@@ -58,19 +56,16 @@ fun FilteringButton(
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     val isPressed by interactionSource.collectIsPressedAsState()
-    val backgroundColor = when {
-        !isSelected && !isPressed -> White
-        !isSelected && isPressed -> TerningSub5
-        isSelected && !isPressed -> TerningSub4
-        else -> TerningSub3
-    }
+    val backgroundColor = White
     val textColor = when {
-        !isSelected -> Grey400
+        !isSelected -> Grey375
+        isPressed -> Grey375
         else -> TerningMain
     }
     val borderColor = when {
-        !isSelected -> TerningMain
-        else -> TerningSub1
+        !isSelected && !isPressed -> Grey150
+        isPressed -> Grey200
+        else -> TerningMain
     }
 
     CompositionLocalProvider(LocalRippleTheme provides NoRippleTheme) {
@@ -87,7 +82,7 @@ fun FilteringButton(
                 color = borderColor
             ),
             shape = RoundedCornerShape(cornerRadius),
-            onClick = { onButtonClick() }
+            onClick = onButtonClick
         ) {
             Text(
                 text = stringResource(id = text),
@@ -104,14 +99,14 @@ fun FilteringButtonPreview() {
     TerningPointTheme {
         Column {
             FilteringButton(
-                isSelected = true,
+                isSelected = false,
                 text = R.string.button_preview,
                 cornerRadius = 15.dp,
                 paddingVertical = 10.dp,
                 onButtonClick = {}
             )
             FilteringButton(
-                isSelected = false,
+                isSelected = true,
                 text = R.string.button_preview,
                 cornerRadius = 15.dp,
                 paddingVertical = 10.dp,

core/src/main/java/com/terning/core/extension/CalendarExt.kt

@@ -0,0 +1,7 @@
+package com.terning.core.extension
+
+import java.util.Calendar
+
+val Calendar.currentYear: Int get() = get(Calendar.YEAR)
+
+val Calendar.currentMonth: Int get() = get(Calendar.MONTH) + 1

core/src/main/java/com/terning/core/util/CalendarDefaults.kt

@@ -0,0 +1,8 @@
+package com.terning.core.util
+
+object CalendarDefaults {
+    const val START_YEAR = 2010
+    const val END_YEAR = 2030
+    const val START_MONTH = 1
+    const val END_MONTH = 12
+}

feature/src/main/java/com/terning/feature/filtering/filtering/FilteringOneScreen.kt → feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt

@@ -1,5 +1,6 @@
-package com.terning.feature.filtering.filtering
+package com.terning.feature.filtering.filteringone
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -8,64 +9,97 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.flowWithLifecycle
 import com.terning.core.designsystem.component.button.RectangleButton
-import com.terning.core.designsystem.component.image.TerningImage
 import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.designsystem.theme.White
 import com.terning.feature.R
-import com.terning.feature.filtering.filtering.component.StatusOneRadioGroup
+import com.terning.feature.filtering.filteringone.component.StatusOneRadioGroup
 
 @Composable
-fun FilteringOneScreen(
+fun FilteringOneRoute(
     name: String,
     onNextClick: (Int) -> Unit,
     navigateUp: () -> Unit,
-    modifier: Modifier = Modifier,
-    paddingValues: PaddingValues = PaddingValues(),
-    onButtonClick: (Int) -> Unit = {},
+    paddingValues: PaddingValues,
+    viewModel: FilteringOneViewModel = hiltViewModel(),
 ) {
-    val isButtonValid = remember { mutableStateOf(false) }
+    val state by viewModel.state.collectAsStateWithLifecycle()
+
+    val lifecycleOwner = LocalLifecycleOwner.current
 
-    var grade by remember { mutableIntStateOf(-1) }
+    LaunchedEffect(viewModel.sideEffects, lifecycleOwner) {
+        viewModel.sideEffects.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle)
+            .collect { sideEffect ->
+                when (sideEffect) {
+                    is FilteringOneSideEffect.NavigateUp -> navigateUp()
+                }
+            }
+    }
 
+    FilteringOneScreen(
+        name = name,
+        onButtonClick = { index ->
+            viewModel.updateGradeAndButton(index)
+        },
+        onNextClick = onNextClick,
+        navigateUp = viewModel::navigateUp,
+        buttonState = state.isButtonValid,
+        gradeState = state.grade,
+        paddingValues = paddingValues
+    )
+}
+
+@Composable
+fun FilteringOneScreen(
+    name: String,
+    onNextClick: (Int) -> Unit,
+    navigateUp: () -> Unit,
+    onButtonClick: (Int) -> Unit,
+    buttonState: Boolean,
+    gradeState: Int,
+    paddingValues: PaddingValues = PaddingValues(),
+) {
     Column(
-        modifier = modifier
+        modifier = Modifier
             .padding(paddingValues)
             .background(White)
     ) {
         BackButtonTopAppBar(
-            onBackButtonClick = { navigateUp() }
+            onBackButtonClick = navigateUp
         )
         Column(
             modifier = Modifier.fillMaxSize()
         ) {
-            TerningImage(
-                painter = R.drawable.ic_filtering_status1,
-                modifier = modifier.padding(
-                    top = 20.dp,
+            Image(
+                painter = painterResource(id = R.drawable.ic_filtering_status1),
+                modifier = Modifier.padding(
+                    top = 28.dp,
                     start = 24.dp
-                )
+                ),
+                contentDescription = "filtering one status"
             )
             Text(
                 text = stringResource(
                     id = R.string.filtering_status1_title,
                     name
                 ),
                 style = TerningTheme.typography.title3,
-                modifier = modifier.padding(
-                    top = 19.dp,
+                modifier = Modifier.padding(
+                    top = 20.dp,
                     start = 24.dp
                 )
             )
@@ -76,35 +110,33 @@ fun FilteringOneScreen(
                 ),
                 style = TerningTheme.typography.body5,
                 color = Grey300,
-                modifier = modifier.padding(
-                    top = 3.dp,
+                modifier = Modifier.padding(
+                    top = 4.dp,
                     start = 24.dp,
-                    bottom = 25.dp
+                    bottom = 24.dp
                 )
             )
             StatusOneRadioGroup(
                 onButtonClick = { index ->
                     onButtonClick(index)
-                    isButtonValid.value = true
-                    grade = index
                 }
             )
             Text(
                 text = stringResource(id = R.string.filtering_status1_warning),
                 style = TerningTheme.typography.detail3,
-                modifier = modifier.padding(
+                modifier = Modifier.padding(
                     start = 24.dp,
-                    top = 9.dp
+                    top = 8.dp
                 )
             )
-            Spacer(modifier = modifier.weight(1f))
+            Spacer(modifier = Modifier.weight(1f))
             RectangleButton(
                 style = TerningTheme.typography.button0,
                 paddingVertical = 20.dp,
                 text = R.string.filtering_button,
-                onButtonClick = { onNextClick(grade) },
-                modifier = modifier.padding(bottom = 12.dp),
-                isEnabled = isButtonValid.value
+                onButtonClick = { onNextClick(gradeState) },
+                modifier = Modifier.padding(bottom = 12.dp),
+                isEnabled = buttonState
             )
         }
     }
@@ -118,7 +150,9 @@ fun FilteringOneScreenPreview() {
             name = "터닝이",
             onButtonClick = {},
             onNextClick = {},
-            navigateUp = {}
+            navigateUp = {},
+            buttonState = true,
+            gradeState = 1
         )
     }
 }

feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneSideEffect.kt

@@ -0,0 +1,5 @@
+package com.terning.feature.filtering.filteringone
+
+sealed class FilteringOneSideEffect {
+    data object NavigateUp : FilteringOneSideEffect()
+}

feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneState.kt

@@ -0,0 +1,6 @@
+package com.terning.feature.filtering.filteringone
+
+data class FilteringOneState(
+    val isButtonValid: Boolean = false,
+    val grade: Int = -1
+)

feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneViewModel.kt

@@ -0,0 +1,30 @@
+package com.terning.feature.filtering.filteringone
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class FilteringOneViewModel : ViewModel() {
+
+    private val _state: MutableStateFlow<FilteringOneState> = MutableStateFlow(FilteringOneState())
+    val state: StateFlow<FilteringOneState> get() = _state.asStateFlow()
+
+    private val _sideEffects = MutableSharedFlow<FilteringOneSideEffect>()
+    val sideEffects: SharedFlow<FilteringOneSideEffect> get() = _sideEffects.asSharedFlow()
+
+    fun updateGradeAndButton(grade: Int) {
+        _state.value = _state.value.copy(
+            grade = grade,
+            isButtonValid = true
+        )
+    }
+
+    fun navigateUp() =
+        viewModelScope.launch { _sideEffects.emit(FilteringOneSideEffect.NavigateUp) }
+}

feature/src/main/java/com/terning/feature/filtering/filtering/component/StatusOneRadioGroup.kt → feature/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt

@@ -1,4 +1,4 @@
-package com.terning.feature.filtering.filtering.component
+package com.terning.feature.filtering.filteringone.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -55,7 +55,7 @@ fun StatusOneRadioGroup(
                     onButtonClick(index)
                 },
                 cornerRadius = 15.dp,
-                paddingVertical = 15.dp
+                paddingVertical = 14.dp
             )
         }
     }

feature/src/main/java/com/terning/feature/filtering/filtering/navigation/FilteringOneNavigation.kt → feature/src/main/java/com/terning/feature/filtering/filteringone/navigation/FilteringOneNavigation.kt

@@ -8,7 +8,7 @@ import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import com.terning.core.navigation.Route
-import com.terning.feature.filtering.filtering.FilteringOneScreen
+import com.terning.feature.filtering.filteringone.FilteringOneRoute
 import kotlinx.serialization.Serializable
 
 fun NavController.navigateFilteringOne(
@@ -27,11 +27,11 @@ fun NavGraphBuilder.filteringOneNavGraph(
 ) {
     composable<FilteringOne> {
         val args = it.toRoute<FilteringOne>()
-        FilteringOneScreen(
+        FilteringOneRoute(
             paddingValues = paddingValues,
             name = args.name,
-            onNextClick = { grade -> navHostController.navigateFilteringTwo(grade) },
-            navigateUp = { navHostController.navigateUp() }
+            onNextClick = navHostController::navigateFilteringTwo,
+            navigateUp = navHostController::navigateUp
         )
     }
 }