athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Allow for better localization

See merge request AuroraOSS/AuroraStore!190
This commit is contained in:
Rahul Patel
2022-09-25 01:12:03 +00:00
parent 451f396c79 e6dc9fefdd
commit 42d0d89368
6 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
View File

@@ -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()

12
app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
View File

@@ -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 -> {

7
app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
View File

@@ -196,7 +196,12 @@ class UpdatesFragment : BaseFragment() {
add(
UpdateHeaderViewModel_()
.id("header_all")
.title("${updateFileMap.size} updates available")
.title("${updateFileMap.size} " +
if (updateFileMap.size == 1)
getString(R.string.update_available)
else
getString(R.string.updates_available)
)
.action(
if (VM.updateAllEnqueued)
getString(R.string.action_cancel)