diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt index e5d667fb..9a8b70a9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt @@ -29,6 +29,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers import kotlinx.coroutines.launch import kr.co.vividnext.sodalive.BuildConfig +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants import kr.co.vividnext.sodalive.common.LoadingDialog @@ -56,7 +57,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i } override fun setupView() { - binding.toolbar.tvBack.text = "로그인" + binding.toolbar.tvBack.text = getString(R.string.title_login) binding.toolbar.tvBack.setOnClickListener { finish() } loadingDialog = LoadingDialog(this, layoutInflater) @@ -113,7 +114,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i // Extract credential from the result returned by Credential Manager handleSignIn(result.credential) } catch (e: GetCredentialException) { - showToast("구글 로그인을 하지 못했습니다. 다시 시도해 주세요") + showToast(getString(R.string.login_google_failed)) Logger.e("Couldn't retrieve user's credentials: ${e.localizedMessage}") loadingDialog.dismiss() } @@ -145,7 +146,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i startActivity(nextIntent) } } else { - showToast("로그인을 하지 못했습니다. 다시 시도해 주세요") + showToast(getString(R.string.login_failed)) Logger.e("Credential is not of type Google ID!") } } @@ -214,7 +215,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i private val kakaoLoginCallback: (OAuthToken?, Throwable?) -> Unit = { token, error -> loadingDialog.dismiss() if (error != null) { - showToast("카카오 계정으로 로그인 하지 못했습니다. 다시 시도해 주세요") + showToast(getString(R.string.login_kakao_failed)) } else if (token != null) { handleKakaoLogin(token) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt index dbcdfa02..9aff98f7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt @@ -12,6 +12,7 @@ import androidx.media3.common.util.UnstableApi import com.jakewharton.rxbinding4.widget.textChanges import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants import kr.co.vividnext.sodalive.common.LoadingDialog @@ -38,7 +39,7 @@ class SignUpActivity : BaseActivity(ActivitySignupBinding } override fun setupView() { - binding.toolbar.tvBack.text = "회원가입" + binding.toolbar.tvBack.text = getString(R.string.title_signup) binding.toolbar.tvBack.setOnClickListener { finish() } loadingDialog = LoadingDialog(this, layoutInflater) diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4b541984..2d3fdeee 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -41,8 +41,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/gmarket_sans_medium" - android:hint="이메일" + android:fontFamily="@font/pretendard_medium" + android:hint="@string/hint_email" android:importantForAutofill="no" android:inputType="textEmailAddress" android:paddingVertical="18dp" @@ -71,8 +71,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/gmarket_sans_medium" - android:hint="비밀번호" + android:fontFamily="@font/pretendard_medium" + android:hint="@string/hint_password" android:imeOptions="actionDone" android:importantForAutofill="no" android:inputType="textPassword" @@ -89,10 +89,10 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="40dp" android:background="@drawable/bg_round_corner_6_7_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" - android:text="로그인" + android:text="@string/title_login" android:textColor="@color/white" android:textSize="15sp" /> @@ -101,9 +101,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="30dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingVertical="10dp" - android:text="비밀번호를 잊으셨나요?" + android:text="@string/forgot_password" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> @@ -112,9 +112,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:fontFamily="@font/gmarket_sans_medium" + android:fontFamily="@font/pretendard_medium" android:paddingVertical="10dp" - android:text="보이스온 회원이 아닌가요? 지금 가입하세요." + android:text="@string/signup_prompt" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml index 91defdd3..60dffc35 100644 --- a/app/src/main/res/layout/activity_signup.xml +++ b/app/src/main/res/layout/activity_signup.xml @@ -42,8 +42,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/gmarket_sans_medium" - android:hint="이메일" + android:fontFamily="@font/pretendard_medium" + android:hint="@string/hint_email" android:importantForAutofill="no" android:inputType="textEmailAddress" android:paddingVertical="18dp" @@ -72,8 +72,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fontFamily="@font/gmarket_sans_medium" - android:hint="비밀번호" + android:fontFamily="@font/pretendard_medium" + android:hint="@string/hint_password" android:imeOptions="actionDone" android:importantForAutofill="no" android:inputType="textPassword" @@ -111,8 +111,8 @@ android:id="@+id/tv_terms_of_service" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" - android:text="이용약관" + android:fontFamily="@font/pretendard_medium" + android:text="@string/terms_of_service" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -120,8 +120,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" - android:text="(필수)" + android:fontFamily="@font/pretendard_medium" + android:text="@string/required_label" android:textColor="@color/color_3bb9f1" android:textSize="12sp" /> @@ -155,8 +155,8 @@ android:id="@+id/tv_privacy_policy" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" - android:text="개인정보수집 및 이용동의" + android:fontFamily="@font/pretendard_medium" + android:text="@string/privacy_policy" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -164,8 +164,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6.7dp" - android:fontFamily="@font/gmarket_sans_medium" - android:text="(필수)" + android:fontFamily="@font/pretendard_medium" + android:text="@string/required_label" android:textColor="@color/color_3bb9f1" android:textSize="12sp" /> @@ -178,10 +178,10 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="26.7dp" android:background="@drawable/bg_round_corner_10_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:gravity="center" android:paddingVertical="16dp" - android:text="회원가입" + android:text="@string/title_signup" android:textColor="@color/white" android:textSize="18.3sp" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 45c27e45..a7cd3aba 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -43,4 +43,18 @@ Delete this? OK Cancel + + + Log in + Sign up + Email + Password + Forgot your password? + Not a VoiceOn member yet? Sign up now. + Terms of Service + Privacy Policy + (Required) + Could not sign in with Google. Please try again. + Could not sign in. Please try again. + Could not sign in with Kakao. Please try again. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b9ccd53c..ef67f2d1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -43,4 +43,18 @@ 削除しますか? OK キャンセル + + + ログイン + 新規登録 + メールアドレス + パスワード + パスワードをお忘れですか? + VoiceOnの会員ではありませんか?今すぐ登録してください。 + 利用規約 + 個人情報の収集・利用について + (必須) + Googleでログインできませんでした。もう一度お試しください。 + ログインできませんでした。もう一度お試しください。 + Kakaoアカウントでログインできませんでした。もう一度お試しください。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2bdaa47d..93e1a889 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,4 +42,18 @@ 삭제 하시겠습니까? 확인 취소 + + + 로그인 + 회원가입 + 이메일 + 비밀번호 + 비밀번호를 잊으셨나요? + 보이스온 회원이 아닌가요? 지금 가입하세요. + 이용약관 + 개인정보수집 및 이용동의 + (필수) + 구글 로그인을 하지 못했습니다. 다시 시도해 주세요 + 로그인을 하지 못했습니다. 다시 시도해 주세요 + 카카오 계정으로 로그인 하지 못했습니다. 다시 시도해 주세요