From 4060c772f7ead6f7bf6a422668ab460a20b10263 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 20 Dec 2014 16:27:56 +0100 Subject: [PATCH] fix list icon assignment for traffic warnings --- .../list_warnings_pedestrian.png | Bin 0 -> 1888 bytes .../list_warnings_pedestrian_us.png | Bin 0 -> 1771 bytes .../drawable-hdpi/list_warnings_railways.png | Bin 0 -> 1825 bytes .../list_warnings_railways_us.png | Bin 0 -> 2041 bytes .../list_warnings_pedestrian.png | Bin 0 -> 1888 bytes .../list_warnings_pedestrian_us.png | Bin 0 -> 1771 bytes .../drawable-large/list_warnings_railways.png | Bin 0 -> 1825 bytes .../list_warnings_railways_us.png | Bin 0 -> 2041 bytes .../osmand/plus/helpers/WaypointHelper.java | 38 +++++++++++++++--- 9 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/list_warnings_pedestrian.png create mode 100644 OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png create mode 100644 OsmAnd/res/drawable-hdpi/list_warnings_railways.png create mode 100644 OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png create mode 100644 OsmAnd/res/drawable-large/list_warnings_pedestrian.png create mode 100644 OsmAnd/res/drawable-large/list_warnings_pedestrian_us.png create mode 100644 OsmAnd/res/drawable-large/list_warnings_railways.png create mode 100644 OsmAnd/res/drawable-large/list_warnings_railways_us.png diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian.png b/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a806ff05edbc1e6960f52533114a8adb72730e GIT binary patch literal 1888 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 H9D(wG*;fsD literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_railways.png b/OsmAnd/res/drawable-hdpi/list_warnings_railways.png new file mode 100644 index 0000000000000000000000000000000000000000..9c3d7a1e74f4a578751af6a6c2b2d1a7a00a652d GIT binary patch literal 1825 zcmd^<`8Sk%9LFEa7-oiKtx>iaYeU^5V^Eec6GJ9jOe9;kbaS$XcFS1HlJyXmlQiAB ziF=V^Vo2Shy19}iThg49p%NON=leW&`YY}a_jNw+&-iplas^bZT;V>oHC}DU! zs;rEvs9*#FN+e<=5~iw(s>wzTQ&-2-H=`OFsHP^WrG;s0qdGe17F|?N58bv6)!z;% z6qHIuO-xX8bCgCyt*ybXpTKS#luifs4B+4Z_Ur*pdjZo0Fqy#34P~eI>6_u5hH8nN0wY7D1b@lc2HyUmxKLK z;V1p@tCz@&L3nr=85)8o-)&4!BhyneGc)t^^J1}hVPQcck$}1P$lM(K=@Y!LfPDG9 zwz|5uw)S0y^gFz~46m($m2b$(ic~7y*w}z&APA63k@a%8Klc9y^8b!EksU-O&f`!b1gVLBNUr1R$wgVXHHpnj@{c{1loFBf zGvpI-;#86~mmOf3Y-4R}&9HM!3zZc~HizXJ;Ni7c78IiCtDa5Kk(g^}g+N5l03W=Z z>t+x2%O?J-B*>SMW*n^BHAJGLwCKY=QB=bR$o&pGzIpi$OA`MotFMj_5f;Jdb#YnB zbyNOIxG4r}T9J7}&W1a;xku%GOlZ^DWRz*XR92?@-rqF4cJ?7r7`LTr%vsyD#>=pJ zP*wM=+@{yLaEQ4zC;tTp?T?b3?y$DUlMJngdnpVLP9Ia5$OBnJ2^2yK7?_fo+EROM> z>)~}ONWAXVhl}duL`H+oO^yD#{-T$$BLq!kqI$n-=jxQu=Jxa(+Ul83T!8qE%jjE{ zlR}l!3&-r$t_1zN7BvaPxwssC!<~;lWbt{l&l){ zJg2v*DM$Zfed|JWk<+XGJ`pR*UaavYkaNyzzF+_3(Hn2_i*8-NY`5c%MEcEswwn95$EL#0<~)7px(+zW@LL literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png new file mode 100644 index 0000000000000000000000000000000000000000..cb5b90243e975a478c7f12707b8b24e148ba07f1 GIT binary patch literal 2041 zcmd^9`9IY8AOB!xjL!_?F~?`#^BGO_&5^6gk>prsaz)?yisVSdOqMNYwX=W6_w{%lugCMp*W>ki#oAb(kcCkgf*@H7a}!&! zv;QGpN~|uEG7VzGxEq}^f}n>HXrVhKc?ED=j2;^gG8B$Bk8ytF(CM<(NFG--s2X8>siz@q?G zVB+_(VC8*yRb?3!6}+knK}`jJK!v2PhF4dE)ins3>M~jyu%k{?#WRH9=YjBjrVap%ZAs_oe-tefL@iDpMhH_@d zQ>rxavSx!Lr>`&51o zg`Y#^=TeJuk>WfWHw$pH(ZXD`=mFr1HJ@3MPcF%)mgFI2TuNC1QqH55^N7`sy&I6@9W+e|)^3j@Na$PC8u>yHiMXxDAYs=93a?n@-8mhqKYDP;P(p-Z+ zsY4&vD74fuTN{|=#Y%ORO6`r*wnlpUBedr!y|anY(ZuY20(x3N|1)ZDE2Hlj+TTVU z>ZHBsq!0Z;>u&>tos7Xwbg+v#+(jSlL591*%U=5Ub7Zua@!uCfFo67T5D~lp6GPzj zFnw|uc{56%9uqg<&8QgY^cZ7$44oOL&%UC+9Rstkz|1S=ya1UKfLQ@LF8~V@;N1ke zIK^0;VlKU5e0YO?m|}@$>B}>yXauJ(6&N5Y-NkHp!+#K_+Kq%i&J zg?J-{o;^Z?dM)Aiz9uI7jT3X5yqmmzryEmt%;8vANojuIp=hV|<78|`{YdGg2DjnM zUd|9_NW}Tc`Nq=vpP`)ff%PwgyY7JoLx|fqoo`qrLt|FyJpJuYD~ZXmg*{e|&F4~6 zrw`HJe)?d#L-AYPZGOKK*7#KS+%FQfUmAa#EmI2C_qwTFX(KtAx1E>V{l}>h+h~XI z5;f!4RAGRFXAEXl>-CXL8y-KX{s%=JE6H4zLw{{jo=Z3XQHmhxWfn0t8G&zGK5xZI zrd)2eSP{KX7*a|$XAf+{HIt5`NjkNY{Le{H$^tW!4eMFEDo#4?t5Sa&73HKL^0eNU zb%wq9&d0naV(Hh(;J6$<+|&6VwyTVhxsBgJo3oY{-nC|ycE#J5S_xnCWz_JYDG;wy zk1x6Dcyils$Nbkm``<8EM@9}U{yA_;k}R=1T+wi)wrsBivTo)`DOQ>INX)MA#~XHs z*rqDp;2wBjwx{|!xuLyF3%8i+R3!KK*3g3L#3R#6J*}44F;Th~Jqr7V4J!7Fs^U92 zlN+8Jmm&xrs-wmoDu)*Y4JVqOfC%L{o~`QFF#B;cUB44TYsX<1ZgfHmN7~4?r~{eW zs#{CTd>9-v;Z&bYj_vlqep=};Dow~*gST8n750@w69z^?Pshy$xdeT)$RE3{e5Fd~ z>fXh>{^BlqT6M*0g={Ep}&;s+oG4CSKU_* zhDzPvj<3TVq+aOus9|YGb+j)*)ngcHq@N!94$rIiyPkEYi$!5E*D2#2LP}({#wNW_ zJAU1+mB2oCU~j)rVQrU)p<)7+o6Q!FF4Iao$2(PP_?{T|3kJsQ)B-!MPbFcF-xZ#$ zsPTN}aamtTL^dXH13O$0qQ+vt<*p$D-@Arx?Qi$kopwBDPs$IrZ0fmlcHZiYm1NG; zZJ&jYq;!3_OYx^V!`V+V1MI_;fVw zg!38~i`=~3*iCq*y?BYfy==Af&P_#8`M8jCY|X)KcBD5P`+M!csw9TG$qM~6o4$My t-W^gmH*Ck=t2+NxaaaFaYg_Fz3H&lf!Q{P{rT82n3sY;8Dr1+3zX9j>_wN7z literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/list_warnings_pedestrian.png b/OsmAnd/res/drawable-large/list_warnings_pedestrian.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a806ff05edbc1e6960f52533114a8adb72730e GIT binary patch literal 1888 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 H9D(wG*;fsD literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/list_warnings_railways.png b/OsmAnd/res/drawable-large/list_warnings_railways.png new file mode 100644 index 0000000000000000000000000000000000000000..9c3d7a1e74f4a578751af6a6c2b2d1a7a00a652d GIT binary patch literal 1825 zcmd^<`8Sk%9LFEa7-oiKtx>iaYeU^5V^Eec6GJ9jOe9;kbaS$XcFS1HlJyXmlQiAB ziF=V^Vo2Shy19}iThg49p%NON=leW&`YY}a_jNw+&-iplas^bZT;V>oHC}DU! zs;rEvs9*#FN+e<=5~iw(s>wzTQ&-2-H=`OFsHP^WrG;s0qdGe17F|?N58bv6)!z;% z6qHIuO-xX8bCgCyt*ybXpTKS#luifs4B+4Z_Ur*pdjZo0Fqy#34P~eI>6_u5hH8nN0wY7D1b@lc2HyUmxKLK z;V1p@tCz@&L3nr=85)8o-)&4!BhyneGc)t^^J1}hVPQcck$}1P$lM(K=@Y!LfPDG9 zwz|5uw)S0y^gFz~46m($m2b$(ic~7y*w}z&APA63k@a%8Klc9y^8b!EksU-O&f`!b1gVLBNUr1R$wgVXHHpnj@{c{1loFBf zGvpI-;#86~mmOf3Y-4R}&9HM!3zZc~HizXJ;Ni7c78IiCtDa5Kk(g^}g+N5l03W=Z z>t+x2%O?J-B*>SMW*n^BHAJGLwCKY=QB=bR$o&pGzIpi$OA`MotFMj_5f;Jdb#YnB zbyNOIxG4r}T9J7}&W1a;xku%GOlZ^DWRz*XR92?@-rqF4cJ?7r7`LTr%vsyD#>=pJ zP*wM=+@{yLaEQ4zC;tTp?T?b3?y$DUlMJngdnpVLP9Ia5$OBnJ2^2yK7?_fo+EROM> z>)~}ONWAXVhl}duL`H+oO^yD#{-T$$BLq!kqI$n-=jxQu=Jxa(+Ul83T!8qE%jjE{ zlR}l!3&-r$t_1zN7BvaPxwssC!<~;lWbt{l&l){ zJg2v*DM$Zfed|JWk<+XGJ`pR*UaavYkaNyzzF+_3(Hn2_i*8-NY`5c%MEcEswwn95$EL#0<~)7px(+zW@LL literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/list_warnings_railways_us.png b/OsmAnd/res/drawable-large/list_warnings_railways_us.png new file mode 100644 index 0000000000000000000000000000000000000000..cb5b90243e975a478c7f12707b8b24e148ba07f1 GIT binary patch literal 2041 zcmd^9`9IY8AOB!xjL!_?F~?`#^BGO_&5^6gk>prsaz)?yisVSdOqMNYwX=W6_w{%lugCMp*W>ki#oAb(kcCkgf*@H7a}!&! zv;QGpN~|uEG7VzGxEq}^f}n>HXrVhKc?ED=j2;^gG8B$Bk8ytF(CM<(NFG--s2X8>siz@q?G zVB+_(VC8*yRb?3!6}+knK}`jJK!v2PhF4dE)ins3>M~jyu%k{?#WRH9=YjBjrVap%ZAs_oe-tefL@iDpMhH_@d zQ>rxavSx!Lr>`&51o zg`Y#^=TeJuk>WfWHw$pH(ZXD`=mFr1HJ@3MPcF%)mgFI2TuNC1QqH55^N7`sy&I6@9W+e|)^3j@Na$PC8u>yHiMXxDAYs=93a?n@-8mhqKYDP;P(p-Z+ zsY4&vD74fuTN{|=#Y%ORO6`r*wnlpUBedr!y|anY(ZuY20(x3N|1)ZDE2Hlj+TTVU z>ZHBsq!0Z;>u&>tos7Xwbg+v#+(jSlL591*%U=5Ub7Zua@!uCfFo67T5D~lp6GPzj zFnw|uc{56%9uqg<&8QgY^cZ7$44oOL&%UC+9Rstkz|1S=ya1UKfLQ@LF8~V@;N1ke zIK^0;VlKU5e0YO?m|}@$>B}>yXauJ(6&N5Y-NkHp!+#K_+Kq%i&J zg?J-{o;^Z?dM)Aiz9uI7jT3X5yqmmzryEmt%;8vANojuIp=hV|<78|`{YdGg2DjnM zUd|9_NW}Tc`Nq=vpP`)ff%PwgyY7JoLx|fqoo`qrLt|FyJpJuYD~ZXmg*{e|&F4~6 zrw`HJe)?d#L-AYPZGOKK*7#KS+%FQfUmAa#EmI2C_qwTFX(KtAx1E>V{l}>h+h~XI z5;f!4RAGRFXAEXl>-CXL8y-KX{s%=JE6H4zLw{{jo=Z3XQHmhxWfn0t8G&zGK5xZI zrd)2eSP{KX7*a|$XAf+{HIt5`NjkNY{Le{H$^tW!4eMFEDo#4?t5Sa&73HKL^0eNU zb%wq9&d0naV(Hh(;J6$<+|&6VwyTVhxsBgJo3oY{-nC|ycE#J5S_xnCWz_JYDG;wy zk1x6Dcyils$Nbkm``<8EM@9}U{yA_;k}R=1T+wi)wrsBivTo)`DOQ>INX)MA#~XHs z*rqDp;2wBjwx{|!xuLyF3%8i+R3!KK*3g3L#3R#6J*}44F;Th~Jqr7V4J!7Fs^U92 zlN+8Jmm&xrs-wmoDu)*Y4JVqOfC%L{o~`QFF#B;cUB44TYsX<1ZgfHmN7~4?r~{eW zs#{CTd>9-v;Z&bYj_vlqep=};Dow~*gST8n750@w69z^?Pshy$xdeT)$RE3{e5Fd~ z>fXh>{^BlqT6M*0g={Ep}&;s+oG4CSKU_* zhDzPvj<3TVq+aOus9|YGb+j)*)ngcHq@N!94$rIiyPkEYi$!5E*D2#2LP}({#wNW_ zJAU1+mB2oCU~j)rVQrU)p<)7+o6Q!FF4Iao$2(PP_?{T|3kJsQ)B-!MPbFcF-xZ#$ zsPTN}aamtTL^dXH13O$0qQ+vt<*p$D-@Arx?Qi$kopwBDPs$IrZ0fmlcHZiYm1NG; zZJ&jYq;!3_OYx^V!`V+V1MI_;fVw zg!38~i`=~3*iCq*y?BYfy==Af&P_#8`M8jCY|X)KcBD5P`+M!csw9TG$qM~6o4$My t-W^gmH*Ck=t2+NxaaaFaYg_Fz3H&lf!Q{P{rT82n3sY;8Dr1+3zX9j>_wN7z literal 0 HcmV?d00001 diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 1bafa0240f..9b4b17e169 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -675,9 +675,22 @@ public class WaypointHelper { //return FavoriteImageDrawable.getOrCreate(uiCtx, point.getColor()); return 0; } else if(type == ALARMS) { - //TODO: Looks like this does not work yet, not sure why: - if(RenderingIcons.containsBigIcon("list_" + ((AlarmInfo) point).getType().toString().toLowerCase())) { - return RenderingIcons.getBigIconResourceId("list_" + ((AlarmInfo) point).getType().toString().toLowerCase()); + //assign alarm list icons manually for now + //attention, some list icons are only temporary test icons, not pixel perfect yet. + if(((AlarmInfo) point).getType().toString()="SPEED_CAMERA") { + return uiCtx.getResources().getDrawable(R.drawable.mx_highway_speed_camera); + } else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") { + return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control); + } else if(((AlarmInfo) point).getType().toString()="RAILWAY") { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways); + } else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") { + return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming); + } else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") { + return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth); + } else if(((AlarmInfo) point).getType().toString()="STOP") { + return uiCtx.getResources().getDrawable(R.drawable.list_stop); + } else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian); } else { return 0; } @@ -706,9 +719,22 @@ public class WaypointHelper { } else if(type == FAVORITES || type == WAYPOINTS) { return FavoriteImageDrawable.getOrCreate(uiCtx, point.getColor()); } else if(type == ALARMS) { - //TODO: Looks like this does not work yet, not sure why: - if(RenderingIcons.containsBigIcon("list_" + ((AlarmInfo) point).getType().toString().toLowerCase())) { - return uiCtx.getResources().getDrawable(RenderingIcons.getBigIconResourceId("list_" + ((AlarmInfo) point).getType().toString().toLowerCase())); + //assign alarm list icons manually for now + //attention, some list icons are only temporary test icons, not pixel perfect yet. + if(((AlarmInfo) point).getType().toString()="SPEED_CAMERA") { + return uiCtx.getResources().getDrawable(R.drawable.mx_highway_speed_camera); + } else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") { + return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control); + } else if(((AlarmInfo) point).getType().toString()="RAILWAY") { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways); + } else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") { + return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming); + } else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") { + return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth); + } else if(((AlarmInfo) point).getType().toString()="STOP") { + return uiCtx.getResources().getDrawable(R.drawable.list_stop); + } else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian); } else { return null; }