From 85d774e9c66e3569c6f7f33913d111c43405a9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Fri, 17 Nov 2017 20:12:24 +0300 Subject: [PATCH] [android] Added drawable resources for intermediate point in transit panel --- .../drawable-hdpi/ic_24px_route_point_a.png | Bin 0 -> 479 bytes .../drawable-hdpi/ic_24px_route_point_b.png | Bin 0 -> 457 bytes .../drawable-hdpi/ic_24px_route_point_c.png | Bin 0 -> 490 bytes .../drawable-mdpi/ic_24px_route_point_a.png | Bin 0 -> 329 bytes .../drawable-mdpi/ic_24px_route_point_b.png | Bin 0 -> 327 bytes .../drawable-mdpi/ic_24px_route_point_c.png | Bin 0 -> 354 bytes .../drawable-xhdpi/ic_24px_route_point_a.png | Bin 0 -> 604 bytes .../drawable-xhdpi/ic_24px_route_point_b.png | Bin 0 -> 589 bytes .../drawable-xhdpi/ic_24px_route_point_c.png | Bin 0 -> 626 bytes .../drawable-xxhdpi/ic_24px_route_point_a.png | Bin 0 -> 868 bytes .../drawable-xxhdpi/ic_24px_route_point_b.png | Bin 0 -> 820 bytes .../drawable-xxhdpi/ic_24px_route_point_c.png | Bin 0 -> 1647 bytes .../ic_24px_route_point_a.png | Bin 0 -> 2411 bytes .../ic_24px_route_point_b.png | Bin 0 -> 2287 bytes .../ic_24px_route_point_c.png | Bin 0 -> 2403 bytes android/res/values/colors.xml | 1 + .../maps/routing/TransitStepType.java | 3 ++- .../maps/routing/TransitStepView.java | 25 +++++++++++++++++- 18 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 android/res/drawable-hdpi/ic_24px_route_point_a.png create mode 100644 android/res/drawable-hdpi/ic_24px_route_point_b.png create mode 100644 android/res/drawable-hdpi/ic_24px_route_point_c.png create mode 100644 android/res/drawable-mdpi/ic_24px_route_point_a.png create mode 100644 android/res/drawable-mdpi/ic_24px_route_point_b.png create mode 100644 android/res/drawable-mdpi/ic_24px_route_point_c.png create mode 100644 android/res/drawable-xhdpi/ic_24px_route_point_a.png create mode 100644 android/res/drawable-xhdpi/ic_24px_route_point_b.png create mode 100644 android/res/drawable-xhdpi/ic_24px_route_point_c.png create mode 100644 android/res/drawable-xxhdpi/ic_24px_route_point_a.png create mode 100644 android/res/drawable-xxhdpi/ic_24px_route_point_b.png create mode 100644 android/res/drawable-xxhdpi/ic_24px_route_point_c.png create mode 100644 android/res/drawable-xxxhdpi/ic_24px_route_point_a.png create mode 100644 android/res/drawable-xxxhdpi/ic_24px_route_point_b.png create mode 100644 android/res/drawable-xxxhdpi/ic_24px_route_point_c.png diff --git a/android/res/drawable-hdpi/ic_24px_route_point_a.png b/android/res/drawable-hdpi/ic_24px_route_point_a.png new file mode 100644 index 0000000000000000000000000000000000000000..ef01b6dbd682978b73efb8bb3eec5a2ed5ecf74d GIT binary patch literal 479 zcmV<50U-W~P)hMAKaxwf{4fM2X}WZcu%s!pq3t4$L$Vkxg$WmBeD|$v+S$QhRP}IKECtmJ}KhYEUOD&)FO@dQHlWf|{7sfX< zhV`jLJM64v^)X(qN$YC2j%n6Dh-MdXs4SSZn-pvv;?0#WenoEDm9Tbsg3VQY{Afd4 z$Q?KBc3HbtRmYF_4P*mts5D{e-^d@j-JpT*C=yOn-{{blrvG5Wuo{k`e86hB001W! V+vL#zKYIWG002ovPDHLkV1jnd+j0N^ literal 0 HcmV?d00001 diff --git a/android/res/drawable-hdpi/ic_24px_route_point_b.png b/android/res/drawable-hdpi/ic_24px_route_point_b.png new file mode 100644 index 0000000000000000000000000000000000000000..70468a88dc32bd5de1e8ff064940cd1a91acaea3 GIT binary patch literal 457 zcmV;)0XF`LP)GH1ANStfdp8&iY6uabITRs8t*R0Y#K>Oemc{%MrU_-C-6;#L;c@612V%B_9!wL-LWef* zu>5BOuh69Fvd}D!pvkI@QzqBY4{i}oxu_#oi@Gi5d-_Ff|FS<5^BwJFFH2=53-xe= zMKM2xNir*s4u1bfFf=oAym`FAB(aN!t31{U?n*se72A&o92Yo22NY2y@ot0W)fU#r zO}_uHLH@re7Obh<)~mGF9~=Dt9OM57D-ZGqF%6eWgOL-;00000NkvXXu0mjfG48&` literal 0 HcmV?d00001 diff --git a/android/res/drawable-hdpi/ic_24px_route_point_c.png b/android/res/drawable-hdpi/ic_24px_route_point_c.png new file mode 100644 index 0000000000000000000000000000000000000000..ffea1353505bddb3312790aeb29dd32d3977e0c8 GIT binary patch literal 490 zcmV{pcBfXRa{Z=3aAnF!)ZnaX0ax?G%5->_4O<_Z!C>G1EV5OWuZ>ktQ_ce97u{I%Z^ zbE}BwzWz?q592GGaOOYG@F~u=d2!EWXbL(#I!ck*K}RwW`nh(QW+P>>v?jQMpocEAGMMc18P$9D4oWb(Z-5ZG*flbYh%psFmH z{I0CDT&&~2wD>$NdP7fO09G8mrc$`c066sA2>FEQP z^f?z+tlQfh(<|t*BoFiRfy3CP;+U#G+J^CINi1S)t^8=sTosL9c8y-wjXpT7KAH6& b{WkRm@%ja)I+V%*00000NkvXXu0mjf^5~MJ literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_24px_route_point_b.png b/android/res/drawable-mdpi/ic_24px_route_point_b.png new file mode 100644 index 0000000000000000000000000000000000000000..3adc969f2fd581f7710e4ff82605137df16a1d1e GIT binary patch literal 327 zcmV-N0l5B&P)5pr+@1yrWFD%u;l9-e?Q{-q#sIlMICRYJmz zMVZe_y&V_L@mp2AycXs{x6roqAcb?o#S1$iXEtwW&k!;g(Dy%Fn7-T&kPZPmYi;E) zR%r)lkAMd(Xl>8*X*-~H2ImEPfaDAo%Dki|*8^d#2K->q!|L|ornidr_FYM@0T+_e8p}fkZN2O1H Z001MS>MHbg`qTgb002ovPDHLkV1hxAjKTl_ literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_24px_route_point_c.png b/android/res/drawable-mdpi/ic_24px_route_point_c.png new file mode 100644 index 0000000000000000000000000000000000000000..6c366dba438404957289898fde00fec205bd8037 GIT binary patch literal 354 zcmV-o0iFJdP)9AaCKlKl?4O{0Rj*ZfB=CF5+VTG7YG6p=|i;iF2lfozr=4^d(aU&hiMhTc3!jo8%4LvG$; z*0jj2ZK*MDYUg&zKKe4n4}2*d{}%IszTp5P46uzm&x6nOfMcWli8bl%;|Q7jzA>&V z^nl7Jo=fLUtv$=ymT_IB2Q)@;S2~Z-xy3amaHY`$I%B{{IxS+-g$`Je&Ie-h9lAw3 z(s_c;11kL5TjYPpC(^l4Yp=4ljz73^uLl&yfOo87fJ2;OQ?9$T|EA$D+6(ruEd32! zVQRl<@t=wbzTiul;A5BIbDjFYng7U4ap~WLk zlDP2s^c3Rb6rCSub@`3>`E9*g0a#D_ksSSWy{(Jii}cv5|L47$eDVlJSw>Yh)xG&s7Z1WM3z zUc}r*w}{s+Lr=++z%}SuE@D2R_r+_gq34<@fe+B}i;fY~kqUF_ULQyQK*tAD0zJ@i zNW|NT8r#HsN1&s}l)!)JSS;c_MvaH!y`|9c-*y#xD`L%~l6m4Y@9b3}eIwo}V&&-p zVcyU~Mdg~!Zghaoh_GOqK?n5RsD2>3s#vmK)emI)sl-|lXCj^6#0lcFYjjfy{bcSR z9WUZMLUSIA&yJ&iRg*ap@EF2zB0%pWS)lyQV>TBw#R#*_U9!j0EocNGHf=u{zWWIN zJT-jpJ%Vwwofq}l-&Seojjil&Ew=0CZuYm=y9XRuIb!M_@)-uZTd>D1noH}T`?%tu q`}oj6W(@YF2A^>*H5dk96aWA{zcNdj{Bi{V0000vBOVeA|;BqCj0KFtj!K37X2p{6F7( zh9+yiK+`GU>+Ci;+L9bzl>#x^mbk(p)!K;j6qut*{^4$k$LQlVz8ij5^L>-=qiPlv zzps1v1>N{%5C81C!1g`2@EbY_%dW(kX#xJej!!!Ryh2wR_Y^wG&`}k54q{y3HdOhl zc;_K>B2)ze#|75tNn;n#NuVkaIWBO5Ytq;w=p<4VNE{Y8#e2n7MK_76Kx(N#4{x_d z7~qjK<_`WsH>s+?3dH$2@C^T9l9lSgOORU5ftNUdZk8^W&<#v?e8UIDGJ1l-<`PP3 z*o8c4>=ZglYTrh;8B1fwHn-8Bh63-Tu_K!YnQ&a-7!RbeU!W7=@-lZ5KX?4VM?6%# z^N-18PE{gwzKxo%|FG<#ehmlNRSd9(PJG)xDHnU5*TsFjz#GFW#MurF`A+?i9#$Fh z16xCSXmLmn?hfhU_0b8A0h?kPo#Z22*&U{qtD$CD4AeyTEOIBhp?X~g`%;6?IF}j> b1275zLua;hgb4hM00000NkvXXu0mjftiS{r literal 0 HcmV?d00001 diff --git a/android/res/drawable-xhdpi/ic_24px_route_point_c.png b/android/res/drawable-xhdpi/ic_24px_route_point_c.png new file mode 100644 index 0000000000000000000000000000000000000000..a856a99bcf33620b7731ed44b13ef2384dd760fb GIT binary patch literal 626 zcmV-&0*(ENP)yW6O(urvAo7SPC7_Ma~|I z*`#+D{EqUZwgn8K=BvCmN= zw{)U+u=7e>w+$V}_b~U;GN{G$kp83}X@|DNb#I-AIT4sR40Lx&j?=r)kreMl=sBSe zmMHup-JyS>BdYQz3rsL$yU{Xjp{KXAva!M4hJZfu3WwYaXE zyWwxIHwPR+95FSAeD=w841bKNsq3J-?{LuFr%~8{HK6*x8iY^7f4>-Tq+J}$?EnA( M07*qoM6N<$f@^CgeE4t)SORCmL(qda;8Xa?_|*K(Gsny}=QJu}Am!j-xCvgC_*{mYOqu2K986=l z2;LEQ+%a`D&Qmb0;8yrqcziZ>w#sraHQ+M%MbhJoX+w>yg);%(mF#dAPRK$qmEk(c zD5ho_B$Gww_-mU{HoIdcGp43t?KnhSPih<{phd!?pQRlmg~y`6YskbA^L1F((w6e@K5>Ly zE=WLwg~zM_?O7~51_udflW_PBTLhXQ^Vk$5pv%JHbclE2dEsz5z@{FJi9YpLgynqx zK2>-$vISHk9Nxj2KJ|}+1AP8ompCRWu>~|+IP6pE-w8J;|2rZaW|zspz-)-}cs+-Y zV0q>4VsOY7kVhSF=!3#R%9!W@p?#h$pc{k+EKus+Ve4+qF-r*TyI~9HDWL&vEsxhv z9xIPoM?(9a+5-9{ZaJ&eJ0i$?${c%9-0~^SfF>*TZudEMi*oEVen6Z@>?5q}Q)dNb zuk8t};B$OE#~1QxS}*A%N}a<+XP9!%QTj`o(9Mrh>YM|wDb7~T8AI*n2?NCkrdLV? z^H@GiW1u*jzjKhe9hcc@OjbKP2&hvUlhsDlXF7gJmn3-_u@}r{D)rQXZ39|IDPx8t z%VqYG>u1;?fql2_N*VPN9usY1FWR57^g_=tRHVzZqdR`Ot@ltpJD=B3zPh#tt{o#e4aUL&)(Mp+JBpzFT zv~vel001EnLi=|x>>f9OKApoS2QaO_&|e5t9|~Rv5+@C~50PAoFoT#y4kf7DK$0oy um4zD%q^~LJU`9H? literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxhdpi/ic_24px_route_point_b.png b/android/res/drawable-xxhdpi/ic_24px_route_point_b.png new file mode 100644 index 0000000000000000000000000000000000000000..c6a61410d1ca7653ac93c1608e6c2494677747be GIT binary patch literal 820 zcmV-41Izr0P)v&=G?3V-3c4Y7EJ)FF>nTrQ?WO$s5GkeXC-shBc#X^P}Br7o3iE+$VcnjyW+ zs6~0(%Bj%^_GCmg8;Z$M8}_D6xilZbKJ1TArKHQLPzZMtQYEQ!snruK|Pqu8kJ)@O=sy6-J@6Z3$p3$BlpkaaqJ%>J@Xm7;qZJ5t6&ZQn~DM)24V)i0rQq&bxx3HjA#O!&KdVPQd! zB4)2bCJkLd0}BhfpqmxQKv$4&Q9*y{am3sz{e(<>T|q&@1zn^57HzsiCn9EcQy+2( zbOnv23o`Ic_5!jQ>lT>US`dI^^cnJ*I9ZU|?=U@~xqLyk|B2~~x=!;n{=@=He#O4i z2fCu!^=TRpY2U*4phm>(QK2JY-?bOTO)5mpzlZq@och#IITJDeGU-o^x}^o3iUi+vWPtvCRwU1*LhibP|^bO|IboT05?Np%q^e6SJXSGl-t%3j?q$5Z){0Mq&l{e?jFq2P5OangYM5Xq$oGl*H_P=dM* yB$=XKS-7!4`kJB+))ck5rZ6|L$1zyS2fzc>hdO5X=R24H0000Px*DM>^@RCodHoK1)vMHI((laL%-<3}V$vjJV!k2Mfc{J>?z!wMmwut5+JauduU z7ZLOplANMO58^^3Ie5vzQx-&IMMTKrF^It!H{u7oK@-K87@}^H-TeO83*9wU-PPUI zv)$u7_%q$Fs@{9`pQ`HW*FDqM*OMLtJq9Xdpua-fR?~}%i-Q!jzzDbx+yia}H%8#2 z@2?1d@Oc`12fhW<{r&xOe0GmO$O0cw<5&yhBzU+?03B$193SIs4`z$_DntjhonocZe&fdJv8iAa>R-HwnqmpagHEHkM4|> zq*~=_98kZ2t>3|~;5@hqtOIv~m7q$wit!Of(f7HWK+s`Or7U3lDA)n4`zrKn!871} z@HePR4(BCD$*wB%In&sGBu`M(-vE?JtU}aR|D+q0m8GjnCNP|}_Bpwu?epMr1;Ooi zI*k`7cu-ZE^v$@hqQ}Jd9JmHTiu#=W#Zl?$kX~c9G_9NgP__~bfro$==v1N38z8id zr8-q19;=w=T40B4&e5+1d%;-{m-C#w3v@+m6ZBfZ&w-F~u+5RFz}rknkC83wRf4ir zU@F7kPn278%;@)Jw9Q*QWAc$W$J$_Ci=OqjBpgL2w0+gH{acRqn?2j-sWuq*Wv&UW zcwwO96Kul1Hf<5He7|Pu9p^i2dhC9K{uf(W30;B%lOR0~4lUCTgHNDe?8vqe`%mEgc6NG}qE7T3aeZ%#*#=B!_| zdV&LUidpZ8ih7FLDGzLu+ic1j=n@>51nCu&(BdNKhR}`z*-LQH34$&=0#}~9j*?1H z9Rpt0n9LERH@iZMYouHW?I@7F1P7fU=oUxduBqp!-Z6D5L9PY0OmvB>Ld=kDPZKL% zw!;Jm<_J1nL0GO#-47M`3SlzAfk}|wCJimRrLf6YHf4%VZ`yYahiWhHd!9N@HygxPLe!1!7ZegVC6w@Auv1E$3AUSjN!aMphtXz%~|h5I`u-%Hi_yY z2gN5qm;8`&B5;WvEj z23zbA{HLXS1iTLBKviNKf0-k|AAw$fxd?6s>wtF8zKMOR7Lu#9%K!R{T=8}3 zhaufA2hwPDj-ZGj?OjfRjcG<2Ty}=oi@$=$s(uLryBbVDR_ME;K052QUFOZ27??yi zVd}f!d?M;wYFARH*iuUtA*D_KmoJig5hS7@N&5tmG^q0ii>{d7KSju#VoO9Y9A`P+ z3KA*FrSgV+Dt7%WN`3JXZ-QhE!zcOJ2AW8cV%`?@fkQv>o?>xxOgC-dra)7so2FG~ zeo!Z(qHjT|)Z;p@xhO`hIU4<)6NB9M$cAjmX0Cl)R;;%2Li-?_ tAzvMx(%z{BdVjFwOIoj9kAd!G;5yT?3&^SNLjeE)002ovPDHLkV1l1o5b6K` literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxxhdpi/ic_24px_route_point_a.png b/android/res/drawable-xxxhdpi/ic_24px_route_point_a.png new file mode 100644 index 0000000000000000000000000000000000000000..ac9f6fa0633d1dced06bbcc9516650027e55997b GIT binary patch literal 2411 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 literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxxhdpi/ic_24px_route_point_b.png b/android/res/drawable-xxxhdpi/ic_24px_route_point_b.png new file mode 100644 index 0000000000000000000000000000000000000000..d95654ac5a415886bca0443a2216b615cd386687 GIT binary patch literal 2287 zcmVPx-sYygZRCodHoo$F!MHt6-Go{GN7kYtS_pTt6UzF^FWs6JX2Pw12FjPz|sEjCx zz?29g(hpK(FGlpmNEA|wJ}bMTL6#CJr0KdrLC}jzS^1LN?+<6)d-u#aGxy$^bI-l^ zJn-k9Gc)&@=lMTp=FH5Qdu~TZAq4{k0|f&G1MSK{XI>p28XCF;+oq1f6wW7rE6c!P z$Dd_5$?;KexE!6GofkOIo#ZM2kbXN1^+xF7bD}54PN1g`>=X#bAy0biR@3kRKzcV` zEQwI6+aosx0~FgN5R7APUumIIkUj=1275rGMK;KmF)c)~*%h1|2c87SK;A?)$+mH3 z>zh0k$CiShK;A_*E^TtUN6g2WX`nyvtQ+i;&C^CaX|f}X9}CukbD&v8w#$dHq391X z3c}zn4Bi4}hB7>3z5A$dAtR z!r6K>*A;;1%HNCu?MD7E=L*82dRjug_W*S}?Ml9aAm7D7%~Ep!qMK2>^!aH7uZ*}z zE0dU4Qx`;q8ft2^Q^*Jd578BEA31e9syYCW--T+8^ILJK>BgG5lpX}lAPC3J+2+)$ zx**8clw331g8Vq2;$%z2Q9L&xrK$j+<2BGqGu#APYEBk6;>cN?yC5Q~mB9nxQfKY$ zS@1k=Pp2z7=;D4gE#O@g7UbJm6-VOANt^<})vpH>vz;^+g~Y(@h%+l2)-DJ|T58Zk z>>I4wiUQ>f{LD#-t|)b>!lg@DhN95q@1l+uKrM0wUm6dzSLha?tu4A=O$RRiQ7njv zvt{6enzeKFYxhDH574Wgz}TF^?#W;U*bN#b;x2W!h3y`&2uDjcXY-g()BhcO2z2jy z5NNkt)*|l2VWQXq@KoYAn<#@Ie1^Gqfc^%UoyuWi0BAbh7(1&01_!BWyueb-8KOjmD-_bAEObNs zcug&lb+Uv{6)T=UufN3Ls6rU z_aC|zlc@{u5o4jSiOvBCYex0jbwRjXx#uBR+dy81?31QyNLQIB$eRnUGL;FK77Ku> z3o;rW&?uj()uNvU-$bp(sGA^YnPQ_cGi+jvTT=iUv3>9AseQWtgG0{i}h-_tSwMLEZ~&dqgP` zOxB9SH0`#1-0Lk$MhvWqxJxC(+5(2ZO-tzK zc=qsl@tMlNZpgnUwM3LzO#t*8rvo7MzTr}7i_-32s{_dNl2(F0MbDay7<@+Cg{A7iwtPTL)e%0sVbs- zoR8%?E~J8iEXE~vZ)x}y!8KU1F8hQ}Kq z|Jhpot~UT`L0aorSgQd|{=Kc(-?*1|6Zs1mums4Eb`$xm*Vl`Knx&?DKzVH#prwjM zK;2QhhVc+!I!VR+rU28L#UeU@`>u7m)rDXtjBQ#`zj*Y6R#_yazy*5ri&2 zw4c9KX3U!5J_`Ao19_FY?*S%jB17*cZynI$RI`d~mk(NA@J@avq|h3QzcS2(X-g#p zqWCjU3rE4T2}1FAw!v9;sDMCdx58r3_J8OcWEA8OgNsE7LN_OxO$()q8DS3wP_Nx; z4gX8?h6kXWXM&-}o^wDi(B4g7Z*Dn(u0F66>|#Wtr+c}OTm_(<5rUy1^3+k7!nr1R zdgsD0IPB2xZ-=1?(@}7^9FShunhm-NDHtdiC>SUhC>Zd{!2fq=%Uo2R%iI6}002ov JPDHLkV1n`bF#`Yq literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxxhdpi/ic_24px_route_point_c.png b/android/res/drawable-xxxhdpi/ic_24px_route_point_c.png new file mode 100644 index 0000000000000000000000000000000000000000..93b74db01fe54f845d637c675bc7246bbcb25c04 GIT binary patch literal 2403 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 literal 0 HcmV?d00001 diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 36aa500bbb..a207a45aa4 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -126,6 +126,7 @@ @color/bg_statusbar @color/bg_statusbar_night #80FFFFFF + #43A047 @color/divider diff --git a/android/src/com/mapswithme/maps/routing/TransitStepType.java b/android/src/com/mapswithme/maps/routing/TransitStepType.java index 9bb33cbd45..075bc7e53e 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepType.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepType.java @@ -6,7 +6,8 @@ import com.mapswithme.maps.R; public enum TransitStepType { - INTERMEDIATE_POINT(R.drawable.ic_20px_route_planning_walk), + // A specific icon for different intermediate points is calculated dynamically in TransitStepView. + INTERMEDIATE_POINT(R.drawable.ic_24px_route_point_a), PEDESTRIAN(R.drawable.ic_20px_route_planning_walk), SUBWAY(R.drawable.ic_20px_route_planning_metro), TRAIN(R.drawable.ic_20px_route_planning_metro), diff --git a/android/src/com/mapswithme/maps/routing/TransitStepView.java b/android/src/com/mapswithme/maps/routing/TransitStepView.java index 9f15d76514..e1cac93b86 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepView.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepView.java @@ -11,6 +11,7 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.support.annotation.ColorInt; import android.support.annotation.Dimension; +import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; @@ -85,7 +86,9 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque public void setTransitStepInfo(@NonNull TransitStepInfo info) { mStepType = info.getType(); - mDrawable = getResources().getDrawable(mStepType.getDrawable()); + mDrawable = getResources().getDrawable(mStepType == TransitStepType.INTERMEDIATE_POINT + ? getIntermediatePointDrawableId(info.getIntermediateIndex()) + : mStepType.getDrawable()); mBackgroundPaint.setColor(mStepType == TransitStepType.PEDESTRIAN ? ThemeUtils.getColor(getContext(), R.attr.transitPedestrianBackground) : info.getColor()); @@ -94,6 +97,21 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque requestLayout(); } + @DrawableRes + private static int getIntermediatePointDrawableId(int index) + { + switch (index) + { + case 0: + return R.drawable.ic_24px_route_point_a; + case 1: + return R.drawable.ic_24px_route_point_b; + case 2: + return R.drawable.ic_24px_route_point_c; + } + throw new AssertionError("Unknown intermediate point index: " + index); + } + @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { @@ -173,6 +191,11 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque drawable.mutate(); DrawableCompat.setTint(drawable, ThemeUtils.getColor(context, R.attr.iconTint)); } + else if (type == TransitStepType.INTERMEDIATE_POINT) + { + drawable.mutate(); + DrawableCompat.setTint(drawable, getResources().getColor(R.color.routing_intermediate_point)); + } drawable.setBounds(mDrawableBounds); drawable.draw(canvas); }