fix(auth): 로그인/회원가입 문자열 리소스화 및 영·일 번역 추가
This commit is contained in:
@@ -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>(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>(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>(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>(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)
|
||||
}
|
||||
|
||||
@@ -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>(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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user