From 644938a016f4a8adaeed5d7b2a0a77dfebd94761 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Wed, 23 Sep 2015 16:12:41 +0300 Subject: [PATCH] Download bar enchantment. --- .../bg_download_bar_light_grey.9.png | Bin 0 -> 1306 bytes .../bg_download_bar_light_orange.9.png | Bin 0 -> 1285 bytes .../bg_download_bar_light_grey.9.png | Bin 0 -> 1191 bytes .../bg_download_bar_light_orange.9.png | Bin 0 -> 1193 bytes .../bg_download_bar_light_grey.9.png | Bin 0 -> 1379 bytes .../bg_download_bar_light_orange.9.png | Bin 0 -> 1394 bytes .../bg_download_bar_light_grey.9.png | Bin 0 -> 1623 bytes .../bg_download_bar_light_orange.9.png | Bin 0 -> 1626 bytes ...ber_of_downloads_progress_bar_drawable.xml | 18 +++ OsmAnd/res/layout/local_index_fragment.xml | 130 +++++++++++++++--- .../res/layout/maps_in_category_fragment.xml | 10 ++ OsmAnd/res/layout/simple_list_menu_item.xml | 16 ++- OsmAnd/res/values/strings.xml | 1 + 13 files changed, 153 insertions(+), 22 deletions(-) create mode 100755 OsmAnd/res/drawable-hdpi/bg_download_bar_light_grey.9.png create mode 100755 OsmAnd/res/drawable-hdpi/bg_download_bar_light_orange.9.png create mode 100755 OsmAnd/res/drawable-mdpi/bg_download_bar_light_grey.9.png create mode 100755 OsmAnd/res/drawable-mdpi/bg_download_bar_light_orange.9.png create mode 100755 OsmAnd/res/drawable-xhdpi/bg_download_bar_light_grey.9.png create mode 100755 OsmAnd/res/drawable-xhdpi/bg_download_bar_light_orange.9.png create mode 100755 OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_grey.9.png create mode 100755 OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_orange.9.png create mode 100644 OsmAnd/res/drawable/number_of_downloads_progress_bar_drawable.xml create mode 100644 OsmAnd/res/layout/maps_in_category_fragment.xml diff --git a/OsmAnd/res/drawable-hdpi/bg_download_bar_light_grey.9.png b/OsmAnd/res/drawable-hdpi/bg_download_bar_light_grey.9.png new file mode 100755 index 0000000000000000000000000000000000000000..6bf0d1c84fac7520d971930e94d7f5e5a457662b GIT binary patch literal 1306 zcmbVMYitx%6dqF{q)N1Cqm;ys(^!jPb{;#Aoyo3sJF{)KVV7DqWkC}=kGtJ*yEEIF zX?NQOM1oo+L5z(;qUb^mBo%-7B5F*djX*cPen4nTd{7f5Dm6+C#7E+twp;zt@WV-F z?mhRO@0{{0ARI+SpSukAscavZNQ=^J+h_sWr68N}wzDFhWt$|LW;n`EQ&fZ%B#sKmbVLYKY%?QCWo*=RT*cHt z*|*{OUc~yZixnjsD6VBEEUTy71?_3ewVbq-LnUdU>S)6@!_=+3v(YQlV$?FQjeejv z+g27`$g^myz<~>}ysB{&&M=IC2S`T21%?KAilb60o1%GMC9x&E{(tjFKvIO)EdObq z@)7JvZ@WASP*@%&V8RKq;iw?Rwpj$ZL5#}bL}6w$5spugx6aR)_uc*6Ge_DUuKBj= zuhHDa)!o;SmR-nrddu;q;GWxB;v>!zXGho6>=>GUtv4#k!`qE@r+cYxm8wsaUaDKwU{uVvCyI&3Uiou;`t^YecRs&+M0r_%o9oS-pYG>k zb5qB}!n5CPD6wNH_2bDamx|{u&mBjH&rH4AH2Kq}!#CGjPrbO0*;zbs)0w^>>Wfmk zssD-M`@%?l^r6sX$7JlXIs&s`|qFTSX&r K`HiNoJ^ujte98m> literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/bg_download_bar_light_orange.9.png b/OsmAnd/res/drawable-hdpi/bg_download_bar_light_orange.9.png new file mode 100755 index 0000000000000000000000000000000000000000..8a11b8acfe5262e27cb8b5dbb6bd1de165ea7a28 GIT binary patch literal 1285 zcmbVMTWB0r7@j0_8*5Tcm1;`S(}~uqot?|hWoOJb-OeWNLN^K9C0Quc&gD#YOlD>~ zGwE*f&{ETvYLG}oynq(GHBclVv<*IN3Z_yCsc&KtY*cLCf?}~YH0zm7Hu@0y;K0l| z|2hBn|KER`bG_X!H*edu4a2bJR5Fo4>yF@U454q|!khhQY4tmE{t?IUi;4@exbCPB zq%36sW}u>voVX6#F|6UFna%mR^kGSJtgsU3giBTdp)stzqf}6|LFfY&4w!ZfU;e6$ z15=OT{al(#7i5?>lcO#?GTNQhMh7)f$2$&y_L77QSkPBM$r`dfsT9Mjb|thAj!7I; zRs6vizD6pS?gg^rLcoQ2LZfIF2x6G#ctI5Q0|vGXzS+gnc*N*P&F3M3t-NXrW1s%m?F2L4N9Q*AFhQh;Ozdd{$` zp?Vl?H89HEgB=Bmh>g_any4tsP{PrMEol3xL<~naVcpavHVQR?)1w5#8!8cHS%Xk$ zfg+%;MuZ5jGEfj}b~eRx+##7^qC6d8Xu6XVWuA^Em`*WHb6u<~*RUzu^A%fzHQ#37 zdkrf*5G%J&ks^a;`A_rIj!;Ji z+l^5`!p1N`8%>alM&;;^#2kjzJ)26zv!$D=KD&K2a%=1OQvH7F+O^#+;YX}Xsf+W6 z_l%Fn+68mooj>ndvQa^F8}k-}tb-GTEve dk6`spm;tU#UjOaXiQvbS>g-N@ap?GK{{Sn|Azs=aOvG&CG7I!A;Z6YGa#%XJ*bMV={Bb znUn4$2wonFDWcX(sL&{ciZ>8n3__*Wv>>%bL=dGuw3MRlgD4_c`kg;nX~GCGB?nsw zRDC#(>IgbBPn|=(40GEduQ5tSYmewQ_Ome6$tHeC(G1humxR!sL4F4SAC`KH99OTK zl~rFf@^WAEV~>O6@f#J zl~ZyBOG1j)wzDq2T$U86R4Ir#NfgWZepT%^%>I&5DOE&4HQLx}5EB^KsO{TJeXn54 zx5Vm3gdo9D1LLW77Yt8eg5wDs0>fxk9dz&W0tYwa2huXFL~WwTJA|A{gniJ;v+k|K zp`hj!%PxqVEXx|F3Nqw0Swfs!5M3+pN{V6$>?+>*zxm@SDL!qM|1?kgh<0SUT^j`| ztPK+i=mbS{RC=DdXDc1EFRNy$kz9Q7)$?7;Lg%i9?&t13dhzSC3*x8u-G7aFVaL=L z3-BxEn zlK#o@>zTvDcM6M_dtTb6|F-G&&R2|GH-HAeJ^K3YJNnFbIxZKN`+grh{rBC8|7N_j zrS6WDHW;~UXXeKa9vuAs$DWtxt&^wT|L}vW$Nt#+letBldt12yp1e{a?DZ4&$J=XX o-#D;*SNEx>JC5CC_iWh6JU+M|Kbq-!Fa32?%R}Zz{ZBmq4-$BbtN;K2 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-mdpi/bg_download_bar_light_orange.9.png b/OsmAnd/res/drawable-mdpi/bg_download_bar_light_orange.9.png new file mode 100755 index 0000000000000000000000000000000000000000..bd3a4748182ef1145ff662c2ae041c7db1db96a4 GIT binary patch literal 1193 zcmbVMTWAzl7#^xv}!bS-I<*WS#@`3W46u4WZl-KRB z3D~MMtrAE}Q!SP}hzfa1K+uQQOHo@TLQ9KK+B`)HRa#o14`QGXJ+sNCeF#2uVCJ0v zod5g(@4wCIuFk!y8aFf&1hFdLt{3sz6u%8C@b|5OcOK#86_hKZ{m?-bBLqa+h9)5M zp3wt}z_168OoLW}Sa#Gcl~K9Sp;^#lj97=MdI3fgMCuiuZfYKp4a)$l$(W+}3! zg8EX_JgIV_i_F3hkP?%mEshsSS!H-BDXVe|DPWo96jtD9PSvD@#tG!YLt$^B?Px{4 zZNV3oQdBQOfyT0xN`vopJ=W>E9WD-d}A@F=o$|y=Et7p>LwsafMDcL$U??=e+El~IE#=hsV z!gH}&HUtKOVF|+idKYx{LIk5;7?9a)t?K0V1FmnwO4J;eX+CNlgziybw}sFnYkAh( zB{(D%Nj9w{Pm7|c(h4UUv?>aKc9OhfN{%4QCPyvc?f;uU7L#J*X8BL^)Q@mS#@oeF zz{27%0Uu9Lh)3o3t>@eEm`&&Pbg4QsUVNkR_MWC=4_3daqaT>-XYU0MH(o#a;*H^* zsnZ_@-6N+)F8^`GGAGu|Trg+X{xvw(v2OV0Pot9`G(EX_uw}w}Z|~@(JDr=peEZuU zKU;S0%%i^_Zn=HvXYIt~tG9NI9(ifoimBl*KHBl8^vl;P&Emzg-#?z29a;X#@l6fS zMrN;$?dUjnYn@BHc5nHKZ^plK#$NvQ>C~3<(b&f3yK1<4?dNmb{0*o9#BX=F)*otW{`Yp>V4UhAE^mmYF##}IBFY{^3J`W#efd$ffs zmkcK2A`BHj=wi@hnwUt?X`+c4%ceL!j2MZ25HhFBUP#QgY&f03%yjmELqCvxuu1zo z|L6Jt{{P?qtpjzn&*tTp#&mlCceV|i5bH);)XOiOSIfIPe$ z0dPR%T0lME`0kD=;Dn&eE+N#YH3s)EQCT!|DIK#e#tk$CId|!CF4_h(I09M($%V|H z`VxT!-i3s1K|C1ufmWe9sep!LZ77;-i_$!@>lxUoGll^XXdJAI?UKsqE@as*W9(DM z7y>V=Xl*WJg;Zm(4))0kfNf?w8pSOnOwneG%}&u&B}^DHhC46H-Wk@chRny`Oh9wdSbHZwtl@`oG(=>(?7(t+h2C8;T8mFU@x+86Y1!`0g z;+h~!aLOVVkvlaPVlZ6^L5v53YlbCtHBm;&FrABI7Bh~CVk)j>ZB?rW|I%1jTMc!` z0ag!Gxl@T6^@#0AgN@uh*ilN+V8iTH1fwWiJ1a*!MIdPb)`b{1W?tYK(gC8Bjd!4g zJr+S7BpE|F3x%VAk60*_p+4LN>{OI zY(P>qPKtuGZ^7`rinTlt%lH()X|fWM<@R(J)V0c*thUN=*ymfWI=nM1NW7d-%Ti@p ziJAq9&;|G^MHb=ZJTt;N9PADo6^Ys{C`pnu>cB}3rAY#yF}o!evBe0Air~m9p8vo3 z!wgbbs#*TiJn18&BU9V8Q80wHVFHpdL5eXdr+dP8A?Tr(0<0&b|2VmCqUNkS|J~pt z-l2VC`t2g8USyj1#AMo=js1Q2iif>d;+fn%y46|Td;D~cR~$LAKQa6E_+v9}(QDT( zWq0{5j&zTl=kTYWoXaUIwayOxW&SqUr7Pn%vFu~7HJm^D2Qhc_z5IKEbMVF@H7l1- zuy1aAeA|5gSjFpKy;EMWv24TlExq?I-&!aPfBoEr6HjCnZD}mr{j%4+`3h2t%w(Lo zI)19TZ1`y9f@gF%d_yna4w_4gH~o4|cyaW@PyJFsB=@`C4Z!G*t=o?$L9F9W&%uND z_mlHiEB)9EGL~^I39i3i{y~P&;C@SdqyM+8bJz2x{rx`VbI+hO*?Vgf(-&~QP~$4i z%{W;yDdg_Cc;RNn)ZO@>R3X%nU(~Us!yo=(UQ71<{(Rk-c=^zofyKke9e20!!^Y{S;bJn=7piAyzIHuZ!h4lWlwmU`~Cq0Xx=IS literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/bg_download_bar_light_orange.9.png b/OsmAnd/res/drawable-xhdpi/bg_download_bar_light_orange.9.png new file mode 100755 index 0000000000000000000000000000000000000000..24e486f43aa19c4c62456a4698d0493eabd4b981 GIT binary patch literal 1394 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n9DLlB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU&_u!9QqR!T z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1 zy>er{{GxPyLrY6beFGzXBO_g)3fZE`@j@x4_pIZg5^PG@yV%reBd*pl_&Wpr4xy@)uZjaY;}r!Wmdq7l%|9r0NHy z7U!21B?IFlO&O*c7&4a6BsFpIWGChrManjC7v#}N6N}Vj zbJG+HT_dx!BwY&=lQi8#LvsV&)RZJ+b7Qk4qf~QCm^s+=8@U;o8#$VonHd@z85+8p zT9}v_Ia)fpI=Pq|8(X@$!1Q|N6_+IDC8xsd&IH;G)oY4Zua$FAYGO%#QAmD%4lES} zWaO9R7iZ)bC^$QVV_iWbJTosPzr0uz6ipCcyQCInmZhe+73JqDfWz4;6N?+nEKJRl zlFbZtO-xKIbuA1`5_K(2j8b*e%nZ|#Ow)|a&65n2p!!qD4L^OLqx3O3sSsNAkM)210`ZSQEC-v#{hK(tqPl!FFQr_U+#S8m@Nb9bs{`IQ`u9w) zym>~UhmV!hNwf8v#76rq>K~sj+4XShoX1TEq;fS>MLsaETsOOJ$L>9!tJcRCEa>WY zpL#a*{9YlZ(-V}IguGpzmS3Iw|7~Bp(|K{N)a7~tr@m-SU^{a#<_zaECqwi1kHVa8 zyR#KuopG7NV6}RHsN&)UI$|%L-IC-85HjLRX7>I>;z8 zX#G3*;*N^8@@wO58sUr`8oV+2xtTd1Bgg|BNg8SMEKuEMUt$bZ|lHE4Ga%?l%Wqd1R66o%Whj_7M9* z*B_gzHwkKHC|=)`|Eg?FZsMZ@GTtqJ&b{RSzMX-YVa>j`+Y9WbZ3dNsp00i_>zopr E0OY0ibN~PV literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_grey.9.png b/OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_grey.9.png new file mode 100755 index 0000000000000000000000000000000000000000..a64df9cfc6379ef0f83ed7d1d13fc307fe848b64 GIT binary patch literal 1623 zcmbVMeNfY87>}r^++aHOrr?fHKe>@6Dg8=E71|WqX@S*>Jxr0@i3AcXAXhHS6JCgQ%^hRFDVNPj zJ9wI7K|dp5<=nhlBt-h+3XH>Od`Zl@MiV8Z4E7QZ7!@Nh!}#wtV(sEh)W2c8(%NOt zbx^R0a&c~_O{j-`?ig6e-Rm9s4TWe_NlscQ3Xz3#HaA1Dya88>gcC7IlPal_vMFSw z5|YU6R!Aw8+93i}AP_}bqZQF|tAtWuV?3|IOQdoX)!{NZ8Z8k7877zNv~pY~RU(Qw z1k;US4XleNSQ|Cwn-+YJVg-iRU{zWtMev-{%yC&`U67p4@tiB2bAVdyNY%kbD`}SG zJg!K8nO@u)r<`;SMaDZh1{}$=ihe~5a-~dRwaHOPDwSf85|I)RCY4Z-U5?tVGP^{f zup**SJo$g~2Ma;L{$}}4^Nei?9qAWej)I`P943ktCdes_%KVJKN&z6iW5DCg-u^q5 z9`;=9)W;1M4Legd1kKm4NK&Gv?&1V6ZWXSc>*X~^tB42zrC$Fx>_kEKjrEl3owkM1C2F!+j z8}L@ltggwdy`9qj^PMYP>e910Pue3QE^QB2uRBr{afr0u8h5g}u|K0@+mXQn@`ej`ko$rRdZrp z(VNkOE?M~JzqI&zQt|%E58lw|9wx^Y%&LgWqX!RNJ!J{>Ir?f!-VfU`bo5F4JXV~zVAhSmE^$4yvYxOwyGGT^zsO3sbH*;Fgv?h`S)vvtiBZP z_ixSy?MAvgsfnKDL>MGH6Y{Qc%LP4f*;9F7N7}&Skb!&c*-wY3-x(Hfo@(YNvope` zuILio2(iXtUBiqa@I+tiGfm}Oa;W;ijIgcUC|;$hFE;YXT;X0mPFgysUB7!LrIuciZWgeGSR_ub?b{Ffaiu+IK{Ud2 zh|JWFfr@U)jERnkb58LaGa*h4sB@u{xu~FXXw0k{!H+q2Me6p4@sC|{_dd`2{(jH% zywArq6z0#L5}Opu;c%vC@<<)Krbgb0Z?WG2&epB$!e!J3Mo(K9Kjj4+rI|JYNaLcc zKnEyuRe3ka;&5Ur?L`L0pj|+iXcv!)V0ZzShh=j(S&D#%GC2SP8G+UAmc#dspMoK~ zSq?7}YcZ`y1#I@bYA?`N=NFl(9VXliE3%=i0Kpn?0fvGCE~nc^1my6jU4oS(+b9f; zLKue}ei@WOTL`IWFMz~631Y(dB1nq!_+p6^mu5l&R!1=zD!>p7C&WSm6F_4R%zE>h zErgED9rML%a@fW&9s))Eem~DI& zc>t;dKDxqdV(Vd<9VN55d$Xemkd1~Y@Y>m;P)?FIRk(ng(U5YOJ>i+{W6La9(<6aXn6wevc@KqTSw)g&(A3k9qo#w8-PNcGmY8SN29Oq4ENXp}j>k?TmIop^au}pN;lFD%EJ!p^Qa#x0&|) z=0wW$^428q+AD!M*Gs#g(L59O*Tf)^iKRx9gpY_sA{>!nA_~Dp0)SW~e2Y-&qb>-zNQpyIkFoLbxR z(Lyp!i*<*bxA32Py83(fIfg8oRqxkKekhoGZ@W}+`dNHVE?JumC+u>_{tWKfpx?hK zo!fbH@W{NSwTZ?_-Pu=8=rXd875DRwh91?#q44Q#MVI3bE?+^|DxYkB8%+xOuPsLg zhNtLOrwE?>Qrh(UqvDaK-n~ty8e@IZ73PESHsA#C@W?`X8PecAn*6 zO9DH~)6! z1ADchr!$Y;3K??mcWqzN3X02Z2eVqgDQoU&RS|y`TpMzQN_QED6YEn_O03D(t`5xA z2D7cj;~ESVT>bO|>r|^Y_`@+B^vRneGh7?bOrrZ1*583ca<2YNX!XTJ?)Y7MJi|59 zcv)9g^&Uz)vAB|IC^_KXIeuEICMMom*Li>8mN>=C)5qstphg_;bW9v6sBKS}^?2=N zXg^e#m@z3cN&TBWjeBXn>iU*>`gyI%vsBKt&8EbLy0VfFlQxDvtx=!Tx6S#nr(>D8 fZFlwA8$nJC2QKYNBbsC@BY%61I-lH^v#jnP3wdMB literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable/number_of_downloads_progress_bar_drawable.xml b/OsmAnd/res/drawable/number_of_downloads_progress_bar_drawable.xml new file mode 100644 index 0000000000..442c1576f3 --- /dev/null +++ b/OsmAnd/res/drawable/number_of_downloads_progress_bar_drawable.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/local_index_fragment.xml b/OsmAnd/res/layout/local_index_fragment.xml index 7e25684ff0..ac0568dc8c 100644 --- a/OsmAnd/res/layout/local_index_fragment.xml +++ b/OsmAnd/res/layout/local_index_fragment.xml @@ -8,34 +8,130 @@ + android:orientation="vertical" + android:padding="8dp"> + android:layout_height="wrap_content" + android:padding="4dp"> + android:text="@string/free_version_title"/> + tools:text="@string/downloads_left_template"/> - + android:layout_height="8dp" + android:layout_margin="4dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + android:padding="10dp"> + tools:text="@string/free"/> + \ No newline at end of file diff --git a/OsmAnd/res/layout/maps_in_category_fragment.xml b/OsmAnd/res/layout/maps_in_category_fragment.xml new file mode 100644 index 0000000000..992e3fb8ad --- /dev/null +++ b/OsmAnd/res/layout/maps_in_category_fragment.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/simple_list_menu_item.xml b/OsmAnd/res/layout/simple_list_menu_item.xml index eb7c9ac9b0..19a89bbda0 100644 --- a/OsmAnd/res/layout/simple_list_menu_item.xml +++ b/OsmAnd/res/layout/simple_list_menu_item.xml @@ -1,22 +1,26 @@ + xmlns:osmand="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/list_item_height" + android:focusable="false" + android:focusableInTouchMode="false"> + tools:text="@string/layer_poi"/> \ No newline at end of file diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 27d73ee204..a791893914 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2268,4 +2268,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Count of lines Are you sure? Any unsaved changes will be lost. Continue? + %1$s downloads left