diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index fb91b150c6..60015a5e00 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -195,6 +195,12 @@ #FF000000 #FF000000 #FF000000 + #FF00B956 + #FF00B956 + #FF571A8C + #FF571A8C + #FF571A8C + #FF571A8C #FFFDFFE6 diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java index 16ca8e2aa6..1ff54ac9cd 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java @@ -43,6 +43,9 @@ public final class PlacePageButtons put(PartnerItem.PARTNER15.getIndex(), PartnerItem.PARTNER15); put(PartnerItem.PARTNER16.getIndex(), PartnerItem.PARTNER16); put(PartnerItem.PARTNER17.getIndex(), PartnerItem.PARTNER17); + put(PartnerItem.PARTNER18.getIndex(), PartnerItem.PARTNER18); + put(PartnerItem.PARTNER19.getIndex(), PartnerItem.PARTNER19); + put(PartnerItem.PARTNER20.getIndex(), PartnerItem.PARTNER20); }}; private final int mMaxButtons; @@ -135,6 +138,9 @@ public final class PlacePageButtons PARTNER15, PARTNER16, PARTNER17, + PARTNER18, + PARTNER19, + PARTNER20, BOOKING, BOOKING_SEARCH, OPENTABLE, @@ -246,7 +252,25 @@ public final class PlacePageButtons R.string.sponsored_partner17_action, new ImageResources(R.drawable.ic_24px_logo_partner17), R.drawable.button_partner17, - ButtonType.PARTNER17); + ButtonType.PARTNER17), + PARTNER18( + 18, + R.string.sponsored_partner18_action, + new ImageResources(R.drawable.ic_24px_logo_partner18), + R.drawable.button_partner18, + ButtonType.PARTNER18), + PARTNER19( + 19, + R.string.sponsored_partner19_action, + new ImageResources(R.drawable.ic_24px_logo_partner19), + R.drawable.button_partner19, + ButtonType.PARTNER19), + PARTNER20( + 20, + R.string.sponsored_partner20_action, + new ImageResources(R.drawable.ic_24px_logo_partner20), + R.drawable.button_partner20, + ButtonType.PARTNER20); private final int mIndex; @StringRes diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 9defea5cba..826a4b509f 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -477,6 +477,9 @@ public class PlacePageView extends RelativeLayout case PARTNER15: case PARTNER16: case PARTNER17: + case PARTNER18: + case PARTNER19: + case PARTNER20: frame.setBackgroundResource(item.getBackgroundResource()); color = Color.WHITE; break; @@ -599,6 +602,9 @@ public class PlacePageView extends RelativeLayout case PARTNER15: case PARTNER16: case PARTNER17: + case PARTNER18: + case PARTNER19: + case PARTNER20: onSponsoredClick(true /* book */, false); break; diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.h b/iphone/Maps/Categories/UIColor+MapsMeColor.h index c7d5ff8b9d..f94fb4b290 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.h +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.h @@ -76,6 +76,12 @@ + (UIColor *)partner16TextColor; + (UIColor *)partner17Background; + (UIColor *)partner17TextColor; ++ (UIColor *)partner18Background; ++ (UIColor *)partner18TextColor; ++ (UIColor *)partner19Background; ++ (UIColor *)partner19TextColor; ++ (UIColor *)partner20Background; ++ (UIColor *)partner20TextColor; + (UIColor *)colorWithName:(NSString *)colorName; diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.mm b/iphone/Maps/Categories/UIColor+MapsMeColor.mm index b946ad69f1..085b705cef 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.mm +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.mm @@ -498,6 +498,36 @@ UIColor * color(SEL cmd) return UIColor.whiteColor; } ++ (UIColor *)partner18Background +{ + return [UIColor colorWithRed:scaled(0) green:scaled(185) blue:scaled(86) alpha:alpha100]; +} + ++ (UIColor *)partner18TextColor +{ + return UIColor.whiteColor; +} + ++ (UIColor *)partner19Background +{ + return [UIColor colorWithRed:scaled(87) green:scaled(26) blue:scaled(140) alpha:alpha100]; +} + ++ (UIColor *)partner19TextColor +{ + return UIColor.whiteColor; +} + ++ (UIColor *)partner20Background +{ + return [UIColor colorWithRed:scaled(87) green:scaled(26) blue:scaled(140) alpha:alpha100]; +} + ++ (UIColor *)partner20TextColor +{ + return UIColor.whiteColor; +} + + (UIColor *)bannerBackground { return color(_cmd); diff --git a/partners_api/partners.cpp b/partners_api/partners.cpp index db5bc1b1d8..a580b1f0df 100644 --- a/partners_api/partners.cpp +++ b/partners_api/partners.cpp @@ -32,6 +32,12 @@ std::vector const kPartners = { PartnerInfo(15, "Menza", true /* m_hasButton */), PartnerInfo(16, "YanPrimus", true /* m_hasButton */), PartnerInfo(17, "GinNo", true /* m_hasButton */), + PartnerInfo(18, "MegafonGreenDot", true /* m_hasButton */, + "https://localads.maps.me/redirects/megafon_green"), + PartnerInfo(19, "MegafonPurpleDot", true /* m_hasButton */, + "https://localads.maps.me/redirects/megafon_purple"), + PartnerInfo(20, "Megafon", true /* m_hasButton */, + "https://localads.maps.me/redirects/megafon_airport"), }; namespace