From 1f6a1df71c550d651f43b4c644818821686c9254 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Fri, 16 Aug 2019 15:22:19 +0300 Subject: [PATCH] [android][search] Fix search categories for routing search wheel. --- .../res/drawable-hdpi/ic_routing_eat_off.png | Bin 0 -> 452 bytes .../res/drawable-hdpi/ic_routing_eat_on.png | Bin 0 -> 331 bytes .../res/drawable-hdpi/ic_routing_food_off.png | Bin 452 -> 400 bytes .../res/drawable-hdpi/ic_routing_food_on.png | Bin 331 -> 343 bytes .../res/drawable-hdpi/ic_routing_shop_off.png | Bin 400 -> 0 bytes .../res/drawable-hdpi/ic_routing_shop_on.png | Bin 343 -> 0 bytes .../res/drawable-mdpi/ic_routing_eat_off.png | Bin 0 -> 298 bytes .../res/drawable-mdpi/ic_routing_eat_on.png | Bin 0 -> 222 bytes .../res/drawable-mdpi/ic_routing_food_off.png | Bin 298 -> 253 bytes .../res/drawable-mdpi/ic_routing_food_on.png | Bin 222 -> 214 bytes .../res/drawable-mdpi/ic_routing_shop_off.png | Bin 253 -> 0 bytes .../res/drawable-mdpi/ic_routing_shop_on.png | Bin 214 -> 0 bytes .../res/drawable-xhdpi/ic_routing_eat_off.png | Bin 0 -> 538 bytes .../res/drawable-xhdpi/ic_routing_eat_on.png | Bin 0 -> 367 bytes .../drawable-xhdpi/ic_routing_food_off.png | Bin 538 -> 441 bytes .../res/drawable-xhdpi/ic_routing_food_on.png | Bin 367 -> 360 bytes .../drawable-xhdpi/ic_routing_shop_off.png | Bin 441 -> 0 bytes .../res/drawable-xhdpi/ic_routing_shop_on.png | Bin 360 -> 0 bytes .../drawable-xxhdpi/ic_routing_eat_off.png | Bin 0 -> 778 bytes .../res/drawable-xxhdpi/ic_routing_eat_on.png | Bin 0 -> 523 bytes .../drawable-xxhdpi/ic_routing_food_off.png | Bin 778 -> 628 bytes .../drawable-xxhdpi/ic_routing_food_on.png | Bin 523 -> 524 bytes .../drawable-xxhdpi/ic_routing_shop_off.png | Bin 628 -> 0 bytes .../drawable-xxhdpi/ic_routing_shop_on.png | Bin 524 -> 0 bytes .../drawable-xxxhdpi/ic_routing_eat_off.png | Bin 0 -> 983 bytes .../drawable-xxxhdpi/ic_routing_eat_on.png | Bin 0 -> 678 bytes .../drawable-xxxhdpi/ic_routing_food_off.png | Bin 983 -> 792 bytes .../drawable-xxxhdpi/ic_routing_food_on.png | Bin 678 -> 667 bytes .../drawable-xxxhdpi/ic_routing_shop_off.png | Bin 792 -> 0 bytes .../drawable-xxxhdpi/ic_routing_shop_on.png | Bin 667 -> 0 bytes android/res/layout-land/layout_nav_search.xml | 10 ++--- android/res/layout/layout_nav_search.xml | 10 ++--- .../mapswithme/maps/routing/SearchWheel.java | 38 +++++++++++------- 33 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 android/res/drawable-hdpi/ic_routing_eat_off.png create mode 100644 android/res/drawable-hdpi/ic_routing_eat_on.png delete mode 100644 android/res/drawable-hdpi/ic_routing_shop_off.png delete mode 100644 android/res/drawable-hdpi/ic_routing_shop_on.png create mode 100644 android/res/drawable-mdpi/ic_routing_eat_off.png create mode 100644 android/res/drawable-mdpi/ic_routing_eat_on.png delete mode 100644 android/res/drawable-mdpi/ic_routing_shop_off.png delete mode 100644 android/res/drawable-mdpi/ic_routing_shop_on.png create mode 100644 android/res/drawable-xhdpi/ic_routing_eat_off.png create mode 100644 android/res/drawable-xhdpi/ic_routing_eat_on.png delete mode 100644 android/res/drawable-xhdpi/ic_routing_shop_off.png delete mode 100644 android/res/drawable-xhdpi/ic_routing_shop_on.png create mode 100644 android/res/drawable-xxhdpi/ic_routing_eat_off.png create mode 100644 android/res/drawable-xxhdpi/ic_routing_eat_on.png delete mode 100644 android/res/drawable-xxhdpi/ic_routing_shop_off.png delete mode 100644 android/res/drawable-xxhdpi/ic_routing_shop_on.png create mode 100644 android/res/drawable-xxxhdpi/ic_routing_eat_off.png create mode 100644 android/res/drawable-xxxhdpi/ic_routing_eat_on.png delete mode 100644 android/res/drawable-xxxhdpi/ic_routing_shop_off.png delete mode 100644 android/res/drawable-xxxhdpi/ic_routing_shop_on.png diff --git a/android/res/drawable-hdpi/ic_routing_eat_off.png b/android/res/drawable-hdpi/ic_routing_eat_off.png new file mode 100644 index 0000000000000000000000000000000000000000..84cd53e5ba1a0519361f5015a1c4984282951b24 GIT binary patch literal 452 zcmV;#0XzPQP)NYhMkQ!14u7acpvaYTq1QHSu zh^9ycSwamDV)lD>_FQ0(y2;HvxpUq-XChWxF0Y2!^3}%wGZ(za*@Uw0i_dP%ugCk> z^?dN7Nv-)bP3eN}{5m4SC0zqx(Wz!Ak3ba>p_;5CT=CYp7QbNqz?qE*9Y-zDbIPD; zssXv_cR4hn?lho>ltRyD+dcV1WTbb!325?`YM%vBf%%-(0z+)L~WKs z9pBoi#uaIYBHZ?CIaLTnxHtM77gNIob11_4xY2d}v^%*B!vss9hzPg525)S+HhZsT zseIJ!fSpA{W}3>O9_Y2ss~4rv9@uLeeWO$5&_392pQ1IDLkHks*+ABDltZt;%jL6O zCx;HfVWhu_45|ZeIl48ch1BqN_mlmcatw|WD5so&lN8D*?-Ho);d$D2+Xe=B3hJW=v5ImrBH|DJsfC8TmP%Cs00009f-JeVB5P~f7K9a98O%(VJKMi|X;-JykD0XG3LBUQ|a!*jCm9W!r|U_1CRrdB!5>)L_t(YiQUydOT$1I$MGvg6pA>zbn)NNso*S#i-nP}}NC!dbQc&X1Aypg%pIw!FGu)wBZGQ<`qVG+0_Dn=z4c2BSq;{8#t97%fsQ&(f|l(e&`^~GXyg#2QC$j2 z%m&>*PaaVBV|SZL%o<k~i2priibv{%SWqJTy3R%N8r=h6X z;#kOHo7EK!64>HU$U>V1s#(z>CZsAPRa(S9P3Qlkf1#8I^}s=9#u#ImGRBy1A>E>7 Tv{db#00000NkvXXu0mjf)NZf9 delta 426 zcmV;b0agBx1H=Q6B!7!ZL_t(Y$F0>ZZxm4!2H=wrUKH8d3+Yf}{wtuC62m5)u%Irbq-?LJbdM_Iq~rTwss7$;~{ubKW~=B34^2 zuZG$3)yDrb7re*WgtG37&u+}G$NSgyeDI@5t@$)f>4NV3I)5U zp_;5CT=CYp7QbNqz?qE*9Y-zDbIPD;ssXv_cR4hn?lho>ltRyD+dcV z1WTbb!325?`YM%vBf%%-(0z+)L~WKs9pBoi#uaIYBHZ?CIaLTnxHtM77gNIob11_4 zxY2d}v^%*B!+!)zpoj>!yasPq-p8-1fw z< diff --git a/android/res/drawable-hdpi/ic_routing_food_on.png b/android/res/drawable-hdpi/ic_routing_food_on.png index 9338bc895c3b878f39161713c17dabdd89302acb..32772dcce1fa307c7409229d0feb49b5d65b6e28 100644 GIT binary patch delta 316 zcmV-C0mJ^w0@nhNB!3=BL_t(Y$K92oZUR9RMQH*GQH2Dvb(r!4H8_G;1i?2oRa;Y0 z*E9hI1dl@DHYEJWqHCHorAZOf1XD`rL9lf*vu`r1xGQgRa^K6{H-*Bvivc?TmcF1Z zCmpEflL%h&7%%}oDEfmQ0GRSD{+Q$d<;S74ygMUJ2&`b|1@#P4*H7$JN z2)Z(XuAMOJtTstC&u)`U_coAAo9gz4OWU;J!iH(G5rSeH=7zm^u&x#h!Z(+$B7?wYR zEV;HKYirsTgcVsEmRW4tjRqOGppRi6F!uGIXKDV@%XtqEhnI6s#O6oQn^*gb>haz^ zRWCkgLuF82R7XVER@MV%Lm9{x)e#CFjgtc1vIfY3pY=c&tbYf}{yB6B+A^8;R9(&w zom-TX{Lqf~xy-lS+)#ugUvr?Fi8(HVBAkt$<3yemR)iuHhr=DE@5M6q9K_8*TpXm6gPTJ~?ch6ba_cDQt4Iey=~7VQ z&>>YE1fgFCueGhuCC`yeUbg%mKDp<~kr_Dn=z4c2BSq;{8#t97%fsQ&(f|l(e&`^~GXyg#2QC$j2%m&>*PaaVBV|SZL%o<6^}6h&zQ3Q>gwvvrvA12s5;SOmd0HC0m;Wi}v$f9eSG^I%q(*#pW z=s~b`GqZ0ptGFv~a&q6x-8Y58xr+fi0G7U>EhinQ=936s@)$4yJ}CNw9sro~EdHJd zbf5~qxaw7(Y2gfd(}O~1&`b|1@#P4*H7$JN2)Z(XuAMOJtTstC&u)`U_coAAo9gz4 zOWU;J!iH(G5rSeH=7zm^u&xO~UJ{}Yf{ p&R!@RZj2(Kp>Z0lP`aVdR!4R~kfJ{_66*i}002ovPDHLkV1kqqjjjLy diff --git a/android/res/drawable-mdpi/ic_routing_eat_off.png b/android/res/drawable-mdpi/ic_routing_eat_off.png new file mode 100644 index 0000000000000000000000000000000000000000..8f208c15d72502dcaa872b3a6f8a86e4677022ba GIT binary patch literal 298 zcmV+_0oDGAP)^SXxp!~^RHhUB2o@*|umEj4_?q$N#<^_1M0*Lx;S&BoP`C{T;fW-hq$c$e-Px#07*qoM6N<$g5-jCqW}N^ literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_routing_eat_on.png b/android/res/drawable-mdpi/ic_routing_eat_on.png new file mode 100644 index 0000000000000000000000000000000000000000..39a1ed0e6a2468b5bd03aff806ed16e9224dd61c GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+irJgR1Ar}67FY5|528ysfXm&G9 zWAVLgB7Nb_VX=~A@up=fbzFlq&UBc4;P_`>v+h9jxjE(Ug#C61)_1l3TrDZMFgPg9p|deu>3=uHP{IteJezyaOikB4_31y*DXxbZObA8X>)U{%#wAg)Cm> zXW0W7pZZwW@MkTU#wS%^WzK8jXe_(ML0fimdKI;Vst0DA>a_y7O^ literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_routing_food_off.png b/android/res/drawable-mdpi/ic_routing_food_off.png index 8f208c15d72502dcaa872b3a6f8a86e4677022ba..19d00156e49851b2dcb82859a89ab34c4d54655b 100644 GIT binary patch delta 225 zcmV<703QFU0{sDyB!9$7L_t(I%VS_59sF1NUqPCN%>V!Ycao;1j4oPELbUvk`v2!Y zcCZCiLo`?rpOy!x8rc3nC!l2^x})l$61cP^qic}({}ZnkRZNdBflFd)d4?^d%#akI zYgvJ*oaO%l6epl+$;8yqfZ~ zXWk^St&818mxX6@Y_`FUa+s;;G1a0c^8406z;4UVqS6N#<^_1M0*Lx;S&B zoP`C{T;fW-hq$c$e-Px#00>D%PDHLkV1fgEb-n-q diff --git a/android/res/drawable-mdpi/ic_routing_food_on.png b/android/res/drawable-mdpi/ic_routing_food_on.png index 39a1ed0e6a2468b5bd03aff806ed16e9224dd61c..6e09c5dc73fd93f303303200a406113b17237169 100644 GIT binary patch delta 186 zcmV;r07d`a0oDPKB!8VrL_t(I%VS`m3;4hFKL{9;s$mvswp{rCR{Q8SX2+Wvp~--=%ZRl{eX o^`G#Ipxf{n!-mgzY@h)E0E>f@)qG6r&;S4c07*qoM6N<$f>Z8SlmGw# delta 194 zcmV;z06qWK0p0*BG#?br9-i+sazR9dz9m>2tDn0(5TOK0cg+V-0p(0Pd^-kshRpx}|96t6rHn3GPC~T&kNW@TKX$MMRYNpb5TBL@s2bS*KPRANA-bdL zp%S>XB%^DP`2Q2H7FA4-FM&&9YI%k&q|A^Mplexyshs8i0u(2pYRSaZ(177hn3f;^ zSO4e4)bIeP#EXR3|NjhC13@kSJ8&ckki(>~X(6A6)LjVB{$>E6Ywa1hApHF@Mu_pshs8i0z4WrF*P*cRQ%)r>i?XW8Xf?pyhw@bXQXQA zz~h6h*fg*KwLBv#9Z`~%+Wvp~--=%ZRl{eX^`G#Ipxf{n!-mgzY@h)E0E>f@)qG6r Q&;S4c07*qoM6N<$f(W)*!2kdN diff --git a/android/res/drawable-xhdpi/ic_routing_eat_off.png b/android/res/drawable-xhdpi/ic_routing_eat_off.png new file mode 100644 index 0000000000000000000000000000000000000000..81d14e58a2ceca51faf18d07f9d103359a2a08c6 GIT binary patch literal 538 zcmV+#0_FXQP)9 zLXb<*@a^{0^OZQFh-t#>l-j6H3SnS^n>_*%E6u^0O?F$%;3*USNjylTR zxu6%~-ckqm9H)=$*X{H|rU=>e* zAuw(*x(fAdK0|@C{?Y=H@a1#V{nJOm5$Yys^{%fD4(fZZ4K17!Qc3eXXQ zmv(M|`M#JP2-z3rKo9&F6J2}Y9xx!X_COUdA?$%gJV*#Jpd#ydF()hl723d~DKXj? zB0$BKaDp#Q;}2Z=9(N%~7yxc`6K%Xws*4*OV*R_NM$PtiZDl~)y$P zC=yVdQpNlOF#$>hl&03%64)l75>jbLV4r}!&{|j!s8OtD3`hvnDO48#<^&oPX@~$* z0xb%(gn$|0c?Q+cT4z}41V6<1Py!u%tD}QNXl>ag-mskv;w(C%soMYGATq!u cqHI4Nzc|Rv+19kj!T3&BqC348}5SlamnVk`Iv_I7r5A(eG1v9z$T6fEKhf!`(nB*_JXO#%*?~fjC<2-X ze0W{3uj+t%ubg3Zz=c=Npz^$Eag9r3w)3O&e(WSRcys{HvNwNbfW#)ZCFL(^*91tk zIpw<`_nm{Bvl>8>*y5aFrt}Rbtp9O&089yFN#k^zn4dyN&DV6fVAtqV;RKk80s(?| z5CIV|e?aH|I_Si2FekvG&YtAq!bG~3)AEYY^Sps!DL%Oc9tOpuNSbrfx50r584aAkHNUc<$ zE3sz+%6KhIteYF%&jh;=b7r765iTVnepuazeLK+jvPnX0*n#x0%83Q$M7MG_a>N}1 z2FMPpgg9bvrGD;qJF(3IHBAB=vB;&L!GX32CgKrOO!`@z8|Oq%9CN?_&^qh+#4YBT z^lQ|G(3>EhaDPIb0Htsirx>8>3|}7a-b=Efj=jzf+Y?J zaOz61|Doba@MQ|n#4u^M;9PiEKlhs!CA2X@gb>q~m7-&V z#f1_Ak+>Ja5{2S+3!0pYDR4)Lhj!N=u?gS}t4jGKd>E!5uXjNk5haxtF?av~002ov JPDHLkV1lKgz1IK$ delta 512 zcmV+b0{{KF1DXVoB!A&aL_t(o!`;`vOF~f;2XHGL!XdKBAaDrW+?;fCNu!`>P-t*- zF}LV%Xo~WGh;RxTf`({r=nn`Q>VYjnkW106%~-ckqm9H)=$*X{H|rU=>e*Auw(*x(fAdK0|@C{?Y=H@a1#V{n zJOm5$Yys^{%fD4(fZZ4K17!Qc3eXXQmv(M|`M#JP2-z3rKo9&F6J2}Y9xx!X_COUd zA?$%gJV*#JpnoFkcrhm|02SK6qbV`k7a~B#mT-bEP2&$-`W|;7NEiTabQ5j7QmTs^ z9AhQ8yMu%w;D+OrihE{52nmp+RB~c|Dj@+q4N(7Xq*4Yx+CZG~hX-8n6 zfW6RKSP-aDtY!>I2-GQ57Xao28Wd@W08;`j3bcfP8R2;b)zDgJSm^{m#Q0DG9ek^! zgG6X;*(KhvrTf;K`yk>hI-;rC|KK1pz$Kz=KOVn0$j#Z-w8z2#0000>Ef35ej5gnnPs$G{(&x7ZInPJ>Sf|b7p28j=#P}NMVMH;u3(HJy4Yf z?BSCw5s;Vbg?R>;a)6?}hJ+L#fCF?jMN)-mLtj%BApHWsM1KWvW2FtKsryjT24vNM zs5T%(O9NMPdK!4DOQ(Ty&}gM0LILp8u!fTY;HRNQJ(aj=C{O|1G{k83UNl(tTev9p zevFy(@6hJoWZEwgrr2j#<~#IA2{-|U_9tB!GS}wD1{hNJvLy`|NtY_e!A|fAd

~+W7=xEBFZZ zc6N3lm31nyw6L%gEaC`)Kb01S2%pUoHtVu8+1)WI<}@>RIQM?syE`LAEtJ^9V(I$E znamXq>G8m4Iluy7edF}haLfy-$^ki(E0!eI7?4rJ09Lt!kbi(H2nb*wT!2=s-|on5 zsR!6`Tg>!`(nB*_JXO#%*?~fjC<2-Xe0W{3uj+t%ubg3Zz=c=Npz^$Eag9r3w)3O& ze(WSRcys{HvNwNbfW#)ZCFL(^*91tkIpw<`_nm{Bvl>8>*y5aFrt}Rbtp9O&089yF zN#k^zn4dyN%}v*IxnS4mQ{e=di2?zFcMt&)Fn>Vj|2pWzZ!jmo+hq6Ztn-{(eMCZ^ m5hMB}PHz_rJh7{&h0`w>y%Nhb9W`m)+N}12FMPpgg9bvrGD;qJF(3IHBAB=vB;&L z!GX32CgKrOO!`@z8|Oq%9CN?_&^qh+#4YBT^lQ|G(3>Eha6+8`rEnIf7@+FqVZ}q7 zpz7)E#)}OoNF;aZfFgQwpecNTKPRe!B@PI1>PoQxq2fyLWeU*5Flo2oTzFVN_nQ_a zv@t@25Yv{J3*0*t3hku6ArT`dFtUH?q+%|`g%SdhxEI0_h2nM#nw*L$a7T%UcGn-V j3E&N@O8F#wrXR0&K^qYzl@>9000000NkvXXu0mjf;dH*k diff --git a/android/res/drawable-xhdpi/ic_routing_shop_on.png b/android/res/drawable-xhdpi/ic_routing_shop_on.png deleted file mode 100644 index bd750d99b573e17c36b8505c6cf755a0c7330c0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)n(}9ge@gMo3|Xi{cW1n>|pK2JGRJEfJ8H>xFp+m~w!ky@rGoAbaS#>~gRIh~O_M>*{*(#>%<+gt&+3 zN*N^Dy`wG7{zOKN+w5V4ZsMFITe+;$aE{j;3GKb)AQb~~na@xdBtj!G${_JEKdATH zEe_JA#JQnM{iTqN-c=6KErquvg0dBP29?)8$L zB)&nvQLq2V@th=o(1=lQBqbvk$saUk)Ei69$wBf5)s1>}OO|!*&E3$T3r4;3);#4^ z@&`>Apb1B&isTQPG(eNiTm{J=G-ZIMGO{yC{-9|CG@Y5BLGlO98=!f`2q(!Ov|xZ1 zRAU?@f6$@L!%{%10^%B+|Dgk9!+VQb`~Y`I`9bAe9F)!%8|Xkd>qd4F?8UNJX#Eut*%z@lBb9 zbbKJob4d^S;@Hwe+t}*ld3vXRp_xQS>N1mie4U*{FKh;AyDYOwmoA$u7n-9f-tYrx zagPC!h${h)8>!NyeXdjh)FbUPTM5n|(q4r)A|jlw6ek(K0kT)946(^b07*qo IM6N<$f;m)HH~;_u literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxhdpi/ic_routing_eat_on.png b/android/res/drawable-xxhdpi/ic_routing_eat_on.png new file mode 100644 index 0000000000000000000000000000000000000000..e66a16fd7cde10a803fdb8307766df02e49abaa6 GIT binary patch literal 523 zcmV+m0`&cfP)YU6o*f=RcEE3E^Z1sxrm@3D5#@zU%=TH5Cp;MA_(FG2+j^ZfI|fzz`;M0iY*0; zh*l^{J||0~N$kDJwFS>_%00>NOdkQEJttlfC_6-KVcjJiHNYkA-92ij}$pzkxY!s3dn02DkJYr%dGeD ztHbd}es9bwMg1orFCf`S8>p|dE7Yewq(BO!KnkQl3Zy`;f%JPwdnhSTHD=X{N`Y1K zpMT8ZH@2NVbH@H5o|-nUg%pZOo=bduF3DT@r#PbyJg`MpR4P@Q^a=3}BDMN_1;qdW N002ovPDHLkV1mE8;bZ^+ literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxhdpi/ic_routing_food_off.png b/android/res/drawable-xxhdpi/ic_routing_food_off.png index 7716b3acdb81df071dfda1c521cec38e6ccc83f6..9511fa63764278d62ec20037d57af7ebdcb8c829 100644 GIT binary patch delta 603 zcmV-h0;K(l2J{4wB!4?eL_t(&-tE}GOF~f;2k=*hElnBpYcnLmf+m}4sQ)6TprOqr zZ3!G58rp3skd~;aDTo>agVqY9A7nvLfjmn|{)x=%&T%0(FsYL_tF+{RwGXys%RZ!8%Aw;-HX2I6rBO+WdM* z4|3Be?3jd;v?~XyZ+?E#itNOWH%Y`rnvexGHa{onnR2S7nx<1H?NdOZ770~J5%rUw zmo!ZSgWw-5Bt*|xq9qWn^j*?LJT7vz7xQO?5=Aj*?;Hp?;1AX<^*|pkX8~dX^pCl zgk)V&cls$|f$2h_dIq0q$=UD7^yCbv%Kw-jPOUeAu7YRarR@c zU1?I(HB?(IHO!zKDXPd;-b_y@&DL>DH56qV0xVrt6~#j;Pn0}q4mm`*2Z|)Ah@fSe pLn>n4GG*DMf-+oSNdyJ&Yh%uxWM}s6&dg>7Uv<0t z=I!Tp_V&%K$p844gR}Hii8D@zXO$r_P6wbOBt~g*5Ec@Htbfv`O_M>*{*(#>%<+g< zY_Xe7YS49)SnVBeYW5!*eTw^h>t&+3N*N^Dy`wG7{zOKN+w5V4ZsMFITe+;$aE{j; z3GKb)AQb~~na@xdBtj!G${_JEKdATHEeT!OcZM1Qiv>OMs0R>4fJLBCP2|H$#2B!AF|QEwzABNxdZG-lKr zOU=na@(0z8dUZ>db?wdF(4Y%Oz4O*QV;m%Z(4qlaRE}zBUU?M*Eg7IC^*F^V zuVSDT1GJK3WG>PPb=@JymNWX+ zl?O7zN;)o(m81s^2L@S4MX%7XNF37fO__ysd}|=fb4d^S;@Hwe+t}*ld3vXRp_xQS z>N1mie4U*{FKh;AyDYOwmoA$u7n-9f-tYrxagPC!h${h)8>!NyeXdjh)FbUPTM5n| k(q4r)A|jlw6ek(K0kT)946(^b07*qoM6N<$f_oBFwEzGB diff --git a/android/res/drawable-xxhdpi/ic_routing_food_on.png b/android/res/drawable-xxhdpi/ic_routing_food_on.png index e66a16fd7cde10a803fdb8307766df02e49abaa6..4829fe120a015b36ff96779e7a8790c539d4ce92 100644 GIT binary patch delta 498 zcmVoy$}-l>Naa#G5coT?j!T*XY$F+oA17vbsUSu zk|M~X0v}OkvlXf!j+d>F|4XQYL0Lk;s;n&o>avO&0On+zxPN*mbRa`$BNTeWkOZMo ze1=MEGS=uE{5+$CysFR=(xId()Q@H=LcaQ@?WZDir!G`XMd*;0Mtm&O(uj`#+gQ^y1kKU)^&R$(-if4Ba^hyE2}rUpf_tg zX|zQb;z=W&`+p2W8gX12mlx+_M~c zm%2VjEIPaBq3O&R7Wu*>PRP~cIM|C!_5l~;S>Nw(4eYv6p;km_OoC7#O{gJl%e+`o zXT3^T&JI3+Lj@ne!9SCVEd`5+Rwzn7CrhJA?7hjg1SA87d?1P0OtJ@vFn}M}BY2Dr!ajCm=5%*+?6xud^%Er#+-V z3Zy^^q(BO!K(2xGdq{gIDNr?L)rv}iRq~&I%;7h-oj!BM{vn>4Hm-#fibmn|{)x=%&T%0(FsY zL_tF+{RwGXys%RZ!8%Aw;-HX2I6rBO+WdM*4|3Be?3jd;v?~XyZ+?E#itNOWH%Y`r znvexGHa{onnR2S7nx<1H?NdOZ770~J5%rUwmo!ZSgLZNyH_z)4iq;e#kY9RTE zFZY$;0A4ka`c<}VRtHI~k^(w5PQAR7_7KP$L~^g<{~-w;tl=Cvq_GN*WK!?tnuW3OFlQq(nDEj7%b94V^ER^CicD9zS!Of?i` z8v-m{Ru#oVDo>O=X%0C=xd)0QsfeIunL{dK-ZEv`q=G@53Te O00001XoE%$x7NnROhC#gZb(qXHjMX0sKlAdZ) z#+gQ^y1kKU)^&R$(-if4Ba^hyE2}rUpf_tgX|zQb;z=W&`wT-GbP+K>LFXLC6}w`NAVk$kpRG*o#c| z0T<(0-|ue??7C5*Rzzq_f>0n$s3C33yjW3Zy-HZ*cz!`y`H`xN(hW;6mgzzTyk`1H z)kSHZLCM#vq=NB{E1M{94~-wWl*Y@e<-h#`&0!lgv{A(-a=fF|Ccci8=9Svyv{7n8 zF6AOj8>J>xi%nhS8`M#@#8fB O0000XOJ=O|pBdTpiwQbvtYTLGLn>YPBHE&n)zulc#=k8yOqxBultW0UW zU#(WF)xt+hKeeze_QS_YtC!(}hS2Zu^CM&mTLIKSzz=W`?#A6X0N<~E`w4{KVpSZ7 zQ*j-hC^f?T7^{JRAK+o{?jd}?!tJLx`~q9!X5&=4QX$|#<99%<+fTvZ_r{o@(v=DU zcN@RE>fJsLpTrjN;A4QnA_%H;`#Ag(7YnKkPyrzU0A|6HP#>T^LMi~vi05D!05O7z zAmDie%ebI#0DKn@Lpp#82z>w?1IYmHrfvVy+Khqyeh$6M`B*S4{*# z4WO$gLIViuf1l6*`rjusfO-fGAgKR+LIX&%PiO!Y5E?+DeL@4MfG`;Vo>sXDAUrV{ z0B(kXB3wTi01knHB5Xbx0Oo`K5#mM_;1jqr0YX-QIIIpC5k>{zv$!S!LRNq{{29+C zK*$OZhov9^LRNq{teOBJGe8_xPJoaZAP%$R(V-*Yf}{X(_!%x#zZa|Q6A}P~;bT|| z5BcD`9y4Qpj12*y3^jZe8{h#G?;I?MPnOpj3PKrr_!Q>H{B@qT4Pahz^OmkG2-yG@5w}R`%7Ty$U@>uvm98uZ*#MRkw`}Rk zf{+bhRdK79t}F7fAOfN`Gd_Xc<> zyVVeKAZ%ZHt06p$zm^_q2yOViBDCT673OKfZ?)d5mjK_Jm`z`o{rvy{002ovPDHLk FV1jB1rLzD4 literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxxhdpi/ic_routing_eat_on.png b/android/res/drawable-xxxhdpi/ic_routing_eat_on.png new file mode 100644 index 0000000000000000000000000000000000000000..62bd9e0a88a8e6d81dcc89beb875dbe0ffe79f9f GIT binary patch literal 678 zcmV;X0$KfuP)pkk+;h4z+8et}pDij74Ii);iTh<_kzl_L0s z!rIvFnxGql2K8?-}0WzIp^7XcFw(XcL7O~BuN@79_9mf*=38( zJnS)%r#Z_7KH)ol^+|u7|I`bo;A@YFdYrfUo_!h}V4>d)Th{iW$=~NM1~fWAcfe1_ z+8&r)Lc0NB7A z>`O?{#oKq3+AHUh(oa^20K9@T{$5HfA-=_QiUh~Cgm^kl`r}+emu%dW2XLb508=(@ zO8XM0?XlzC2P$1c0uX=z1Rwwb2msg>Y59gdS@tdo_RZo~VAV9vhvETNst)kTG|sEy z0Un}b80T@}0B#F+&7yq4(=r~TchEM9a?fq$1rU2+<4G)|?j2(TN8RU)k6oK1rF)5M z1|QOmaQX#`v-Hy<-SEbjP8JB)J<@;8y-}UJFaUrTxG_@t&v+nu>ro&8z++s=ocwguV4TG;C|lZ$ApN#xx~v%+@@OrxXciBT*Nt?!jXWXhc?=H zfkl^U<7U+d+=y$j8$Sa>wQSwC?02K}6eDAOq!d8@XX2azhTa=fB_sd=2tWV=5Ww~T znE3xzU_vD%009U<00Izz00bZa0c?}=Krb}1Zjep*YGgGpfaMe;*%kgp#ZpcS$3t8j zxXN1NK?ASNz%}A0PUcp7Y;c~PzyFiuJR3${n{4%YorEMwk|f3I53ZW%B-->`NB{r; M07*qoM6N<$f-#*nssI20 literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxxhdpi/ic_routing_food_off.png b/android/res/drawable-xxxhdpi/ic_routing_food_off.png index b730f30fae6473f006c29259155f867589b2b78a..bbffc6eaf71c02f9f0e7e869c6aaed91a7e5975f 100644 GIT binary patch delta 780 zcmV+n1M~dX2bczs8Gi%-002mlzq0@U0^dnQK~#9!?b<(R6hRaQ@QF$yRFfdE9~)apoQHbkADv!Si-;YLnYukwpVxr zH1RtUA|VnYArc}X5+Z?1cmWI}U=pvOQ6JI90UN-4s+BJS@YRBVaeN*jLfhsZT*+wU zi}1+?FpZxhL-=O5kXxC}d=T#10g{|{`h?T0F!e<^YzvsrZK+B4V85MZg{eNFZR{&E zOtlH;Tmac&s((v3;&v)(4Q(z@_~Lr3OA0O^O}N89nd%ZQxC5Gn7m*|!bq5R!Q)xn% z^4?--n936F8%7m`sU+c|;Z#AG$`KM4ASro4E}@S-hE;`ODnVE^yebiKuKpj?>p2#*cBN`@(maFq{8Dt?Dy`BkpJpgD}^zcbYt$-P; zF8&DUGk*Xc30QZ3guD{4;<|`E6R?;Wqv1SAIOuqctGcyKUAOT}I zi7$cK7=O#S>>8<$1_5U>FSS7G^Hh8-Z+vHXidvfp9Z0zyM(bv%vwj5yBjQixBSk#u$S}(BuDi^%t%Z?UYy9%yIw#002ov KP6b4+LSTX{VP{PM delta 972 zcmV;-12g=X2G<9W8Gi-<0082ccQ^n51D;7lK~#7F?b`#aJ=Ye%;r(pewi!Lv3Th*& zZAP_i+l^}5wr!g?{W>*oSMtBzomuDZUyP&m9nGvvX}w>qR;$&*M@v7our2n($4aZ0 z;e&?I@9^^@WC~jW)Ih)wa1ids-8cZ>uYUUpgx_LS9EekK9e9X zA$-5W?WZ{W0$bx|<5ap*A>csccR;P%Pr=~##+abel?nlO8^62i-98SV#1`@3V}QXT z2&!}YIQ$Y93#trI0U-eZX2FwCAD})$Dgexg=U^BBF@lL8;DVt5U|Kv2!vP2q6d~Zt zxS($Ud>0QxI)8u)2z>w?1IYmHrfvVy+Khqyeh$6M`B*S4{*#4WO$gLIViuf1l6*`rjus zfO-fGAgKR+LIX&%PiO!Y5E?+DeL@4MfG`;Vo>sXDAb&hD831mEfg)T#82}D}fg)@^ z835*k{t@Cv72p%NGXX+YfH=P0IgyCaY3J>|=EwfHP23~62nS*@{H%=A5D-eH@Ck9BC_()pk?NT0T+xSz@NnZ zsl@gFb(9p~pW^;my0Rc-1NgVNf0wQ-2-yIp5q~#L>B@qT4Pa(*GncL`2-yH;6E|Dw z%7Ty$U|w#BPt}F=I0G1QCZ0X8^kPTo}ajTZDEC{K> zI^xzTb!rG$PuzN?P7MK@irci*sUct+aodzSH3aM|Zs*d~KLR6%fW5@+RR$1@90Cp$ zcYk0KfP4rzLfjFF0CFMVC~-$61IUAb6UCjF5FiHv&JcG-PJjdmIA7fPIRO$N;4*QS z-PqDD!bJXav*G9daEHk ujK7v1Y6xxky&|;X_Z8-8!*8|TtCs-Zo0v^sm;Ly2NJG8`(`zfy_Plf7;eP&r`_AX}-t)cp zz8Z!`qtR$I7SMqmn8>A1PWjI$#JUuL9TX;m1{ne-eqv6#z<;IeDFgrmG8S>-M}bYr zZ4>}r(I_t!E-eavc>)U-fopjJ&B$65hU6(6SOm7^35>xBJR*R$(gdmzgENSis;~y9 z5GYNc$1wsXO&X}-zY5GXH^)u+L1c>?Owpo{iw zz)g($Y{1PP{eRhjmwEcL0WaOM&jv|UQV6I^gF~wGnW{8cq!Lh-2K{#36!DNom0dSQ zJRIA3Q^diNoi{}s49mVLdP6O(0CyUk(%;tcrojrm0B;(MP?z7rx{R}^r!9XNPpt1h zN?ZOo-kE#QDrNZ|e6VN0C|&uz$gr1xLUIl;48uSTZhzRzze6kC`(I`+{|HTV<<}v} zR(J+i*uo%f_nF9h%ssqt%lXu|n^%65AqiaM2zaG^Y|UK(E@=X3=>oUXr%*`xBK8$* zqjDw^+L^a;CW2_ERoGzPN+d`X;6{pFAxQfhc<{+AU{bFHKeK{KznDF&6Dep%KXPM( zsUyXS`+Jb3srnGYZQcfhj?({PrqO7Ay_733gL9;jLKIW#$0_!)E<`MSBa9Z6;}rka zB6+PZtZtm*A3R;Kdrzqvr+9%gnyYZCamqjBf0I%*&Oa0oKZV3EV(D#Ee31Qtt%OFS c(P;hvU$s_V^RI7e%>V!Z07*qoM6N<$f+UV9RR910 delta 654 zcmV;90&)GD1*Qd%B!6v5L_t(|+U=V?YZOrwhTrSQZUh@eEjFu#V!%}X04pJ&VyB&j z_LfS1fmjNPjYSHJYy=^Qe;{g=BKU>E+Su)ypc{h*{D|^eh_E}e^R@TP%#L~A@}A2% z=h=I9&b@PY0ZEc1Ng661<^y)wWsA)`>@kt2Im-n;;X8iyNq>Kx|I`bo;A@YFdYrfU zo_!h}V4>d)Th{iW$=~NM1~fWAcfe1_+8&r)Lc0NB7A>`O?{#oKq3+AHUh(oa^20K9@T{$5HfA-=_Q ziUh~Cgm^kl`hVkGLYHjZlm~F4>Ht$VZc6(Sr|q%h-3KaNLIMzg00bZa0SExt6>0f~ zJz4fH3HHt6S76mN&WGXwR;mv0$TZHY;sG9_V;JXg;Q($6cg>=F!P7Dxqj%6YigM3w z&Yq1+Y14FfJ-L~v^qxBRc zV|}C)K!5&c;+z47-WyXTBme;jKmY;|!1e%``2SX5LM0>s0SG_<0uX=z1RwwbY?Jdq zFEp}lkWKh%WHm2<4f(8^Q_f}NcpR%tBmDg^~4kf0!n zo?;fN^{tAwt{c9$d+26CdGfcG!=Uf2UVX8|w;&v)(4Q(z@_~Lr3OA0O^O}N89nd%ZQ zxC5Gn7m*|!bq5R!Q)xn%^4?--n936F8%7m`sU+c|;Z#AG$`KM4ASro4E}@S-hE;`O zDnVE^yebiKuKpj?>p2#*cBN`@(maFq{8Dt?Daqm>HwtJV-d`c#NyMwM}3N zhq#1gK$S3wRVo2B^wbGU+RA7ujf-zmo6yf%TqnCsdP5}#1RvTh>Dgz6$zu%0?# zghQZzCGi)Mkq{sOV>pYK=%a@Y76^Sd@C;AXmNRDXXvd}2Fh%L3lSmlLxa=CKj|Kr} zGB342>hn~5E#$mx?U4FB7hldfdvK4`rz@UF!hoK5s0u$q9r1lZcoA>)5hIAk=#D;e z1gVWI)kpF!aE}tXeb5~EQ#Ky+MuBiMFu(v|1GB*awh_V{e~S?A_{JE6M$qH`cl8&p W677^%+01eP0000-M}bYrZ4>}r(I_t!E-eavc>)U-fopjJ&B$65 zhU6(6SOm7^35>xBJR*R$(gdmzgENSis;~y95GYNc$1wsXO&X}-zY5GXH^)u+L1c>?Owpo{iwz)g($Y{1PP{n>z*dHS;fFWs`w21!&> z2&hYgL#p$csx(-n5>S-}{dV0H@sLK9T{lHM9NT$Q#KDrCH$@x_%f2akLoKZUcN(11 z-`4S_!3w&m>0%_?2x6-FjNctl76>Ot&CKB42w{a$dXs1=!VBbn4NEP5lid`W{ z`x|)h$t++}uLM7{f=R!aJ**QcXh%PCV}q$9#fkfnrK$Q5!foCLgO1YwVy4k(e!Y|{ zFoScXkwO$x>c=Veu`Wa`eItw(mE#ou)*^YWFRX5y;vYO+uzOFb8mD-HGn%V#s&UFc z)FJkF!RD6*Afvto_qtR&o0AICMUh}VSYRv!u002ovPDHLkV1if8 BD%Ai0 diff --git a/android/res/layout-land/layout_nav_search.xml b/android/res/layout-land/layout_nav_search.xml index 6c3eb5a369..0065e9d049 100644 --- a/android/res/layout-land/layout_nav_search.xml +++ b/android/res/layout-land/layout_nav_search.xml @@ -40,16 +40,16 @@ style="@style/MwmWidget.SearchNavigationButton" android:src="@drawable/ic_routing_parking_on"/> + + - - + android:src="@drawable/ic_routing_eat_on"/> + android:src="@drawable/ic_routing_food_on"/> - \ No newline at end of file + diff --git a/android/src/com/mapswithme/maps/routing/SearchWheel.java b/android/src/com/mapswithme/maps/routing/SearchWheel.java index 66f36c01d6..64f1fd4664 100644 --- a/android/src/com/mapswithme/maps/routing/SearchWheel.java +++ b/android/src/com/mapswithme/maps/routing/SearchWheel.java @@ -8,6 +8,7 @@ import android.support.annotation.DrawableRes; import android.support.annotation.IdRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.annotation.StringRes; import android.text.TextUtils; import android.view.ContextThemeWrapper; import android.view.View; @@ -52,27 +53,32 @@ class SearchWheel implements View.OnClickListener private enum SearchOption { - FUEL(R.id.search_fuel, R.drawable.ic_routing_fuel_off, R.drawable.ic_routing_fuel_on, "fuel"), - PARKING(R.id.search_parking, R.drawable.ic_routing_parking_off, R.drawable.ic_routing_parking_on, "parking"), - FOOD(R.id.search_food, R.drawable.ic_routing_food_off, R.drawable.ic_routing_food_on, "food"), - SHOP(R.id.search_shop, R.drawable.ic_routing_shop_off, R.drawable.ic_routing_shop_on, "shop"), - ATM(R.id.search_atm, R.drawable.ic_routing_atm_off, R.drawable.ic_routing_atm_on, "atm"); + FUEL(R.id.search_fuel, R.drawable.ic_routing_fuel_off, R.drawable.ic_routing_fuel_on, R.string.fuel), + PARKING(R.id.search_parking, R.drawable.ic_routing_parking_off, R.drawable.ic_routing_parking_on, R.string.parking), + EAT(R.id.search_eat, R.drawable.ic_routing_eat_off, R.drawable.ic_routing_eat_on, R.string.eat), + FOOD(R.id.search_food, R.drawable.ic_routing_food_off, R.drawable.ic_routing_food_on, R.string.food), + ATM(R.id.search_atm, R.drawable.ic_routing_atm_off, R.drawable.ic_routing_atm_on, R.string.atm); + @IdRes private int mResId; + @DrawableRes private int mDrawableOff; + @DrawableRes private int mDrawableOn; - private String mSearchQuery; + @StringRes + private int mQueryId; - SearchOption(@IdRes int resId, @DrawableRes int drawableOff, @DrawableRes int drawableOn, String searchQuery) + SearchOption(@IdRes int resId, @DrawableRes int drawableOff, @DrawableRes int drawableOn, + @StringRes int queryId) { this.mResId = resId; this.mDrawableOff = drawableOff; this.mDrawableOn = drawableOn; - this.mSearchQuery = searchQuery; + this.mQueryId = queryId; } @NonNull - public static SearchOption FromResId(@IdRes int resId) + public static SearchOption fromResId(@IdRes int resId) { for (SearchOption searchOption : SearchOption.values()) { @@ -83,12 +89,13 @@ class SearchWheel implements View.OnClickListener } @Nullable - public static SearchOption FromSearchQuery(@NonNull String query) + public static SearchOption fromSearchQuery(@NonNull String query, @NonNull Context context) { final String normalizedQuery = query.trim().toLowerCase(); for (SearchOption searchOption : SearchOption.values()) { - if (searchOption.mSearchQuery.equals(normalizedQuery)) + final String searchOptionQuery = context.getString(searchOption.mQueryId).trim().toLowerCase(); + if (searchOptionQuery.equals(normalizedQuery)) return searchOption; } return null; @@ -154,7 +161,7 @@ class SearchWheel implements View.OnClickListener return; } - mCurrentOption = SearchOption.FromSearchQuery(query); + mCurrentOption = SearchOption.fromSearchQuery(query, mFrame.getContext()); refreshSearchButtonImage(); } @@ -263,10 +270,10 @@ class SearchWheel implements View.OnClickListener break; case R.id.search_fuel: case R.id.search_parking: + case R.id.search_eat: case R.id.search_food: - case R.id.search_shop: case R.id.search_atm: - startSearch(SearchOption.FromResId(v.getId())); + startSearch(SearchOption.fromResId(v.getId())); } } @@ -288,7 +295,8 @@ class SearchWheel implements View.OnClickListener private void startSearch(SearchOption searchOption) { mCurrentOption = searchOption; - SearchEngine.INSTANCE.searchInteractive(searchOption.mSearchQuery, System.nanoTime(), false /* isMapAndTable */, + final String query = mFrame.getContext().getString(searchOption.mQueryId); + SearchEngine.INSTANCE.searchInteractive(query, System.nanoTime(), false /* isMapAndTable */, null /* hotelsFilter */, null /* bookingParams */); refreshSearchButtonImage();