OC-1833: New color button_text_color in setup.xml

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 80463d2..4b49701 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -24,7 +24,8 @@
     <color name="actionbar_end_color">#1D2D44</color>
     
     <!-- Button -->
     <color name="actionbar_end_color">#1D2D44</color>
     
     <!-- Button -->

-    <bool name="custom_buttons">false</bool>
+    <bool name="custom_buttons">true</bool> <!-- enable background customization -->
+    <color name="button_text_color">#FFFFFF</color>

     
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">false</bool>
     
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">false</bool>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3a3e839..00e96b4 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -57,8 +57,8 @@
        
        <!-- Buttons -->
     <style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
        
        <!-- Buttons -->
     <style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">

-        <item name="android:background">@drawable/btn_default</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:background">@android:drawable/btn_default</item>
+        <item name="android:textColor">@color/button_text_color</item>

     </style>
 
        <!-- PopDownMenu -->
     </style>
 
        <!-- PopDownMenu -->