From 0d95479af1fc232593bd35dbbb774a45a2d8f547 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park <amanda0109@naver.com> Date: Thu, 11 Jul 2024 08:05:54 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[FEAT/#49]=20main=20title=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/FilteringMainTitleText.kt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 feature/src/main/java/com/terning/feature/home/filtering/component/FilteringMainTitleText.kt diff --git a/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringMainTitleText.kt b/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringMainTitleText.kt new file mode 100644 index 000000000..0be923ef8 --- /dev/null +++ b/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringMainTitleText.kt @@ -0,0 +1,20 @@ +package com.terning.feature.home.filtering.component + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.terning.core.designsystem.theme.Black +import com.terning.core.designsystem.theme.TerningTheme + +@Composable +fun FilteringMainTitleText( + text: String, + modifier: Modifier = Modifier, +) { + Text( + text = text, + style = TerningTheme.typography.title3, + color = Black, + modifier = modifier, + ) +} \ No newline at end of file From 10312ea54279011fcae7c38bf09ee216155e4cb4 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park <amanda0109@naver.com> Date: Thu, 11 Jul 2024 08:08:32 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[FEAT/#49]=20sub=20title=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/FilteringSubTitleText.kt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 feature/src/main/java/com/terning/feature/home/filtering/component/FilteringSubTitleText.kt diff --git a/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringSubTitleText.kt b/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringSubTitleText.kt new file mode 100644 index 000000000..c448889a2 --- /dev/null +++ b/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringSubTitleText.kt @@ -0,0 +1,20 @@ +package com.terning.feature.home.filtering.component + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.terning.core.designsystem.theme.Grey300 +import com.terning.core.designsystem.theme.TerningTheme + +@Composable +fun FilteringSubTitleText( + text: String, + modifier: Modifier = Modifier, +) { + Text( + text = text, + style = TerningTheme.typography.body5, + color = Grey300, + modifier = modifier, + ) +} \ No newline at end of file From 603f44baf90cda8333d3a25a41f3178150ddb307 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park <amanda0109@naver.com> Date: Fri, 12 Jul 2024 03:43:00 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[ADD/#49]=20string=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/src/main/res/values/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index 390a5972c..fd3c862fd 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -53,4 +53,12 @@ <string name="calendar_button_description_list">list</string> <string name="calendar_animation_label">Calendar Transition</string> + <!-- changeFilter --> + <string name="change_filter_grade_main">재학 상태를 선택해주세요</string> + <string name="change_filter_period_main">희망하는 인턴 근무 기간을 선택해주세요</string> + <string name="change_filter_start_work_main">입사를 계획중인 달을 선택해주세요</string> + <string name="change_filter_grade_sub">휴학중이라면, 휴학 전 마지막 수료 학년을 선택해주세요</string> + <string name="change_filter_period_sub">선택한 기간동안 근무할 수 있는 인턴 공고를 찾아드릴게요</string> + <string name="change_filter_start_work_sub">선택한 달부터 근무를 시작할 수 있는 공고를 찾아드릴게요</string> + </resources> \ No newline at end of file From d8099c725b04d028ecbc9979e17581ebf1e1302c Mon Sep 17 00:00:00 2001 From: Hyobeen-Park <amanda0109@naver.com> Date: Fri, 12 Jul 2024 03:44:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[CHORE/#49]=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/FilteringMainTitleText.kt | 3 ++- .../component/FilteringSubTitleText.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) rename feature/src/main/java/com/terning/feature/home/{filtering => changefilter}/component/FilteringMainTitleText.kt (81%) rename feature/src/main/java/com/terning/feature/home/{filtering => changefilter}/component/FilteringSubTitleText.kt (81%) diff --git a/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringMainTitleText.kt b/feature/src/main/java/com/terning/feature/home/changefilter/component/FilteringMainTitleText.kt similarity index 81% rename from feature/src/main/java/com/terning/feature/home/filtering/component/FilteringMainTitleText.kt rename to feature/src/main/java/com/terning/feature/home/changefilter/component/FilteringMainTitleText.kt index 0be923ef8..1bc543e55 100644 --- a/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringMainTitleText.kt +++ b/feature/src/main/java/com/terning/feature/home/changefilter/component/FilteringMainTitleText.kt @@ -1,8 +1,9 @@ -package com.terning.feature.home.filtering.component +package com.terning.feature.home.changefilter.component import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview import com.terning.core.designsystem.theme.Black import com.terning.core.designsystem.theme.TerningTheme diff --git a/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringSubTitleText.kt b/feature/src/main/java/com/terning/feature/home/changefilter/component/FilteringSubTitleText.kt similarity index 81% rename from feature/src/main/java/com/terning/feature/home/filtering/component/FilteringSubTitleText.kt rename to feature/src/main/java/com/terning/feature/home/changefilter/component/FilteringSubTitleText.kt index c448889a2..1a26d42f4 100644 --- a/feature/src/main/java/com/terning/feature/home/filtering/component/FilteringSubTitleText.kt +++ b/feature/src/main/java/com/terning/feature/home/changefilter/component/FilteringSubTitleText.kt @@ -1,8 +1,9 @@ -package com.terning.feature.home.filtering.component +package com.terning.feature.home.changefilter.component import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview import com.terning.core.designsystem.theme.Grey300 import com.terning.core.designsystem.theme.TerningTheme