From 07d57bd582b33c9f66521b14176ae8f1490263c5 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 19 Mar 2015 22:03:09 +0100 Subject: [PATCH] Update icons --- .../ic_action_road_works_dark.png | Bin 0 -> 1547 bytes .../ic_action_road_works_light.png | Bin 1566 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png | Bin 4857 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_cancel_p.png | Bin 4893 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_hmenu_o.png | Bin 931 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_hmenu_p.png | Bin 980 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_info_o.png | Bin 5405 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_info_p.png | Bin 5395 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_menu_o.png | Bin 2235 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_menu_p.png | Bin 2319 -> 0 bytes .../res/drawable-hdpi/map_btn_navigate_o.png | Bin 5703 -> 0 bytes .../res/drawable-hdpi/map_btn_navigate_p.png | Bin 5609 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_ok_o.png | Bin 4645 -> 0 bytes OsmAnd/res/drawable-hdpi/map_btn_ok_p.png | Bin 4685 -> 0 bytes .../res/drawable-hdpi/map_btn_signpost_o.png | Bin 4215 -> 0 bytes .../res/drawable-hdpi/map_btn_signpost_p.png | Bin 4243 -> 0 bytes ...ight.png => ic_action_road_works_dark.png} | Bin 1332 -> 1331 bytes .../ic_action_road_works_dark.png | Bin 0 -> 1716 bytes .../ic_action_road_works_light.png | Bin 1689 -> 0 bytes .../ic_action_road_works_dark.png | Bin 0 -> 2198 bytes .../ic_action_road_works_light.png | Bin 2241 -> 0 bytes OsmAnd/res/drawable/map_btn_cancel.xml | 6 - OsmAnd/res/drawable/map_btn_hmenu.xml | 6 - OsmAnd/res/drawable/map_btn_info.xml | 7 - OsmAnd/res/drawable/map_btn_menu.xml | 6 - OsmAnd/res/drawable/map_btn_navigate.xml | 6 - OsmAnd/res/drawable/map_btn_signpost.xml | 6 - OsmAnd/res/drawable/map_zoom_in.xml | 6 - OsmAnd/res/drawable/map_zoom_out.xml | 6 - .../net/osmand/plus/ContextMenuAdapter.java | 43 +++--- OsmAnd/src/net/osmand/plus/IconsCache.java | 17 +-- .../src/net/osmand/plus/OsmandSettings.java | 2 +- .../osmand/plus/activities/HelpActivity.java | 19 +-- .../plus/activities/MapActivityActions.java | 9 +- .../activities/NavigatePointFragment.java | 12 +- .../plus/download/LocalIndexesFragment.java | 9 +- .../plus/download/UpdatesIndexFragment.java | 4 - .../plus/helpers/AvoidSpecificRoads.java | 4 +- .../plus/myplaces/AvailableGPXFragment.java | 125 ++++++------------ .../osmand/plus/osmedit/OsmEditingPlugin.java | 25 ++-- 40 files changed, 115 insertions(+), 203 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png delete mode 100644 OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_cancel_p.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_hmenu_o.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_hmenu_p.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_info_o.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_info_p.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_menu_o.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_menu_p.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_navigate_o.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_navigate_p.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_ok_o.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_ok_p.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_signpost_o.png delete mode 100644 OsmAnd/res/drawable-hdpi/map_btn_signpost_p.png rename OsmAnd/res/drawable-mdpi/{ic_action_road_works_light.png => ic_action_road_works_dark.png} (58%) create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png delete mode 100644 OsmAnd/res/drawable/map_btn_cancel.xml delete mode 100644 OsmAnd/res/drawable/map_btn_hmenu.xml delete mode 100644 OsmAnd/res/drawable/map_btn_info.xml delete mode 100644 OsmAnd/res/drawable/map_btn_menu.xml delete mode 100644 OsmAnd/res/drawable/map_btn_navigate.xml delete mode 100644 OsmAnd/res/drawable/map_btn_signpost.xml delete mode 100644 OsmAnd/res/drawable/map_zoom_in.xml delete mode 100644 OsmAnd/res/drawable/map_zoom_out.xml diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..fba92868eb5b7728de33a8c92811495968d4f86e GIT binary patch literal 1547 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFqdV9M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpRyp^1XIrJkXw znYpF8j)D=8uWw+XZ)BirU}P;hnz$GU<>cxGNoetEGbD4HO?c1bPDEK5ysE6UGR0Ee?xCKflOnHZ;- zS(qB>rkSM}=$e?CB8G__0%eXLH_miQQWfUrsZ?#9 z)U#>P1_|knN!hNwt(z3Qn*XqRiOEF#JHOa*>omFb zmcDGPVU<-BKdX1q>wwM;M&1XrC;jqJ+_==ZMB@g>(`Ns3*S9fSM=)hC=qh^Ba&Nx2 z$}jbwCUdTwmRWAEAZya-bAjtm!n{ef5?2~SJ{-#2pA<5|Sy6o3%fEUbno>6CcRFl7 za(qb>|M7TM)rMr&bUm)!JJduQS$E}6`?--({&@TJUl-DqxxAFW- z7uAH0_4z#A(){4x+q;4y%JW{{S!kzm?A$j)$H3J6Ogs$x-}1|fzfhk8DxN)E{an^L HB{Ts5f<`ks literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png deleted file mode 100644 index f9eadf7c8e7535cffb29bdf5ba5e1afc0d9ff072..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1566 zcmbVMeQXnD7{7Jdia={Y(PS-iTVNT)?5_8gR@z>7cVpcq zVYO2_MFR=~Ba53ts00a^X^5y8sRmp~2pM7!Av7ppAb?qPM#8*~75#(ohnL*F@AJOT z?|FXD*Y(wVYgN-1PKO{!yd4A%Vc%5v2avILr`UPEXw#c0tsfphG4{k+&ys; zfrFd{S!?j%o~Q!^f~&d&(Aec|@^x+WQ5;fT1y{ys*+3Xb3>*uGA|f5LAd_}!d7nMT z5O`8W+Gs%@k!tqT!wy~mut94?eK?_qO_Y`}7)_LE1x(5^hMO@GM{$Za=xCgTryfN1 zCUAbb!C5oqOO`B1K$4;~hIMpwXghRTUf6&U6h&b;iIF5KYoKChL}FrSL|mG)-~^&i z2u7tKAAz$L8J2ICEQrkXQ3&Cv$Me{5M4U>LoH8uNL@`2(W8rW%u1RfCY5@Pzc%ru0 z)ENa>0}%Ok!6(_C$sQ*@mpQ zdup!~A9`J@&OjM2GTLstaQ?FG1?%Bey>tPrJ@9E_fBbmSo5xjiK1`6Q;(jW%DA{>5 zIZ?odR2ADVsavSiillGwcA53CGX221Vp@8E^_4kWzY3&YIz%UD_3yHc)xv)$GOel0 zO4ti!2Anq!^e5Q(k44MAJgsPhHCya&^bf?w5@X-JIAViGE^QyL7&3f8?8FplF+N_I zC$_ZhuYPAyQ~bTg;hxxR&0QtC5`OrMXY@w2By_!~#r;vj`ittbHS4N02Ni8<4W`T# z!w+YscMtu(HXd6tceAVad)%(lhYsA~12^Y8#NE$p-Y?96bL;0r>F%C!MDsUv3~yO> zRh3?Hy?6Uk^;@-r)W>!eZO@0hf=Td!mPl&s|psBRF&_jv5g#@Xuj80dFOtY zU46dC54z%^)PQ->=nV9=TLrC~Y3H{lx=8oi;I&`j9w;B``v#b9ou9ip`^R>>yv`%` H)>r=l@gF9H diff --git a/OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png b/OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png deleted file mode 100644 index ddff6ccea2019cb4cf7b0dbda094978e82110168..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4857 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 FV1iQ|wG99O diff --git a/OsmAnd/res/drawable-hdpi/map_btn_hmenu_p.png b/OsmAnd/res/drawable-hdpi/map_btn_hmenu_p.png deleted file mode 100644 index d2fe88e7d1a58a408a834dd8d7422841db603a1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 980 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 ABme*a diff --git a/OsmAnd/res/drawable-hdpi/map_btn_info_p.png b/OsmAnd/res/drawable-hdpi/map_btn_info_p.png deleted file mode 100644 index 83e32a23f471893651824d8a04893b8af8b4db61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5395 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 diff --git a/OsmAnd/res/drawable-hdpi/map_btn_menu_o.png b/OsmAnd/res/drawable-hdpi/map_btn_menu_o.png deleted file mode 100644 index dca9ec1d0dc05a507866d393ad593a70fcabf750..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2235 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 diff --git a/OsmAnd/res/drawable-hdpi/map_btn_navigate_p.png b/OsmAnd/res/drawable-hdpi/map_btn_navigate_p.png deleted file mode 100644 index 0614f81f8d41148688481b0029b864514bb3992c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5609 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 Dx02@| diff --git a/OsmAnd/res/drawable-hdpi/map_btn_ok_o.png b/OsmAnd/res/drawable-hdpi/map_btn_ok_o.png deleted file mode 100644 index 6daf38f82b613c733fd725138f9447f0095c25d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4645 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 bXe#_4BCH4oBVrTE00000NkvXXu0mjf{iwl1 diff --git a/OsmAnd/res/drawable-hdpi/map_btn_ok_p.png b/OsmAnd/res/drawable-hdpi/map_btn_ok_p.png deleted file mode 100644 index 386683bd5f22be26bf9a527f396406d978b2fa89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4685 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 P00000NkvXXu0mjfQKZ?# diff --git a/OsmAnd/res/drawable-hdpi/map_btn_signpost_o.png b/OsmAnd/res/drawable-hdpi/map_btn_signpost_o.png deleted file mode 100644 index 8f0214ace6dfa29243b7792be6fad9c9be395014..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4215 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 diff --git a/OsmAnd/res/drawable-hdpi/map_btn_signpost_p.png b/OsmAnd/res/drawable-hdpi/map_btn_signpost_p.png deleted file mode 100644 index 5573f531f5624fa3b8bce8340a33d9855fda7b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4243 zcmV;E5Nz*>P)EX>4Tx0C?J+Q)g6D=@vcr-tj1^HV42lZa2jn55j)S9!ipu-pd!uXCy!YnK{> z2n?1;Gf_2w45>mM5#WQz#Kz&|EGkvK~TfD`~gdX7S-06<0ofSs5oQvjd@0AR~wV&ec% zEdXFAf9BHwfSvf6djSAjlpz%XppgI|6J>}*0BAb^tj|`8MF3bZ02F3R#5n-iEdVe{ zS7t~6u(trf&JYW-00;~KFj0twDF6g}0AR=?BX|IWnE(_<@>e|ZE3OddDgXd@nX){& zBsoQaTL>+22Uk}v9w^R97b_GtVFF>AKrX_0nHe&HG!NkO%m4tOkrff(gY*4(&JM25 z&Nhy=4qq+mzXtyzVq)X|<DpKGaQJ>aJVl|9x!Kv}EM4F8AGNmGkLXs)P zCDQ+7;@>R$13uq10I+I40eg`xs9j?N_Dd%aSaiVR_W%I$yKlkNCzL=651DUOSSq$Ed=-((3YAKgCY2j1FI1_jrmEhm z3sv(~%T$l4UQ>OpMpZLYTc&xiMv2YpRx)mRPGut5K^*>%BIv?Wdil zy+ylO`+*KY$4Vz$Cr4+G&IO(4Q`uA9rwXSQO+7mGt}d!;r5mBUM0dY#r|y`ZzFvTy zOmC;&dA;ZQ9DOhSRQ+xGr}ak+SO&8UBnI0I&KNw!HF0k|9WTe*@liuv!$3o&VU=N* z;e?U7(LAHoMvX=fjA_PP<0Rv4#%;!P6gpNq-kQ#w?mvCS^p@!_XIRe=&)75LwiC-K#A%&Vo6|>U7iYP1 zgY$@siA#dZE|)$on;XX6$i3uBboFsv;d;{botv|p!tJQrukJSPY3_&IpUgC$DV|v~ zbI`-cL*P;6(LW2Hl`w1HtbR{JPl0E(=OZs;FOgTR*RZ#xcdGYc?-xGyK60PqKI1$$ z-ZI`wBrnsy*W_HW0Wrec-#cqqYFCLW#$!oKa ztOZ#u3bsO~=u}!L*D43HXJuDrzs-rtIhL!QE6wf9v&!3$H=OUE|LqdO65*1zrG`sa zEge|qy{u|EvOIBl+X~|q1uKSD2CO`|inc0k)laMKSC_7Sy(W51Yk^+D%7VeQ0c-0E zRSM;Wee2xU?Ojh;FInHUVfu!h8$K0@imnvf7nc=(*eKk1(e4|2y!JHg)!SRV_x(P}zS~s+RZZ1q)n)rh`?L2yu8FGY z_?G)^U9C=SaqY(g(gXbmBM!FLxzyDi(mhmCkJc;eM-ImyzW$x>cP$Mz4ONYt#^NJz zM0w=t_X*$k9t}F$c8q(h;Rn+nb{%IOFKR-X@|s4QQ=0o*Vq3aT%s$c9>fU<%N829{ zoHRUHc}nwC$!Xf@g42^{^3RN&m7RTlF8SPG+oHC6=VQ*_Y7cMkx)5~X(nbG^=R3SR z&Rp`ibn>#>OB6F(@)2{oV%K?xm;_x?s~noduI3P8=g1L-SoYA z@fQEq)t)&$-M#aAZ}-Lb_1_lVesU-M&da;mcPH+xyidGe^g!)F*+boj)jwPQ+}Q8j ze`>&Yp!3n(NB0JWgU|kv^^Xrj1&^7J%Z3ex>z+71IXU7#a{cN2r$f(V&nBK1{-XZN zt``^}my^G3e5L*B!0Q>W+s4Ai9=^$VGcjKDR{QP2cieX!@1x%j zPvm?ce<=TG`LXp=(5L&88IzO$1Ou4!{O>iCf&c&j24YJ`L;(K){{a7>y{D4^000Sa zNLh0L01FcU01FcV0GgZ_00007bV*G`2i^k^3=BC5^Tf~q00qxUL_t(|+U=arZ_{QN z$G`c3%|anflQe4DrfB?VSObIu2VfQA&>E=+E-*21=1_VWn#TXYkhU9KK-z7vBR9in zCXG;3kWj^F8ydHirlq7&niQ*!?Zn<;p@Y&isR@qbydTMzC{Et@`+ncY&-2=^0Rn+Q zAP@)y0)apE_JG7R%IfbRgD0`Lt0F96zP`tSe}0A>OF1>g?LvNO5}%`i+afI+w0 z{e3tb#@@Yq;q&>>)YJsK-EJzCMNvdHn?*XE2FG!D_Uswb>GbaaZm=x-_ZJhIVVJ8f zm+Q*FzyOXMIRa4>kxr+P&1NA80`mDh6h$$W*fyID6h(oeDD2v`3yDMm_wL=p^78UE zmSwM0RcMA`C;-3o^z;l}xNrd$iv_P=zeXyRYRGu&bUN|m$rFr?ja>)uBg?Y6a_3Y! z*MIHp?Y(s7%o$`d8B9%0p-?C^?1e3p$siaEf~M(9qobn$FjRJCRN&^H!{P7`=gytO z;^HFW@wn;2gBBD;fz#=Pq9{k3o11rV9Cu%{&u70d z!J9X4PIPv5MmUa}E%iNXnco>47#IKm#N%r- zo;{1{>1pshPwZQQrluy$&(DVffxvGZ$7Q$b==0%l7@{a5nM@M*ZgK!XTU#3doY#_d zoZ7Qz50;je)_zP+LZJ}4ySrhv{^tcrlJNNPW4wL)){w4tyWNQ;pg`FuXi z&CS(B=s+N_CNcm}6ornC4lFJ%8dB(;J9h#=NQRG}>v3jk1>DnnIOk-8cQi(zbR%n-{3WgT5j zp{-V{u2a9eyBlt|8;>46s(BqyR_J^OR#g>~laqM*^r^1xX(&hMaydMF z_zr9rSaD~s_E$E znb$Q^N7V_ z6_?CjuXk-w-aqG8uNXGH>+9>ozJ2>X`s~4j2bh?cFsIP9x)}QX{!cz@Yiq;!_&9NN zwJW&wgIv!ARNWOU^_p%P+R3tcVe*^yk0NaOIX2CG~=C8VwT+Jz;RrrqoX6Zd-v{8t@aw$3xXg(5QN(-%ihwO z-rX1-9X-E)|9&JA38H9;Y@_%{!;Q_px9QFuj^k!KJ3Dtc9F7x(LV>(KVgs_-EM!@} z#WbuYxvvU^Lg>R? zwUz9Ktw$6^K|Y^{APC@j9=TlZwyLT_(lV$=s0yjppq5>iTe+vu|cmMzaQ%OWYRCwC#)v-&%KorOE z#vmdTmw=172n7d)Iy%%v5XC`o5&wZM;^5@q=+MPU5S)en2f@EUP;dx1iLP}Jx)rgN z((@bmiAS24#HL#xd?0DwyO+D`wT>~SG|q4)4boyNXZ{v;$2Eg#Ji)~(dPUFR1k0%C ze>z))Gss{89rGIJk_OZS0t630l} z{R$5BjVkF`{lA;+p^Xo0ql|UDMV6|q+}txbhlf4A=_ej>70L6In`;JD^!0`<9Ag&O z*ooQjzG^bfz`>YHqFEmc~dt2aTBZT|-aTn>dTqY((-KNewFKn$e@Hv4$G> lrnvBb#-02pr^dGc0|3-8UAf_U6*d3>002ovPDHLkV1gp#xJ&>5 delta 392 zcmV;30eAkh3bYEaWdZ>-lV$=s0ys0Xq5>iTe`>8U>Hq)%R7pfZRCwBA{Qv(y11$mL zs0Bn@P+VM0jCwa9W(DG{gcSDn_JU~^5*!0Ecp?xp1Mwap{z;4`CK431ML4a8G%ID{k%kiEVDh`$0c8xT(c;`2lVC0+~ABaaV=j{tEw5Z?yk8$kRLYSD2V zi2<(#=*e#j5VJ!g_7)JI0OB4X_J+pEa({fu8QlVG8E6d<=K^sR5MO}0b`cOihx%d% zo(zd$0k$IGJ`jgM*=j)C55%vKz7RB`MYM&)p`NyxR~CI_H$Gz0^!PD!#G63AxL>_P&gRnVzY zil|sc5C^qb6ts$9Ez*IgQ$j@Q+N`l{&TTd8RQDN7-fa2;t?TToggf@@G97E`CA3RI2c ze9?-A&}h!t24xDF61Q5c#W9xJA;Yp^W(rNCg@oJ8YHcP;0va^kUWS$%o0>@h{?5}NxAV#ZEmI(MwsDYK!{CDDZo%t4cIWFi4faDnUi|O)Y@?jF@Z@D zGBcF!q(dASh9Nc=;&MSs0wi)wq}m3W2;XT9Qk2kI z3}(`Rn*fJKwFb{3LzxuQH!fi2xVX29O~h27sE|Q6wHe~D*bs&}{F;;|NCo;Yjdw~D z${aHaDNq8>vS_J%=zOQaRP5ew$RS9v5hqv-R8rJNDXz`JP!ky|4P{a{EX06_d3*%X zXaoX~D-iHNn9YMh7)H3D0Og>3t%ir{G|04`ci{!FTq+Ur@wuQ*fUrRxpQi;iYK;(Ni*#xP zMo|>jahOwhwdH^T<;m_`HOIsboGQ}t^1M+z2#J5WK(I>9QUV8|3~%nSFpBR2+)+Ao+}F}01OSE z7;Cp|^1HPSI8<3$=oWBPVRK7_CHiDVS74fl9;u?=NE|uu z((-4mGHnadtjhS@`Gq~IJ20`(wO9QaIFwX9BR=5O#`9-tyZ1-s8NDgfgY&Cne8)X!=Q;J~cU0aPOs(n= zi5b1leNj&9={*tQn>{AvEnmy&jM3W-{yfQ$_o(xJ`neY0gT^J{2iec&eS71>IU)96^QQZ}jJn~A-(PPc?{@Y3JuI2nzG;^Ea@UXJ-_1*Gy)R*DwzjT! z>GH2?6YTO^+TfzB8=u!izh=i)K7dV{X8X)lK8M@mLyn5DFlUvmcFySHMKio@FXiI+ zgiHI^EXN>CssJrN)W;6DZbst|pH6cxb*kwXZCKp1Bl-6kI_-Td@5`uyBff%0?|!!M zr^;&urD6E(m6dZ&yY78x1v;~58yV|fe*oR~dJ-sTf{xS;e43(67|U7Kd1kMB@X4A= zzlN92#8>Iyr6=`&5!(wHgPGMs3!9s->|A7QfBoUeRq2{!`?LH;IX&23+L>LvVH4`-g!rSxHAmP4vp*^5VU_x@dpg*(e%_rm61M z?{j(lQOQlo&$njvWsU4OP%nGs+Fy1+)~MfES9Z^*>_p0|T~Go*jkFCz%`|6Pc+pdj Tggek>$A2VN7B4*!m6rbxfR~Vg literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png deleted file mode 100644 index 91aaadb1d5bfbd846520e63c4c9d05537ce9fbf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1689 zcmbVNYfuwc6kY;SieMEG6;PK@@R{r;BpY@i$Ri;zij5dvjzu=v8(1LOuvti8vhqSt%@B~EQ*du0i$58;HyuB79WVy%BWKrtm2GSQLA=?VEe=IM|WoT-gEEy&iT%3 zwo1EH-pr}Q53u(v)9IOX9v{@+}K5A|2E%6|iPAp}?^3tU`LutMNr-X~5;V3)78!!QmgzcsRvz4$bg`;)}e(yX+gz%^e zm#-AQB9)P>h2t3(z;ZDrGN2L}tiZ(*Ii|oB3t=fQBWMI7MMWr1$ioR#3XeTP-Wy99 zi4;}Bm@i&Z3UfKmLLi9EW)s`O#SEK+NN^lSP$?pnig*o?wZzPkc9Gc{GHyWytOl00 za5Q6vofb(wQ^YBSJkwVpm@LW3uML~6V~OHZhS*69A`zpA$>fY{RNKm>fPZPcQQN93 zu>d3mSeYW$z}LeVG7jc*_jX54MV<}u0Za2mAq!NDp~wWxT#`yDXcJFNKfh&A~eECQaAtr zH%f$Kcf^Nb(y9qHV@9tB=_JxsvNPY}zG%4zqyDG(%ROH#$^?EQc4 zh|Kki4LWbV^ObhN))nfBH_wI5ue?#$B&kYkXg&H%q`Klvx^;zGEiMn}ttva9j+rvM zVoqL&&*WCEE^$xghi;!8sHlDrIO6}p>)CXh5jl2z?a0?BT3T8jbX{2e5^wA&z#^N2 zvNY#Irfr@$a(#l|!}7eNL(R`)XAQUIHDw*qOteh@a%fEyv#vI?CJr=h+1BE4Z|{7! zaLpF5W6EygdT8UcWvVc@ZE^KKXZ6%fa0v zt2$;|do z_viVzw3~i+59|m)Lw{7PpE*zwzr4wRGF5Y^GX!->Yg&SLNAwA@%2#c;`}o1k29L^s zJx2y+*aZpmvK3qV-n)N!nZDIWTh(WZc0Z$^bV`ul8JzV~(ftjN0>GiER|MR(i*><6 zcU=QJ$>QQ^k^5E}{e#?c&V{Er^5*aM?;UWR#T0V;pQt}C%O8l&JY9FHtI3h->rzOC^+n;&jJe7MxzF(W76 zJ8a>+Y)N%XYtQ1~?yUO7p^ntu0zMs$c{r8-G!D|EU zZRgnHa5#H@5H|!HgC<^UOY9pqP#K5~v(bPEG!&7dI*|s(aUett1AL`O28X~RC_c6U z_QT=Kwkd=WXoO%5OM)l~q6ry-Ua7{=IGo>dy;>xRhEYHa%M>a$`10Zv5KusDFq|eJ z3Do|uToII@fkPA43MC2A5+(#LUk3Q;Sr~y5Mn!;L8Kcs&^lb10FAJMbY!gA?g9sYU z20t1VAqWQi5e*E`2z0!JM5Y41Oahrk_htHe0~BmcBr%8-5}w3l(R^4W3h?OxF>M-1 z$_nA~KIy_%Y*3D(Y8H{G)9DC09|EG05y?y@lSrZvDHJ>=f!D^XP>~+5(k`52;KEvo zMxjO(hzgis6p4{Ilnr8*esn>p76?8QtF)g2g@uf$7paM40*R8YYIoS|m;*!SW$pI0?pL_veZx1Tkw^>of{1DWVuIB8gMNDwNMdQWz96lS~evVhmi4 zKaWdh@_2L_hcSuetF)*{C4nb(D=^)ku;f3*vivo$2t_nP1c{lff?zp^ZaQPsS+@TgM7g$BMyX&cnZ?Il4dY@k@PG7rHx@>-N>EAV0_Z zgF8D@&VSX_uq$=7-q8RO`04aptB&4Iqpy5z=ziamB&aJ-yxG{^v8_3OYlqV7unY%eY8Oxv!IRc?f@Ag-uc;*D+?A-pZ0UA2GYL!v9oYi<4dK z^@{V}#S7(5`k>^tLkG31jfFzz)Dv%Pa$I|>Wsy_f9*o+2I+!!h*y~*UwYmM%l=!n< zBgcM52k~K`ylfA{(2QSw*!rmLuREtTCCmq`TFu#pOb;Nllhwn?D!AME-8H&t=L3#& zDN*;&n7sql7L_Z)TQ0QGU2B{k^7t*F++6Rl=X~oHuPY~MRvw1w=RGq!tEO9e7&Ies z$Fpt>{O9S$-)}%!1)6}^WobdD;&2fjAipw#r`(`_!4AmY`_0w9D%PnNl-dM$;!EQV z0#DHz<)$rA zubUl-^mtpa{`)gDQ+ndiUk#pNN8!*aw?>PD#-IgQUB%uA*J5a_2G{dW&Mi=fHRBY^=br3Wv)x<>~vo!#Qp) zz4P?;qYuuKnf;AbqhSTcf?HP~i(PirFwI!TJcg3C)Uouy_Mr}7v-BWOIrWFU!KlvR zEfINvcB${)4r{HFvmM69=|Sr(2FS^GmqxD7n=(4ZVer+vf@><%&1EBt48L?2t$*H; z=JH-;{abOqKUlFMr+1}!+)0_&IOSjowJ%}!u>5gZS}*Hf08}Y_vs$(zIqcc5uCH1x zu9(V^OZRI>Q=)2r+|d}v+iBZkc_!t^?fx;(pzm?wp!aQ@_|S zoRoLkW?FZJV9q_IXlr890yN}WgH*96*VrN3-?||mCD>?OGI}c%oijW$68i2&{q4PQ zo!ue3WCcUt4(>Bep$F9?+`G>^-Hb2r+xOPJ-cjDnUev;FGHNh)E}+$+Gk`}WD*IW` zWB>1-W{f4Tv%l@GxC}bGz0?);9Q!F`c2nNsq299fulw{f50{ud!rw2(C!C~>M-XPT zv;XmTd5IKE@82ifaWNqNaxH_qp{TQ2olhwJdj6wbGN+QdCq1A-FVgDFT?2BqV_dNC@GMTm~H+lXQm!a+x#`E(bXUVOCjW zb{&Ue5D^yU(5RzOFp3JgxFo}&BUm_IBOpl4j-ZIjb`aeC!T-Ten7y5g9RL9K;XFg3x3`&?(d?8UO+Ub!wqF9Y#PAoGMeYu`?Y%VnG?i z#_ps=lcLojuvEs&(ZKOJF$v7$3COCS{DEBg!_J>$jhz1rSDouh)C12?RzEp*% zv{IEC3<+7PI*8jTQ$ngNt(U1x?{3Y3HL^??;%Zb1a4F9$*#}~fP<KhzY|mQ$ofrbUG+%#KaHhD!34bzOq(lD23Zgz2*`<=rBR(n{SUp)X5$ z=Z~EH`gE#~mHZ`2%G@WJ6H%SdtS0-Iq@b5mDQ9O+uZkLVHe~i}Fe3cGlDxm2!rcLA77Ed$dpx+>%IM9< zaQENrU?l??AL0MaSGpgq3IGEfB|2Ogd_Huu5ogr7J?`DH`G{o=H}d?wODq?zgE5aE z1I+H-{Ck5{vqv-a(yNG;{_8-uQ<}rxe8KHk&A_Dnu?^ch^)1het&1bI7A1K^&doH% zY8Ts_XVq>`@79eMti~js3;X1wH$X~Kz-RUw+(-37^X+{#51-tnrhFQ|^@qe_siD-? z20tk0zBOxl>R$2q4CmmSTu@;2PPx2QTTr@XuGFFaO68fCZFA+8Hf2do(IdO~pYl`r zKF4Z)qUEh^H~)uOifC?IUQ%)c(EY_Z{f?ajZy&E2_X@roK5vEFdDWHs-4Vm4+IEG@MWitanyYx>~~ zBlAn9UD>bv2|?Vnp6wj`)nFk|{P8%WB#&XuuJ7!ZIV`|l4~>71>C4{}#I_N)*<7ld zUDfO^9=;eFR@i^my1Uch<)F1W6r2*2W&1P6_!I!=&!@gIKjt~482bJBd|d%zk>6mu zu&LQg>NWm_<&f)zD|MDRtuLeGqpx*l4@R1u8fSD@b+*S=O|F@=ZC}eWpX6j$OuRZ} zndxnB5cOzp+q%uQxdpjmW{ZZlP^7r3+BtTl)Z+?!AY>%!)=&FetY=BCb#5&;y}VDY z@0v>fuHXVa&7+glW69rbbT)F@%ecuUXCE2N+2+$``PPnnRrOyyj&J@UHTRYen1~rZ zXg85-mfsW~OOjV?XrfF|ds9x%-*7G4`DjYZs&(&GA|DsMv|b09hL^EJ=suTgu4DLJ8=Pq4S<)>>S@ z!OgIHI76^g4EPJ4R}@vgavL1u(FAjC-k>LD7_T0i;B_5Nd^GU=bjWRK$A0m)B7dUy zs9sjFZd#sjlrdF3=K4IUeGjpF@nVP2um-`@d9#~&&2Q*w4JFm=r&ibdxm6JtM)b;p zDfv)yaVz_&CCXV9#~9JK5T1Nf`Dfsf)X+4(_;!7rTcg>8v49HN^DG8T0@wZ9?gBI5 Yb(jHh8YTb9^ivTY8pHW^``*I;070mJ8UO$Q diff --git a/OsmAnd/res/drawable/map_btn_cancel.xml b/OsmAnd/res/drawable/map_btn_cancel.xml deleted file mode 100644 index 887819a70d..0000000000 --- a/OsmAnd/res/drawable/map_btn_cancel.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/OsmAnd/res/drawable/map_btn_hmenu.xml b/OsmAnd/res/drawable/map_btn_hmenu.xml deleted file mode 100644 index de5537e033..0000000000 --- a/OsmAnd/res/drawable/map_btn_hmenu.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/OsmAnd/res/drawable/map_btn_info.xml b/OsmAnd/res/drawable/map_btn_info.xml deleted file mode 100644 index 3430164b08..0000000000 --- a/OsmAnd/res/drawable/map_btn_info.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/OsmAnd/res/drawable/map_btn_menu.xml b/OsmAnd/res/drawable/map_btn_menu.xml deleted file mode 100644 index 8024ab38e1..0000000000 --- a/OsmAnd/res/drawable/map_btn_menu.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/OsmAnd/res/drawable/map_btn_navigate.xml b/OsmAnd/res/drawable/map_btn_navigate.xml deleted file mode 100644 index 3e52bfd986..0000000000 --- a/OsmAnd/res/drawable/map_btn_navigate.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/OsmAnd/res/drawable/map_btn_signpost.xml b/OsmAnd/res/drawable/map_btn_signpost.xml deleted file mode 100644 index 2ba7595ef6..0000000000 --- a/OsmAnd/res/drawable/map_btn_signpost.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/OsmAnd/res/drawable/map_zoom_in.xml b/OsmAnd/res/drawable/map_zoom_in.xml deleted file mode 100644 index 794067bf67..0000000000 --- a/OsmAnd/res/drawable/map_zoom_in.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/OsmAnd/res/drawable/map_zoom_out.xml b/OsmAnd/res/drawable/map_zoom_out.xml deleted file mode 100644 index 563d631640..0000000000 --- a/OsmAnd/res/drawable/map_zoom_out.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java index c0b81de131..292a95ce96 100644 --- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java @@ -1,6 +1,5 @@ package net.osmand.plus; -import android.widget.*; import gnu.trove.list.array.TIntArrayList; import java.util.ArrayList; @@ -8,15 +7,21 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import net.osmand.plus.activities.actions.AppModeDialog; +import net.osmand.plus.dialogs.ConfigureMapMenu; import android.app.Activity; import android.content.Context; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.os.Build; import android.view.View; import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; -import net.osmand.plus.activities.actions.AppModeDialog; -import net.osmand.plus.dialogs.ConfigureMapMenu; +import android.widget.ImageView; +import android.widget.ProgressBar; +import android.widget.TextView; public class ContextMenuAdapter { @@ -124,11 +129,17 @@ public class ContextMenuAdapter { selectedList.set(pos, s); } - public int getImageId(int pos, boolean light) { - if(!light || iconListLight.get(pos) == 0) { - return iconList.get(pos); + + public Drawable getImage(OsmandApplication ctx, int pos, boolean light) { + int lst = iconList.get(pos); + if(lst != 0) { + return ctx.getResources().getDrawable(lst); } - return iconListLight.get(pos); + int lstLight = iconListLight.get(pos); + if(lstLight != 0) { + return ctx.getIconsCache().getActionBarIcon(lstLight, light); + } + return null; } public int getBackgroundColor(Context ctx, boolean holoLight) { @@ -178,10 +189,9 @@ public class ContextMenuAdapter { this.icon = icon; return this; } - - public Item icons(int icon, int lightIcon) { - this.icon = icon; - this.lightIcon = lightIcon; + + public Item iconColor(int icon) { + this.lightIcon = icon; return this; } @@ -236,6 +246,8 @@ public class ContextMenuAdapter { return this; } + + } public String[] getItemNames() { @@ -276,6 +288,7 @@ public class ContextMenuAdapter { public ArrayAdapter createListAdapter(final Activity activity, final boolean holoLight) { final int layoutId = defaultLayoutId; + final OsmandApplication app = ((OsmandApplication) activity.getApplication()); ArrayAdapter listAdapter = new ArrayAdapter(activity, layoutId, R.id.title, getItemNames()) { @Override @@ -289,7 +302,7 @@ public class ContextMenuAdapter { @Override public void onClick(View view) { if (selected.size() > 0) { - ((OsmandApplication) activity.getApplication()).getSettings().APPLICATION_MODE.set(selected.iterator().next()); + app.getSettings().APPLICATION_MODE.set(selected.iterator().next()); notifyDataSetChanged(); } if (changeAppModeListener != null) { @@ -305,9 +318,9 @@ public class ContextMenuAdapter { TextView tv = (TextView) v.findViewById(R.id.title); tv.setText(isCategory(position) ? getItemName(position).toUpperCase() : getItemName(position)); - int imageId = getImageId(position, holoLight); - if (imageId != 0) { - ((ImageView) v.findViewById(R.id.icon)).setImageResource(imageId); + Drawable imageId = getImage(app, position, holoLight); + if (imageId != null) { + ((ImageView) v.findViewById(R.id.icon)).setImageDrawable(imageId); v.findViewById(R.id.icon).setVisibility(View.VISIBLE); } else if (v.findViewById(R.id.icon) != null){ v.findViewById(R.id.icon).setVisibility(View.GONE); diff --git a/OsmAnd/src/net/osmand/plus/IconsCache.java b/OsmAnd/src/net/osmand/plus/IconsCache.java index 56859e2713..09796c54f6 100644 --- a/OsmAnd/src/net/osmand/plus/IconsCache.java +++ b/OsmAnd/src/net/osmand/plus/IconsCache.java @@ -28,14 +28,6 @@ public class IconsCache { return d; } - public Drawable getContentIcon(int id, int lightContentColor, int darkContentColor) { - return getDrawable(id, app.getSettings().isLightContent() ? lightContentColor : darkContentColor); - } - - public Drawable getContentIcon(int id, int lightContentColor) { - return getDrawable(id, app.getSettings().isLightContent() ? lightContentColor : 0); - } - public Drawable getIcon(int id, int colorId) { return getDrawable(id, colorId); } @@ -45,4 +37,13 @@ public class IconsCache { return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color_light : 0); } + + public Drawable getActionBarIcon(int id) { + return getDrawable(id, app.getSettings().isLightActionBar() ? R.color.icon_color_light : 0); + } + + public Drawable getActionBarIcon(int id, boolean light) { + return getDrawable(id, light ? R.color.icon_color_light : 0); + } + } diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 7865dd2e04..930b2306d3 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -1774,7 +1774,7 @@ public class OsmandSettings { new IntPreference("osmand_theme", OSMAND_DARK_THEME).makeGlobal().cache(); public boolean isLightActionBar(){ - return OSMAND_THEME.get() == OSMAND_LIGHT_THEME; + return true; } diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index 535b5c89d9..d21f71c879 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -111,16 +111,16 @@ public class HelpActivity extends OsmandActionBarActivity { getClearToolbar(false); } createMenuItem(menu, HOME, R.string.home, - R.drawable.ic_action_home_dark, R.drawable.ic_action_home_dark, + R.drawable.ic_action_home_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); createMenuItem(menu, BACK, R.string.shared_string_previous, - R.drawable.ic_action_undo_dark, R.drawable.ic_action_undo_dark, + R.drawable.ic_action_undo_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS ); createMenuItem(menu, FORWARD, R.string.shared_string_next, - R.drawable.ic_action_redo_dark, R.drawable.ic_action_redo_dark, + R.drawable.ic_action_redo_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS ); createMenuItem(menu, CLOSE, R.string.shared_string_close, - R.drawable.ic_action_close_dark, R.drawable.ic_action_close_dark, + R.drawable.ic_action_close_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS ); return super.onCreateOptionsMenu(menu); } @@ -152,11 +152,10 @@ public class HelpActivity extends OsmandActionBarActivity { return false; } - public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType) { - int r = isLightActionBar() ? iconLight : iconDark; + public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconDark, int menuItemType) { MenuItem menuItem = m.add(0, id, 0, titleRes); - if (r != 0) { - menuItem.setIcon(r); + if (iconDark != 0) { + menuItem.setIcon(getMyApplication().getIconsCache().getActionBarIcon(iconDark)); } MenuItemCompat.setShowAsAction(menuItem, menuItemType); menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @@ -168,10 +167,6 @@ public class HelpActivity extends OsmandActionBarActivity { return menuItem; } - public boolean isLightActionBar() { - return ((OsmandApplication) getApplication()).getSettings().isLightActionBar(); - } - public Toolbar getClearToolbar(boolean visible) { final Toolbar tb = (Toolbar) findViewById(R.id.bottomControls); tb.setTitle(null); diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 644ff213ee..7438cd5cca 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -50,6 +50,7 @@ import android.app.AlertDialog.Builder; import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; import android.view.View; @@ -739,7 +740,7 @@ public class MapActivityActions implements DialogProvider { } if(routingHelper.isRouteCalculated()) { optionsMenuHelper.item(R.string.impassable_road) - .icons(R.drawable.ic_action_road_works_dark, R.drawable.ic_action_road_works_light) + .iconColor(R.drawable.ic_action_road_works_dark) .listen(new OnContextMenuClick() { @Override public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { @@ -969,9 +970,9 @@ public class MapActivityActions implements DialogProvider { for (int i = 0; i < qa.length(); i++) { ActionItem ai = new ActionItem(); - int id = qa.getImageId(i, true); - if (id != 0) { - ai.setIcon(activity.getResources().getDrawable(id)); + Drawable id = qa.getImage(app, i, true); + if (id != null) { + ai.setIcon(id); } final int ki = i; ai.setTitle(qa.getItemName(i)); diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 0d8bd57e91..4c6e8b3dbf 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -122,7 +122,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi } MenuItem menuItem = menu.add(0, NAVIGATE_TO, 0, R.string.context_menu_item_directions_to); MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); - menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gdirections_light : R.drawable.ic_action_gdirections_dark); + menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_gdirections_dark, light)); menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override @@ -135,13 +135,11 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi if (targets.getPointToNavigate() != null) { menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_intermediate_point); MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); - menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flage_light - : R.drawable.ic_action_flage_dark); + menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_flage_dark, light)); } else { menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_destination_point); MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); - menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flag_light - : R.drawable.ic_action_flag_dark); + menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_flag_dark, light)); } menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override @@ -153,7 +151,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi //} menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map); MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); - menuItem = menuItem.setIcon(light ? R.drawable.ic_action_marker_light : R.drawable.ic_action_marker_dark); + menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_marker_dark, light)); menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override @@ -165,7 +163,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi menuItem = menu.add(0, ADD_TO_FAVORITE, 0, R.string.shared_string_add_to_favorites); MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); - menuItem = menuItem.setIcon(light ? R.drawable.ic_action_fav_light : R.drawable.ic_action_fav_dark); + menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_fav_dark, light)); menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java index 8d067102ea..e1f12466ff 100644 --- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java @@ -507,10 +507,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment { } }; optionsMenuAdapter.item(R.string.local_index_mi_reload) - .icon(R.drawable.ic_action_refresh_dark) + .iconColor(R.drawable.ic_action_refresh_dark) .listen(listener).position(1).reg(); optionsMenuAdapter.item(R.string.shared_string_delete) - .icon(R.drawable.ic_action_delete_dark) + .iconColor(R.drawable.ic_action_delete_dark) .listen(listener).position(2).reg(); optionsMenuAdapter.item(R.string.local_index_mi_backup) .listen(listener).position(3).reg(); @@ -535,8 +535,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment { item = menu.add(0, optionsMenuAdapter.getElementId(j), j + 1, optionsMenuAdapter.getItemName(j)); MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS ); } - if (optionsMenuAdapter.getImageId(j, isLightActionBar()) != 0) { - item.setIcon(optionsMenuAdapter.getImageId(j, isLightActionBar())); + OsmandApplication app = getMyApplication(); + if (optionsMenuAdapter.getImage(app, j, isLightActionBar()) != null) { + item.setIcon(optionsMenuAdapter.getImage(app, j, isLightActionBar())); } } diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java index bbe9ae7346..03acef8e05 100644 --- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java @@ -177,10 +177,6 @@ public class UpdatesIndexFragment extends ListFragment { return getDownloadActivity().getMyApplication(); } - public boolean isLightActionBar() { - return ((OsmandApplication) getActivity().getApplication()).getSettings().isLightActionBar(); - } - @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == DownloadIndexFragment.RELOAD_ID) { diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java index 7a56265f21..bbc9382042 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java +++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java @@ -56,8 +56,8 @@ public class AvoidSpecificRoads { } final RouteDataObject obj = getItem(position); v.findViewById(R.id.all_points).setVisibility(View.GONE); - ((ImageView) v.findViewById(R.id.waypoint_icon)).setImageResource(app.getSettings().isLightContent() ? - R.drawable.ic_action_road_works_light : R.drawable.ic_action_road_works_dark); + ((ImageView) v.findViewById(R.id.waypoint_icon)).setImageDrawable( + app.getIconsCache().getContentIcon(R.drawable.ic_action_road_works_dark)); double dist = MapUtils.getDistance(mapLocation, MapUtils.get31LatitudeY(obj.getPoint31YTile(0)), MapUtils.get31LongitudeX(obj.getPoint31XTile(0))); ((TextView) v.findViewById(R.id.waypoint_dist)).setText(OsmAndFormatter.getFormattedDistance((float) dist, app)); diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java index b5f4dbd8fa..27ecdc7f2d 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java @@ -1,5 +1,45 @@ package net.osmand.plus.myplaces; +import java.io.File; +import java.text.Collator; +import java.text.DateFormat; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import net.osmand.IndexConstants; +import net.osmand.access.AccessibleToast; +import net.osmand.plus.ContextMenuAdapter; +import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick; +import net.osmand.plus.GPXUtilities; +import net.osmand.plus.GPXUtilities.GPXFile; +import net.osmand.plus.GPXUtilities.GPXTrackAnalysis; +import net.osmand.plus.GPXUtilities.WptPt; +import net.osmand.plus.GpxSelectionHelper; +import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; +import net.osmand.plus.OsmAndFormatter; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandPlugin; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.activities.OsmandBaseExpandableListAdapter; +import net.osmand.plus.activities.OsmandExpandableListFragment; +import net.osmand.plus.activities.SavingTrackHelper; +import net.osmand.plus.activities.TrackActivity; +import net.osmand.plus.dialogs.DirectionsDialogs; +import net.osmand.plus.download.LocalIndexesFragment; +import net.osmand.plus.helpers.ScreenOrientationHelper; +import net.osmand.plus.monitoring.OsmandMonitoringPlugin; +import net.osmand.plus.osmedit.OsmEditingPlugin; +import net.osmand.util.Algorithms; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; @@ -28,7 +68,6 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.CompoundButton; -import android.widget.EditText; import android.widget.ExpandableListView; import android.widget.Filter; import android.widget.Filterable; @@ -37,47 +76,6 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import net.osmand.IndexConstants; -import net.osmand.access.AccessibleToast; -import net.osmand.plus.ContextMenuAdapter; -import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick; -import net.osmand.plus.GPXUtilities; -import net.osmand.plus.GPXUtilities.GPXFile; -import net.osmand.plus.GPXUtilities.GPXTrackAnalysis; -import net.osmand.plus.GPXUtilities.WptPt; -import net.osmand.plus.GpxSelectionHelper; -import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; -import net.osmand.plus.OsmAndFormatter; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandPlugin; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.activities.OsmandBaseExpandableListAdapter; -import net.osmand.plus.activities.OsmandExpandableListFragment; -import net.osmand.plus.activities.SavingTrackHelper; -import net.osmand.plus.activities.TrackActivity; -import net.osmand.plus.dialogs.DirectionsDialogs; -import net.osmand.plus.download.LocalIndexesFragment; -import net.osmand.plus.helpers.ScreenOrientationHelper; -import net.osmand.plus.monitoring.OsmandMonitoringPlugin; -import net.osmand.plus.osmedit.OsmEditingPlugin; -import net.osmand.util.Algorithms; - -import java.io.File; -import java.text.Collator; -import java.text.DateFormat; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - public class AvailableGPXFragment extends OsmandExpandableListFragment { public static final int SEARCH_ID = -1; @@ -370,8 +368,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment { } }); } - if (optionsMenuAdapter.getImageId(j, isLightActionBar()) != 0) { - item.setIcon(optionsMenuAdapter.getImageId(j, false)); + OsmandApplication app = getMyApplication(); + if (optionsMenuAdapter.getImage(app, j, isLightActionBar()) != null) { + item.setIcon(optionsMenuAdapter.getImage(app, j, isLightActionBar())); } } @@ -543,44 +542,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment { allGpxAdapter.notifyDataSetChanged(); } - private void renameFile(GpxInfo info) { - final File f = info.file; - Builder b = new AlertDialog.Builder(getActivity()); - if (f.exists()) { - final EditText editText = new EditText(getActivity()); - editText.setPadding(7, 3, 7, 3); - editText.setText(f.getName()); - b.setView(editText); - b.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int which) { - String newName = editText.getText().toString(); - File dest = new File(f.getParentFile(), newName); - if (dest.exists()) { - AccessibleToast.makeText(getActivity(), R.string.file_with_name_already_exists, - Toast.LENGTH_LONG).show(); - } else { - if (!f.getParentFile().exists()) { - f.getParentFile().mkdirs(); - } - if (f.renameTo(dest)) { - asyncLoader = new LoadGpxTask(); - asyncLoader.execute(getActivity()); - } else { - AccessibleToast - .makeText(getActivity(), R.string.file_can_not_be_renamed, Toast.LENGTH_LONG) - .show(); - } - } - - } - }); - b.setNegativeButton(R.string.shared_string_cancel, null); - b.show(); - } - } - private void showGpxOnMap(GpxInfo info) { info.setGpx(GPXUtilities.loadGPXFile(app, info.file)); boolean e = true; diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index 0be89bce12..16ba1a5d03 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -10,13 +10,12 @@ import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; -import net.osmand.plus.activities.TabActivity; -import net.osmand.plus.audionotes.NotesFragment; -import net.osmand.plus.myplaces.AvailableGPXFragment; -import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo; import net.osmand.plus.activities.EnumAdapter; import net.osmand.plus.activities.EnumAdapter.IEnumWithResource; import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.activities.TabActivity; +import net.osmand.plus.myplaces.AvailableGPXFragment; +import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo; import net.osmand.plus.myplaces.FavoritesActivity; import net.osmand.plus.views.OsmandMapTileView; import net.osmand.util.Algorithms; @@ -128,16 +127,12 @@ public class OsmEditingPlugin extends OsmandPlugin { } }; if(selectedObj instanceof Amenity) { - adapter.item(R.string.poi_context_menu_modify).icons(R.drawable.ic_action_edit_dark, - R.drawable.ic_action_edit_light).listen(listener).position(1).reg(); - adapter.item(R.string.poi_context_menu_delete).icons(R.drawable.ic_action_delete_dark, - R.drawable.ic_action_delete_light).listen(listener).position(2).reg(); + adapter.item(R.string.poi_context_menu_modify).iconColor(R.drawable.ic_action_edit_dark).listen(listener).position(1).reg(); + adapter.item(R.string.poi_context_menu_delete).iconColor(R.drawable.ic_action_delete_dark).listen(listener).position(2).reg(); } else { - adapter.item(R.string.context_menu_item_create_poi).icons(R.drawable.ic_action_plus_dark, - R.drawable.ic_action_plus_light).listen(listener).position(-1).reg(); + adapter.item(R.string.context_menu_item_create_poi).iconColor(R.drawable.ic_action_plus_dark).listen(listener).position(-1).reg(); } - adapter.item(R.string.context_menu_item_open_bug).icons(R.drawable.ic_action_bug_dark, - R.drawable.ic_action_bug_light).listen(listener).reg(); + adapter.item(R.string.context_menu_item_open_bug).iconColor(R.drawable.ic_action_bug_dark).listen(listener).reg(); } @Override @@ -155,7 +150,7 @@ public class OsmEditingPlugin extends OsmandPlugin { @Override public void registerLayerContextMenuActions(OsmandMapTileView mapView, ContextMenuAdapter adapter, MapActivity mapActivity) { adapter.item(R.string.layer_osm_bugs).selected(settings.SHOW_OSM_BUGS.get() ? 1 : 0) - .icons(R.drawable.ic_action_bug_dark, R.drawable.ic_action_bug_light).listen(new OnContextMenuClick() { + .iconColor(R.drawable.ic_action_bug_dark).listen(new OnContextMenuClick() { @Override public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { @@ -177,7 +172,7 @@ public class OsmEditingPlugin extends OsmandPlugin { public void contextMenuFragment(final Activity la, final Fragment fragment, final Object info, ContextMenuAdapter adapter) { if (fragment instanceof AvailableGPXFragment) { adapter.item(R.string.local_index_mi_upload_gpx) - .icons(R.drawable.ic_action_gup_dark, R.drawable.ic_action_gup_light) + .iconColor(R.drawable.ic_action_gup_dark) .listen(new OnContextMenuClick() { @Override @@ -194,7 +189,7 @@ public class OsmEditingPlugin extends OsmandPlugin { if (fragment instanceof AvailableGPXFragment) { final AvailableGPXFragment f = ((AvailableGPXFragment) fragment); optionsMenuAdapter.item(R.string.local_index_mi_upload_gpx) - .icon(R.drawable.ic_action_export) + .iconColor(R.drawable.ic_action_export) .listen(new OnContextMenuClick() { @Override