From 528188bc11e0f207b89a555fe07c638b4e8d0832 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 9 Oct 2018 19:07:02 +0300 Subject: [PATCH] Added Sixt partner in code --- .../res/drawable-hdpi/ic_24px_logo_partner2.png | Bin 0 -> 1411 bytes .../res/drawable-mdpi/ic_24px_logo_partner2.png | Bin 0 -> 952 bytes android/res/drawable-v21/button_partner2.xml | 13 +++++++++++++ .../res/drawable-xhdpi/ic_24px_logo_partner2.png | Bin 0 -> 1973 bytes .../drawable-xxhdpi/ic_24px_logo_partner2.png | Bin 0 -> 2798 bytes .../drawable-xxxhdpi/ic_24px_logo_partner2.png | Bin 0 -> 3828 bytes android/res/drawable/button_partner2.xml | 7 +++++++ android/res/values/partner_colors.xml | 2 ++ .../maps/widget/placepage/PlacePageButtons.java | 8 ++++++++ .../maps/widget/placepage/PlacePageView.java | 6 ++++++ iphone/Maps/Categories/UIColor+PartnerColor.h | 2 ++ iphone/Maps/Categories/UIColor+PartnerColor.mm | 8 ++++++++ .../ic_28px_logo_partner2.imageset/Contents.json | 1 + .../ic_28px_logo_partner2.pdf | Bin 0 -> 1814 bytes partners_api/partners_list.hpp | 2 ++ 15 files changed, 49 insertions(+) create mode 100644 android/res/drawable-hdpi/ic_24px_logo_partner2.png create mode 100644 android/res/drawable-mdpi/ic_24px_logo_partner2.png create mode 100644 android/res/drawable-v21/button_partner2.xml create mode 100644 android/res/drawable-xhdpi/ic_24px_logo_partner2.png create mode 100644 android/res/drawable-xxhdpi/ic_24px_logo_partner2.png create mode 100644 android/res/drawable-xxxhdpi/ic_24px_logo_partner2.png create mode 100644 android/res/drawable/button_partner2.xml create mode 100644 iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Place Page/ic_28px_logo_partner2.imageset/ic_28px_logo_partner2.pdf 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 0000000000000000000000000000000000000000..b7e60163d25447f8e2be97564ebbeddd0f9b31ab GIT binary patch literal 1411 zcmV-}1$_F6P)L zGk4DQR)3fed#!c;|FzESz1QAH_@A-6Xa1WYSEsl?nbq5O)@14hlS!5pdwRMbYf~($ zteR}i{A3e$f;~Om^ALJfxhOqKKbkf5%XO2j{ht-Q_uk_UuWPUnq^~9?b>k!mx0jCpcfwZb4=%OasjDZvd#F{6L_6_~5-bjyC}H5rW-4-J2Tt6gUhx zvhFE28q*+97r0_ZZ{If~Hf!xn?|pINWscz=f+?A+M0pCBnTbL9UUS^wD(+)|-96py z>KPAJgllK5?0b8}5QgCiir)rIIRM^K1OO&9%SBmB)?xvKIpWz=Dor`|0CU;tJqsF( z1qw>ChDjtpUR36#FFO6Lapau))P}{cQr>#8TrSKO z*spMqz<@#o8VT|T@QsI^sC-e#4{ks7iEk^VQfYdk$!#_)-mEahso-`0x&S$Xf8m@U zHni`9UXbEX5M8Z_yyBeO0r)TskB4M>tKcb9%#MBg_6>9*Y;ExoL>_{+?Wq+8QCX~k z4gdtIa};^Jb*OwT_`AngtToReEbc&PufnDPeP1O1Znawdtwl`1mWt1g3{=I6Py!A^ zIXsTsQ6oNU?F>XeBjZM?!kw<_o*x+-V@{KRZ7qX^t#Q>Y7-O>5o{H#JAeTWm5%|c% zdOYi#bH5JTLmQfE+B0$F#`Jw-%$X9f1t@f+s;rA+cX<;>rhA{+tkr5i#j(39j@*nu^jwq|fn6Esrz84OmVB%& z-iWYh{73)}33Bol2Y3i+we2U>YHdp#yF22@9hKz#TtpTF8-TyY;X9>M;lja%*&xqk zNftOg49$ur+ju>H4D!~R7YQ^6ASzYga1qD{`IVJFE8hX%0WXxxN3=U)+W-8Bfp{bH?z2qqQbH z8CT;+hR^P4=o((nowc(D1fUyJy~-svG}}#RR+!K%x1rsH$jj+;@>*N9Ln(={hV%~) z+g#)x28bf}Akf!_?G$TGZ(F?guZ32e&C?ZYfR7ALN7l6^Y-U*47e4Uq$8S z6#sxv^rXgV8iwKVir-F~e^Q}WpeM!oaU8p|8%;rfe}BLCoQLpE`;t=ehrk0aau-%A zmAFk@u1&G1aC`HbjH2iZfhFz4g={yfJizeL@Y2H6!qNF8SOlD?Fpr_nGew|_p_UXW z>=on}ML!pn58^o93=EDY4$W<2T!_dot{Sgx<%=Tsv?-Z-pqQ+@i0*DS{S7WE@aA+% RrZWHl002ovPDHLkV1kw%m*)Tg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..137a31df0f3eba2c8e6dbbeaadd520596a9c7c25 GIT binary patch literal 952 zcmV;p14sOcP)ZHYky>6@h(ibPOU zFt+GJ5J8L9`T!D2y6Q0s$`7avNC4^}IZ6eA)Me9|^4MMQ0dG{gw?^UiM4x^sNE zx$)jjZa#{hr`_{E`#-;#owF7TC>s!E{+ML2O9f!{JuhgsXpHTthdpEa>F|PrS z<)n$`rb`1?;+Y3rRVtM>sQ$e=inJOvW#DHKnJkyfzf_B+p4xI9Mm#`f%$kVagy;^V z^eD9EJTr;XckQ9?{<>no=Bt`-DMa(CLQmAJ2!bdm5dc+i-kuWl`4FauvsLo8Di2gF zA_AbGIdg%_QKj$t{;?qd>+KtYbgl@{IoCzhFBSX}wOxt~I_K_KruV3t_(aF+XGZ|M zx4jDc<}YLMFe>^ic{r7xB%}q6+(*4*K}2_{Htdpto&@Q=^XN}IZhq%nuXDwhthF5q zhgU>4*AO=6ld5_V$kH@DZoU0Ngd66x$XbOFsgVC}gmR2bfQ+hUr#8HMew~OuqHq|Y z9Yhg!0axeRTtK*l(gw6Ir~zWV{Y+qct{@7GsOk`ylSz_%L(NWl@4HoXort!mNE=bx zk|ceyqS+S|4lcegGMt2@8;H&oUqs|Uor<|NgfLnKd`RF3RL**X7)SX~#0-QG#$3sM zgmO>qf|8InRsFrU#}poH;58|jt`Nc$z*2xF4e3!-?nd~E#wU0!!X71_b|v@9B6UhWD6%=<6Ysf##Ox(=&h0{Lr9e?hO?X-4Fjx zDR2S!1ei{e6_~;4Ie8nq+HJX5I(3E#+ANMst82-rFOZ>4jrDN8Q;7$1wUb5)kE*Is;u+wY8m-Hfiv2{!7Xy@8 zg5ZIR0>3JJukfkC981b!%6q#Wn8~db;M+Mm7)fT~0Max)?p*O@5!t!`+qdeYGV0000 + + + + + + + + + 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 0000000000000000000000000000000000000000..aff32b7094ba4a52f3f5fdb9dacc93e7d6372659 GIT binary patch literal 1973 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 Av;Y7A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2e02dca602a0ffc50d6989e075887af2132377ea GIT binary patch literal 3828 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 qdD-xi>nJT+y_%k3EpKO=;{O2FN?0BDC4 + + + + + 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 0000000000000000000000000000000000000000..e588e8a66cf8061982430e2e6d039962aaf565f9 GIT binary patch literal 1814 zcmZWq3p7+|9N)H0no!YhPu$XAkhymlh8!{DHB&JSllSVHxyFdO)19m6v2jAAx2U%A zI!KD7)T~EQyJwWjqc|IFQdy7E##V%_y>~p)={xt_d%xfPfB(n#`~JU6<-548hAf#B zYI%RjD8(880W>s%;@|+#*CR3s9u6=GNI(GqfbJ%Z#1V{mM#4Daf{0KtLUDAYC~ypc zqbMQU);{bwACzx-een|C;sE`0U*;}m{pYcJd&Y!=4SUiWF07~<`*p!btDADe z+@Esc+_n#X_pkq1pe#RL-Fqt5zxW^d9>Y}E(gB7bbaqJ>?eLbCQ`MrRj5W4Ka+BfB zt1jym&z=8SzuDhpoAZaUfkO$h!?UwWB>J9Ht>816} zP!>LX5AFG7iD04cB~IL)@19hIKtC9yEVMLx<&fl2xv4vl#fNRnP?PDqEB?gDkDAtcN@|m?|L%i%+ACUq$#>Efl-&^J=iS zanwwTrpC2p^VZrJoxgOVo9*e9TPoqsP!-KK+!(URmOiv~aNs}X$AM*z^BT85KHFJo z8h+y*j&iazSh{_o{f(@w$mX1xw^}^A1=U*m=xcTki^)}4)F!PSdY|sX+kbZluXS(9 z$S{A=&q0>ummg%N#cFtFvYu$St2{=P;UkAOHWwI&cJ>_U)aks>u8$GYO&$7!lahk{ zirpRyo`!(vXcetKt9R{o)gM+AL?)hST;h#vd9u&RC(-G4)(rAHIkTD)1hoXX#^CPW zIMM!qg98Z=gARkl1fX-A0SKUrVB$`Q0`Y;k6W4?v#*`m`?h`9V06HI*AOIDB)PDIe zhRASY>7>?dK*Um*jm7|h1Ox(BOaQV5g4MPhRE87A3V;-=abuS-M~<_h_=rX%1|rIpAZcI9fzVtf>f=VkiJvLQG2t1WdzmTy9S% zHkUvp7%UH$iWHV8CZW;PfjEQ!<5E=SLK0)@V$T2}76gKJ5Yx&Av6TKiP{m#iDH6qI$9D}8i2&Vpfc}sU7M9L%&0u;povheZ4!j*-g a0J-gI9u+u@;pz$@rY(a)rMh~#QT_+1tFfg3 literal 0 HcmV?d00001 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"),