[MOD/#12] 필터링 월 -> 년+월로 수정

teamterning · Jul 11, 2024 · 42d9583 · 42d9583
1 parent 0ef202b
commit 42d9583
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt b/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt
@@ -90,7 +90,8 @@ fun HomeScreen() {
                     HomeFilteringScreen(
                         grade = 3,
                         period = 1,
-                        month = 7
+                        startYear = 2024,
+                        startMonth = 7,
                     )
 
                     HorizontalDivider(

diff --git a/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringScreen.kt b/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringScreen.kt
@@ -2,9 +2,11 @@ package com.terning.feature.home.home.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -15,6 +17,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.theme.Black
 import com.terning.core.designsystem.theme.Grey300
@@ -27,22 +30,25 @@ import com.terning.feature.R
 fun HomeFilteringScreen(
     grade: Int,
     period: Int,
-    month: Int,
+    startYear: Int,
+    startMonth: Int,
     modifier: Modifier = Modifier,
 ) {
     Row(
         modifier = modifier
             .padding(top = 10.dp, bottom = 11.dp)
             .padding(horizontal = 24.dp)
             .height(IntrinsicSize.Min)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween
     ) {
         Row(
             modifier = modifier
                 .background(
                     color = TerningMain,
                     shape = RoundedCornerShape(5.dp),
                 )
-                .align(Alignment.CenterVertically)
+                .align(Alignment.CenterVertically),
         ) {
             Image(
                 painter = painterResource(id = R.drawable.ic_home_filtering_28),
@@ -54,16 +60,17 @@ fun HomeFilteringScreen(
                 text = stringResource(id = R.string.home_recommend_filtering),
                 style = TerningTheme.typography.button4,
                 color = White,
+                textAlign = TextAlign.Center,
                 modifier = modifier
-                    .padding(vertical = 8.dp)
-                    .padding(end = 8.dp)
+                    .padding(end = 6.dp)
+                    .align(Alignment.CenterVertically)
             )
         }
 
         HomeFilteringText(
             text = grade.toString() + stringResource(id = R.string.home_recommend_filtering_grade),
             modifier = Modifier
-                .padding(vertical = 7.dp, horizontal = 28.dp),
+                .padding(vertical = 7.dp)
         )
         HomeFilteringDivider()
         HomeFilteringText(
@@ -76,14 +83,14 @@ fun HomeFilteringScreen(
                 }
             ),
             modifier = Modifier
-                .padding(vertical = 7.dp, horizontal = 25.dp)
+                .padding(vertical = 7.dp)
         )
         HomeFilteringDivider()
         HomeFilteringText(
-            text = month.toString() + stringResource(id = R.string.home_recommend_filtering_month),
+            text = startYear.toString() + stringResource(id = R.string.home_recommend_filtering_startYear)
+                    + "  " + startMonth.toString() + stringResource(id = R.string.home_recommend_filtering_startMonth),
             modifier = Modifier
                 .padding(vertical = 7.dp)
-                .padding(start = 34.dp, end = 13.dp)
         )
     }
 }

diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml
@@ -77,7 +77,8 @@
     <string name="home_recommend_filtering_working_period_1">1개월 ~ 3개월</string>
     <string name="home_recommend_filtering_working_period_2">4개월 ~ 6개월</string>
     <string name="home_recommend_filtering_working_period_3">7개월 이상</string>
-    <string name="home_recommend_filtering_month">월</string>
+    <string name="home_recommend_filtering_startYear">년</string>
+    <string name="home_recommend_filtering_startMonth">월</string>
     <string name="home_recommend_no_intern">
         필터링 설정에 일치하는 인턴 공고가 없어요!\n딱 맞는 인턴 공고가 올라오면 바로 알려드릴게요
     </string>