Skip to content

Commit

Permalink
[MERGE] #49 -> develop
Browse files Browse the repository at this point in the history
[ADD/#49] ํ•„ํ„ฐ๋ง ์žฌ์„ค์ • / Text ์ปดํฌ๋„ŒํŠธ ๊ตฌํ˜„
  • Loading branch information
Hyobeen-Park authored Jul 11, 2024
2 parents ce20eb1 + a1dedb4 commit 0795434
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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

@Composable
fun FilteringMainTitleText(
text: String,
modifier: Modifier = Modifier,
) {
Text(
text = text,
style = TerningTheme.typography.title3,
color = Black,
modifier = modifier,
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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

@Composable
fun FilteringSubTitleText(
text: String,
modifier: Modifier = Modifier,
) {
Text(
text = text,
style = TerningTheme.typography.body5,
color = Grey300,
modifier = modifier,
)
}
7 changes: 7 additions & 0 deletions feature/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,12 @@
</string>
<string name="home_recommend_no_intern_description">์ธํ„ด ๊ณต๊ณ ๊ฐ€ ์—†์–ด์š”!</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>

0 comments on commit 0795434

Please sign in to comment.