languageManager update
This commit is contained in:
@ -27,6 +27,10 @@ class MainActivity : AppCompatActivity() {
|
||||
// LIVE: Network-Callback (optional für Statusleiste)
|
||||
private var netCb: ConnectivityManager.NetworkCallback? = null
|
||||
|
||||
// Wir kennen hier (vor dem OpeningScreen) noch keine Nutzerwahl → Deutsch als Startsprache.
|
||||
private val bootLanguageId: String get() = "GERMAN"
|
||||
private fun t(key: String): String = LanguageManager.getText(bootLanguageId, key)
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
@ -57,11 +61,11 @@ class MainActivity : AppCompatActivity() {
|
||||
setPadding(dp(20), dp(8), dp(20), 0)
|
||||
}
|
||||
val etUser = EditText(this).apply {
|
||||
hint = "Username"
|
||||
hint = t("username_hint")
|
||||
setSingleLine()
|
||||
}
|
||||
val etPass = EditText(this).apply {
|
||||
hint = "Passwort"
|
||||
hint = t("password_hint")
|
||||
setSingleLine()
|
||||
inputType = android.text.InputType.TYPE_CLASS_TEXT or
|
||||
android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD
|
||||
@ -70,14 +74,14 @@ class MainActivity : AppCompatActivity() {
|
||||
container.addView(etPass)
|
||||
|
||||
val dialog = AlertDialog.Builder(this)
|
||||
.setTitle("Login erforderlich")
|
||||
.setTitle(t("login_required_title"))
|
||||
.setView(container)
|
||||
.setCancelable(false)
|
||||
.setPositiveButton("Login") { _, _ ->
|
||||
.setPositiveButton(t("login_btn")) { _, _ ->
|
||||
val user = etUser.text.toString().trim()
|
||||
val pass = etPass.text.toString()
|
||||
if (user.isEmpty() || pass.isEmpty()) {
|
||||
Toast.makeText(this, "Bitte Username & Passwort eingeben", Toast.LENGTH_SHORT).show()
|
||||
Toast.makeText(this, t("please_username_password"), Toast.LENGTH_SHORT).show()
|
||||
showLoginThenDownload()
|
||||
return@setPositiveButton
|
||||
}
|
||||
@ -97,14 +101,14 @@ class MainActivity : AppCompatActivity() {
|
||||
// Wenn Download fehlgeschlagen ist, aber evtl. schon eine DB lokal liegt,
|
||||
// lassen wir den Nutzer trotzdem weiterarbeiten (Offline).
|
||||
if (!ok && !hasLocalDb()) {
|
||||
Toast.makeText(this, "Download fehlgeschlagen – keine lokale Datenbank vorhanden", Toast.LENGTH_LONG).show()
|
||||
Toast.makeText(this, t("download_failed_no_local_db"), Toast.LENGTH_LONG).show()
|
||||
// Zurück zum Login, damit man es erneut probieren kann
|
||||
showLoginThenDownload()
|
||||
return@downloadAndReplaceDatabase
|
||||
}
|
||||
|
||||
if (!ok) {
|
||||
Toast.makeText(this, "Download fehlgeschlagen – arbeite offline mit vorhandener DB", Toast.LENGTH_LONG).show()
|
||||
Toast.makeText(this, t("download_failed_use_offline"), Toast.LENGTH_LONG).show()
|
||||
}
|
||||
|
||||
// Opening-Screen starten
|
||||
@ -115,12 +119,13 @@ class MainActivity : AppCompatActivity() {
|
||||
},
|
||||
onError = { msg ->
|
||||
showBusy(false)
|
||||
Toast.makeText(this, msg, Toast.LENGTH_LONG).show()
|
||||
val txt = t("login_failed_with_reason").replace("{reason}", msg ?: "")
|
||||
Toast.makeText(this, txt, Toast.LENGTH_LONG).show()
|
||||
showLoginThenDownload()
|
||||
}
|
||||
)
|
||||
}
|
||||
.setNegativeButton("Beenden") { _, _ -> finishAffinity() }
|
||||
.setNegativeButton(t("exit_btn")) { _, _ -> finishAffinity() }
|
||||
.create()
|
||||
|
||||
dialog.show()
|
||||
|
||||
Reference in New Issue
Block a user