From 9fe1a4c2113d90b530788ba9e82145b91e75b05a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 2 Jul 2013 23:49:20 +0200 Subject: [PATCH] Update icons --- OsmAnd/res/drawable-hdpi/map_layers_black.png | Bin 0 -> 2134 bytes OsmAnd/res/drawable-hdpi/map_layers_white.png | Bin 0 -> 2004 bytes OsmAnd/res/drawable-hdpi/widget_layer.png | Bin 0 -> 1406 bytes .../res/drawable-large/map_layers_black.png | Bin 0 -> 2134 bytes .../res/drawable-large/map_layers_white.png | Bin 0 -> 2004 bytes OsmAnd/res/drawable-large/widget_layer.png | Bin 0 -> 1406 bytes .../res/drawable-xhdpi/map_layers_black.png | Bin 0 -> 2215 bytes .../res/drawable-xhdpi/map_layers_white.png | Bin 0 -> 2031 bytes .../plus/activities/MapActivityActions.java | 8 ++++++ .../plus/activities/MapActivityLayers.java | 6 ++--- .../rastermaps/OsmandRasterMapsPlugin.java | 2 +- .../net/osmand/plus/views/MapInfoLayer.java | 23 ++++++++++-------- 12 files changed, 24 insertions(+), 15 deletions(-) create mode 100755 OsmAnd/res/drawable-hdpi/map_layers_black.png create mode 100644 OsmAnd/res/drawable-hdpi/map_layers_white.png create mode 100755 OsmAnd/res/drawable-hdpi/widget_layer.png create mode 100755 OsmAnd/res/drawable-large/map_layers_black.png create mode 100644 OsmAnd/res/drawable-large/map_layers_white.png create mode 100755 OsmAnd/res/drawable-large/widget_layer.png create mode 100755 OsmAnd/res/drawable-xhdpi/map_layers_black.png create mode 100644 OsmAnd/res/drawable-xhdpi/map_layers_white.png diff --git a/OsmAnd/res/drawable-hdpi/map_layers_black.png b/OsmAnd/res/drawable-hdpi/map_layers_black.png new file mode 100755 index 0000000000000000000000000000000000000000..3b515df85134998daa7e5254a8d8f7d8d80a3987 GIT binary patch literal 2134 zcmV-c2&wmpP)$Zu=E@1h*P^}LqfZOMsfa|(9i^wBD)4bBE4~Of1 zU*qw3;D(xpoWDd_GC zfR8N<-wNbJp;NFng2R0224ZRVLuXqBTot;hDZ1xf0=1^QtMD9r@lfRgWRXiSV92*?T3E5w89Os(;{{FFQYo1BKb=}X3$Znu5 z6mvpEdXmZHKW8Fe4Qtn~U3~iV>2<2w4O}iF{l=KzBoc}Lgc6U8jg9?9M6M1^kq3r> z;ZnOrMAC^w;?;@-T-Uu$M79Gm^?+mM>p^UUPHv4q!_i!^QwV z2!eaWTDwJ6pRN-0yJgFk-LZ4$&iwpPor>1h*7KX1nw~B`p}C-6thLXp>bhwHMu7uB zZ#J8Ket3BJ?Kv(q1x4xpEU-G{+Nr89h{y_{6-flgZ@6RmiUfo&_!}Gf$}M z*L>gqd&M@|)6?S|J9f-f)oxYo5|K63-g$c;I0*ELNN-C^iy!`eT-UuqMD|hHz0Qls zEy-kZilmQ5qus`sr-Ad!%%?IB7dB&J$fsdEP zWK{J=-}nC<9vq9swiH|S!BSh;fL(nut-16UJ^d4s~Q zzIQs}(_!`M)h$5~bd{t8(66dL_kI6gRmeXC++A){)fa;x*gQBm_|9}|h^m&p_9uXg zDx4xOIgZoQ-{1f5ddb%c5izdoJ__6xa_t4K^E_{2#__J}Zlti!hCjyNQaGbd&Kuhh zthEim<3NQ1Rn^^@Oy=vg)D>}Ew-<<4@l68#rOKPhWCm)PuvT<-b~a@)ncZOpDk8sc zX=(XZtr|>R*L?u^K@G7Jz&}a}rBbQExm=4v;bJhC%k3f5I2Ms@p67jUrd!D{q^+&( zqYVuWcT(twuBK9N%!Idr=Sm6rzJIuuLB)&kzX8#5yQ==!_x+#LO1y-MZPZ%(5nydu zS0YO7h3X_l8IjND52RA5SHb}u9UY&}<#PKd>_}(019y3z_se?8Pe~w*_V)G*B9X|K zi`!rq1!-F=jsgcnq&J(*_C_L+B_gsPxTGv5ud28CzQ27gyey$` z$6_X&rt-j_E$X1B>X>5+&g!B&8jW5eB3&ZVO<^aiwF&l~h+LOUCil&G@gnB+&mPv= z%YiNt=~mS%seY20RtL=m^O``##3II8`vq0)Dr%#Wlz5<;4w@_e4;amq1+^r#EdT%j M07*qoM6N<$f^e-7*8l(j literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/map_layers_white.png b/OsmAnd/res/drawable-hdpi/map_layers_white.png new file mode 100644 index 0000000000000000000000000000000000000000..1d52220d051d6130408e3ec9e64f747514bff502 GIT binary patch literal 2004 zcmV;_2P^oAP) zK~!ko)mnXQTUQnTo$If(EG|P#1BTeL4{0N9V!w}AkWo^*?OLL(D^ns3G&Hs{4KX2= zp&`U3!HUE*RZvhhF+gL2Nu{J26)P&Vjg^*_H1T`SPHU%9)x}!JHW=MUmbDIv-#z@X z=gE0}c5F8x-ud&r`>ucI-gD3Icg{62GZxd*>GV}n%AEib0N!Kf91&#!WQ7p9si~QF#&#ll5`e$K zDGC5i6H!h|nI)o}5F#6mM$ZA@C39eObTk|Y1fF5$yRbAi4PXMmyd8^1qpw}I1D0iV zF!MeDH{t(puK{?VVFxVBx|f-s0#^4qz(cEB{v8vyJB z5NQJNZ!z{BWQYw|YhlqZM52vO5MD#$Df!f8)V*pkQ zAyzZANA3E*3*s{YbLIBsI*7hFl_Jt^f6h?&VSj5~;^7eE}q z4a)$&$jo2UG;NPZp|qKZ23@N6EoR=VY1-H&Ol+FwXNV{vrHm6%9KffR82k(o^(l&S zz+>h6nfW;YfpQ(h%o{aL%PuG-GMUUrZQI`G6zEG*ZAmF_*LD4OUhI#6%j%V0=VAw>SX`}06y!;jMfIhzbS;+6pcm=5AY8I*m+6u;`eXp?CgBC zA`_Rz-Tgv{-2hr#ulCK%%-q-A-924Ws;gG5(xsFM=lp!m;~UR%&=F-59^iKXc+~wE zz^2a5&hu4^`jL^56~SQeDFF9+9I{6=P5aqG)mk_l{=Aej;hZ1MW059p+g{(*)s=T+ zu`KHk%-lbZv6zq9wtagn7JIjr&jyIMn1)V*6HZ(OgwHLsaIzD?BfGLD{gi@*079!g3G3Ymwlamkj_4V0H1wNO{ zT~R0$_B%V&h@GHRDs_~I)>f*301N?027|$)Yu2oJd$GVf()}QSnCsOaiRc(Jw*y!W zpdG-+Dmq{o#^V4UtC8x{%$yWL4Eg>37fX`1UQ4A?pAbSE0M>PSf9#Q&HUfA7 zK(OrbED_y7*=#mgC=|X9px4=nRW;(612768DWy!VT)A?jy}f;Qp^q||%yqVHA8|<* zX6A2enzq{mdD$z*P_ZF|ro zPX7boFAiTss&zINunSVkJ9S+@;sO31B6`L}g0DCPc%~u~mrZb&Gl82I4gvV8s;cKp znPhHmuBVK7Z>bUdJ3@#rMWfLXkKcZXh<@QJV9q!q?p#$V;V|Np%)H&5fr#jFMNxL3 z$}Ni12wO))31*I0Xb}9Hh&C#Ua?<1bM*-|`2SXqbxUCYIe&E3P`1m!&VsS5kZr7Oe z&Z-}(H%7+B#@d7s@sgAPaDs?_swm1?5AZtyJnU*_{X+=R8;L~Tso3yh=F(~31K=u` zkQ%XVyFV6-{c{Nm8ey8|(*U-4gzHvSRWDZU*cpbg(aE#!!}x2bMx9$K5y0O|4k?O~Mg!NP!21`2e!u^KyK&6SyEIMv4yxQrUgE&``1nWW=H?!9 z`k^tG-l%480~juI=yXk;sP`|z{|Z2Hh0PBYMfp+PUF-5RYMSOs0JoNPC6qdd>h+S0 z@cDd0(P;E#kCp$l-|s){WTf&o;dWJ3f8NM$E+{36#o`y8G#GcJZLKy5V2GKM!C)|1 zEEdDed<4L?*w`!Vp_;Rz^qW;;#G|ig<#F;rkL_HNMsfs#i*&T2*tYH|P mL=<000McNliru-3I~{Fg9>Zb2|V41q(?; zK~z}7?U-w96jc<*f9LL&E{IJPkfz`(GzR6lJ8e;m1{MfLlpx_@tVSdn5|j`lUo;vG z5xy8CN_@lsz92+E147V4Gj&yUp7D^MvUm+w{PFosyep^i+eHxs;W&QvfWyH0wCF)yQI_UJB%@( zs_O6_mdapN9Slqo5k$lVssKzkw&)RKOan0dau>3y{uzBwc43S9q*AGsz`|Z4mKOv; zZI=K!j&qZ$ZjP3-7shVj0nhVJM*-6TrSAh8MWk22h{%_~RBP?&c)SoG<2cSz5!nF@ z=%tm}q^i@cwdXpdeL9^UWQv+BHsr=aG<254&sHUdo+Lo4$)FBfy&Ct$5eG~_{Yy0V`k)Xxvx9*vJl)l zV0st|x})sCdEjAd?UoprXH@mg@VTdgAh_T2yuI;Bi9&a(tgIZ_+SGb5d0&d7fuGb^CBh-v#=Gp^d3j>d8HO z_WV^q$%m*H!6L_T4ytOMi0txxzdoPO zpX$OU`)H5$ zl1`^bClZOLRdrqm=jIC{vM&OdOeTMBZEf8KjEzhbsI}H!3SK&F6tZ}bzS$1I3r6-OYc(ENvfI^k?J<}xWZbyq)ofD1Gp{>EwR?F=(Ou_ z9A`Z6NmSq>;`+Wn%k#WrUFbya34);77~{FF`+0P&s;X*o5CmI*YeFko;JWUbPTQbN zCQ~aSA4LCDRo9+5b7tY;!-voJppkq?L^c4$VZGJ5uDiLTIsaKld3pJVz>wGxb9gG1 z8ed*sUS3vKcD}i}xw(+Cc0m2dMPyw_h;yns!&QSBN zc?UZHvlv(znW!;lTBO9?ZlxW^83;^_9YJnuXYL80PDJW_-`^G0StgTtSwvomI@BNt zrh10?W7)2)uSRZIsARh_x&mPeEv|czHG>3G8I5J)T1mg zs6g5e$z*cM{{8!pU(wewfH;mb63B*nR0T8yLGYC4dB0wL+tnN6Uq;vdq6k5QK>z>% M07*qoM6N<$g51=GfdBvi literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_layers_black.png b/OsmAnd/res/drawable-large/map_layers_black.png new file mode 100755 index 0000000000000000000000000000000000000000..3b515df85134998daa7e5254a8d8f7d8d80a3987 GIT binary patch literal 2134 zcmV-c2&wmpP)$Zu=E@1h*P^}LqfZOMsfa|(9i^wBD)4bBE4~Of1 zU*qw3;D(xpoWDd_GC zfR8N<-wNbJp;NFng2R0224ZRVLuXqBTot;hDZ1xf0=1^QtMD9r@lfRgWRXiSV92*?T3E5w89Os(;{{FFQYo1BKb=}X3$Znu5 z6mvpEdXmZHKW8Fe4Qtn~U3~iV>2<2w4O}iF{l=KzBoc}Lgc6U8jg9?9M6M1^kq3r> z;ZnOrMAC^w;?;@-T-Uu$M79Gm^?+mM>p^UUPHv4q!_i!^QwV z2!eaWTDwJ6pRN-0yJgFk-LZ4$&iwpPor>1h*7KX1nw~B`p}C-6thLXp>bhwHMu7uB zZ#J8Ket3BJ?Kv(q1x4xpEU-G{+Nr89h{y_{6-flgZ@6RmiUfo&_!}Gf$}M z*L>gqd&M@|)6?S|J9f-f)oxYo5|K63-g$c;I0*ELNN-C^iy!`eT-UuqMD|hHz0Qls zEy-kZilmQ5qus`sr-Ad!%%?IB7dB&J$fsdEP zWK{J=-}nC<9vq9swiH|S!BSh;fL(nut-16UJ^d4s~Q zzIQs}(_!`M)h$5~bd{t8(66dL_kI6gRmeXC++A){)fa;x*gQBm_|9}|h^m&p_9uXg zDx4xOIgZoQ-{1f5ddb%c5izdoJ__6xa_t4K^E_{2#__J}Zlti!hCjyNQaGbd&Kuhh zthEim<3NQ1Rn^^@Oy=vg)D>}Ew-<<4@l68#rOKPhWCm)PuvT<-b~a@)ncZOpDk8sc zX=(XZtr|>R*L?u^K@G7Jz&}a}rBbQExm=4v;bJhC%k3f5I2Ms@p67jUrd!D{q^+&( zqYVuWcT(twuBK9N%!Idr=Sm6rzJIuuLB)&kzX8#5yQ==!_x+#LO1y-MZPZ%(5nydu zS0YO7h3X_l8IjND52RA5SHb}u9UY&}<#PKd>_}(019y3z_se?8Pe~w*_V)G*B9X|K zi`!rq1!-F=jsgcnq&J(*_C_L+B_gsPxTGv5ud28CzQ27gyey$` z$6_X&rt-j_E$X1B>X>5+&g!B&8jW5eB3&ZVO<^aiwF&l~h+LOUCil&G@gnB+&mPv= z%YiNt=~mS%seY20RtL=m^O``##3II8`vq0)Dr%#Wlz5<;4w@_e4;amq1+^r#EdT%j M07*qoM6N<$f^e-7*8l(j literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_layers_white.png b/OsmAnd/res/drawable-large/map_layers_white.png new file mode 100644 index 0000000000000000000000000000000000000000..1d52220d051d6130408e3ec9e64f747514bff502 GIT binary patch literal 2004 zcmV;_2P^oAP) zK~!ko)mnXQTUQnTo$If(EG|P#1BTeL4{0N9V!w}AkWo^*?OLL(D^ns3G&Hs{4KX2= zp&`U3!HUE*RZvhhF+gL2Nu{J26)P&Vjg^*_H1T`SPHU%9)x}!JHW=MUmbDIv-#z@X z=gE0}c5F8x-ud&r`>ucI-gD3Icg{62GZxd*>GV}n%AEib0N!Kf91&#!WQ7p9si~QF#&#ll5`e$K zDGC5i6H!h|nI)o}5F#6mM$ZA@C39eObTk|Y1fF5$yRbAi4PXMmyd8^1qpw}I1D0iV zF!MeDH{t(puK{?VVFxVBx|f-s0#^4qz(cEB{v8vyJB z5NQJNZ!z{BWQYw|YhlqZM52vO5MD#$Df!f8)V*pkQ zAyzZANA3E*3*s{YbLIBsI*7hFl_Jt^f6h?&VSj5~;^7eE}q z4a)$&$jo2UG;NPZp|qKZ23@N6EoR=VY1-H&Ol+FwXNV{vrHm6%9KffR82k(o^(l&S zz+>h6nfW;YfpQ(h%o{aL%PuG-GMUUrZQI`G6zEG*ZAmF_*LD4OUhI#6%j%V0=VAw>SX`}06y!;jMfIhzbS;+6pcm=5AY8I*m+6u;`eXp?CgBC zA`_Rz-Tgv{-2hr#ulCK%%-q-A-924Ws;gG5(xsFM=lp!m;~UR%&=F-59^iKXc+~wE zz^2a5&hu4^`jL^56~SQeDFF9+9I{6=P5aqG)mk_l{=Aej;hZ1MW059p+g{(*)s=T+ zu`KHk%-lbZv6zq9wtagn7JIjr&jyIMn1)V*6HZ(OgwHLsaIzD?BfGLD{gi@*079!g3G3Ymwlamkj_4V0H1wNO{ zT~R0$_B%V&h@GHRDs_~I)>f*301N?027|$)Yu2oJd$GVf()}QSnCsOaiRc(Jw*y!W zpdG-+Dmq{o#^V4UtC8x{%$yWL4Eg>37fX`1UQ4A?pAbSE0M>PSf9#Q&HUfA7 zK(OrbED_y7*=#mgC=|X9px4=nRW;(612768DWy!VT)A?jy}f;Qp^q||%yqVHA8|<* zX6A2enzq{mdD$z*P_ZF|ro zPX7boFAiTss&zINunSVkJ9S+@;sO31B6`L}g0DCPc%~u~mrZb&Gl82I4gvV8s;cKp znPhHmuBVK7Z>bUdJ3@#rMWfLXkKcZXh<@QJV9q!q?p#$V;V|Np%)H&5fr#jFMNxL3 z$}Ni12wO))31*I0Xb}9Hh&C#Ua?<1bM*-|`2SXqbxUCYIe&E3P`1m!&VsS5kZr7Oe z&Z-}(H%7+B#@d7s@sgAPaDs?_swm1?5AZtyJnU*_{X+=R8;L~Tso3yh=F(~31K=u` zkQ%XVyFV6-{c{Nm8ey8|(*U-4gzHvSRWDZU*cpbg(aE#!!}x2bMx9$K5y0O|4k?O~Mg!NP!21`2e!u^KyK&6SyEIMv4yxQrUgE&``1nWW=H?!9 z`k^tG-l%480~juI=yXk;sP`|z{|Z2Hh0PBYMfp+PUF-5RYMSOs0JoNPC6qdd>h+S0 z@cDd0(P;E#kCp$l-|s){WTf&o;dWJ3f8NM$E+{36#o`y8G#GcJZLKy5V2GKM!C)|1 zEEdDed<4L?*w`!Vp_;Rz^qW;;#G|ig<#F;rkL_HNMsfs#i*&T2*tYH|P mL=<000McNliru-3I~{Fg9>Zb2|V41q(?; zK~z}7?U-w96jc<*f9LL&E{IJPkfz`(GzR6lJ8e;m1{MfLlpx_@tVSdn5|j`lUo;vG z5xy8CN_@lsz92+E147V4Gj&yUp7D^MvUm+w{PFosyep^i+eHxs;W&QvfWyH0wCF)yQI_UJB%@( zs_O6_mdapN9Slqo5k$lVssKzkw&)RKOan0dau>3y{uzBwc43S9q*AGsz`|Z4mKOv; zZI=K!j&qZ$ZjP3-7shVj0nhVJM*-6TrSAh8MWk22h{%_~RBP?&c)SoG<2cSz5!nF@ z=%tm}q^i@cwdXpdeL9^UWQv+BHsr=aG<254&sHUdo+Lo4$)FBfy&Ct$5eG~_{Yy0V`k)Xxvx9*vJl)l zV0st|x})sCdEjAd?UoprXH@mg@VTdgAh_T2yuI;Bi9&a(tgIZ_+SGb5d0&d7fuGb^CBh-v#=Gp^d3j>d8HO z_WV^q$%m*H!6L_T4ytOMi0txxzdoPO zpX$OU`)H5$ zl1`^bClZOLRdrqm=jIC{vM&OdOeTMBZEf8KjEzhbsI}H!3SK&F6tZ}bzS$1I3r6-OYc(ENvfI^k?J<}xWZbyq)ofD1Gp{>EwR?F=(Ou_ z9A`Z6NmSq>;`+Wn%k#WrUFbya34);77~{FF`+0P&s;X*o5CmI*YeFko;JWUbPTQbN zCQ~aSA4LCDRo9+5b7tY;!-voJppkq?L^c4$VZGJ5uDiLTIsaKld3pJVz>wGxb9gG1 z8ed*sUS3vKcD}i}xw(+Cc0m2dMPyw_h;yns!&QSBN zc?UZHvlv(znW!;lTBO9?ZlxW^83;^_9YJnuXYL80PDJW_-`^G0StgTtSwvomI@BNt zrh10?W7)2)uSRZIsARh_x&mPeEv|czHG>3G8I5J)T1mg zs6g5e$z*cM{{8!pU(wewfH;mb63B*nR0T8yLGYC4dB0wL+tnN6Uq;vdq6k5QK>z>% M07*qoM6N<$g51=GfdBvi literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/map_layers_black.png b/OsmAnd/res/drawable-xhdpi/map_layers_black.png new file mode 100755 index 0000000000000000000000000000000000000000..098036f0b2640ac64bb286c9addf4a32bcc2792d GIT binary patch literal 2215 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 N002ovPDHLkV1n=ml#&1d literal 0 HcmV?d00001 diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index c6f9322031..ffdb8b533a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -982,6 +982,7 @@ public class MapActivityActions implements DialogProvider { mapActivity.getMapLayers().openLayerSelectionDialog(mapView); } }).reg(); + // 3-5. Navigation related (directions, mute, cancel navigation) boolean muteVisible = routingHelper.getFinalLocation() != null && routingHelper.isFollowingMode(); if (muteVisible) { @@ -1035,6 +1036,13 @@ public class MapActivityActions implements DialogProvider { } // 6-9. Default actions (Settings, Search, Favorites) + optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light) + .listen(new OnContextMenuClick() { + @Override + public void onContextMenuClick(int itemId, int pos, boolean isChecked, DialogInterface dialog) { + mapActivity.getMapLayers().getMapInfoLayer().openViewConfigureDialog(); + } + }).reg(); optionsMenuHelper.item(R.string.settings_Button).icons(R.drawable.ic_action_settings2_dark, R.drawable.ic_action_settings2_light) .listen(new OnContextMenuClick() { @Override diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java index b1b10a3241..a10da1d9c2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java @@ -250,8 +250,7 @@ public class MapActivityLayers { settings.SHOW_POI_OVER_MAP.set(isChecked); } else if(itemId == R.string.layer_poi_label){ settings.SHOW_POI_LABEL.set(isChecked); - } else if(itemId == R.string.layer_map_appearance){ - getMapInfoLayer().openViewConfigureDialog(); + } else if(itemId == R.string.layer_favorites){ settings.SHOW_FAVORITES.set(isChecked); } else if(itemId == R.string.layer_gpx_layer){ @@ -275,8 +274,7 @@ public class MapActivityLayers { final OsmandSettings settings = getApplication().getSettings(); final ContextMenuAdapter adapter = new ContextMenuAdapter(activity); // String appMode = " [" + settings.getApplicationMode().toHumanString(view.getApplication()) +"] "; - adapter.item(R.string.layer_map_appearance).icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light).reg(); - adapter.item(R.string.layer_poi).selected(settings.SHOW_POI_OVER_MAP.get() ? 1 : 0) + adapter.item(R.string.layer_poi).selected(settings.SHOW_POI_OVER_MAP.get() ? 1 : 0) .icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light).reg(); adapter.item(R.string.layer_poi_label).selected(settings.SHOW_POI_LABEL.get() ? 1 : 0) .icons(R.drawable.ic_action_text_dark, R.drawable.ic_action_text_light).reg(); diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java index 84af311c51..8a4494cc00 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java @@ -202,7 +202,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin { } } }; - adapter.item(R.string.layer_map).icons(R.drawable.ic_action_wmap_dark, R.drawable.ic_action_wmap_light) + adapter.item(R.string.layer_map).icons(R.drawable.ic_action_globus_dark, R.drawable.ic_action_globus_light) .listen(listener).position(0).reg(); adapter.item(R.string.layer_overlay).selected(overlayLayer.getMap() != null ? 1 : 0). icons(R.drawable.ic_action_up_dark, R.drawable.ic_action_up_light).listen(listener).position(10).reg(); diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index b1929c6e07..27f022d4aa 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -238,8 +238,8 @@ public class MapInfoLayer extends OsmandMapLayer { backToLocation = mic.createBackToLocation(map); mapInfoControls.registerTopWidget(backToLocation, R.drawable.widget_backtolocation, R.string.map_widget_back_to_loc, "back_to_location", MapWidgetRegistry.RIGHT_CONTROL, all, 5); - View globus = createGlobus(); - mapInfoControls.registerTopWidget(globus, R.drawable.widget_globus, R.string.menu_layers, "progress", MapWidgetRegistry.RIGHT_CONTROL, none, 15); + View globus = createLayer(); + mapInfoControls.registerTopWidget(globus, R.drawable.widget_layer, R.string.menu_layers, "progress", MapWidgetRegistry.RIGHT_CONTROL, none, 15); topText = mic.createStreetView(app, map, paintText); mapInfoControls.registerTopWidget(topText, R.drawable.street_name, R.string.map_widget_top_text, @@ -771,10 +771,13 @@ public class MapInfoLayer extends OsmandMapLayer { }); return fl; } - private View createGlobus(){ - final Drawable globusDrawable = view.getResources().getDrawable(R.drawable.list_activities_globus); - final Drawable globusDrawableWhite = view.getResources().getDrawable(R.drawable.list_activities_globus_white); - ImageView globus = new ImageViewWidget(view.getContext()) { + private View createLayer(){ +// final Drawable globusDrawable = view.getResources().getDrawable(R.drawable.list_activities_globus); +// final Drawable globusDrawableWhite = view.getResources().getDrawable(R.drawable.list_activities_globus_white); + final Drawable layerDrawable = view.getResources().getDrawable(R.drawable.map_layers_black); + final Drawable layerDrawableWhite = view.getResources().getDrawable(R.drawable.map_layers_white); + + ImageView layers = new ImageViewWidget(view.getContext()) { private boolean nightMode; @Override @@ -782,21 +785,21 @@ public class MapInfoLayer extends OsmandMapLayer { boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode(); if(nightMode != this.nightMode) { this.nightMode = nightMode; - setImageDrawable(nightMode ? globusDrawableWhite : globusDrawable); + setImageDrawable(nightMode ? layerDrawableWhite : layerDrawable); return true; } return false; } };; - globus.setImageDrawable(globusDrawable); - globus.setOnClickListener(new View.OnClickListener() { + layers.setImageDrawable(layerDrawable); + layers.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { map.getMapLayers().openLayerSelectionDialog(view); //map.getMapLayers().selectMapLayer(view); } }); - return globus; + return layers; }