From 4572755093588d186675bfa016955674017b78fc Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Sun, 3 Dec 2023 18:09:32 +0200 Subject: [PATCH] [android][ios] Rename "More on KAYAK" option and update icon Signed-off-by: Roman Tsisyk --- .../src/main/res/drawable/ic_kayak_white.xml | 14 ++++ .../src/main/res/layout/place_page_kayak.xml | 6 +- .../res/layout/place_page_links_fragment.xml | 2 +- data/strings/strings.txt | 79 +++++++++--------- .../ic_placepage_kayak.imageset/kayak.png | Bin 338 -> 496 bytes .../ic_placepage_kayak.imageset/kayak@2x.png | Bin 585 -> 899 bytes .../ic_placepage_kayak.imageset/kayak@3x.png | Bin 890 -> 1225 bytes .../PlacePageInfoViewController.swift | 12 +-- 8 files changed, 64 insertions(+), 49 deletions(-) create mode 100644 android/app/src/main/res/drawable/ic_kayak_white.xml diff --git a/android/app/src/main/res/drawable/ic_kayak_white.xml b/android/app/src/main/res/drawable/ic_kayak_white.xml new file mode 100644 index 0000000000..7a0cf04180 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_kayak_white.xml @@ -0,0 +1,14 @@ + + + + diff --git a/android/app/src/main/res/layout/place_page_kayak.xml b/android/app/src/main/res/layout/place_page_kayak.xml index 03d5fae80e..af224c5c1e 100644 --- a/android/app/src/main/res/layout/place_page_kayak.xml +++ b/android/app/src/main/res/layout/place_page_kayak.xml @@ -10,13 +10,13 @@ tools:visibility="visible"> - @@ -13,4 +12,5 @@ + \ No newline at end of file diff --git a/data/strings/strings.txt b/data/strings/strings.txt index 2dc0cee3cb..90be66777f 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -16042,45 +16042,46 @@ [more_on_kayak] comment = A referral link on the place page for some hotels tags = android,ios - en = Details on KAYAK - ar = التفاصيل على KAYAK - be = Падрабязнасці на KAYAK - bg = Подробности в KAYAK - ca = Detalls a KAYAK - cs = Podrobnosti na KAYAK - da = Detaljer på KAYAK - de = Einzelheiten bei KAYAK - el = Λεπτομέρειες στο KAYAK - es = Detalles en KAYAK - es-MX = Detalles sobre KAYAK - et = Üksikasjad KAYAKi kohta - eu = Xehetasunak KAYAK-en - fa = جزئیات در KAYAK - fi = Lisätietoa osoitteessa KAYAK - fr = Détails sur KAYAK - he = פרטים על KAYAK - hi = कयाक पर विवरण - hu = Részletek a KAYAK-on - id = Perincian di KAYAK - it = Dettagli su KAYAK - ja = KAYAK で詳細表示 - ko = KAYAK의 세부 정보 - mr = कायाक वर तपशील - nb = Mer informasjon om KAYAK - nl = Details op KAYAK - pl = Szczegóły na KAYAK - pt = Detalhes em KAYAK - ro = Detalii pe KAYAK - ru = Подробнее на KAYAK - sk = Podrobnosti na KAYAK - sv = Information på KAYAK - sw = Maelezo kuhusu KAYAK - th = รายละเอียดบน KAYAK - tr = KAYAK hakkında detaylar - uk = Докладніше на KAYAK - vi = Chi tiết trên KAYAK - zh-Hans = KAYAK 上的详细信息 - zh-Hant = KAYAK 上的詳細資訊 + en = Photos, reviews, booking + ar = الصور والتعليقات والحجز + be = Фота, водгукі, браніраванне + bg = Снимки, отзиви, резервация + ca = Fotos, comentaris, reserves + cs = Fotografie, recenze, rezervace + da = Fotos, anmeldelser, booking + de = Fotos, bewertungen, buchung + el = Φωτογραφίες, κριτικές, κράτηση + es = Fotos, opiniones, reservas + es-MX = Fotos, reseñas, reservas. + et = Fotod, arvustused, broneerimine + eu = Argazkiak, iritziak, erreserba + fa = عکس ها، نظرات، رزرو + fi = Kuvat, arvostelut, varaus + fr = Photos, commentaires, réservations + he = תמונות, ביקורות, הזמנה + hi = तस्वीरें, समीक्षाएँ, बुकिंग + hu = Fényképek, vélemények, foglalás + id = Foto, ulasan, pemesanan + it = Foto, recensioni, prenotazioni + ja = 写真、レビュー、予約 + ko = 사진, 리뷰, 예약 + mr = फोटोपुनरावलोकनेबुकिंगबुकिंग + nb = Bilder, anmeldelser, bestilling + nl = Foto's, beoordelingen, boeken + pl = Zdjęcia, opinie, rezerwacja + pt = Fotos, comentários, reservas + pt-BR = Fotos, avaliações, reservas + ro = Fotografii, comentarii, rezervări + ru = Фотографии, отзывы, бронирование + sk = Fotografie, recenzie, rezervácie + sv = Foton, recensioner, bokning + sw = Picha, hakiki, uhifadhi + th = รูปภาพ รีวิว การจอง + tr = Fotoğraflar, yorumlar, rezervasyon + uk = Фото, відгуки, бронювання + vi = Hình ảnh, đánh giá, đặt phòng + zh-Hans = 照片、评论、预订 + zh-Hant = 照片、評論、預訂 [dialog_kayak_disclaimer] comment = An explanation dialog shown when clicking on more_on_kayak link. diff --git a/iphone/Maps/Images.xcassets/Place Page/ic_placepage_kayak.imageset/kayak.png b/iphone/Maps/Images.xcassets/Place Page/ic_placepage_kayak.imageset/kayak.png index 9401f45eed5f6aa781c15e0b9377b18b324ac56f..5f58141e117080932774bde33ead35ee7b4472b3 100644 GIT binary patch delta 428 zcmV;d0aO0c0`LQnD+>XH0004m0hbADYWtflr#}Uh+}b* zB8R;%o{wa~G;7W57v{|DGlNo!lhiQqu3<9p-yV#*E@39Azm4}toKi}CESFdhgSkp6 zf9uKo-BQZ=`utN3b|cbNOefhB{HU8CoWSe+1ZgCsneOw6qKL^=ZH3g0^mt-%n(>HJlX99m$eu!EF zFUnikBmC?ecq5trNwuB-r6$1asGn|9f2Rp>8~cGj!mZ-~e#dH(EsC#7C*Wb>Ux7ca z8FT`E!Ag?NVxn&#JjJ)bAFBR=y#x2~Ajzh1y>B4A#K$CC9#^+5a32dvc17NiI{opt zRChB{)^j_*Y3A`a@JG0P9Ka7)OR@!3!#|?vA^Zwo13!8M!(F^ivU6%zXmHX`7X5#_ WPMjo$G0Hap0000cv000A30YXHAHIX(ae*oV}L_t(YiS5=QOT$4J$MMf!SXf#z zujxBjGWZG%27L!&G$_*~CP5UVSgpgbcd)Rsmmp%WTTBavzu}MYI2g|1GYt2G3*S4Q z`*O$KaaCQ{wH0P<&Hn(a;#!j0w)g*V?b&0009C0WStv;gL2ce*+LnL_t(&f!*58tCmF=2JqhzJsw<0 z8tG2+lqj|e(xYg!Y|*BKHvR)57KkFER(@rRqXr=%L4;r}f))lsJ2CJBF^f?AKub$n zlqjhSL+!jR28Dxq&U26NJY(lt&o$Rv&pprFGxtnSr_(W(F|PIiN@L6$9N(bLv-mmK zfA0(o1=_F1%Am%1ynzw_v7QG1;57Uh6d#X&8@7E87cn`g@g}|X zQjeH}U7pY!?HGI;i-VlMu%jE|r49CCdj{`)-0a2xN*jC!F9tbh@kO@=P}1Ntf7p=0 zTZ4Pu8bnEh?@9HX2oB=AZVsYUnwX8#m>A#;VLpBgYK@3e5!^0j4)*G@Im$(_Bc9af z;7U+uRFsNfG^r0NV2=7lr~8QRQ5&Pw6de-#c;RAFQUcmBh4WP8ad)S!4+bmvvdnDRO^!ue#LIhLg)lVNnTScdrr7N$<2fc%N_$8=4 z3~g=Ie!|y5POrR0Y8cuq{5~%w|Gq#!9W0Sbj#+4Pvwa!6gPh!w;{&vPf13CR*Mgiy zSeh%?w!y#UZK?;wD+H)>9{g0=!bQ-J6**!x4BnMjPW(W;N>}Yf{|$}=Ia9DcDpd0s z$pDUtt&n%{lJxYe5o*?Cj!Th@Abi(R`zhBfDfvfN$X9W=NyFMzwM*EO!E2oSYa1lJ znYkY13`qBmqoT!ay3G5Ej6(=bJgV$2)-4`d9x%MNXw6951J M07*qoM6N<$f{5gbO8@`> delta 517 zcmV+g0{Z=f2gwAGD+>my000K60by4;$B{NCe*xA>L_t(&f$iEq=uS}_$MM%A!h&Lz z3}mt>WgvsmB!j_bFi2AJqx_OT!|&%O3mFV1gEE-x%J7?HuwYR#Az=_b@)*wgoHLz2 z9i4YQ)2G|#zPr!8=icwVli6%G^B=RO^$wI~2=>kp?42RlJ43K{hG6du!QROwcm$Kk zfA4E#n@`xB*zQ)29cy_67x5#KZO7RhC9MSC;9(+P#>N~)tpqRNPbAxq6S<072tLQN zM1EU12eVLH@UL+6VjRQ4oQ1UoAK_&rTZg6Gg*63#30KY-XRs@GX-&a9_z=mq;7W5Z65NARiF^S+a}>3l zY+uKwNcItTbCgWRmrk8C1bb%)_RbLOogvseL$G&-VDJ0`zdk}ILyN(!00000NkvXX Hu0mjf70dD< diff --git a/iphone/Maps/Images.xcassets/Place Page/ic_placepage_kayak.imageset/kayak@3x.png b/iphone/Maps/Images.xcassets/Place Page/ic_placepage_kayak.imageset/kayak@3x.png index 0793347d497bf6a2a7dfa46654f6d7c92a4606ad..ee009557d7afadbb65e88c2e56a6e21b141a8f53 100644 GIT binary patch delta 1162 zcmV;51agU000Dz0hpOu29Y)=e*{)ZL_t(|obBCNh}Bg9$MKIdZIZ2| zv?md$RDx75Jrw#7Ezo! ze;STE2Xh0@{~5LfJg@*~gj}!{o4X!WRaKM6hAP9FhR^@s$8c3uTSBj?s;X+Ns;Wgz zUdy0d^4H+>pzj%MYBF#Tg3iKSLEj&^v+3YL2zm>S4f@vO`=*229`pp<5cGYA`+E_z zJ?Ls28uZ?ZYS6b9KL>piri7qJ3Ep+YHarsabwvq5SK{cPZv}P)eO-}Uv~9wXxH{=>>k;J3|&z| z&{6e9uoTCuSLypg2|?ir*|p0N92fLWm{Nl7#_d7hEcK;7<&+W>Ucq}o-!d!;`X)q4 zL8&j*)MS51_8!%QpR^>>f6H%6)MuKejM9QqFLL}H^gUn-*L_P2x($y8ed+Dw`=!L7 z)br9`!oK8QseMvv(Ct_g^vy9vll@YI!ejU%=o`UFL0?Bo4!TozvY*}&-I0=m!i)GI z=(|#O&;DMN9+doKKY6O8;}ew5M!X#KEyg85-yXCfDD{5(baoQ3T?#8b{-zt+Z*>6+O-_&0ikYcv%u0OOZC_IEOgTD0PvepINsfRE6>%bwh z_p@3Tl={rkhe6*JI6Eb4W6(-{GA>2*^hq0o!n=4a=sRENd{kS5Qolp*3i=`^_}UzF zE1nAa=Hc32C2bB$bba9A_ptAXUIc9q`jhOw&|~zt6T0m|sqboj9rRs?Q<@GQgrGa* zC;Mxg4jzP{@GL$K`Yyw{O$N@Wn*IDwi9cO27pH|>)c;04?{-krpwsMwLAm6MVLE7- c>7Zf$1x7)@xNh4+ZU6uP07*qoM6N<$f~uHDIsgCw delta 825 zcmX@f`HO9WHa8ao0|OTWqjS?4n~7%X^~~&^E{-7;bKcHAofRA?(zf5EFQ;_XwSA6z zuY?QaS5z_zIyx4pY>8MaE^@R&JM`d0B`&KEj4X}|_ceX*e0=QmjVlv#W!?mO_*~b^ zp1Wr4>*h0ceE)ymc=+bc)Zpyxw{w|H+t^|s#4ERG2|G>YTzIM_Ak}Gwkz&Y9fmJ>n zp=$Lw#9_iAs#`d(w9H@jVb*u!b(Va8uI-%qZ^|yGdZyl6G3Of9OqN!s^87dS1f6_$u_y^f83o-`o%OuJk7mP^RQn1Qjvw;2X^+ng#g4^}d-Lta#ci>_ zf|@Rf6__g9pJsT!nq{GRCw}tbLaN28?pUg*hU+6xt$e^0(M$!$} zmh^@44a*O`;V8JdpYQ}?D4HeHzo6k)@kbPKB8yG})F8|29 zlqJid%F$|~FD0HQzKO{S!4h&0zL> zDd$`UKJLxB4<;o}pEpHKcJVK?L0oZk=* zit*4FR+p}MoKg|p`y=$K&&&M_uZX^y21#77M1+>+kcE|z(qfC&XLh;Q873>8ubcp8 O5(ZCKKbLh*2~7Y!ws4*R diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift index 9979df36ff..54980fd7a6 100644 --- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift @@ -146,12 +146,6 @@ class PlacePageInfoViewController: UIViewController { self?.delegate?.didPressWikipedia() } } - - if placePageInfoData.kayak != nil { - kayakView = createInfoItem(L("more_on_kayak"), icon: UIImage(named: "ic_placepage_kayak"), style: .link) { [weak self] in - self?.delegate?.didPressKayak() - } - } if placePageInfoData.wikimediaCommons != nil { wikimediaCommonsView = createInfoItem(L("wikimedia_commons"), icon: UIImage(named: "ic_placepage_wikimedia_commons"), style: .link) { [weak self] in @@ -208,6 +202,12 @@ class PlacePageInfoViewController: UIViewController { addressView?.canShowMenu = true } + if placePageInfoData.kayak != nil { + kayakView = createInfoItem(L("more_on_kayak"), icon: UIImage(named: "ic_placepage_kayak"), style: .link) { [weak self] in + self?.delegate?.didPressKayak() + } + } + var formatId = self.coordinatesFormatId if let coordFormats = self.placePageInfoData.coordFormats as? Array { if formatId >= coordFormats.count {