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:
authorArsentiy Milchakov <milcars@mapswithme.com>2016-11-16 17:41:02 +0300
committerRoman Romanov <rromanov@65gb.net>2016-11-23 11:27:39 +0300
commit08bd233dc434ea036de420a0cfebc1ce4ba48254 (patch)
treeeb42143beee430b75d5b2b64fcb5a6c4ee39f6af /android/res/values
parentf539abfc6da243933cfbb0d70969c27622cd6440 (diff)
[android] Place Page banners.
Diffstat (limited to 'android/res/values')
-rw-r--r--android/res/values/colors.xml6
-rw-r--r--android/res/values/dimens.xml5
-rw-r--r--android/res/values/font_sizes.xml2
-rw-r--r--android/res/values/strings.xml1
-rw-r--r--android/res/values/styles-text.xml6
-rw-r--r--android/res/values/themes-attrs.xml3
-rw-r--r--android/res/values/themes-base.xml6
7 files changed, 29 insertions, 0 deletions
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 814be0823f..0c5c9d7d38 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -147,4 +147,10 @@
<color name="bg_brand_opentable">#FFDA3743</color>
<color name="bg_brand_opentable_pressed">#FFFC5965</color>
+ <!-- Banner colors-->
+ <color name="bg_banner_color">#FFF8E1</color>
+ <color name="bg_banner_color_night">#555A5A</color>
+ <color name="text_banner_color">#28000000</color>
+ <color name="text_banner_color_night">#28FFFFFF</color>
+
</resources>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index c5bb871d90..f47d8f5ca3 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -160,4 +160,9 @@
<!-- Compass offset-->
<dimen name="compass_navigation_landscape_offset">-54dp</dimen>
+ <!-- Banner-->
+ <dimen name="placepage_banner_height">46dp</dimen>
+ <dimen name="placepage_banner_icon_size">22dp</dimen>
+ <dimen name="placepage_banner_icon_size_full">40dp</dimen>
+
</resources>
diff --git a/android/res/values/font_sizes.xml b/android/res/values/font_sizes.xml
index 90f27baf3f..3e984fe207 100644
--- a/android/res/values/font_sizes.xml
+++ b/android/res/values/font_sizes.xml
@@ -43,4 +43,6 @@
<dimen name="text_size_nav_circle_exit">12sp</dimen>
<dimen name="text_size_nav_number">24sp</dimen>
<dimen name="text_size_nav_dimension">20sp</dimen>
+
+ <dimen name="text_size_banner">8sp</dimen>
</resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 2e1157ff28..5fcc0f8fdb 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1010,4 +1010,5 @@
<string name="whatsnew_uber_message">Order a taxi directly from the app!</string>
<string name="dialog_taxi_offline">Taxi ordering is unavailable in offline mode.</string>
<string name="dialog_taxi_error">Taxi ordering is temporarily unavailable.</string>
+ <string name="advertisement">Advertisement</string>
</resources>
diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml
index dc016d2b54..4786559b79 100644
--- a/android/res/values/styles-text.xml
+++ b/android/res/values/styles-text.xml
@@ -171,4 +171,10 @@
<style name="MwmTextAppearance.Editor.Buttons">
<item name="android:textSize">@dimen/text_size_body_3</item>
</style>
+
+ <style name="MwmTextAppearance.Banner" parent="MwmTextAppearance.Body4">
+ <item name="android:textSize">@dimen/text_size_banner</item>
+ <item name="android:textAllCaps">true</item>
+ <item name="android:textColor">?bannerText</item>
+ </style>
</resources>
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index 8f718bdbf8..181b6e787e 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -66,6 +66,9 @@
<attr name="routingButtonHint" format="color"/>
<attr name="routingButtonPressedHint" format="color"/>
<attr name="routingButtonActivatedHint" format="color"/>
+
+ <attr name="bannerText" format="color"/>
+ <attr name="bannerBackground" format="color"/>
</declare-styleable>
<declare-styleable name="ThemeAttrs.NavButtons">
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index 9cdefefbc4..bca68417c1 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -82,6 +82,9 @@
<item name="ppRatingText">@color/text_placepage_rating</item>
<item name="ppPositive">@drawable/ic_positive_review</item>
<item name="ppNegative">@drawable/ic_negative_review</item>
+
+ <item name="bannerText">@color/text_banner_color</item>
+ <item name="bannerBackground">@color/bg_banner_color</item>
</style>
<!-- Night theme -->
@@ -167,5 +170,8 @@
<item name="ppRatingText">@color/text_placepage_rating_night</item>
<item name="ppPositive">@drawable/ic_positive_review_night</item>
<item name="ppNegative">@drawable/ic_negative_review_night</item>
+
+ <item name="bannerText">@color/text_banner_color_night</item>
+ <item name="bannerBackground">@color/bg_banner_color_night</item>
</style>
</resources> \ No newline at end of file