From a36244f162ebc4163884ec6e53bc990d01de24fc Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 15 Jun 2018 00:33:21 +0200
Subject: [PATCH] Fixes translation issues
---
.../setup/accounts/edit/AccountEditActivity.kt | 18 ++++++++++--------
app/src/main/res/values/strings_settings.xml | 1 +
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
index 1aa9d65f9..e5040d46d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
@@ -24,13 +24,13 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.design.widget.TextInputLayout
-import android.support.v7.app.AlertDialog
import android.text.Editable
import android.view.Menu
import android.view.MenuItem
import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
+import com.afollestad.materialdialogs.MaterialDialog
import dagger.android.support.DaggerAppCompatActivity
import de.kuschku.quasseldroid.Keys
import de.kuschku.quasseldroid.R
@@ -156,10 +156,14 @@ class AccountEditActivity : DaggerAppCompatActivity() {
override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) {
R.id.action_delete -> {
- AlertDialog.Builder(this)
- .setTitle("Delete?")
- .setMessage("Are you sure?")
- .setPositiveButton("Delete") { _, _ ->
+ MaterialDialog.Builder(this)
+ .content(R.string.delete_confirmation)
+ .positiveText(R.string.label_yes)
+ .negativeText(R.string.label_no)
+ .negativeColorAttr(R.attr.colorTextPrimary)
+ .backgroundColorAttr(R.attr.colorBackgroundCard)
+ .contentColorAttr(R.attr.colorTextPrimary)
+ .onPositive { _, _ ->
val it = account
if (it != null)
handler.post {
@@ -174,9 +178,7 @@ class AccountEditActivity : DaggerAppCompatActivity() {
setResult(Activity.RESULT_OK)
finish()
}
- .setNegativeButton("Cancel") { dialogInterface, _ ->
- dialogInterface.cancel()
- }
+ .build()
.show()
true
}
diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml
index ffdf83bd6..69c30b731 100644
--- a/app/src/main/res/values/strings_settings.xml
+++ b/app/src/main/res/values/strings_settings.xml
@@ -83,6 +83,7 @@
<string name="settings_chatlist_sort_alphabetically">Sort Alphabetically</string>
<string name="settings_chatlist_add_new_buffers_automatically">Add new chats automatically</string>
<string name="settings_chatlist_network">Network</string>
+ <string name="settings_chatlist_network_all">All Networks</string>
<string name="settings_chatlist_show_status_buffer">Show Status Buffer</string>
<string name="settings_chatlist_types">Chat Types</string>
<string name="settings_chatlist_show_channels">Show Channels</string>
--
GitLab