diff --git a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt index 4efbad11a..c8bee8c0c 100644 --- a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt @@ -79,12 +79,12 @@ class AccountActivity : BaseActivity() { } AuthState.Available -> { - updateStatus("Verifying session") + updateStatus(getString(R.string.session_verifying)) updateActionLayout(false) } AuthState.Unavailable -> { - updateStatus("You need to login first") + updateStatus(getString(R.string.session_login)) updateActionLayout(true) } @@ -93,7 +93,7 @@ class AccountActivity : BaseActivity() { } AuthState.SignedOut -> { - updateStatus("Last session scrapped") + updateStatus(getString(R.string.session_scrapped)) updateActionLayout(true) } @@ -114,10 +114,10 @@ class AccountActivity : BaseActivity() { when (event) { is BusEvent.GoogleAAS -> { if (event.success) { - updateStatus("Verifying Google Session") + updateStatus(getString(R.string.session_verifying_google)) VM.buildGoogleAuthData(event.email, event.aasToken) } else { - updateStatus("Failed to login via Google") + updateStatus(getString(R.string.session_login_failed_google)) } } else -> { @@ -129,10 +129,10 @@ class AccountActivity : BaseActivity() { private fun updateContents() { if (accountProvider.isSignedIn()) { B.viewFlipper.displayedChild = 1 - updateStatus("Woah! all good.") + updateStatus(getString(R.string.session_good)) } else { B.viewFlipper.displayedChild = 0 - updateStatus("Login and enjoy.") + updateStatus(getString(R.string.session_enjoy)) } updateUserProfile() diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt index f12cb967f..fffcea6f4 100644 --- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt @@ -77,7 +77,7 @@ class SplashActivity : BaseActivity() { attachActions() //Initial status - updateStatus("Getting things ready..") + updateStatus(getString(R.string.session_init)) VM.liveData.observe(this, { when (it) { @@ -86,12 +86,12 @@ class SplashActivity : BaseActivity() { } AuthState.Available -> { - updateStatus("Verifying session") + updateStatus(getString(R.string.session_verifying)) updateActionLayout(false) } AuthState.Unavailable -> { - updateStatus("You need to login first") + updateStatus(getString(R.string.session_login)) updateActionLayout(true) } @@ -100,7 +100,7 @@ class SplashActivity : BaseActivity() { } AuthState.SignedOut -> { - updateStatus("Last session scrapped") + updateStatus(getString(R.string.session_scrapped)) updateActionLayout(true) } @@ -164,10 +164,10 @@ class SplashActivity : BaseActivity() { when (event) { is BusEvent.GoogleAAS -> { if (event.success) { - updateStatus("Verifying Google Session") + updateStatus(getString(R.string.session_verifying_google)) VM.buildGoogleAuthData(event.email, event.aasToken) } else { - updateStatus("Failed to login via Google") + updateStatus(getString(R.string.session_login_failed_google)) } } else -> { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 717b60079..a3bb63fe8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -316,6 +316,14 @@ "App not found" "Could not get files" "Session expired, re-login to obtain new session." + Login and enjoy. + Woah! All good. + Getting things ready… + You need to login first + Failed to login via Google + Last session scrapped + Verifying session + Verifying Google Session "Make sure you re-login to apply the spoof" "Make sure you re-login and restart app to apply changes." "Categories"