From e20c6add4398ffc0137fc637bb9897c2cd09cb18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 22 Feb 2015 23:52:29 +0100
Subject: Fix multi select and more colors

---
 .../java/org/sufficientlysecure/keychain/KeychainApplication.java     | 2 +-
 .../main/java/org/sufficientlysecure/keychain/ui/MainActivity.java    | 2 --
 .../java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java    | 2 --
 .../keychain/ui/dialog/CustomAlertDialogBuilder.java                  | 4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'OpenKeychain/src/main/java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 957ce4b23..01f6735ea 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -86,7 +86,7 @@ public class KeychainApplication extends Application {
         }
 
         brandGlowEffect(getApplicationContext(),
-                getApplicationContext().getResources().getColor(R.color.emphasis));
+                getApplicationContext().getResources().getColor(R.color.primary));
 
         setupAccountAsNeeded(this);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index f3bf337c9..2f29f9360 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -31,8 +31,6 @@ public class MainActivity extends NavDrawerActivity {
     public void init(Bundle savedInstanceState) {
         super.init(savedInstanceState);
 
-        setTitle(R.string.nav_keys);
-
         // if this is the first time show first time activity
         Preferences prefs = Preferences.getPreferences(this);
         if (prefs.isFirstTime()) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
index 1bd1f0085..fb23c7d3a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
@@ -24,8 +24,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.remote.ui.AppsListFragment;
 
 import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
-import it.neokree.materialnavigationdrawer.elements.MaterialSection;
-import it.neokree.materialnavigationdrawer.elements.listeners.MaterialSectionListener;
 
 public abstract class NavDrawerActivity extends MaterialNavigationDrawer {
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java
index aa27e8391..d405b1dda 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java
@@ -26,13 +26,13 @@ public class CustomAlertDialogBuilder extends AlertDialog.Builder {
         int dividerId = dialog.getContext().getResources().getIdentifier("android:id/titleDivider", null, null);
         View divider = dialog.findViewById(dividerId);
         if (divider != null) {
-            divider.setBackgroundColor(dialog.getContext().getResources().getColor(R.color.emphasis));
+            divider.setBackgroundColor(dialog.getContext().getResources().getColor(R.color.header_text));
         }
 
         int textViewId = dialog.getContext().getResources().getIdentifier("android:id/alertTitle", null, null);
         TextView tv = (TextView) dialog.findViewById(textViewId);
         if (tv != null) {
-            tv.setTextColor(dialog.getContext().getResources().getColor(R.color.emphasis));
+            tv.setTextColor(dialog.getContext().getResources().getColor(R.color.header_text));
         }
 
         return dialog;
-- 
cgit v1.2.3