From 81a1a23cf701b11e05d1752d445ae3e013d9ab85 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 25 Nov 2019 13:18:19 +0100 Subject: [PATCH] Improve button text during registration. Fixes #1249 --- Habitica/res/values/strings.xml | 2 ++ .../habitrpg/android/habitica/ui/activities/LoginActivity.kt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index c07088f35..6d8759410 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -461,6 +461,8 @@ Not owned Login with Facebook Login with Google + Sign up with Facebook + Sign up with Google Back Oh, you must be new here. I’m Justin, I’ll be your guide in Habitica.\n\nFirst, what should we call you? Feel free to change what I picked. When you’re all set, let’s create your avatar! Randomize diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt index 3e8b2cef1..6cb9e185b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt @@ -252,10 +252,14 @@ class LoginActivity : BaseActivity(), Consumer { this.mLoginNormalBtn.text = getString(R.string.register_btn) mUsernameET.setHint(R.string.username) mPasswordET.imeOptions = EditorInfo.IME_ACTION_NEXT + facebookLoginButton.setText(R.string.register_btn_fb) + googleLoginButton.setText(R.string.register_btn_google) } else { this.mLoginNormalBtn.text = getString(R.string.login_btn) mUsernameET.setHint(R.string.email_username) mPasswordET.imeOptions = EditorInfo.IME_ACTION_DONE + facebookLoginButton.setText(R.string.login_btn_fb) + googleLoginButton.setText(R.string.login_btn_google) } this.resetLayout() }