Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralexzatsepin <alexander.zatzepin@gmail.com>2016-10-10 12:39:01 +0300
committeralexzatsepin <alexander.zatzepin@gmail.com>2016-10-12 11:17:02 +0300
commit531a7c9ff56d7c1fbb33979091828d8f867c3d9e (patch)
tree773275373af7ca00907100c4c3a729a1201f0260 /android/res/values
parent9de1d397b687dc68e95a4c2780610107ddfb9053 (diff)
[android] Fixed the nigh theme look for start(order) button
Diffstat (limited to 'android/res/values')
-rw-r--r--android/res/values/styles.xml3
-rw-r--r--android/res/values/themes-attrs.xml2
-rw-r--r--android/res/values/themes-base.xml4
3 files changed, 8 insertions, 1 deletions
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 56c21826f4..c492b2cc27 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -36,7 +36,8 @@
</style>
<style name="MwmWidget.Button.Start">
- <item name="android:background">@drawable/button_start</item>
+ <item name="android:background">?startButtonBackground</item>
+ <item name="android:textColor">?accentButtonTextColor</item>
<item name="android:textSize">14sp</item>
</style>
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index ea638e55b7..3d28b09b3a 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -47,6 +47,8 @@
<attr name="redButtonTextColor" format="color"/>
<attr name="redButtonTextColorDisabled" format="color"/>
+ <attr name="startButtonBackground" format="reference"/>
+
<attr name="circleAccent" format="reference"/>
<attr name="menuBackground" format="color"/>
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index bc57ba64b7..da5be597a4 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -59,6 +59,8 @@
<item name="redButtonTextColor">@color/button_red_text</item>
<item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
+ <item name="startButtonBackground">@drawable/button_start</item>
+
<item name="circleAccent">@drawable/circle_accent</item>
<item name="menuBackground">@color/bg_menu</item>
@@ -141,6 +143,8 @@
<item name="redButtonTextColor">@color/button_red_text</item>
<item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
+ <item name="startButtonBackground">@drawable/button_start_night</item>
+
<item name="circleAccent">@drawable/circle_accent_night</item>
<item name="menuBackground">@color/bg_menu_night</item>