From dde7ad84c04071e5acf6596967ed87ddcfc4f846 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Thu, 4 Feb 2016 11:55:41 +0100
Subject: Use own accent colors for alert dialogs.

---
 main/src/main/AndroidManifest.xml       |  4 ++--
 main/src/main/res/values-v21/styles.xml | 17 ++++++++++++++---
 main/src/main/res/values/styles.xml     |  6 ++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index ee513475..a6d351f7 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
             android:autoRemoveFromRecents="true"
             android:excludeFromRecents="true"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
+            android:theme="@style/blinkt.dialog" />
 
         <activity
             android:name=".activities.LogWindow"
@@ -141,7 +141,7 @@
             android:name=".LaunchVPN"
             android:excludeFromRecents="true"
             android:label="@string/vpn_launch_title"
-            android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
+            android:theme="@style/blinkt.dialog"
             tools:ignore="ExportedActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/main/src/main/res/values-v21/styles.xml b/main/src/main/res/values-v21/styles.xml
index e0549164..83a693f1 100644
--- a/main/src/main/res/values-v21/styles.xml
+++ b/main/src/main/res/values-v21/styles.xml
@@ -5,11 +5,22 @@
   -->
 
 <resources>
-    <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar" />
+    <!-- http://www.google.de/design/spec/style/color.html#color-color-palette -->
+    <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item>
+    </style>
 
+    <style name="blinkt.dialog" parent="android:Theme.Material.Light.Dialog">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item>
+    </style>
 
-    <!-- http://www.google.de/design/spec/style/color.html#color-color-palette -->
-    <style name="blinkt" parent="blinkt.common">
+    <style name="blinkt.alertDialog" parent="android:Theme.Material.Light.Dialog.Alert">
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorPrimaryDark">@color/primary_dark</item>
         <item name="android:colorAccent">@color/accent</item>
diff --git a/main/src/main/res/values/styles.xml b/main/src/main/res/values/styles.xml
index 5f8bea41..a1723456 100644
--- a/main/src/main/res/values/styles.xml
+++ b/main/src/main/res/values/styles.xml
@@ -6,14 +6,12 @@
 
 <resources>
     <style name="blinkt.baseTheme" parent="android:Theme.DeviceDefault.Light" />
-    <style name="blinkt.common" parent="blinkt.baseTheme" >
+    <style name="blinkt" parent="blinkt.baseTheme" >
         <!-- Shared between Holo and Material -->
         <item name="android:preferenceStyle">@style/BlinktPreferencePanel</item>
-
     </style>
 
-    <style name="blinkt" parent="blinkt.common">
-    </style>
+    <style name="blinkt.dialog" parent="android:Theme.DeviceDefault.Light.Dialog" />
 
     <!-- No margins or background by default. Not different for x-large screens -->
     <style name="BlinktPreferencePanel">
-- 
cgit v1.2.3