From 5198c6f8f9635e75a9d53d29ca8dc42eb45ee569 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Sun, 4 Dec 2016 22:38:41 +0200
Subject: [PATCH] Theme fix for API>=21 Minor drawer tweak

---
 .../gr/thmmy/mthmmy/activities/BaseActivity.java |  6 +++---
 app/src/main/res/values-v21/styles.xml           | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/BaseActivity.java
index 09f9dade..28d04c89 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/BaseActivity.java
@@ -73,7 +73,7 @@ public class BaseActivity extends AppCompatActivity
     @Override
     protected void onPause() {
         super.onPause();
-        if(drawer!=null)    //temporary solution to solve drawer animation closing after returning to activity
+        if(drawer!=null)    //close drawer animation after returning to activity
             drawer.closeDrawer();
     }
 
@@ -177,8 +177,8 @@ public class BaseActivity extends AppCompatActivity
                             }
 
                         }
-                        else
-                            drawer.closeDrawer();
+
+                        drawer.closeDrawer();
                         return true;
                     }
                 })
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 04e77b64..72e2ac82 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,5 +1,21 @@
 <resources>
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:textColorPrimary">@color/primary_text</item>
+        <item name="android:textColorSecondary">@color/secondary_text</item>
+        <item name="android:windowBackground">@color/primary</item>
+        <item name="cardBackgroundColor">@color/card_background</item>
+
+        <item name="colorControlNormal">@color/iron</item>
+        <item name="colorControlActivated">@color/white</item>
+        <item name="colorControlHighlight">@color/white</item>
+        <item name="android:textColorHint">@color/iron</item>
+
+        <item name="colorButtonNormal">@color/primary</item>
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyle</item>
+
         <item name="android:windowContentTransitions">true</item>
     </style>