Explorar o código

Make button colours easy to brand

David A. Velasco %!s(int64=9) %!d(string=hai) anos
pai
achega
bd1f6452ac
Modificáronse 3 ficheiros con 9 adicións e 10 borrados
  1. 0 2
      res/values/colors.xml
  2. 5 4
      res/values/setup.xml
  3. 4 4
      res/values/styles.xml

+ 0 - 2
res/values/colors.xml

@@ -33,8 +33,6 @@
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="login_text_color">#757575</color>
     <color name="login_text_hint_color">#757575</color>
-    <color name="primary_button_color">@color/owncloud_blue_accent</color>
-    <color name="secondary_button_color">#D6D7D7</color>
     <color name="transparent">#00000000</color>
 
     <!-- Colors -->

+ 5 - 4
res/values/setup.xml

@@ -33,10 +33,11 @@
     <color name="background_color">#FFFFFF</color>
     <color name="actionbar_start_color">#1D2D44</color>
     <color name="actionbar_end_color">#1D2D44</color>
-    
-    <!-- Button -->
-    <color name="button_text_color">#000000</color>
-    
+    <color name="primary_button_background_color">@color/owncloud_blue_accent</color>
+    <color name="primary_button_text_color">@color/white</color>
+    <color name="secondary_button_background_color">#D6D7D7</color>
+    <color name="secondary_button_text_color">@color/color_accent</color>
+
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">true</bool>
     

+ 4 - 4
res/values/styles.xml

@@ -66,13 +66,13 @@
 	</style>
 
 	<style name="Button" parent="Base.Widget.AppCompat.Button">
-		<item name="colorButtonNormal">@color/secondary_button_color</item>
-		<item name="android:textColor">@color/color_accent</item>
+		<item name="colorButtonNormal">@color/secondary_button_background_color</item>
+		<item name="android:textColor">@color/secondary_button_text_color</item>
 	</style>
 
 	<style name="Button.Primary" parent="Button">
-		<item name="colorButtonNormal">@color/primary_button_color</item>
-		<item name="android:textColor">@color/white</item>
+		<item name="colorButtonNormal">@color/primary_button_background_color</item>
+		<item name="android:textColor">@color/primary_button_text_color</item>
 	</style>
 
 	<style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">