Skip to content

Commit

Permalink
[MERGE] #73 -> develop
Browse files Browse the repository at this point in the history 
[FIX/#73] λΌμ΄νŒ… μˆ˜μ •
  • Loading branch information
@arinming
arinming authored Jul 15, 2024
2 parents 84a57bd + 9bfdd35 commit b1a803b
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 48 deletions.
7 changes: 5 additions & 2 deletions core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.terning.core.designsystem.component.textfield

import androidx.annotation.StringRes
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.res.stringResource
import com.terning.core.designsystem.theme.Black
import com.terning.core.designsystem.theme.Grey300
import com.terning.core.designsystem.theme.Grey400
Expand All @@ -15,7 +17,8 @@ fun NameTextField(
onValueChange: (String) -> Unit,
hint: String,
drawLineColor: Color,
helperMessage: String,
@StringRes
helperMessage: Int,
helperColor: Color,
helperIcon: Int? = null,
) {
Expand All @@ -31,7 +34,7 @@ fun NameTextField(
hintColor = Grey300,
showTextLength = true,
maxTextLength = 12,
helperMessage = helperMessage,
helperMessage = stringResource(id = helperMessage),
helperIcon = helperIcon,
helperColor = helperColor,
)
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
<string name="ic_logo">탑 λ°” 둜고</string>
<string name="ic_20_right">였λ₯Έμͺ½ λ²„νŠΌ</string>

<!-- MyPage-->
<!--MyPage-->
<string name="my_page_top_app_bar">ν”„λ‘œν•„ μˆ˜μ •</string>

<!-- button-->
<!--Button-->
<string name="button_preview">button</string>

<!-- Intern Item-->
<!--InternItem-->
<string name="intern_item_working_period">근무기간</string>
<string name="intern_item_working_period_month">%sκ°œμ›”</string>
<string name="intern_item_d_day">D-%s</string>
<string name="intern_item_scrap">슀크랩</string>

<!-- Calendar-->
<!--Calendar-->
<string name="calendar_button_description_previous">previous</string>
<string name="calendar_button_description_next">next</string>
<string name="calendar_button_description_list">list</string>

<!-- μ •λ ¬ λ²„νŠΌ + λ°”ν…€μ‹œνŠΈ -->
<string name="sort_by_earliest">μ±„μš© 마감 이λ₯Έμˆœ</string>
<!--SortByBottom-->
<string name="sort_by_earliest">μ±„μš© 마감 이λ₯Έ 순</string>
<string name="sort_by_shortest">짧은 근무 κΈ°κ°„μˆœ</string>
<string name="sort_by_longest">κΈ΄ 근무 κΈ°κ°„μˆœ</string>
<string name="sort_by_scrap">슀크랩 λ§Žμ€μˆœ</string>
Expand Down
8 changes: 5 additions & 3 deletions feature/src/main/java/com/terning/feature/onboarding/signup/SignUpState.kt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.terning.feature.onboarding.signup

import androidx.annotation.StringRes
import androidx.compose.ui.graphics.Color
import com.terning.core.designsystem.theme.Grey400
import com.terning.core.designsystem.theme.Grey500
import com.terning.feature.onboarding.signup.SignUpViewModel.Companion.HELPER
import com.terning.feature.R

data class SignUpState(
val name: String = "",
val character: Int = 0,
val drawLineColor: Color = Grey500,
val helper: String = HELPER,
@StringRes
val helper: Int = R.string.sign_up_helper,
val helperIcon: Int? = null,
val helperColor: Color = Grey400,
val isButtonValid : Boolean = false
val isButtonValid: Boolean = false,
)
9 changes: 3 additions & 6 deletions feature/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class SignUpViewModel @Inject constructor() : ViewModel() {
nameErrorRegex.containsMatchIn(trimmedName) -> _state.value = _state.value.copy(
name = trimmedName,
drawLineColor = WarningRed,
helper = HELPER_ERROR,
helper = R.string.sign_up_helper_error,
helperIcon = R.drawable.ic_sign_up_error,
helperColor = WarningRed,
isButtonValid = false
Expand All @@ -35,7 +35,7 @@ class SignUpViewModel @Inject constructor() : ViewModel() {
trimmedName.isEmpty() -> _state.value = _state.value.copy(
name = trimmedName,
drawLineColor = Grey500,
helper = HELPER,
helper = R.string.sign_up_helper,
helperIcon = null,
helperColor = Grey400,
isButtonValid = false
Expand All @@ -44,7 +44,7 @@ class SignUpViewModel @Inject constructor() : ViewModel() {
else -> _state.value = _state.value.copy(
name = trimmedName,
drawLineColor = TerningMain,
helper = HELPER_AVAILABLE,
helper = R.string.sign_up_helper_available,
helperIcon = R.drawable.ic_check,
helperColor = TerningMain,
isButtonValid = true
Expand All @@ -54,9 +54,6 @@ class SignUpViewModel @Inject constructor() : ViewModel() {

companion object {
const val NAME_ERROR = "[!@#\$%^&*(),.?\":{}|<>\\[\\]\\\\/]"
const val HELPER = "12자리 이내, 문자/숫자 κ°€λŠ₯, 특수문자/기호 μž…λ ₯λΆˆκ°€"
private const val MAX_LENGTH = 12
private const val HELPER_ERROR = "이름에 νŠΉμˆ˜λ¬ΈμžλŠ” μž…λ ₯ν•  수 μ—†μ–΄μš”"
private const val HELPER_AVAILABLE = "이용 κ°€λŠ₯ν•œ μ΄λ¦„μ΄μ—μš”"
}
}
64 changes: 33 additions & 31 deletions feature/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@
<string name="server_success">μ„œλ²„ν†΅μ‹  성곡</string>
<string name="server_failure">μ„œλ²„ν†΅μ‹  μ‹€νŒ¨</string>

<!--bottom_navigation-->
<!--BottomNavigation-->
<string name="bottom_nav_home">ν™ˆ</string>
<string name="bottom_nav_calendar">μΊ˜λ¦°λ”</string>
<string name="bottom_nav_search">탐색</string>
<string name="bottom_nav_my_page">λ§ˆμ΄νŽ˜μ΄μ§€</string>

<!--sign_In-->
<!--SignIn-->
<string name="sign_in_kakao_button">카카였둜 λ‘œκ·ΈμΈν•˜κΈ°</string>
<string name="sign_in_kakao_login_fail">μΉ΄μΉ΄μ˜€ν†‘ λ‘œκ·ΈμΈμ— μ‹€νŒ¨ν–ˆμŠ΅λ‹ˆλ‹€</string>
<string name="sign_in_kakao_cancel">λ‘œκ·ΈμΈμ„ μ·¨μ†Œν•˜μ˜€μŠ΅λ‹ˆλ‹€</string>

<!--sign_up-->
<!--SignUp-->
<string name="sign_up_title">λ°˜κ°€μ›Œμš”!\n이름을 μ•Œλ €μ£Όμ„Έμš”</string>
<string name="sign_up_profile_image">ν”„λ‘œν•„ 이미지</string>
<string name="sign_up_profile_button">ν”„λ‘œν•„ λ²„νŠΌ</string>
<string name="sign_up_name">이름</string>
<string name="sign_up_hint">이름을 μž…λ ₯ν•΄μ£Όμ„Έμš”</string>
<string name="sign_up_helper">12자리 이내, 문자/숫자 κ°€λŠ₯, 특수문자/기호 μž…λ ₯λΆˆκ°€</string>
<string name="sign_up_hint">이름을 μž…λ ₯ν•΄ μ£Όμ„Έμš”</string>
<string name="sign_up_next_button">λ‹€μŒμœΌλ‘œ</string>
<string name="sign_up_helper">12자리 이내, 문자/숫자 κ°€λŠ₯, 특수문자/기호 μž…λ ₯λΆˆκ°€</string>
<string name="sign_up_helper_error">이름에 νŠΉμˆ˜λ¬ΈμžλŠ” μž…λ ₯ν•  수 μ—†μ–΄μš”</string>
<string name="sign_up_helper_available">μ‚¬μš© κ°€λŠ₯ν•œ μ΄λ¦„μ΄μ—μš”</string>

<!--search-->
<string name="search_text_field_hint">κ΄€μ‹¬μžˆλŠ” 인턴 곡고 ν‚€μ›Œλ“œλ₯Ό κ²€μƒ‰ν•΄λ³΄μ„Έμš”</string>

<!--Search-->
<string name="search_text_field_hint">κ΄€μ‹¬μžˆλŠ” 인턴 곡고 ν‚€μ›Œλ“œλ₯Ό 검색해 λ³΄μ„Έμš”</string>
<string name="search_today_popular">μš”μ¦˜ λŒ€ν•™μƒλ“€μ—κ²Œ 인기 μžˆλŠ” 곡고</string>
<string name="search_most_view_intern">μ§€κΈˆ μ‘°νšŒμˆ˜κ°€ λ§Žμ€ κ³΅κ³ λ“€μ΄μ—μš”</string>
<string name="search_most_scrap_intern">μ§€κΈˆ μŠ€ν¬λž©μˆ˜κ°€ λ§Žμ€ κ³΅κ³ λ“€μ΄μ—μš”</string>
Expand All @@ -40,7 +41,7 @@
<string name="search_process_no_result_text_sub">에</string>
<string name="search_process_no_result_text_main">ν•΄λ‹Ήν•˜λŠ” 검색 κ²°κ³Όκ°€ μ—†μ–΄μš”</string>

<!--calendar-->
<!--Calendar-->
<string name="calendar_text_sunday">일</string>
<string name="calendar_text_monday">μ›”</string>
<string name="calendar_text_tuesday">ν™”</string>
Expand All @@ -54,13 +55,12 @@
<string name="calendar_animation_label">Calendar Transition</string>
<string name="calendar_empty_scrap">μ„ νƒν•˜μ‹  λ‚ μ§œμ— 지원 마감인 슀크랩 곡고가 μ—†μ–΄μš”</string>

<!-- ν™ˆ 였늘 마감 곡고 -->
<!--Home-->
<string name="home_today_title">였늘 λ§ˆκ°λ˜λŠ” %sλ‹˜μ˜ 관심 곡고</string>
<string name="home_today_no_scrap">아직 슀크랩된 인턴 곡고가 μ—†μ–΄μš”!\n관심 곡고λ₯Ό μŠ€ν¬λž©ν•˜λ©΄ 마감 당일에 μ•Œλ €λ“œλ¦΄κ²Œμš”</string>
<string name="home_today_no_closed">였늘 마감인 곡고가 μ—†μ–΄μš”\nμΊ˜λ¦°λ”μ—μ„œ κ°€κΉŒμš΄ 곡고 일정을 ν™•μΈν•΄λ³΄μ„Έμš”</string>
<string name="home_today_no_closed">였늘 마감인 곡고가 μ—†μ–΄μš”\nμΊ˜λ¦°λ”μ—μ„œ κ°€κΉŒμš΄ 곡고 일정을 확인해 λ³΄μ„Έμš”</string>
<string name="home_today_check_schedule">곡고 마감 일정 ν™•μΈν•˜κΈ°</string>

<!-- ν™ˆ 맞좀 곡고 -->
<string name="terning_post_d_day">D-</string>
<string name="terning_post_working_period">근무기간</string>
<string name="home_recommend_sub_title">λ§ˆμŒμ— λ“œλŠ” 곡고λ₯Ό μŠ€ν¬λž©ν•˜κ³  μΊ˜λ¦°λ”μ—μ„œ λͺ¨μ•„λ³΄μ„Έμš”</string>
Expand All @@ -72,52 +72,52 @@
<string name="home_recommend_filtering_working_period_3">7κ°œμ›” 이상</string>
<string name="home_recommend_filtering_startYear">λ…„</string>
<string name="home_recommend_filtering_startMonth">μ›”</string>
<string name="home_recommend_no_intern">필터링 섀정에 μΌμΉ˜ν•˜λŠ” 인턴 곡고가 μ—†μ–΄μš”!\nλ”± λ§žλŠ” 인턴 곡고가 올라였면 λ°”λ‘œ μ•Œλ €λ“œλ¦΄κ²Œμš”</string>
<string name="home_recommend_no_intern">필터링 섀정에 μΌμΉ˜ν•˜λŠ” 인턴 곡고가 μ—†μ–΄μš”!</string>
<string name="home_recommend_no_intern_description">인턴 곡고가 μ—†μ–΄μš”!</string>
<string name="home_recommend_no_filtering">
μ§€κΈˆ 곡고 필터링을 μ„€μ •ν•˜κ³ \nλ‚΄ κ³„νšμ— λ”± λ§žλŠ” λŒ€ν•™μƒ 인턴 곡고λ₯Ό μΆ”μ²œλ°›μ•„λ³΄μ„Έμš”!
</string>
<string name="home_recommend_no_filtering_hyphen">-</string>

<!--start_filtering-->
<!--StartFiltering-->
<string name="start_filtering_title">ν„°μΉ˜ 3번으둜\nμ›ν•˜λŠ” λŒ€ν•™μƒ 인턴 곡고λ₯Ό λ„μ›Œλ“œλ¦΄κ²Œμš”</string>
<string name="start_filtering_main_image">μ‹œμž‘ν™”λ©΄ 이미지</string>
<string name="start_filtering_button">μ‹œμž‘ν•˜κΈ°</string>

<!-- start home-->
<!-- StartHome-->
<string name="start_home_title">이제 λ”± λ§žλŠ” 곡고와 ν•¨κ»˜\n터닝을 μ‹œμž‘ν•΄ λ³ΌκΉŒμš”?</string>
<string name="start_home_next_button">λ‚΄ 맞좀 곡고 λ°”λ‘œ λ³΄λŸ¬κ°€κΈ°</string>

<!--filtering-->
<string name="filtering_status1_title">%sλ‹˜μ˜ μž¬ν•™ μƒνƒœλ₯Ό μ„ νƒν•΄μ£Όμ„Έμš”</string>
<string name="filtering_status1_warning">*5λ…„μ œ ν˜Ήμ€ μ΄ˆκ³Όν•™κΈ°μƒμΈ 경우 4ν•™λ…„μœΌλ‘œ μ„ νƒν•΄μ£Όμ„Έμš”</string>
<string name="filtering_status1_sub">νœ΄ν•™μ€‘μ΄λΌλ©΄, νœ΄ν•™ μ „ λ§ˆμ§€λ§‰ 수료 학년을 μ„ νƒν•΄μ£Όμ„Έμš”</string>
<!--Filtering-->
<string name="filtering_status1_title">%sλ‹˜μ˜ μž¬ν•™ μƒνƒœλ₯Ό 선택해 μ£Όμ„Έμš”</string>
<string name="filtering_status1_warning">*5λ…„μ œ ν˜Ήμ€ μ΄ˆκ³Όν•™κΈ°μΈ 경우 4ν•™λ…„μœΌλ‘œ 선택해 μ£Όμ„Έμš”</string>
<string name="filtering_status1_sub">νœ΄ν•™ 쀑이라면, νœ΄ν•™ μ „ λ§ˆμ§€λ§‰ 수료 학년을 선택해 μ£Όμ„Έμš”</string>
<string name="filtering_status1_button1">1ν•™λ…„</string>
<string name="filtering_status1_button2">2ν•™λ…„</string>
<string name="filtering_status1_button3">3ν•™λ…„</string>
<string name="filtering_status1_button4">4ν•™λ…„</string>
<string name="filtering_status1_description1">λŒ€ν•™μƒμ˜ 꽃 인턴, μ–΄λ¦° λ‚˜μ΄μ— 미리 λ„μ „ν•΄λ³Όλž˜μš”!</string>
<string name="filtering_status1_description2">미리 λŒ€ν•™μƒ 인턴 κ²½ν—˜ν•˜κ³ , μ‚¬νšŒ μƒν™œμ„ ν•΄ 보고 μ‹Άμ–΄μš”</string>
<string name="filtering_status1_description3">4학년이 되기 μ „, μΈν„΄μœΌλ‘œ μœ μ˜λ―Έν•œ μŠ€νŽ™μ„ μŒ“κ³  μ‹Άμ–΄μš”</string>
<string name="filtering_status1_description4">μ‚¬νšŒμΈμœΌλ‘œμ˜ 첫 발걸음, μΈν„΄μœΌλ‘œ μ±„μš°κ³  μ‹Άμ–΄μš”</string>
<string name="filtering_status1_description1">λŒ€ν•™μƒ 인턴, λˆ„κ΅¬λ³΄λ‹€ λΉ λ₯΄κ²Œ μ‹œμž‘ν•΄ λ³΄μ„Έμš”!</string>
<string name="filtering_status1_description2">μΈν„΄μ΄λΌλŠ” 쒋은 기회둜 λ‹¨μˆ¨μ— μŠ€νŽ™μ—…ν•˜μ„Έμš”!</string>
<string name="filtering_status1_description3">μ§€κΈˆκΉŒμ§€ μ€€λΉ„ν•œ μ—­λŸ‰μ„ μΈν„΄μœΌλ‘œ λ°œνœ˜ν•΄ λ³΄μ„Έμš”!</string>
<string name="filtering_status1_description4">μ‚¬νšŒμ΄ˆλ…„μƒμœΌλ‘œ λ„μ•½ν•˜κΈ° μœ„ν•œ λ§ˆμ§€λ§‰ 단계λ₯Ό κ²½ν—˜ν•˜μ„Έμš”! </string>
<string name="filtering_status2_title">ν¬λ§ν•˜λŠ” 인턴 근무 기간을 선택해 μ£Όμ„Έμš”</string>
<string name="filtering_status2_sub">μ„ νƒν•œ κΈ°κ°„λ™μ•ˆ 근무할 수 μžˆλŠ” 인턴 곡고λ₯Ό μ°Ύμ•„λ“œλ¦΄κ²Œμš”</string>
<string name="filtering_status2_sub">μ„ νƒν•œ κΈ°κ°„ λ™μ•ˆ 근무할 수 μžˆλŠ” 인턴 곡고λ₯Ό μ°Ύμ•„λ“œλ¦΄κ²Œμš”</string>
<string name="filtering_status2_button1">1κ°œμ›” ~ 3κ°œμ›”</string>
<string name="filtering_status2_button2">4κ°œμ›” ~ 6κ°œμ›”</string>
<string name="filtering_status2_button3">7κ°œμ›” 이상</string>
<string name="filtering_status2_description1">짧은 κΈ°κ°„ μ•ˆμ— μŠ€νŽ™μ„ μŒ“κ³  싢은\n\인턴 μ΄ˆλ…„μƒ\μ—κ²Œ μΆ”μ²œν•΄μš”!</string>
<string name="filtering_status2_description2">μ’€ 더 였랜 μ‹œκ°„λ™μ•ˆμ˜ νšŒμ‚¬ κ²½ν—˜μ„ μ›ν•˜λŠ”\n\μ„±μˆ™ μΈν„΄λŸ¬\μ—κ²Œ μΆ”μ²œν•΄μš”!</string>
<string name="filtering_status2_description3">산업에 였랜 κΈ°κ°„ λ”₯λ‹€μ΄λΈŒ ν•˜κ³  싢은\n\μ˜ˆλΉ„ μ‚¬νšŒμΈ\μ—κ²Œ μΆ”μ²œν•΄μš”!</string>
<string name="filtering_status3_title">μž…μ‚¬λ₯Ό κ³„νšμ€‘μΈ 달을 μ„ νƒν•΄μ£Όμ„Έμš”</string>
<string name="filtering_status3_sub">μ„ νƒν•œ 달뢀터 근무λ₯Ό μ‹œμž‘ν•  수 μžˆλŠ” 곡고λ₯Ό μ°Ύμ•„λ“œλ¦΄κ²Œμš”</string>
<string name="filtering_status2_description1">짧은 κΈ°κ°„ μ•ˆμ— μœ μ˜λ―Έν•œ μŠ€νŽ™μ„ μŒ“μ„ 수 μžˆμ–΄μš”!</string>
<string name="filtering_status2_description2">νšŒμ‚¬μ™€ 직무에 λŒ€ν•΄ μ΄ν•΄ν•˜κΈ° μ λ‹Ήν•œ κΈ°κ°„μ΄μ—μš”!</string>
<string name="filtering_status2_description3">였랜 κΈ°κ°„ λ‚΄ 컀리어에 λ§žλŠ” 직무 κ²½ν—˜μ„ λ§Œλ“€ 수 μžˆμ–΄μš”!</string>
<string name="filtering_status3_title">μ–Έμ œλΆ€ν„° 인턴 근무가 κ°€λŠ₯ν•œμ§€ μ•Œλ €μ£Όμ„Έμš”</string>
<string name="filtering_status3_sub">μ›ν•˜λŠ” 근무 μ‹œμž‘ μ‹œκΈ°μ— λ§žλŠ” 인턴 곡고λ₯Ό μ°Ύμ•„λ“œλ €μš”</string>
<string name="filtering_button">λ‹€μŒμœΌλ‘œ</string>

<!-- changeFilter -->
<!--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_period_sub">μ„ νƒν•œ κΈ°κ°„ λ™μ•ˆ 근무할 수 μžˆλŠ” 인턴 곡고λ₯Ό μ°Ύμ•„λ“œλ¦΄κ²Œμš”</string>
<string name="change_filter_start_work_sub">μ„ νƒν•œ 달뢀터 근무λ₯Ό μ‹œμž‘ν•  수 μžˆλŠ” 곡고λ₯Ό μ°Ύμ•„λ“œλ¦΄κ²Œμš”</string>

<!--Intern-->
Expand All @@ -134,4 +134,6 @@
<string name="intern_sub_title_intern_detail">상세 정보</string>
<string name="intern_info_request">μžκ²©μš”κ±΄</string>
<string name="intern_info_work">직무</string>

<!--Onboarding-->
</resources>

0 comments on commit b1a803b

Please sign in to comment.