From 835ef01a70357da320cd8cbaaa0a49a7eaef6467 Mon Sep 17 00:00:00 2001
From: d8ahazard <d8ahazard@gmail.com>
Date: Mon, 26 Sep 2016 14:11:00 -0500
Subject: [PATCH] Prettify theme, add relaunch to settings on change

---
 .../java/com/topjohnwu/magisk/MainActivity.java | 17 +++++++++++------
 app/src/main/res/values/colors.xml              |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
index e14caaedb..69191a45a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
@@ -135,20 +135,25 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         mSelectedId = savedInstanceState == null ? mSelectedId : savedInstanceState.getInt(SELECTED_ITEM_ID);
         navigationView.setCheckedItem(mSelectedId);
 
-        if (savedInstanceState == null) {
-            mDrawerHandler.removeCallbacksAndMessages(null);
-            mDrawerHandler.postDelayed(() -> navigate(mSelectedId), 250);
-        }
 
         navigationView.setNavigationItemSelectedListener(this);
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            navigate(R.id.settings);
-            Logger.dh("MainActivity: Intent has extras " + getIntent().getExtras().getString("Relaunch"));
+            String toLaunch = "";
+            toLaunch = getIntent().getExtras().getString("Relaunch");
+            if (toLaunch.equals("Settings")) {
+                Logger.dh("MainActivity: Intent has extras " + getIntent().getExtras().getString("Relaunch"));
+                mSelectedId = R.id.settings;
+            }
 
         }
 
+
+        mDrawerHandler.removeCallbacksAndMessages(null);
+        navigate(mSelectedId);
+
+
     }
 
     @Override
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ca2ed3910..4bab5f5eb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,7 +16,7 @@
     <color name="dh_primary">#3F51B5</color>
     <color name="dh_primary_dark">#303F9F</color>
     <color name="dh_primary_light">#C5CAE9</color>
-    <color name="dh_accent">#9C6DFF</color>
+    <color name="dh_accent">#448AFF</color>
 
     <color name="dh_primary_text">#dedede</color>
     <color name="dh_secondary_text">#8A8A8A</color>
@@ -24,8 +24,8 @@
     <color name="dh_divider">#313131</color>
     <color name="dh_alertWarn">#FF9800</color>
     <color name="dh_alertOk">@color/dh_accent</color>
-    <color name="dh_alertNeutral">#2196F3</color>
-    <color name="dh_alertFail">#FF5722</color>
+    <color name="dh_alertNeutral">@color/dh_primary_light</color>
+    <color name="dh_alertFail">@color/red500</color>
 
 
 </resources>