merged part of the fixes from material buttons branch to fix bugs reported in PR...

[pub/Android/ownCloud.git] / res / values / styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 555d28c..981fdb0 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -21,7 +21,7 @@
        <style name="Animations" />
 
        <!-- General ownCloud app style -->
-       <style name="Theme.ownCloud" parent="style/Theme.AppCompat.Light.DarkActionBar">
+       <style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
        <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
        <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
        <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
@@ -29,13 +29,14 @@
                <item name="colorPrimaryDark">@color/primary_dark</item>
                <item name="colorAccent">@color/color_accent</item>
                <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
+               <item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
                <item name="colorButtonNormal">@color/background_color</item>
                <item name="colorControlActivated">@color/primary_dark</item>
                <item name="colorControlHighlight">@color/color_accent</item>
        </style>
 
        <!-- seperate action bar style for activities without an action bar -->
-       <style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.DarkActionBar">
+       <style name="Theme.ownCloud.noActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
                <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
                <item name="windowNoTitle">true</item>
                <item name="windowActionBar">false</item>
@@ -43,6 +44,7 @@
                <item name="colorPrimaryDark">@color/primary_dark</item>
                <item name="colorAccent">@color/color_accent</item>
                <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
+               <item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
                <item name="colorButtonNormal">@color/background_color</item>
                <item name="colorControlActivated">@color/primary_dark</item>
                <item name="colorControlHighlight">@color/color_accent</item>
@@ -52,6 +54,15 @@
                <item name="colorAccent">@color/white</item>
        </style>
 
+       <style name="ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+               <item name="colorAccent">@color/color_accent</item>
+               <item name="android:textColorPrimary">@color/primary</item>
+       </style>
+
+       <style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog">
+               
+       </style>
+
        <style name="ownCloud.Button" parent="Widget.AppCompat.Button">
                <item name="colorButtonNormal">@color/primary</item>
                <item name="colorControlActivated">@color/primary_dark</item>