From d6a000caeeb951236911c2d87e3cc610ce818e1a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 25 Mar 2015 19:03:34 +0100 Subject: [PATCH] Small changes --- .../res/drawable-hdpi/ic_back_drawer_dark.png | Bin 1270 -> 0 bytes .../drawable-hdpi/ic_back_drawer_white.png | Bin 1270 -> 0 bytes OsmAnd/res/drawable-hdpi/ic_drawer_am.png | Bin 2842 -> 0 bytes .../ic_navigation_drawer_dark.png | Bin 137 -> 0 bytes .../ic_navigation_drawer_light.png | Bin 133 -> 0 bytes .../res/drawable-mdpi/ic_back_drawer_dark.png | Bin 1160 -> 0 bytes .../drawable-mdpi/ic_back_drawer_white.png | Bin 1160 -> 0 bytes OsmAnd/res/drawable-mdpi/ic_drawer_am.png | Bin 2837 -> 0 bytes .../ic_navigation_drawer_dark.png | Bin 105 -> 0 bytes .../ic_navigation_drawer_light.png | Bin 105 -> 0 bytes .../drawable-xhdpi/ic_back_drawer_dark.png | Bin 1273 -> 0 bytes .../drawable-xhdpi/ic_back_drawer_white.png | Bin 1271 -> 0 bytes OsmAnd/res/drawable-xhdpi/ic_drawer_am.png | Bin 1056 -> 0 bytes .../ic_navigation_drawer_dark.png | Bin 140 -> 0 bytes .../ic_navigation_drawer_light.png | Bin 140 -> 0 bytes .../drawable-xxhdpi/ic_back_drawer_dark.png | Bin 1361 -> 0 bytes .../drawable-xxhdpi/ic_back_drawer_white.png | Bin 1361 -> 0 bytes .../ic_navigation_drawer_dark.png | Bin 206 -> 0 bytes .../ic_navigation_drawer_light.png | Bin 208 -> 0 bytes .../osmand/plus/dashboard/DashboardOnMap.java | 4 +- .../plus/monitoring/DashTrackFragment.java | 6 +- .../plus/myplaces/SelectedGPXFragment.java | 86 ++++++++++-------- .../plus/sherpafy/TourViewActivity.java | 2 +- 23 files changed, 58 insertions(+), 40 deletions(-) delete mode 100644 OsmAnd/res/drawable-hdpi/ic_back_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-hdpi/ic_back_drawer_white.png delete mode 100644 OsmAnd/res/drawable-hdpi/ic_drawer_am.png delete mode 100644 OsmAnd/res/drawable-hdpi/ic_navigation_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-hdpi/ic_navigation_drawer_light.png delete mode 100644 OsmAnd/res/drawable-mdpi/ic_back_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-mdpi/ic_back_drawer_white.png delete mode 100644 OsmAnd/res/drawable-mdpi/ic_drawer_am.png delete mode 100644 OsmAnd/res/drawable-mdpi/ic_navigation_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-mdpi/ic_navigation_drawer_light.png delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_back_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_back_drawer_white.png delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_drawer_am.png delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_navigation_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_navigation_drawer_light.png delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_back_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_back_drawer_white.png delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer_dark.png delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer_light.png diff --git a/OsmAnd/res/drawable-hdpi/ic_back_drawer_dark.png b/OsmAnd/res/drawable-hdpi/ic_back_drawer_dark.png deleted file mode 100644 index bc26173a816fbd1471adb81da80411821e2432cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1270 zcmbVMZD<>196#4~Erm#zcAKq8&#TKU^Ky5&OLBK4%iA?;w8=siZ1zF6%iWXaXzsyj2>X_1+M;tFF*i$W=L$RJEqoC=OfoC-2uzBu+t%D^v9Klw$}`COV*Ka_p&;O=?; z&-45J-~V?$n>pqh92-Os#Fd&Ba&X=6yaRjT_uYe+FTrKho+{WU^paf_O@PE?y$H~h zD$ao%5aq=ezXl-$={ck13w9wr!%MpA6&;MXrW%lqAfZUj5T$uwqeU>MXkqNPPj6tT zB8RbAf0|4i2~bw1mrQVCDU+9$<|R(XB1h3sjfVBS;_N^WhMITZ@`4)^N?5=xPvvC7Ft0E4qd{ z8pWc%V23g2>2?UJkxuU@)~rsVV9JP^Xb_Z_BvjRjtBtno9QfCbUC~y4(EvmaSo(q~ z!FrS?x@4HUhZ}N$&>Q}^slcL$6+xF4RG`@@A&kKrudK*?krtUEC`ovb1`JM<41;sP zN8_yI19ZU0$TA!3>e-E-q=O6-XF0z=8KkHwhKOxsZlz*NovIce%D z+Riht?BWB-1}MN312~{$KkhFvKAa6wGER#{juS~zBw2uU`11eF9|4^roM!n?^K_43 zM>^Y`QGmkEFaZrtkO@a+B$m03AdehK39)?bZt>3t4g0fUMn1Ie)Z(7Z1&#FO*ePH_0)b( zXjOXE^L(8!8`K9wubq9o5!|=_oH2U$^;@%j#Z%9^-s)@p{9Vhlhw49c?(e>>3Yzq) zBg@xU+=196$TAmP#aRyUkWc&#TKU^K!4r<&I>{%Qb7<(uFM8?1OCg@}xPMd-3kN zq*bsjGE-1o-I&s%&=1=XAtijb|Ko~(f&uF>4n@=AT6jS$04UE5{Tab+);qi(kDYL*uWiX=|5$xAbKEqH= zjbPJ(G?}&%pr}nQ*xAt@H+cs~^gay<70N<*0-Lj+CYBrgOQfuzyagF$PyS`e~g zvSkZO5v=ICmOv2Ya@k*I{H8raP(05QBu&sX4iUIBZ@5wgH=NP71`#-lty!*S8fZhK zB%5dLKkr^fx2V zelYTJ+_!5pc5rQJd@(e#9+y4uBb#09yAPqC90V|o{xU+>>s)PSL(v>pTpI+zpX#F_`^B`o%VT8MF-Yj zAik?ogM-@1;_BtDI=Jv~U&r;O%I>xNf!gHgC1LD~er@2Lv94Yc*?*Vv_1t*%eB)1) MnwS!6@zcxy0K=Z1mjD0& diff --git a/OsmAnd/res/drawable-hdpi/ic_drawer_am.png b/OsmAnd/res/drawable-hdpi/ic_drawer_am.png deleted file mode 100644 index ff7b1def9ac3f86488a855f502b965ac75b633fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2842 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 diff --git a/OsmAnd/res/drawable-hdpi/ic_navigation_drawer_dark.png b/OsmAnd/res/drawable-hdpi/ic_navigation_drawer_dark.png deleted file mode 100644 index 5c9db3584a4c79a075a2d1d18451913f66bf2852..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj0iG_7As*guCm-ZwFyLT5`()|l z+k$*jp9KGUN!bR6?hvWlf93A;>n@j6-%1%MCB69eS+hu8-sJt#&B|b?vTeOkZ3ylY24=ovocr#~J9OirC? zLG~gGx}c!=>Rv=qPz3iu3nKMF3WBUu#OsUf`Y0^*!G+z`?#Xnf`cQl@keu_M^MC*U z{kI$)9@^8<-rY`7R7XCSDU$W$_+9%E`EJXx^JLkA2g-N^Rd5Z2km`4k1?jv8#$XWw zXX?Oh*h^7u2i;N`mkWc2jl2YibrN+iAZUu}?W+gC9*3B=;F#;Dn7^*iGPLWYm{Fy` z7XlMj-Q08tN2Z5L_Vl=|J51k~bZ^}t20VxXUH2yZ$f&27hFyc~<71AY8!C7_#VnC3 z7lvsQg^*SfDr@tCOlx{VP*hFVcF`h{IX=mWJj?5bA{o3$Hy?(03!REl%w(Ish?HWg z7zYN&)oQgwO-i6}j1zQS=XjA5MV4r=(Ugxto%N%hmW2$A?9dIci+nn^2rM*-Qw(9c z6oMBN3d@H5sF^5|GOi8+PDt>a=f!a~v?E-EZ)vQk9hIg6$Q5CPCPSOlqtep?lia=E zQLISV7<)sP6a`FVkUi-^ALlbEhTJ3^*D)*!$QG>FtR_L3m3UcZbtp<~(iWklin8M* zwU(Wg@Yw+~si$R4QL>sK49IDPPo@<~HC0~Ic+G5K^L~VZZ^M>vm-udC)%RizGlT%6 zu!PV=s|$v!2&1Tq0@^eiRi}51y1s*I(HC)QAiy78m>4#7DE=^obAGAGwx({PeS}TW^4_!3{I3c6R=qemwi# z%qRQ0ex4hoAAI}U`L=})OKxvFkUI5x(~(c-H$J=fh`N=|y{O%)-e3L4h8_QQciz2O z5!GXdcHdbIH?LaQW+@_bW%18;eWLq>*MIf&FLM`jZ|-GZa`V6b^Z8LWcPaaP#ymc9 yrue&j_WsEqPW`y{>ow=@cAdpf5ARynxt|*PY5SJ)LeH!C-;f^|%3MzG|Neg|WP4Qr diff --git a/OsmAnd/res/drawable-mdpi/ic_back_drawer_white.png b/OsmAnd/res/drawable-mdpi/ic_back_drawer_white.png deleted file mode 100644 index 0ea5a84f6c9f24753181641460cca83660afa1a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1160 zcmbVMU1$_n6rPwOHkc9uMopoP<4Z(m=YMBs$TZE)?z#)v7&eQEZ{C@?o1G>zcbvI# zHz|eIBB-EX@ud&a9~1>eP@x2h=tB?$F(icI&r7M|lOXY>&}!2=o87bzArBpxx#!&b zednBee&)=`@S)C*-VTbQIt%$siL4*R@3yVvyC=^sl4Uo}j^j~O!8H&2iKyE>8MZH}QE5Ikux zYe9_{M`#m;kX8~&*5(D7R<(qnBvnm4NQ*@0_!KAdEU)Q`r1K)(d>G;_bSio&lWY1S zn!!{t4s?#I)oO{FltAGGCuo|+@ggUREJ3i*jE_N`^`m_)3mF*Mp&MWq`E+a%SZEp> z42g8@3SLkwt{e8FW}-;SxH}e1BxR5aza*}XdN4F#(Td-oYssv?L;$@lDpeV5^TZB?l zlpQCfw(M-g&t=V&mX_0sl2ZjCO9VcZR-~kvkJIt6VS~Uo2){&9HFgO>!)|_g6^U1b8QE@{zyN) z_x0Saqut*>7@~ju>h{(4l}=0UXg_XTeBX2Wa~FXznj zqd%1%%a@nGJ$3Qyw$DGfve11QKmX?7hh4`gp=a-IP3+qd{~HR~;mpnSv6KG*+gy4e diff --git a/OsmAnd/res/drawable-mdpi/ic_drawer_am.png b/OsmAnd/res/drawable-mdpi/ic_drawer_am.png deleted file mode 100644 index fb681ba2639897cc4646d3784b97bbe16f5d4e91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2837 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 diff --git a/OsmAnd/res/drawable-mdpi/ic_navigation_drawer_dark.png b/OsmAnd/res/drawable-mdpi/ic_navigation_drawer_dark.png deleted file mode 100644 index b7d28b5c7181477ac11696a49e58f39662383361..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2A(dCAr}70DGLM){{8>If1ZS~ zgrubO#+A}6YyyvKYO*BQ?=@VENRa4dWn=3y7G^LvP!W7`ki7(`m%-E3&t;ucLK6Tj C-5eDF diff --git a/OsmAnd/res/drawable-mdpi/ic_navigation_drawer_light.png b/OsmAnd/res/drawable-mdpi/ic_navigation_drawer_light.png deleted file mode 100644 index 836dde34b22f413c31cefad994930e9fad8a6442..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2A(dCAr}70DGLM)n7%F-%si%( z^NOvV(d8GzZlej}8cZRE2_|A1UCeB47b6l97#ND#IR&TKxr6}qGI+ZBxvX19KR7(YatV5lXX@(t{`)Gxy!vIxwCOi^WuU_TW`T;A1pq(dy*XKy?A$R z(x6yZUr?!7mNMtd>V^aDpyH@g(6K7`p+Q|lm@^E9IFy3e4=o}C#plwb`l0ND2Y1i& zf1dyE|Ns5p?&aaZN4#D8x-bm$CJ)6VwD!1fX9xOP-s@GgbUX2kbHvCwC161;q8M3- zCpD0V5(LWRQ!B6!!#opeI^$$gheg@Ye8AQ5l{FKgF|6-k*#vSCI(Qc5RXt3seRhe! zRV7S}@F_ZFMqxocRI%WZ%3xZq6lFmn4nBiV(y4^|?N*PrKCgu0hl%~0HHMMO=g8$OkR@+Wbnvjy9ZH!wo zszRLma~}1EDrHsoM_FW!Uzu zBHt~na7(NhwIFZ|D{UBK?JgKD7>;2V3=@w=n^nj6kEpt0lFV7G8Rdf8%uMMU0?L?e(@X_>NyspzMGjjHU0d( zSC+0^oi$%;T-~^9&g=w3lJUpdhpTV>ko^0b`LCZouzpe99slX{96UL4K2fc%QebbQ zaC~j$@mJ5on|HvY7ar?+Te^Ap+4rt}{M-|@H&^GYH?HSyulF=SWxaQ_vAhF*xe=_b z{4%w$96r0UVb@0PDR6tOeZz|vUix#qi0^!be;u3Y@YnIh%2&@k>TUE-e-fx4onGkA zdzW$_l>hShmQVb)eBvRGT|2qzseQV5$=Rv@+;MF*k5?w@>{(0QRlV)|%lj{iQ-$1_ z?sI42U865_eoh>?Pb^A%-k6@fd+N^j8MR&?9OGuOcevSarH}5H-pw4J$2{1=sXqSl Suj^^|XOxT&#uf*jJoXRxB)T^M diff --git a/OsmAnd/res/drawable-xhdpi/ic_back_drawer_white.png b/OsmAnd/res/drawable-xhdpi/ic_back_drawer_white.png deleted file mode 100644 index e70772a78d82b1d79d7ffc709d56fabdbe67bdff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1271 zcmbVMU2NM_6gDkNr$WaALqOC?#ua0MId=S$#HOK5j0vPM*5+j(q%qL6O)44^hzTAT*J)CCsP=#* z``&Z!`Of*ypATe)p6%-Nc48RTl^m3^Xzh02bsqFJyROvG@~9mjwTEHBuF59BqAJV- zJgLh?kOi_j@$%Q87sJ~3YPnH+G__4spzfDl9lxVj5E{dJ`<#lbl!1-sK~Xaz#H~-x z5V)pBh!H+Trz$Z}(gr6@Fg!VwQzpxbpb~x0;JuEB4Cug?aYr9BEYXP&4Z9-RyT=rP zH&pC$gjgXpn#$lYXabz~2T6qvaCk`Y2l!w}2yMX`BvW*lVrY^UM4lCC25&wD@@A?9 zF)JmSzK|3lO151QDXLnn`m3xTnnfxg2m(bj6vL26gR~|LTXsmp>SDk3&w+SE`{* z>PUCHItoZw9VTF)2{O^B)EBN^#jtxGPD;_7^Zml1==!t$8}^-))7`VuxAGVK*3Z|M zcb1n2Z}5A5?mkpmC#SRUk6Z9*xa)~OL(|M}CobHcKY0E0{vD6(+jZ9ae0KiKrX-U% zGL`;lXKiDB+IRB!TiGAqTq^$c;I(62%h}+zJIBv~Baio6rTsU*dB-WYchr3KE57Sb zc3f_Ipth+_ZSK?O7I%N8^`G7zIrrfU?Y_*ZnR`pzYp-|?{_@c6r}kX(c&8R-E_yGw z9px__e($I4o)>4S?_Q;$RnBUwZ!C;mL7q z@q)zeh`+Jn(@y2r*WY(;oH{_#?L8#clL1R}$2N{EN^SO%BtG}$;lY`F>hHGuG5B^b U|Jc;|JMOP286T297}!1g4_VHzqyPW_ diff --git a/OsmAnd/res/drawable-xhdpi/ic_drawer_am.png b/OsmAnd/res/drawable-xhdpi/ic_drawer_am.png deleted file mode 100644 index b9bc3d70f1d29fec2e4530e5d1809edc8e15ad35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1056 zcmbVLy>HV%6u%0oKud=rkbnW5+yx|J`<&Q`t(wY-lQsgURT^lJI@GnVjg{JG>??6I zp$-TJMs}p`%!m$vm_Q6HNWhFgdkGtJ{wp^s;CS4?Jv|~pY7%o}Gu+V}T4Zw+(*J#qF zbyIVQ&)caDpZFm|128?4gtpVh6t3cRFVMN~yDvHDxjMHbTcQ<~aLb$PMtHGXYdGDu zqq^M8bvT`9jKIg#hKaus#9E?rJzkB;saoJ*&xE#ht{+s>T7V@IVJP$2j3Xih6@^DR zSy9k6D2YfCMD{8fl+$EIlk#xzaLileu4#3%GVsNAI@h8!)C8f^>F}K_Poi}Jsj8ZC zNK%GbWa6!W+DRser-lqBj-AL0sYe2sGTN(TljTGkrXC2cz{u9QL)^TGi#6lg%WHWNueXLCl!K`-2J4y{%G}?URu}iTxOyX?%IG|Ni z=hzAFdahPhWYd&UB`ZouDIio33t8338aX7(id>P097kc5Tt2T#qN-LD1EI21DCNpU z)l>>nF>e%+ImA|jnA(AZhkiZgcYrM%i`7aIwke4kglr5uV4+1QiCZLur9}l^v24c+ zQpMHug8KQIIP&gcw-ON__A0D-M?~=N%==jPf2t<1V1%?i{%V(@iuGVB9yUMQ9F7kT z*vv$1ICdVt{>%oeRyB=A^5xqTV+_DEZ*K2>+`fG7_s{+D?GHCbcTc|H-@OlOr+<7J z`MUh8J-U;h90BvQ$x;pMJp@l5JO^O;{&-)=znWYD7w()l&fdzcq%&JB*UV?dmF)v& C(MMk43$!J_J?#KgECHZhDa8rP5!Wi~%Wf|WR}@{NaOE324;l?cObP0l+XkK2hJ=D diff --git a/OsmAnd/res/drawable-xxhdpi/ic_back_drawer_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_back_drawer_dark.png deleted file mode 100644 index 4022c1b4221f5ca6a7ab238f402efae50238108f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1361 zcmbVMZ%i9y7(XCvTK*)8Og4u(k4)I$dUx&h&z*Fv^jaucSuI7{IO49oxAcVGb$2hc zbeOp<(Tp#{i7uPOkl|S36400}na(Wgh(lyDLiSz@RGat zdEWQ;d!FZg{@hW2Yg36~ivh#15^u8*KMYL>&?htHKV=yIZ0CP%e z1mNC;*aZSWl=}BigL(`r=#zsX81n7rqiVt^W--QeB8k`-R^O0LiqUQW@d)UW6$kP2 zCzlCamK;Qf#Yg*+E)bWSGa6{iv<9P@?kFb_4LkArG>;4<02J|bqDRsBw1Zf-%Og3v zO%eDq1a>=!m7qdCKkiaBfLn}KGD@DjBuPt(;{sL#42CA{?k0UE!2@&acvZkvNlXWK@+5*QK^4zeiFm-_Im|qFn#mN$=Q<6>0(d8;lh27 zR*czr!>6BNcm<}=EeGyY+*LFVgY5+br}*~`Z_{&d;#!Lc_-GK)f0Z1hNJ{<(|49e-+J`rhv?zHR)BVes4Un;VASJMjLQ z=l*)~3=D^zt`V%$LBjH)!M!K0o_}X?c39}xH0p)m*NL-tzA_9?)Xu1TEWZrZ9@_X! z}(qnq(hr60?7qFd<>v;$Bi?Le`;pcDjv+rhqa$a|< JFwwa0@IM@5(ZT=# diff --git a/OsmAnd/res/drawable-xxhdpi/ic_back_drawer_white.png b/OsmAnd/res/drawable-xxhdpi/ic_back_drawer_white.png deleted file mode 100644 index cab4e58f7af534d643b661946ee0cb15610540d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1361 zcmbVMZ%i9y7(XC51xlg>baR;V$Oao+@2=m)Y7UUK(7 z&-?y<&-1*`pL^Bc+GHr&QiNfc!P_hZ(7H4GKKu~+PJKGPA1#}qy94f1qcA0E0CP%e z7~o!6>;eHGN_~f?K|O{Q^u~i7u*0{9kEpUy%wmjbIf2+1R^O0Lh>>mp@i6F$D-Po4 zkFF4STyhZY79Z_PxIir4oYBC(OlvTb>5gy`(Xb1zPxHut44{ao{ph#D*ASZmjb;F9jmMD}mDlH}`#z<4LoW0iyT89DfZx|b*^C<{c<@O!m5DvH=6sF9=$6zCNk1UfNFafuI`MK%ng5z=M` zENP}$mgIoROxhzRV78iANwV8=b~fU>8K=F`= zucAXyiGZB%IP$&5wLg%{yEGs|RST+WPp%96F%_zMOikb}*Gkp#n)bLNsVRL&woI$H z7JwG-1(HWoWqc*ie0+l#XuFjGY}iTyMzWBWC~G3^Hbx@NVwmGZnigq0AlCTO|IHtT zf}*m`@}K6(ZK00LitD3*l=Wc(3Ys7djmmZT>Mab*JM0yl!StPLr)LdU=@L)DK;gkh zzIv&2zTo3eF#HKjNi5;Z+m{~$c{|?}?ruKPc7NN+{`byK+`nvJ4xicniYIhZ@oeq4 zw)pmcnLJkVJ{;-zv%khNcFWA;#rKx<3k#QD?B$%cT^CwruYV`s94(o{F0~!XUmPlf z)iZxnnNaVkGIs0e#Xwo$cX!kG1#G9|cHWWv5^P{1^sJ%kgSWFkIj_4_ Jm~1>a@DHj7(lh`7 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer_dark.png deleted file mode 100644 index 42e0f81ed7bddfb5609cdb5189d2b0735875de6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtsh%#5AsNnZXL#}*FyLW2e0uf1 zJ3GIy2Au3P-D`cCL1^W*r}Opf|36~7%e89Nygp}-s{c2pbMFude4yOkx?zHMLQks` z!`sIpoq3!A46IH}5gIHK{fixX3}PD0UNJp!G+x&GDf|!*qol-S#>7Fi*AsNnZryt}!V8FpVIn_91 z`PxM}4HI?NoSrXsuFU(JRNc1^|HPShi0l8PQ17=ZQn9MiL$eqG7p;4)^gXho6rxJ!t67JeSCo*`t`njxg HN@xNA0dYy| diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java index 05afbcc7d8..2eee8150b2 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java @@ -274,7 +274,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks { }); lst.setVisibility(View.VISIBLE); if (visibleType == DashboardType.DASHBOARD) { - lst.setImageDrawable(iconsCache.getActionBarIcon(R.drawable.ic_navigation_drawer_dark)); + lst.setImageDrawable(iconsCache.getActionBarIcon(R.drawable.ic_navigation_drawer)); } else if (visibleType == DashboardType.LIST_MENU) { lst.setImageDrawable(iconsCache.getActionBarIcon(R.drawable.ic_dashboard_dark)); } @@ -363,7 +363,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks { if(visible == this.visible && type == visibleType) { return; } - this.previousVisibleType = this.visible ? null : visibleType; + this.previousVisibleType = this.visible ? visibleType : null; this.visible = visible; boolean refresh = this.visibleType == type; this.visibleType = type; diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java index fd3f2477ab..58f2134bc9 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java @@ -179,7 +179,11 @@ public class DashTrackFragment extends DashBaseFragment { } OsmandSettings settings = getMyApplication().getSettings(); - settings.setMapLocationToShow(file.getLastPoint().lat, file.getLastPoint().lon, settings.getLastKnownMapZoom()); + if(file.getLastPoint() != null) { + settings.setMapLocationToShow(file.getLastPoint().lat, file.getLastPoint().lon, settings.getLastKnownMapZoom()); + } else if(file.findPointToShow() != null) { + settings.setMapLocationToShow(file.findPointToShow().lat, file.findPointToShow().lon, settings.getLastKnownMapZoom()); + } getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(file); MapActivity.launchMapActivityMoveToTop(getActivity()); } diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java index 9172ae4ad6..2753247e1d 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java @@ -258,46 +258,58 @@ public class SelectedGPXFragment extends ListFragment { protected void selectSplitDistance() { final List groups = filterGroups(GpxDisplayItemType.TRACK_SEGMENT); - if(groups.size() == 0) { - return; - } - + + View view = getMyActivity().getLayoutInflater().inflate(R.layout.selected_track_edit, null); + final Spinner sp = (Spinner) view.findViewById(R.id.Spinner); Builder bld = new AlertDialog.Builder(getMyActivity()); - int[] checkedItem = new int[] {!groups.get(0).isSplitDistance() && !groups.get(0).isSplitTime()? 0 : -1}; - List options = new ArrayList(); final List distanceSplit = new ArrayList(); final TIntArrayList timeSplit = new TIntArrayList(); - View view = getMyActivity().getLayoutInflater().inflate(R.layout.selected_track_edit, null); + if(groups.size() == 0) { + sp.setVisibility(View.GONE); + } else { + sp.setVisibility(View.VISIBLE); + + int[] checkedItem = new int[] { !groups.get(0).isSplitDistance() && !groups.get(0).isSplitTime() ? 0 : -1 }; + List options = new ArrayList(); + + + options.add(app.getString(R.string.none)); + distanceSplit.add(-1d); + timeSplit.add(-1); + addOptionSplit(30, true, options, distanceSplit, timeSplit, checkedItem, groups); // 100 feet, 50 yards, 50 + // m + addOptionSplit(60, true, options, distanceSplit, timeSplit, checkedItem, groups); // 200 feet, 100 yards, + // 100 m + addOptionSplit(150, true, options, distanceSplit, timeSplit, checkedItem, groups); // 500 feet, 200 yards, + // 200 m + addOptionSplit(300, true, options, distanceSplit, timeSplit, checkedItem, groups); // 1000 feet, 500 yards, + // 500 m + addOptionSplit(600, true, options, distanceSplit, timeSplit, checkedItem, groups); // 2000 feet, 1000 yards, + // 1km + addOptionSplit(1500, true, options, distanceSplit, timeSplit, checkedItem, groups); // 1mi, 2km + addOptionSplit(3000, true, options, distanceSplit, timeSplit, checkedItem, groups); // 2mi, 5km + addOptionSplit(8000, true, options, distanceSplit, timeSplit, checkedItem, groups); // 5mi, 10km + + addOptionSplit(15, false, options, distanceSplit, timeSplit, checkedItem, groups); + addOptionSplit(30, false, options, distanceSplit, timeSplit, checkedItem, groups); + addOptionSplit(60, false, options, distanceSplit, timeSplit, checkedItem, groups); + addOptionSplit(120, false, options, distanceSplit, timeSplit, checkedItem, groups); + addOptionSplit(150, false, options, distanceSplit, timeSplit, checkedItem, groups); + addOptionSplit(300, false, options, distanceSplit, timeSplit, checkedItem, groups); + addOptionSplit(600, false, options, distanceSplit, timeSplit, checkedItem, groups); + addOptionSplit(900, false, options, distanceSplit, timeSplit, checkedItem, groups); + + ArrayAdapter adapter = new ArrayAdapter(getMyActivity(), + android.R.layout.simple_spinner_item, options); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + sp.setAdapter(adapter); + if (checkedItem[0] > 0) { + sp.setSelection(checkedItem[0]); + } + } - options.add(app.getString(R.string.none)); - distanceSplit.add(-1d); - timeSplit.add(-1); - addOptionSplit(30, true, options, distanceSplit, timeSplit, checkedItem, groups); // 100 feet, 50 yards, 50 m - addOptionSplit(60, true, options, distanceSplit, timeSplit, checkedItem, groups); // 200 feet, 100 yards, 100 m - addOptionSplit(150, true, options, distanceSplit, timeSplit, checkedItem, groups); // 500 feet, 200 yards, 200 m - addOptionSplit(300, true, options, distanceSplit, timeSplit, checkedItem, groups); // 1000 feet, 500 yards, 500 m - addOptionSplit(600, true, options, distanceSplit, timeSplit, checkedItem, groups); // 2000 feet, 1000 yards, 1km - addOptionSplit(1500, true, options, distanceSplit, timeSplit, checkedItem, groups); // 1mi, 2km - addOptionSplit(3000, true, options, distanceSplit, timeSplit, checkedItem, groups); // 2mi, 5km - addOptionSplit(8000, true, options, distanceSplit, timeSplit, checkedItem, groups); // 5mi, 10km - - addOptionSplit(15, false, options, distanceSplit, timeSplit, checkedItem, groups); - addOptionSplit(30, false, options, distanceSplit, timeSplit, checkedItem, groups); - addOptionSplit(60, false, options, distanceSplit, timeSplit, checkedItem, groups); - addOptionSplit(120, false, options, distanceSplit, timeSplit, checkedItem, groups); - addOptionSplit(150, false, options, distanceSplit, timeSplit, checkedItem, groups); - addOptionSplit(300, false, options, distanceSplit, timeSplit, checkedItem, groups); - addOptionSplit(600, false, options, distanceSplit, timeSplit, checkedItem, groups); - addOptionSplit(900, false, options, distanceSplit, timeSplit, checkedItem, groups); final CheckBox vis = (CheckBox) view.findViewById(R.id.Visibility); vis.setChecked(app.getSelectedGpxHelper().getSelectedFileByPath(getGpx().path) != null); - final Spinner sp = (Spinner) view.findViewById(R.id.Spinner); - ArrayAdapter adapter = new ArrayAdapter(getMyActivity(), android.R.layout.simple_spinner_item, options); - adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - sp.setAdapter(adapter); - if(checkedItem[0] > 0) { - sp.setSelection(checkedItem[0]); - } bld.setView(view); bld.setNegativeButton(R.string.shared_string_cancel, null); @@ -306,8 +318,10 @@ public class SelectedGPXFragment extends ListFragment { @Override public void onClick(DialogInterface dialog, int which) { SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(groups.get(0).getGpx(), vis.isChecked(), true); - updateSplit(groups, distanceSplit, timeSplit, sp.getSelectedItemPosition(), - vis.isChecked() ? sf : null); + if (groups.size() > 0) { + updateSplit(groups, distanceSplit, timeSplit, sp.getSelectedItemPosition(), vis.isChecked() ? sf + : null); + } } }); diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java index f58bfd40d4..183ea414da 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java @@ -108,7 +108,7 @@ public class TourViewActivity extends OsmandActionBarActivity { } }); - mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, R.drawable.ic_navigation_drawer_light, + mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, R.drawable.ic_navigation_drawer, R.string.shared_string_more_actions, R.string.shared_string_close); if (getMyApplication().isApplicationInitializing()) { FragmentManager fragmentManager = getSupportFragmentManager();