From 6692b618ea2037e307a939ab5bb1c41478921395 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sun, 25 Sep 2016 14:11:39 -0500 Subject: [PATCH] More fun with themes --- .../com/topjohnwu/magisk/MainActivity.java | 1 - app/src/main/res/layout/activity_main.xml | 1 - app/src/main/res/values/colors.xml | 4 ++-- app/src/main/res/values/styles.xml | 22 ++++++++++++++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java index de998eaf8..e14caaedb 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java @@ -24,7 +24,6 @@ import android.view.View; import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Shell; -import com.topjohnwu.magisk.utils.Utils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1d3713612..00adc40b5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -30,7 +30,6 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" - style="?attr/navStyle" app:menu="@menu/drawer"/> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 64bd55534..ca2ed3910 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -16,14 +16,14 @@ #3F51B5 #303F9F #C5CAE9 - #03A9F4 + #9C6DFF #dedede #8A8A8A #dedede #313131 #FF9800 - #2196F3 + @color/dh_accent #2196F3 #FF5722 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 142956fb3..a173c067f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -41,10 +41,13 @@ @style/AlertDialog.dh @style/AlertDialog.dh @style/OverFlow + @color/dh_primary_text + @color/dh_accent + @color/dh_icons @color/dh_alertOk @color/dh_alertWarn @color/dh_alertFail - @color/grey500 + @color/dh_alertWarn @@ -106,6 +109,23 @@ @android:color/transparent + + + +