From 05bdbbc10e3c5b603023118b01993bdcc5807fa1 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 9 Sep 2016 06:56:49 +0200
Subject: [PATCH] Fixed minor issues with "save changes" dialogs

---
 .../ui/coresettings/chatlist/ChatListEditActivity.java       | 5 +++++
 .../ui/coresettings/identity/IdentityEditActivity.java       | 5 +++++
 .../coresettings/identity/nick/IdentityNickListActivity.java | 5 +++++
 .../ui/coresettings/ignore/IgnoreRuleEditActivity.java       | 5 +++++
 .../ui/coresettings/network/NetworkEditActivity.java         | 5 +++++
 .../kuschku/util/ui/preferences/MaterialListPreference.java  | 3 +--
 app/src/main/res/values/attrs.xml                            | 1 +
 app/src/main/res/values/themes_quassel.xml                   | 2 ++
 app/src/main/res/values/themes_solarized.xml                 | 2 ++
 9 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
index 013ea3760..57d169705 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
@@ -120,6 +120,7 @@ public class ChatListEditActivity extends BoundActivity {
                     .negativeText(R.string.actionNo)
                     .positiveColor(context.themeUtil().res.colorAccent)
                     .negativeColor(context.themeUtil().res.colorForeground)
+                    .backgroundColorAttr(R.attr.colorBackgroundDialog)
                     .onPositive((dialog, which) -> {
                         save();
                         super.onBackPressed();
@@ -134,6 +135,9 @@ public class ChatListEditActivity extends BoundActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
             case R.id.action_delete: {
                 new MaterialDialog.Builder(this)
                         .content(getString(R.string.confirmationDelete, config.bufferViewName()))
@@ -141,6 +145,7 @@ public class ChatListEditActivity extends BoundActivity {
                         .negativeText(R.string.actionNo)
                         .positiveColor(context.themeUtil().res.colorAccent)
                         .negativeColor(context.themeUtil().res.colorForeground)
+                        .backgroundColorAttr(R.attr.colorBackgroundDialog)
                         .onPositive((dialog, which) -> {
                             finish();
                             context.client().bufferViewManager().deleteBufferView(config.bufferViewId());
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
index 9a4630d14..ff861908e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
@@ -154,6 +154,7 @@ public class IdentityEditActivity extends BoundActivity {
                     .negativeText(R.string.actionNo)
                     .positiveColor(context.themeUtil().res.colorAccent)
                     .negativeColor(context.themeUtil().res.colorForeground)
+                    .backgroundColorAttr(R.attr.colorBackgroundDialog)
                     .onPositive((dialog, which) -> {
                         save();
                         super.onBackPressed();
@@ -168,6 +169,9 @@ public class IdentityEditActivity extends BoundActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
             case R.id.action_delete: {
                 new MaterialDialog.Builder(this)
                         .content(getString(R.string.confirmationDelete, identity.identityName()))
@@ -175,6 +179,7 @@ public class IdentityEditActivity extends BoundActivity {
                         .negativeText(R.string.actionNo)
                         .positiveColor(context.themeUtil().res.colorAccent)
                         .negativeColor(context.themeUtil().res.colorForeground)
+                        .backgroundColorAttr(R.attr.colorBackgroundDialog)
                         .onPositive((dialog, which) -> {
                             finish();
                             context.client().removeIdentity(identity.id());
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java
index b7660b67f..ff212968a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/nick/IdentityNickListActivity.java
@@ -71,6 +71,7 @@ public class IdentityNickListActivity extends BoundActivity implements OnStartDr
                 .positiveColor(context.themeUtil().res.colorAccent)
                 .negativeColor(context.themeUtil().res.colorForeground)
                 .neutralColor(context.themeUtil().res.colorForeground)
+                .backgroundColorAttr(R.attr.colorBackgroundDialog)
                 .onPositive((dialog1, which) -> {
                     String text = dialog1.getInputEditText().getText().toString().trim();
                     nicks.set(nicks.indexOf(nick), text);
@@ -116,6 +117,7 @@ public class IdentityNickListActivity extends BoundActivity implements OnStartDr
                     .negativeText("Cancel")
                     .positiveColor(context.themeUtil().res.colorAccent)
                     .negativeColor(context.themeUtil().res.colorForeground)
+                    .backgroundColorAttr(R.attr.colorBackgroundDialog)
                     .onPositive((dialog1, which) -> {
                         String nick = dialog1.getInputEditText().getText().toString().trim();
                         if (!nicks.contains(nick))
@@ -138,6 +140,9 @@ public class IdentityNickListActivity extends BoundActivity implements OnStartDr
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
             case R.id.action_confirm: {
                 Intent intent = new Intent();
                 intent.putStringArrayListExtra("nicks", nicks);
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/ignore/IgnoreRuleEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/ignore/IgnoreRuleEditActivity.java
index 7320566e6..98ab05672 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/ignore/IgnoreRuleEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/ignore/IgnoreRuleEditActivity.java
@@ -124,6 +124,7 @@ public class IgnoreRuleEditActivity extends BoundActivity {
                     .negativeText(R.string.actionNo)
                     .positiveColor(context.themeUtil().res.colorAccent)
                     .negativeColor(context.themeUtil().res.colorForeground)
+                    .backgroundColorAttr(R.attr.colorBackgroundDialog)
                     .onPositive((dialog, which) -> {
                         save();
                         super.onBackPressed();
@@ -138,6 +139,9 @@ public class IgnoreRuleEditActivity extends BoundActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
             case R.id.action_delete: {
                 new MaterialDialog.Builder(this)
                         .content(getString(R.string.confirmationDelete, this.item.getIgnoreRule().rule()))
@@ -145,6 +149,7 @@ public class IgnoreRuleEditActivity extends BoundActivity {
                         .negativeText(R.string.actionNo)
                         .positiveColor(context.themeUtil().res.colorAccent)
                         .negativeColor(context.themeUtil().res.colorForeground)
+                        .backgroundColorAttr(R.attr.colorBackgroundDialog)
                         .onPositive((dialog, which) -> {
                             delete();
                             finish();
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
index 0de4a867a..c2708c20c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
@@ -229,6 +229,7 @@ public class NetworkEditActivity extends BoundActivity {
                     .negativeText(R.string.actionNo)
                     .positiveColor(context.themeUtil().res.colorAccent)
                     .negativeColor(context.themeUtil().res.colorForeground)
+                    .backgroundColorAttr(R.attr.colorBackgroundDialog)
                     .onPositive((dialog, which) -> {
                         save();
                         super.onBackPressed();
@@ -243,6 +244,9 @@ public class NetworkEditActivity extends BoundActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
             case R.id.action_delete: {
                 new MaterialDialog.Builder(this)
                         .content(getString(R.string.confirmationDelete, network.networkName()))
@@ -250,6 +254,7 @@ public class NetworkEditActivity extends BoundActivity {
                         .negativeText(R.string.actionNo)
                         .positiveColor(context.themeUtil().res.colorAccent)
                         .negativeColor(context.themeUtil().res.colorForeground)
+                        .backgroundColorAttr(R.attr.colorBackgroundDialog)
                         .onPositive((dialog, which) -> {
                             finish();
                             context.client().removeNetwork(network.networkId());
diff --git a/app/src/main/java/de/kuschku/util/ui/preferences/MaterialListPreference.java b/app/src/main/java/de/kuschku/util/ui/preferences/MaterialListPreference.java
index efbaa0609..1396c604e 100644
--- a/app/src/main/java/de/kuschku/util/ui/preferences/MaterialListPreference.java
+++ b/app/src/main/java/de/kuschku/util/ui/preferences/MaterialListPreference.java
@@ -39,7 +39,6 @@ import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.lang.reflect.Field;
 
-import de.kuschku.quasseldroid_ng.R;
 import de.kuschku.util.annotationbind.AutoBinder;
 
 /**
@@ -121,7 +120,7 @@ public class MaterialListPreference extends ListPreference {
                             break;
                     }
                 })
-                .backgroundColor(AutoBinder.obtainColor(R.attr.colorBackground, context.getTheme()))
+                .backgroundColor(AutoBinder.obtainColor(de.kuschku.quasseldroid_ng.R.attr.colorBackgroundDialog, context.getTheme()))
                 .negativeText(getNegativeButtonText())
                 .items(getEntries())
                 .autoDismiss(true) // immediately close the dialog after selection
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4d99f32e6..05ae0682b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -76,6 +76,7 @@
     <attr name="colorBackgroundHighlight" format="color"/>
     <attr name="colorBackgroundSecondary" format="color"/>
     <attr name="colorBackgroundCard" format="color"/>
+    <attr name="colorBackgroundDialog" format="color"/>
 
     <!-- Tint colors for drawer -->
 
diff --git a/app/src/main/res/values/themes_quassel.xml b/app/src/main/res/values/themes_quassel.xml
index b92fba7d6..36b18e745 100644
--- a/app/src/main/res/values/themes_quassel.xml
+++ b/app/src/main/res/values/themes_quassel.xml
@@ -55,6 +55,7 @@
         <item name="colorBackgroundHighlight">#ff8811</item>
         <item name="colorBackgroundSecondary">@null</item>
         <item name="colorBackgroundCard">#FFFFFF</item>
+        <item name="colorBackgroundDialog">#FAFAFA</item>
 
         <item name="colorTintActivity">#88cc33</item>
         <item name="colorTintMessage">#2277dd</item>
@@ -97,6 +98,7 @@
         <item name="colorBackgroundHighlight">#ff8811</item>
         <item name="colorBackgroundSecondary">@null</item>
         <item name="colorBackgroundCard">#424242</item>
+        <item name="colorBackgroundDialog">#303030</item>
 
         <item name="colorTintActivity">#88cc33</item>
         <item name="colorTintMessage">#2277dd</item>
diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml
index 9a0209ab9..f7948875d 100644
--- a/app/src/main/res/values/themes_solarized.xml
+++ b/app/src/main/res/values/themes_solarized.xml
@@ -61,6 +61,7 @@
         <item name="colorBackgroundHighlight">#268bd2</item>
         <item name="colorBackgroundSecondary">@null</item>
         <item name="colorBackgroundCard">#EEE8D5</item>
+        <item name="colorBackgroundDialog">#FDF6E3</item>
 
         <item name="colorTintActivity">#88cc33</item>
         <item name="colorTintMessage">#2277dd</item>
@@ -108,6 +109,7 @@
         <item name="colorBackgroundHighlight">#268bd2</item>
         <item name="colorBackgroundSecondary">@null</item>
         <item name="colorBackgroundCard">#073642</item>
+        <item name="colorBackgroundDialog">#002B36</item>
 
         <item name="colorTintActivity">#88cc33</item>
         <item name="colorTintMessage">#2277dd</item>
-- 
GitLab