diff --git a/android/res/drawable-hdpi/ic_24px_logo_partner2.png b/android/res/drawable-hdpi/ic_24px_logo_partner2.png new file mode 100644 index 0000000000..b7e60163d2 Binary files /dev/null and b/android/res/drawable-hdpi/ic_24px_logo_partner2.png differ diff --git a/android/res/drawable-mdpi/ic_24px_logo_partner2.png b/android/res/drawable-mdpi/ic_24px_logo_partner2.png new file mode 100644 index 0000000000..137a31df0f Binary files /dev/null and b/android/res/drawable-mdpi/ic_24px_logo_partner2.png differ diff --git a/android/res/drawable-v21/button_partner2.xml b/android/res/drawable-v21/button_partner2.xml new file mode 100644 index 0000000000..3f5c3efd26 --- /dev/null +++ b/android/res/drawable-v21/button_partner2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/android/res/drawable-xhdpi/ic_24px_logo_partner2.png b/android/res/drawable-xhdpi/ic_24px_logo_partner2.png new file mode 100644 index 0000000000..aff32b7094 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_24px_logo_partner2.png differ diff --git a/android/res/drawable-xxhdpi/ic_24px_logo_partner2.png b/android/res/drawable-xxhdpi/ic_24px_logo_partner2.png new file mode 100644 index 0000000000..1cdf0b3eeb Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_24px_logo_partner2.png differ diff --git a/android/res/drawable-xxxhdpi/ic_24px_logo_partner2.png b/android/res/drawable-xxxhdpi/ic_24px_logo_partner2.png new file mode 100644 index 0000000000..2e02dca602 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_24px_logo_partner2.png differ diff --git a/android/res/drawable/button_partner2.xml b/android/res/drawable/button_partner2.xml new file mode 100644 index 0000000000..de0925157c --- /dev/null +++ b/android/res/drawable/button_partner2.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/res/values/partner_colors.xml b/android/res/values/partner_colors.xml index f54934bad3..0e9b9f611a 100644 --- a/android/res/values/partner_colors.xml +++ b/android/res/values/partner_colors.xml @@ -4,6 +4,8 @@ #FF303438 #FF25282B + #FFD7D7D7 + #FFD7D7D7 #FFE61717 #FFB31212 #FF00B956 diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java index 430ed110fa..4f00b21c83 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java @@ -33,6 +33,7 @@ public final class PlacePageButtons // Do NOT change it manually. // %PartnersExtender.PartnerItemMap put(PartnerItem.PARTNER1.getIndex(), PartnerItem.PARTNER1); + put(PartnerItem.PARTNER2.getIndex(), PartnerItem.PARTNER2); put(PartnerItem.PARTNER3.getIndex(), PartnerItem.PARTNER3); put(PartnerItem.PARTNER18.getIndex(), PartnerItem.PARTNER18); put(PartnerItem.PARTNER19.getIndex(), PartnerItem.PARTNER19); @@ -121,6 +122,7 @@ public final class PlacePageButtons // Do NOT change it manually. // %PartnersExtender.ButtonType PARTNER1, + PARTNER2, PARTNER3, PARTNER18, PARTNER19, @@ -154,6 +156,12 @@ public final class PlacePageButtons new ImageResources(R.drawable.ic_24px_logo_partner1), R.drawable.button_partner1, ButtonType.PARTNER1), + PARTNER2( + 2, + R.string.sponsored_partner2_action, + new ImageResources(R.drawable.ic_24px_logo_partner2), + R.drawable.button_partner2, + ButtonType.PARTNER2), PARTNER3( 3, R.string.sponsored_partner3_action, diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index c1370e7a29..faf7430631 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -527,6 +527,11 @@ public class PlacePageView extends RelativeLayout color = Color.WHITE; break; + case PARTNER2: + frame.setBackgroundResource(item.getBackgroundResource()); + color = Color.BLACK; + break; + case BOOKMARK: mBookmarkButtonIcon = icon; updateBookmarkBtn(); @@ -633,6 +638,7 @@ public class PlacePageView extends RelativeLayout // Do NOT change it manually. // %PartnersExtender.SwitchClick case PARTNER1: + case PARTNER2: case PARTNER3: case PARTNER18: case PARTNER19: diff --git a/iphone/Maps/Categories/UIColor+PartnerColor.h b/iphone/Maps/Categories/UIColor+PartnerColor.h index 88bfd1fc50..311384940d 100644 --- a/iphone/Maps/Categories/UIColor+PartnerColor.h +++ b/iphone/Maps/Categories/UIColor+PartnerColor.h @@ -3,6 +3,8 @@ + (UIColor *)partner1Background; + (UIColor *)partner1TextColor; ++ (UIColor *)partner2Background; ++ (UIColor *)partner2TextColor; + (UIColor *)partner3Background; + (UIColor *)partner3TextColor; + (UIColor *)partner18Background; diff --git a/iphone/Maps/Categories/UIColor+PartnerColor.mm b/iphone/Maps/Categories/UIColor+PartnerColor.mm index bbd89d4202..7d7b261aa4 100644 --- a/iphone/Maps/Categories/UIColor+PartnerColor.mm +++ b/iphone/Maps/Categories/UIColor+PartnerColor.mm @@ -11,6 +11,14 @@ { return [UIColor colorWithRed:scaled(255) green:scaled(255) blue:scaled(255) alpha:1]; } ++ (UIColor *)partner2Background +{ + return [UIColor colorWithRed:scaled(215) green:scaled(215) blue:scaled(215) alpha:1]; +} ++ (UIColor *)partner2TextColor +{ + return [UIColor colorWithRed:scaled(33) green:scaled(33) blue:scaled(33) alpha:1]; +} + (UIColor *)partner3Background { return [UIColor colorWithRed:scaled(230) green:scaled(23) blue:scaled(23) alpha:1]; diff --git a/iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/Contents.json new file mode 100644 index 0000000000..c1da7221b8 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/Contents.json @@ -0,0 +1 @@ +{"images": [{"idiom": "universal", "filename": "ic_28px_logo_partner2.pdf"}], "info": {"version": 1, "author": "xcode"}} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/ic_28px_logo_partner2.pdf b/iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/ic_28px_logo_partner2.pdf new file mode 100644 index 0000000000..e588e8a66c Binary files /dev/null and b/iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/ic_28px_logo_partner2.pdf differ diff --git a/partners_api/partners_list.hpp b/partners_api/partners_list.hpp index b6a897d1a1..53134f0ecb 100644 --- a/partners_api/partners_list.hpp +++ b/partners_api/partners_list.hpp @@ -6,6 +6,8 @@ std::vector const kPartners = { PartnerInfo(1, "McArthurGlen", true /* m_hasButton */, "https://localads.maps.me/redirects/mcarthurglen", 180705), + PartnerInfo(2, "Sixt", true /* m_hasButton */, + "https://localads.maps.me/redirects/sixt", 180912), PartnerInfo(3, "BurgerKing", true /* m_hasButton */), PartnerInfo(18, "MegafonGreenDot", true /* m_hasButton */, "https://localads.maps.me/redirects/megafon_green"),