diff options
-rw-r--r-- | android/res/drawable-v21/button_partner3.xml | 13 | ||||
-rw-r--r-- | android/res/drawable/button_partner3.xml | 7 | ||||
-rw-r--r-- | android/res/values/colors.xml | 2 | ||||
-rw-r--r-- | android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java | 15 | ||||
-rw-r--r-- | android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java | 5 | ||||
-rw-r--r-- | iphone/Maps/Categories/UIColor+MapsMeColor.h | 2 | ||||
-rw-r--r-- | iphone/Maps/Categories/UIColor+MapsMeColor.mm | 10 |
7 files changed, 53 insertions, 1 deletions
diff --git a/android/res/drawable-v21/button_partner3.xml b/android/res/drawable-v21/button_partner3.xml new file mode 100644 index 0000000000..1a38b23478 --- /dev/null +++ b/android/res/drawable-v21/button_partner3.xml @@ -0,0 +1,13 @@ +<ripple + xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?attr/colorControlHighlight"> + <item> + <selector> + <item android:drawable="@color/bg_brand_partner3_pressed" + android:state_pressed="true"/> + + <item android:drawable="@color/bg_brand_partner3"/> + </selector> + </item> +</ripple> + diff --git a/android/res/drawable/button_partner3.xml b/android/res/drawable/button_partner3.xml new file mode 100644 index 0000000000..a74f856e27 --- /dev/null +++ b/android/res/drawable/button_partner3.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/bg_brand_partner3_pressed" + android:state_pressed="true"/> + + <item android:drawable="@color/bg_brand_partner3"/> +</selector> diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 58f9af56a2..f9d8098eea 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -163,6 +163,8 @@ <color name="bg_brand_opentable_pressed">#FFFC5965</color> <color name="bg_brand_partner1">#FFFFDA00</color> <color name="bg_brand_partner1_pressed">#FFF2CE00</color> + <color name="bg_brand_partner3">#FFE61717</color> + <color name="bg_brand_partner3_pressed">#FFB31212</color> <!-- Banner colors --> <color name="bg_banner_color">#FFFDFFE6</color> diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java index 58b23ad95a..cbfc2c50f6 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java @@ -96,7 +96,20 @@ final class PlacePageButtons PARTNER2, - PARTNER3, + PARTNER3 + { + @Override + int getTitle() + { + return R.string.sponsored_partner3_action; + } + + @Override + int getIcon() + { + return R.drawable.ic_24px_logo_partner3; + } + }, PARTNER4, diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 8e71e9cb0b..c4a25fa440 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -472,6 +472,11 @@ public class PlacePageView extends RelativeLayout color = Color.BLACK; break; + case PARTNER3: + frame.setBackgroundResource(R.drawable.button_partner3); + color = Color.WHITE; + break; + case BOOKMARK: mBookmarkButtonIcon = icon; updateBookmarkButton(); diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.h b/iphone/Maps/Categories/UIColor+MapsMeColor.h index ef71c5431c..ff816a1fa9 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.h +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.h @@ -46,6 +46,8 @@ + (UIColor *)ratingGreen; + (UIColor *)partner1Background; + (UIColor *)partner1TextColor; ++ (UIColor *)partner3Background; ++ (UIColor *)partner3TextColor; + (UIColor *)colorWithName:(NSString *)colorName; diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.mm b/iphone/Maps/Categories/UIColor+MapsMeColor.mm index 498e93525e..4d1cdca68a 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.mm +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.mm @@ -346,6 +346,16 @@ UIColor * color(SEL cmd) return UIColor.blackColor; } ++ (UIColor *)partner3Background +{ + return [UIColor colorWithRed:scaled(230) green:scaled(23) blue:scaled(23) alpha:alpha100]; +} + ++ (UIColor *)partner3TextColor +{ + return [UIColor colorWithRed:scaled(255) green:scaled(255) blue:scaled(255) alpha:alpha100]; +} + + (UIColor *)bannerBackground { return [UIColor colorWithRed:scaled(249) green:scaled(251) blue:scaled(231) alpha:alpha100]; |