[MERGE] #323 -> develop

[FIX/#323] 홈, 필터링 재설정 뷰 / 1차 QA 반영
teamterning · Jan 9, 2025 · 1ca3117 · 1ca3117
2 parents f93f578 + 6fb2d8a
commit 1ca3117
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -28,8 +28,8 @@
 
     <!--SortByBottom-->
     <string name="sort_by_earliest">채용 마감 이른 순</string>
-    <string name="sort_by_shortest">짧은 근무 기간 순</string>
-    <string name="sort_by_longest">긴 근무 기간 순</string>
+    <string name="sort_by_shortest">근무 기간 짧은 순</string>
+    <string name="sort_by_longest">근무 기간 긴 순</string>
     <string name="sort_by_scrap">스크랩 많은 순</string>
     <string name="sort_by_view_count">조회수 많은 순</string>
     <string name="sort_button_description">정렬 기준</string>

diff --git a/.../src/main/java/com/terning/feature/home/component/bottomsheet/HomeFilteringBottomSheet.kt b/.../src/main/java/com/terning/feature/home/component/bottomsheet/HomeFilteringBottomSheet.kt
@@ -17,7 +17,6 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 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
@@ -69,8 +68,12 @@ internal fun HomeFilteringBottomSheet(
     val density = LocalDensity.current
     var pageHeight by remember { mutableIntStateOf(0) }
 
-    LaunchedEffect(pagerState.currentPage) {
-        currentFilteringInfo = defaultFilteringInfo
+    var isCheckBoxChecked by remember {
+        mutableStateOf(
+            with(currentFilteringInfo) {
+                listOf(grade, workingPeriod, startYear, startMonth).all { it == null || it == 0 }
+            }
+        )
     }
 
     GetPagerHeight(
@@ -142,6 +145,7 @@ internal fun HomeFilteringBottomSheet(
                         1 -> {
                             PlanFilteringScreen(
                                 currentFilteringInfo = currentFilteringInfo,
+                                isCheckBoxChecked = isCheckBoxChecked,
                                 updateGrade = {
                                     currentFilteringInfo = currentFilteringInfo.copy(
                                         grade = if (it != null) {
@@ -166,6 +170,9 @@ internal fun HomeFilteringBottomSheet(
                                         startMonth = it
                                     )
                                 },
+                                updateIsCheckBoxChecked = {
+                                    isCheckBoxChecked = it
+                                }
                             )
                         }
                     }
@@ -189,7 +196,10 @@ internal fun HomeFilteringBottomSheet(
                             )
                         }
                     },
-                    isEnabled = checkButtonEnable(currentFilteringInfo = currentFilteringInfo)
+                    isEnabled = checkButtonEnable(
+                        currentFilteringInfo = currentFilteringInfo,
+                        isCheckBoxChecked = isCheckBoxChecked
+                    )
                 )
             }
 
@@ -243,10 +253,12 @@ fun TerningTab(
     }
 }
 
-private fun checkButtonEnable(currentFilteringInfo: HomeFilteringInfo): Boolean =
+private fun checkButtonEnable(
+    currentFilteringInfo: HomeFilteringInfo,
+    isCheckBoxChecked: Boolean
+): Boolean =
     with(currentFilteringInfo) {
-        listOf(grade, workingPeriod, startYear, startMonth).all { it == null || it == 0 } ||
-                listOf(grade, workingPeriod, startYear, startMonth).none { it == null || it == 0 }
+        isCheckBoxChecked || listOf(grade, workingPeriod, startYear, startMonth).none { it == null }
     }
 
 @Composable
@@ -255,6 +267,7 @@ private fun GetPagerHeight(
 ) {
     PlanFilteringScreen(
         currentFilteringInfo = HomeFilteringInfo(null, null, null, null, "total"),
+        isCheckBoxChecked = false,
         modifier = Modifier
             .onGloballyPositioned {
                 onHeightMeasured(it.size.height)

diff --git a/.../home/src/main/java/com/terning/feature/home/component/bottomsheet/PlanFilteringScreen.kt b/.../home/src/main/java/com/terning/feature/home/component/bottomsheet/PlanFilteringScreen.kt
@@ -43,17 +43,17 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 internal fun PlanFilteringScreen(
     currentFilteringInfo: HomeFilteringInfo,
+    isCheckBoxChecked: Boolean,
     modifier: Modifier = Modifier,
     updateGrade: (Int?) -> Unit = {},
     updateWorkingPeriod: (Int?) -> Unit = {},
     updateStartYear: (Int?) -> Unit = {},
     updateStartMonth: (Int?) -> Unit = {},
+    updateIsCheckBoxChecked: (Boolean) -> Unit = {},
 ) {
     var isYearNull by remember { mutableStateOf(currentFilteringInfo.startYear == 0 || currentFilteringInfo.startYear == null) }
     var isMonthNull by remember { mutableStateOf(currentFilteringInfo.startMonth == 0 || currentFilteringInfo.startMonth == null) }
 
-    var isCheckBoxChecked by remember { mutableStateOf(false) }
-
     var isInitialNullState by remember { mutableStateOf(false) }
 
     val yearsList by remember(isYearNull) {
@@ -93,7 +93,7 @@ internal fun PlanFilteringScreen(
             ).toImmutableList(),
             onButtonClick = {
                 updateGrade(it)
-                isCheckBoxChecked = false
+                updateIsCheckBoxChecked(false)
             },
             columns = 4,
             modifier = Modifier
@@ -118,7 +118,7 @@ internal fun PlanFilteringScreen(
             ).toImmutableList(),
             onButtonClick = {
                 updateWorkingPeriod(it)
-                isCheckBoxChecked = false
+                updateIsCheckBoxChecked(false)
             },
             modifier = Modifier
                 .padding(horizontal = 23.dp),
@@ -136,15 +136,15 @@ internal fun PlanFilteringScreen(
             onYearChosen = { year, isInitialSelection ->
                 updateStartYear(year)
                 if (year != null) {
-                    isCheckBoxChecked = false
+                    updateIsCheckBoxChecked(false)
                     isYearNull = false
                     isInitialNullState = isInitialSelection
                 }
             },
             onMonthChosen = { month, isInitialSelection ->
                 updateStartMonth(month)
                 if (month != null) {
-                    isCheckBoxChecked = false
+                    updateIsCheckBoxChecked(false)
                     isMonthNull = false
                     isInitialNullState = isInitialSelection
                 }
@@ -179,7 +179,7 @@ internal fun PlanFilteringScreen(
                             updateStartYear(null)
                             updateStartMonth(null)
                         }
-                        isCheckBoxChecked = isChecked
+                        updateIsCheckBoxChecked(isChecked)
                     },
                     colors = CheckboxDefaults.colors(
                         checkedColor = TerningMain,