From 31abef4ac05e15fe9e21f5a4003e43a55d837d9b Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Tue, 19 May 2015 18:30:31 +0300 Subject: [PATCH] New design of bookmark list activity. --- android/res/drawable-hdpi/ic_show.png | Bin 773 -> 761 bytes .../res/drawable-hdpi/icon_bookmark_blue.png | Bin 963 -> 957 bytes .../res/drawable-hdpi/icon_bookmark_brown.png | Bin 963 -> 957 bytes .../res/drawable-hdpi/icon_bookmark_green.png | Bin 963 -> 957 bytes .../res/drawable-hdpi/icon_bookmark_lblue.png | Bin 956 -> 950 bytes .../drawable-hdpi/icon_bookmark_orange.png | Bin 963 -> 957 bytes .../drawable-hdpi/icon_bookmark_purple.png | Bin 960 -> 952 bytes .../res/drawable-hdpi/icon_bookmark_red.png | Bin 970 -> 960 bytes .../drawable-hdpi/icon_bookmark_yellow.png | Bin 956 -> 950 bytes android/res/drawable-mdpi/ic_show.png | Bin 551 -> 542 bytes .../res/drawable-mdpi/icon_bookmark_blue.png | Bin 678 -> 665 bytes .../res/drawable-mdpi/icon_bookmark_brown.png | Bin 675 -> 665 bytes .../res/drawable-mdpi/icon_bookmark_green.png | Bin 672 -> 662 bytes .../res/drawable-mdpi/icon_bookmark_lblue.png | Bin 673 -> 662 bytes .../drawable-mdpi/icon_bookmark_orange.png | Bin 682 -> 666 bytes .../drawable-mdpi/icon_bookmark_purple.png | Bin 675 -> 665 bytes .../res/drawable-mdpi/icon_bookmark_red.png | Bin 663 -> 649 bytes .../drawable-mdpi/icon_bookmark_yellow.png | Bin 678 -> 662 bytes android/res/drawable-xhdpi/ic_hide.png | Bin 1279 -> 1217 bytes android/res/drawable-xhdpi/ic_show.png | Bin 1056 -> 1044 bytes .../res/drawable-xhdpi/icon_bookmark_blue.png | Bin 1382 -> 1338 bytes .../drawable-xhdpi/icon_bookmark_brown.png | Bin 1382 -> 1366 bytes .../drawable-xhdpi/icon_bookmark_green.png | Bin 1377 -> 1357 bytes .../drawable-xhdpi/icon_bookmark_lblue.png | Bin 1358 -> 1346 bytes .../drawable-xhdpi/icon_bookmark_orange.png | Bin 1381 -> 1367 bytes .../drawable-xhdpi/icon_bookmark_purple.png | Bin 1369 -> 1354 bytes .../res/drawable-xhdpi/icon_bookmark_red.png | Bin 1390 -> 1369 bytes .../drawable-xhdpi/icon_bookmark_yellow.png | Bin 1365 -> 1344 bytes android/res/drawable-xxhdpi/ic_hide.png | Bin 1894 -> 1793 bytes android/res/drawable-xxhdpi/ic_show.png | Bin 1526 -> 1486 bytes .../drawable-xxhdpi/icon_bookmark_blue.png | Bin 1893 -> 1866 bytes .../drawable-xxhdpi/icon_bookmark_brown.png | Bin 1899 -> 1868 bytes .../drawable-xxhdpi/icon_bookmark_green.png | Bin 1895 -> 1870 bytes .../drawable-xxhdpi/icon_bookmark_lblue.png | Bin 1882 -> 1855 bytes .../drawable-xxhdpi/icon_bookmark_orange.png | Bin 1894 -> 1867 bytes .../drawable-xxhdpi/icon_bookmark_purple.png | Bin 1874 -> 1847 bytes .../res/drawable-xxhdpi/icon_bookmark_red.png | Bin 1900 -> 1876 bytes .../drawable-xxhdpi/icon_bookmark_yellow.png | Bin 1884 -> 1853 bytes android/res/layout/edit_bookmark_set.xml | 18 -- .../layout/fragment_bookmark_categories.xml | 15 +- .../res/layout/fragment_bookmarks_list.xml | 32 +-- android/res/layout/item_bookmark.xml | 34 +++ android/res/layout/item_bookmark_category.xml | 1 + android/res/layout/item_category_title.xml | 10 + .../{list_item_track.xml => item_track.xml} | 8 +- android/res/layout/list_item_bookmark.xml | 41 ---- android/res/layout/list_separator_base.xml | 17 -- .../maps/base/BaseMwmFragmentActivity.java | 4 - .../bookmarks/BookmarkCategoriesFragment.java | 16 +- .../maps/bookmarks/BookmarkListAdapter.java | 71 +++--- .../maps/bookmarks/BookmarksListFragment.java | 207 ++++++++---------- 51 files changed, 190 insertions(+), 284 deletions(-) delete mode 100644 android/res/layout/edit_bookmark_set.xml create mode 100644 android/res/layout/item_bookmark.xml create mode 100644 android/res/layout/item_category_title.xml rename android/res/layout/{list_item_track.xml => item_track.xml} (87%) delete mode 100644 android/res/layout/list_item_bookmark.xml delete mode 100644 android/res/layout/list_separator_base.xml diff --git a/android/res/drawable-hdpi/ic_show.png b/android/res/drawable-hdpi/ic_show.png index 8d3a8c9f72ddb5583f0189802daaaf0d4fe1e88f..f33c6979ba7873034f8c5e4666a9cddbbd462a51 100644 GIT binary patch delta 464 zcmV;>0WbcA2KfcBGy#9GNklq<#;f z21CXe4iI8AW~}iDK_*2eQk=kNI%7h!sqeZoCN`VER%8lASVn(L#d>RlF;f{2@KBd#Y|eJZ#c}vsR5`n(9OmA-R=AP?cMst4FlBy zG#KFR{6+qHIe%k-29T@L=k)AVEU#y$^r_~Mr_a-~7{?Eb#lx`}&rkHpqd>1m_l}nv zG&Yv*y+6{c;IDth%`N$5dxtLWY|AfOoBqly(YCuM#yc>b8+RUJ<8L_J2u89?zK%>~ delta 476 zcmV<20VDqT1%(E%Gy#9SNklrsH1BTT z-*4}ln*(1PzqrVwZ|j%f*vtBjhl_+LI!l+U*C5vGYRO_|UTf}jm=yCiR;Vta;RP1-K zjqqn2>nMy`HtG*UJu1{of_gns8-u$g{|atN%wd2!hEP-oAol1bB{^Kee{M)s23wd< zEb8Nq87nXY4Q7-=4RM(95j(izM`rx6j=v_*EZGYR%|CTD@`*?{qL(t%b?_g&W=nw3 SDdQ{v00004BT)#VkuZ%Ci^EhrK~|C}SV|?y zR62tZGHEiA&0(ZmmLz#M#^TPCL7|8-6$^&@%IC^w>+kKx1l)hRZ-t3yzFIm5QL6<} zF0G1<3}h=SkY$F^l7eh!Z*K>(6e$ugvB10l6A2oKL$+OKu5UvYr@j(Q>~q&XOq8f6 z0@>x?-pPM1A&d0uMijE&-1i%@Xs@;eA!|)>-&6~-AQ6Qin_l>R}wKD6JYg?Ne>uamkWemC0xwzZlks7<| z%=BPrnn#+(kcYfbIp7fvpyDMT)DGFwA=G^2hsIHvO_h(J;n$yx~V7t&!ROux?{bkR`@lP-G>u k)u=?{_%;4gW@8=f0ABA-%RNu(UjP6A07*qoM6N<$f@sqszyJUM delta 604 zcmV-i0;B!C2g3)ja{+%lNkly^~R}Rkj`M$F=JJP!n$wJ|Xrbi9aG@`l|35UqHzF6FZgBg$Ykspa<3W8KJLA~^+ z;VGS=?__iMRxV4P@&)uz$diYGB6=zgkYrGUFWMj}hKAwO@Q{CUuY6WM?Y>*X4`{Bp z!jCv!EnkGF)q<#)x79`gvbj0P3f*eSLAJKBu?AU=EE#y1VxEGB|8<^*Y_-l@Uxh49 z9VK|!7eE8sUzS7GyCZibFQWmNCfU zL?IKR@d>s}j6;89hA0fdWMz7WzsyWmCLst@1YNV$`Gv)$<&|2QUCOnU<)y`i`RXjX zBKBTfZ*WhIb$e&(=o;moM$x5H6gFGj!xn6!WWa8lzqJiJgG@N=l-W~x2M(tDFm@ZB zZ?y~eVFNCE`z+eugNs2?xE&m_;P3!$QPQC}s zzOqW@QjA_o!0G0*8gHxUsNR0o>kXU|;&*e`Zi4#?zEtkp&2lGxH`EV@2QEK8!Qtt# z%nxwL$X`_K^UEs~uP@KA%PF6`e}$|vR`^!T2N`IBj8cJyxFF+Wkij*;$Q)=`556YI qGJY2nS;=cPDv=+*{4QmI*1>;X?@r5BqNpwa00004BT)#VkuZ%Ci^EhrK~|C}SV|?y zR62tZGHEiA&0(ZmmLz#M#^TPCL7|8-6$^&@%IC^w>+kKx1l)hRZ-t3yzFIm5QL6<} zF0G1<3}h=SkY$F^l7eh!Z*K>(6e$ugvB10l6A2oKL$+OKu5UvYr@j(QTyobXOq8f6 z0@?4sy_5g{hAh&r8&SxnxNi!wXs@;eA!|)@-*gMIAQ6Qin_l>R}wKD6JYg?Ne>uamkWemC0xwzZlks7<| z%=BPrpGVrqkcYfbIp7fvpyDMT)DGFwA=G^2hsIHvO_h(J;n$yx~V7t&!ROux?{bkR`@lP-G>u k)u=?{_%;4gW@8=f06j!b%YMJ&Z2$lO07*qoM6N<$f+S`kqW}N^ delta 604 zcmV-i0;B!C2g3)ja{+%lNkly^~R}Rkj`M$F=JJP!n$wJ|Xrbi9aG@`l|35UqHzF6FZgBg$Ykspa<3W8KJLA~^+ z;VGS=?__iMRxV4P@&)uz$diYGB6=zgkYrGUFWMj}hKAwO@Q{CUuY6WM?Y>*X4`{Bp z!jCv!EnkGF)q<#)x79`gvbj0P3f*eSLAJKBu?AU=EE#y1VxEGB|8<^*Y_-l@Uxh49 z9VK`;<`2j4P@=XZWN*Lu!{0Z^lAYX0K{mo2Bao%q*%E`SHOd{MEy!X-6o+h#En|?y zi9#ks;}dL|7>9qz3{e<@$;$K$f0>!COhOQ*2)bsg^9zeh%PX}qyOe7y%S($3^VL~& zMeMz}-r$}Z>-Nsn(Y47vZK6x3C~UU4hb`Dd$$;H9e`_0d2AOc!DYK{Y4jfGPVeB?M z-)a}`!v0)+K^2x-@{|RqLQ6_vaK?f&H4MZUdS}5OHHO3hJZH;Avw6Xmb2R|P=)JVc;_4c> zzOqW@QjA_o!0G0*8gHxUsNR0o>kXU|;&*e`Zi4#?zEtkp&2lGxH`EV@2QEK8!Qtt# z%nxwL$X`_K^UEs~uP@KA%PF6`e}$|vR`^!T2N`IBj8cJyxFF+Wkij*;$Q)=`556YI qGJY2nS;=cPDv=+*{4QmI*1>;0L{7^_<9QnZ00004BT)#VkuZ%Ci^EhrK~|C}SV|?y zR62tZGHEiA&0(ZmmLz#M#^TPCL7|8-6$^&@%IC^w>+kKx1l)hRZ-t3yzFIm5QL6<} zF0G1<3}maTkY$F^l7eh~XJ;L<6e$ugvB~hyGOq8f6 z0@?oG-pT*>A&d0uMijE&-1i%@Xs@;eA!|)>-&6~-AQ6Qin`Ol;WFaDlAELQ=R?N>q z~V7t&!ROux?{bkR`@lP-G>u k)u=?{_%;4gW@8=f00sO`&jB5u`v3p{07*qoM6N<$g8B<1jsO4v delta 604 zcmV-i0;B!C2g3)ja{+%lNkly^~R}Rkj`M$F=JJP!n$wJ|Xrbi9aG@`l|35UqHzF6FZgBg$Ykspa<3W8KJLA~^+ z;VGS=?__iMRxV4P@&)uz$diYGB6=zgkYrGUFWMj}hKAwO@Q{CUuY6WM?Y>*X4`{Bp z!jCv!EnkGF)q<#)x79`gviW()3f*eSLAJQIwg_2{EE#y1W}b$J|8<^*Y@yCvUw|x4 z9VK{J=MU@fP@=XZWShVF!{1HFlAYX0LH5QSZ;++h*%E`SHNqVuEy!X-6o+h_E#r{I zi9#ks6O(M2oPdAG3{e<@smjbOf0>=BOhFK)2)gE~qhm|UE336KyOe9IE6Yn`qt!Wd zMeMz}(cqpM8}`oB(Y3`rZJ|r2C~UU5hi%wI$$;Gse`^PJ2AOc!EwiWcE*wnvVeB0)+K^2x-@{|RqLQ6_vaK?f&H4MZUdS}5OHHO3hJZH;Avw6Xmb2R|P=)JVc;_4c> zzOqW@QjA_o!0G0*8gHxUsNR0o>kXU|;&*e`Zi4#?zEtkp&2lGxH`EV@2QEK8!Qtt# z%nxwL$X`_K^UEs~uP@KA%PF6`e}$|vR`^!T2N`IBj8cJyxFF+Wkij*;$Q)=`556YI qGJY2nS;=cPDv=+*{4QmI*1>-T{7%n!5OxXx0000JI2et>WZ2^BYNklvnA0wvO)qI)+8CGR-`B zf5+KWoXhR;`uu@lFyQxjJ#Lq>EfkIfp%aXRL&}b5EDjgr)Nmxpz)OXSud@GYy zma;jFkjp9y`2t2N8%_tmlmP~9%5 zLRJ$SIdJRi;Bv!g$$*=w)n>qDR8I;PHbgdHp&#c-a0@Mw)&jVs`c#31EqS*E3l;St z2JZCF$I1Ur!Nor7MjYIjd>R86|EMitaNTkFG~NXlR!T*{O-RoKxQJ4&AgIYH>6w}Y z6?7>#i0S(5oD6@=&DN(uxRnP(^Nq!&<(1X7W>pNT&9&8)<)y{OJcc~lT-iC%yOHd+)pZ{_nAY zc!QadgLC}-pW|~p(jAFpfndl8N1~<~jf9O*FhHIS#o{LVnDN*Ud67t_AV?(>G{|ro zuF@I$PBw>c<+9`|U%&u`Jh>>AFi@#Tk`V)*7$c+^9fL<>quPIW<+Ji>_1gx1z)=1b zex%rUMdNv`Z2>(Y zXD@Cwd7$Q&vopi!+2Mh9&=aNz9CmqtT{uK23a35()*hUqq}YeO;~>n>=tWUVtj|7J7>)~bRn@Z z>a3|l7nEA^f&~{sOG;sI$%0F$;$jT_Wx;Q#VqySZv8~c-RoHf=2cQ_e*LGRl+yb{Z zcFA0e(Mt(6uRp8tu7**PNo}Vm! zM4ycO#J*F!zCrW$`U0n%_PBdj$f{$7ccr|afyU1$8Ok^cr_9XE%zXcAY?JkC4CBUq z{(i?8OBxB63`GO+a3mOvgyVr|C@G%x_9TL^2qt=Z#fyP-21F)3Angq0;40TAzv+nK zSFsLp)zytQy1T?hK83bYd0{#O@FdVF4*gkpl}3kbb}io2iM*DT4LZvMn^}$#l+AD7n7=!aM36K<-ko9Rf|*La?&&i7aRI* z11<)oAq{TpL%)4)flD|0Mh4u3Hcf!bG%N9n!2d%!+vlC zHV1D?y&b?NB4OAa%_%W=1iP@r;c!w^hvEqw;Lhg0`VACEj7zLmS|=8g43;8#P?B21r`(t?^l0-UIiS#wT-2 zTdxej>OmXc9_whTKfYz~N5i?ipq=KHNR&?%=V)i&U4NK;tJ$`3iA<;-jD7>Nhg`59>bG1ftLTg2D{C ktww|5#jw|<%-1^j51>{~04~B9761SM07*qoM6N<$f=DADX#fBK delta 604 zcmV-i0;B!C2g3)ja{+%lNkl8Tki9ZJz4zXG?`3!2|1~xc zZ?I=%aE`zKb9|0Rx+9S+9tiuQ!I0k{3Pye5K%86~D#ZM-@y7~7*~A27`EIpDAR8SU8-*-FrXn0nF;Bt4|2j`YHeF$^OhcBY zjxro<@~2HWC{tS!vhCme>CZM~$xd#hAe-clNyt*|Y$-rio#l?%Dr5yBib1x_re(-t zL~%bvGe>MXnt^}FAEy8WbG4H*{&sd!n}Z-gVRS9DmNr&a*VY>bD~!ha+Um;2QfmQS zVQVjLHMy_mmbEjZ=-T1FcF+~2AS`ydk6l;R#;Oxg(iP026mk_buqrf(4Dj99J;XB z7!B4mpbJPXdBK7Up(Uj-xMaa4R53Az{<7c$s)87RH*C7C*KgT$qX(cEy?16=Ts;5} zS7yoFiP1|X*gbw#<5LSAt*5VgeS}>}d~TlGO)y@=x7v8SS)Rq`hDKns$j0>>Y~HR7 zUW83ieqvN#?q8vKy?=pKM0?!b%V*WG!o5V!%Ru90l=3vhc^MzQ46YtVW>3Sq_ccLQ qbi1I)%1*0MncVp0b}93;4*mn6R!#t3Pw3_V0000Va5xkU_ z3CMQ-ao^t^$P&Z4k%a7=ht45O4r)sjvhHsl`rU;rN<=ZprdTxvS&YaNhG=?*RWs8N zg+1hjV75NFz~6rsChM~hc*%#6#m2e~87Q(*(8xv{>sx-!vN#E4Iui`#9s)!x=- zW&k6*Y-<-I0SZE6k8SKhBS;}=?ekds&bHd|;P!gz8B21my% zIzECyh=MRWIc34=3527I*i+{hb;zw_@p~ zxUpV;MdL#QLyd>8cs17VxY%wU2TAZ$$G7^^AXy&8c0(!XJhSrh3Z2&%g`c65kz4HB z`v*)u-rr21l@pq~Q-!QBRyb73yB}!Wj8ZO!I2Yrii^0{!$n0WRcfTgcGENs1S z6@H}9b4NvpS}ll*IY({eA)A?jEZ?n`EMyC7YYUKN$(DwTY36CT_+RHK$mZ+J^?Arr z)KP+qb^fpp7bR*-K(_gZKm6W=EYZo0BxEPtaROPgoh?zwT5sI()`BcbL@~(5*)|SY zj3^L+XkwCWlM{asMFJFrV5%}U%U@>4DpL>y$w1d!b#!rQd1bX$W<|NSy0W~qI9i=U zm*MQijRyDC*l>2HiLNc~YYSZ_h2gNxeQd)aOctDW_**-0vPik9-7>o>?<#kt9>!jS zT{QNf9=4#^KVZ?pJ`@&(p*lQb!Oy9p0VIeXh|sy&RK8{RZNVbzbtr%Dk=ux1=}v0%}cgj=m983@0DE^*Ehh; zwOuk-V)Rm6&Fjxr&=x9sCF9b54tpr;+dg0000nK_wKxS5%mnQ7quw`d63`4!vq z{H+Zul}aRYI9+a!*XQ^9ydJm9=^)Dj!H^$1{!lPLR)ix_2%?cNnTf?QR6IdOk|`KU zC26R11|~9T8X}v6sa%#Mc{eO^=Sfj0!lGh9`LF!0s5tmYU$Uf;&O!A1 zH$=HK^&~S8RrdBO5M`3om4a-Cc?Yr-btE7gn`NFIgDgR9amcFttqNJ3T1t=|jPSRS z1ISABBLdkdw~Rs-Y2`)~qVhPmjF%yb{$xuKvI*{(fGkKvA;>1VV-m6uk;4y3d5U|c z%8>XS7t z?PPk;x3$eCwztsdAulxQyKHE;4h=8)pw-xC1N#kV`N$8Qa+8N@mZ9S(KL#A~5QiAx zCm#kKvFHeceB_1Vm<7jBc*z6R2`f&Z@`!9z)Z-nJJvY5+>n zTe;&e_YW{V+?&h0iWI$+fZd}RxK9S!j3+aMA7PgepPOgqm)8a?8m}+R&*F1K{jh1i zRqJr5SKnBgu*t|z?7w#i-v7cXr#$Z76|zcO;aMr~r=juFO8IKy{IrjL8do1Jv#(~| u|Ck`lcpXq=Ww+6&OkVu)I+Xbu2mb^4rB3e8J(oHF0000Lup@ diff --git a/android/res/drawable-hdpi/icon_bookmark_yellow.png b/android/res/drawable-hdpi/icon_bookmark_yellow.png index bf0a2119c6c49e8cadebd26f7fcf62aeb25e569e..0f5206ea539fed8e4cb2a52ad5e1cf29f2a8ce3a 100644 GIT binary patch delta 597 zcmV-b0;>JI2et>WZ2^BYNklTs!Evs||h*XrhL2O)ow1<9a{|57HMVg;hX z0HR8fM)D=dwzeQEjlY%xWb@7DJY)s>mV=FL=55%>(U&Y_%U$N~GGtlOG+<+wKkdRs zgH$QV_WtsxKYNg+w7!vs?1D8Hkfqh$5{GQ?lQlmFkj0580ogQvn}#ewYhizpM-~@aa}f9`fU%|a%Iezs#%4!h6Q#4cvA(vt(q6(?KwpbHJ$BUF z(N|^&V^i#C3S%J(Lua2I>_aC^5$GN8L;( zQb}I1;7Te=dQyw!Q5-jvfx$B?FRw6oeNp%s203}e zzP*3I;^R&I4SEH6xVuuy%dx_ZO3_Q8@f4-JhdA%?(R*-pADO*}b&qR;Am@HTku>a9 jqXxP0!~Ig`VIBMjI4w>o+eHYx00000NkvXXu0mjfeAFBC delta 603 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 diff --git a/android/res/drawable-mdpi/icon_bookmark_green.png b/android/res/drawable-mdpi/icon_bookmark_green.png index 92918f14971724040fa9e52717318dc641e4ae8a..fafe8c610532cf1976b29000ac97a365aba6a6af 100644 GIT binary patch delta 395 zcmV;60d)SL1(pS{76E^2Nkl37TfTIa)Dk?WlvfI#HX1ZVwCfy5e~~EYYi; z8DXiYjH3hP^b|@brm?UdZ&B1^59hu(&9Zdf%RLub!kj>JJtBYVLt9^CUR#Ie6Hx#y z=U+LrfXINhvB|$SH=r40LfT3b9!t_KNG4er+a8Yco!vba_I7vj(Qq4M7TFlvKj66z z_AzFYgNefBIPrdz5_L zxR1vLe!t2}n2c|yW-(KY?sNwqjg7Ebzhf9y^e4V)I0%*QcnlGv5 pYp?ktZN8cXufJs3H~xM608tlggC(p~TL1t607*qoM6LruV1g-d!8ZT^ delta 405 zcmV;G0c!r11)v4676E^CNkl-@X5(7Geh5!Z3Ni zda*5yq#zMR)pWx&4P8?e^byN;2!~@^QZ4101Yo+UcQ2hG5;AF^{kT~oCF}n1UM^2Q zlFxDH0S}n$OqYDcedPh(Hy(p`J~K+ee4_~Fo|0bd2Z1lU+=72~_AvHf<*mC|0A9I- zaj6VU`z|^_4Dp>1hz>#u@G8}ZSgin4L8_qDd=JNXeoYWnq*0^ZXojtJ2Xl1Vt+3gs zQ&B@Y6}vqwrPrmRjtoNS4`kk;Pbda@RdG0a_eR54B~g(jGJ)QNB~+wWQ>HV~n@w5F zKssT}7reKa6NZ0|G{Uju#U&rn#DYh>7>NZ}cyYyxD_&HDrdV%cBM4$~vlf~H*-YHV z@tyDQ;xD#Lw8h5VV|+NC9)Z*GfbpJdTyYf6m+Or@xm_=3HVR<4e*Xx^-!B_3IIeQC z>7)xF@k&X$q>`?^37TfTIa)Dk?WlvfI#HX1ZVwCfy5e~~EYYi; z8DXiYjH3hP^b|@brm?UdZvLe!t2}n2c|yW-(KY?sNwqjg7Ebzhf9y^e4V)I0%*QcnlGv5 pYp?ktZN8cXufJs3H~xM60As6chaM$HdjJ3c07*qoM6LruV1iu>!L0xQ delta 406 zcmV;H0crl01)&A776E^DNklp*2AHOs)BDEZ z1{j!`ARa-KWJOgKSrP^G5luG;gQ07&nrW#7pjzg;mr9cu(kY;2tSpHoYh_q3mnR>| z=a}_?2TZ!AMgGN#;sECxkHI;ABQjyUt_x!~V>k9}+l$*=gZF>zVC(= z6eT2wVz-B5>2*U-5U*~n?yw#$OL*58c-1_Bw{+_z1ft` zDM%)i`GWNpb3%WSkwh4lthgi$5`WafpjWv zgZZ83?Se11RMh#z-D7+>o?e5~@qqE3NnE}Z&X?=$Z*aR_&a@Ojaorz;;c=(M1IW2hGynhq07*qoM6N<$f;1|- AfdBvi diff --git a/android/res/drawable-mdpi/icon_bookmark_orange.png b/android/res/drawable-mdpi/icon_bookmark_orange.png index 546b13de9b5bf301fbf42be8d7aff556fd1052bd..cf948361e4fe24da1b56da6c7ccd2c292ddb812e 100644 GIT binary patch delta 396 zcmV;70dxMU1)2r083BK6Nkl3KJVj`d!S`?ThDiu|T(a zrh$cwGL8~XyhTxuJ(&68ERM5TFLzC7DRT>uz< z2m2Ta$-&s+5zlaRh%txCEFPcmKPSg!CTUm&a>g}hRX{^>P&&V0<>DMAheA{?uUNRc zL?t8}!Zi!m5Nv;)@PdUxC)|Q?!@>;&OEtyqDgTLM{&RY(nu2;L-H*;cWZA>$j(e1P zx^W+wpPpav>*e{0`B65m8im)l_YX{byuZE5QBcG6`32$YQx2CN*V#Hz(*@9cr8Hks q&DUP@McRBd3+`aSvTywR_yL!XY(=5hl8FES002ovPDBK*LSTaC+`^Rr delta 412 zcmV;N0b~A}1*!$G83BKMNklY-cmm)#?NygZk_eIsAWLxuiNxSiv@Vk- zZ%JpU^MDR0!!tP&3m4=8zOPsW-}#-92J( z+Kqb6kBdn6g`F;rq}%c1I+BP_uOFrB_lS>#f+`M%ue#wNs3gjTiHxCc943@Q5($`0 zS>1FJ#w4VZklBBn*3D;BNJk=}SkS@+9TC}r7ib~VY$|(&OIo;Ou8?Vp)yPv=mM0vo zn5IBxXl}gt)^)eu6C0|{*v8#qygwYD#__PnctFXvM@3ShWycS3Q$ zf#Cw<`ihbGZ~^?jQa)c&@oVpYi!^>UL*#7Cvj6k%;|mm*k8DLi4NyP;00003HiyAiy>7TfT8Co%E?Wlv9I#HX1ZVz+yy5e~~EYPc- z8DXKQjH3hP^b|@brjf87ZLfY6&c_iK3fMk+|k*)1vv9r6!!rtyqG2Gt5h($I=_78Zb zgMEzH!kJ@h16JVNdPVXx> zz)WTa#3P83tf;CYOQL{2qUi=RLgw#QfU%HIt8?hl_jxctqkks^5i4= z9J3$rfJyhX$iG-o9N>QAF}UX|A``~zx-fP#_F&Jpy|}|Qm}h?nV+Uqldx{0%m5LY_ zOTg5hq5(u7Kk2MVNFgEpL7X?}lMn?(Ssaeuz0okrB>JI&OrSTR0sSC_L`-MAH=EKm z1<8amU$EX{PAGpek_f|+6_~4-T$h7FiI!n@76jY8TGC)gs1Nozz+Y}Je!B(&PtsofIewXsLL z8Z*LPQMr#Ml=T`)Gp1CSK>2xl`+<^#TPGedkG4(jxlk58=H7n-it7eSzd7~Y|9X9XdPKn_3#nmm##_vKL!>OSkvW?4 z7V{%yY;uqrEP2CnfSf}v3agFDXDbw3>Y{Xf!pg}pN?meLIXz?H>=YG;YzXHpoI|k5 zf^fmY1q6#s2$y>-TtYDQ6<)D$1;J2{;yOFzo15(LuhpXul*=PU&002ovPDHLkV1j_wx%~hD delta 402 zcmV;D0d4+?1(yY|5CMO3NklS}lxRAh=O@?Ul-)pLwa5HR7-ab wfZ~yI-;gREd-o60;?Yd;8pXrD`1kP(biHWjCTXY7000UA07*qoM6N<$f{zr%&;S4c diff --git a/android/res/drawable-mdpi/icon_bookmark_yellow.png b/android/res/drawable-mdpi/icon_bookmark_yellow.png index d7a1ff19fa644bef88253eb85deeb7d698bf75f5..c39552add5e2e24216b89183411c73e514cb65c5 100644 GIT binary patch delta 395 zcmV;60d)SR1(pS{76E^2Nkl37TfTIa)Dk?WlvfI#HX1ZVwCfy5e~~EYYi; z8DXiYjH3hP^b|@brm?UdZvLe!t2}n2c|yW-(KY?sNwqjg7Ebzhf9y^e4V)I0%*QcnlGv5 pYp?ktZN8cXufJs3H~xM60As6chaM$HdjJ3c07*qoM6LruV1i`A!Lk4V delta 411 zcmV;M0c8G`1*QeC76E^INklAI#WvV`7Zm=h zBX7xNnePD|P||NYEY*n^e7pHUt- ziv^4eMc_1VLJRmpd?N%-3n2-(O69w-Tmo(h$(&sYJRIQ#6)qqnB{r(Hde~^TFhi@^ z2wmq|=V$D$+h$i$MFC8Sj|yQISFz=B#keMijo_J}dOOg7ZhXV1*0r2)RqKTty1kjUKBd zcPWrb&2<#t1i>bHV@)F_e{r`M@AikgaoF!L-ZB@LZ-wLOeEBmj=hKn40%)%54`KMZ z(&mEgDkhWqZ~!Eal+T7#^4R-)kS332h>=eo_Q}7GUt<%iY=?ehXNUj*002ovPDHLk FV1n)v!Hxg` diff --git a/android/res/drawable-xhdpi/ic_hide.png b/android/res/drawable-xhdpi/ic_hide.png index 2a4fbe396845421a1aa32de8a80f964aae9d8645..b5c0eed49e673dd99ef8fd34588243c6cafb44ad 100644 GIT binary patch delta 1197 zcmV;e1XBC|3Bd`FB!7rWL_t(|0nC_%ZX-z$hUfTBydXRh?_)$1@!?Ax055>9lWq%nD%_4W0&=`2wAfhF)Gz5O}=Cq8)!rzuHYUC3dj9;bzO3iI3{C8x> zLTD1c2=Dijgyw*gA^jr%NoXGUk3cie`%NWq|K4Cg-xExTV+MIpJ^234q-Hh>C84gF ztB(!iw2nr>K^J}u8s!(VVfz(DY;eQC7TH-QD$RLRs49H^&?dZo0 z;%+VzKT=zGr53sr^z>{phs`6FtEGeQ*(Zjbh?FxQkQl=r$ckdC$G;HF zIfhtIXvf~0j)Kr>>1h7h<5vVz(h>36fdff8D@Y*&(u{|k#f*)>R~~f}Oqqg;pc6;8 z(onA?mWz;pnE{#8?a_jHaHs$iSkSk+Z~{p~*MA&?O3Xk7usDeeo@tw!#{g7-Z4hSl z?QWccN~93O5b|2C3NUEVx_Wd*Fku@i1RsRFxV{JHpb`lvZP5%=2sq+7?tR?Y`5$i);MAziFY3)$ zMGX3Jr{$5X-)cunBqkl!Z?eFwC2^@Fr{)XHI{S0n5dI5NgXh7TlNU|5tCv z1^~eT00e8h0%plJnM+!F0Km=h_dtgDSI7ZU7!VVI918?(fCK=j0$?cs>;Y&LfXe`$ z2LMNahyuuVnJKroG3B<;80hU&c_x20*xogY6uLOsHDU^>xV~!){jE68lz_(*00000 LNkvXXu0mjf!`wIK delta 1259 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 delta 1311 zcmV+)1>pL+3g!xsB!8_?OjJbx000ehvj=Oj2WqheYOe)quLf$c25GPbYOe)puN-m4 z2WqedX|V=sumx$b|Ns98X|e`tuLWwbByF|_X|V=ruLo+d25PVfYqbVxunBLo25PYd zYOpJS)dg#?4so~zYOo1ywgzdi2XC+|^H z?e+Zq{_pkq5pc6Oh`;jp`Uh&S25PTao5{l3>&D#d_4)gCtkV>7wCC{m4sNo|;qUPF z`t0-hf3nuy>-0a2!Pn>Vg|^s>x!D(VwDm&g13{hY+#%dZ2y3v3xY;3kxWU=$x;fS9B6_$AY_JJyux+Q%z}f0< zsL;pV?ezHjyVmI~fx9k&yk4HmU!Tj5yW22=ypX)xFM_wA5&OO7*mbJyhN0xVyW%yM6Bdo4>BC(h`!H1hNj#WiGOE@g}op zhdhMBk(%155v!|<8PVFBNH|25GvkS5JxbIk6LFI&(2#0uf}p7})j;KGZfS+8wWXQ- zGt+JG)Rs2Mr?>%Mj5zs!(cS^yI(Cq!&J4rMeMFx8pn`piZ)B&p>zK0(2SsTi5~J zwaLkA&~;FeI6Pctz6=j>+F}~eof%^uI|H3zQo$fRoaYVa;UP_bo0{98do#=%hTlNf zR+tJc@UXy^1$by7OG7JkrIp~^9ABTEs7jN11$;aVNKzEai+=MPcL`kTo_i&Lt(@-UeLiG?$-FPtbj&0t} zJh(9hQGJNQaC$g@arV*UCvzjC>}qsm?#bgvXD1%QDNIAKxp-;z%2oF1>Xq3`7hw~j zENrgNb6MuE!zN2P*zG>bWjMMUb~%co#KbZ7?brlLM9Dy@<0sgs6UR}?pcouZ-eX_x zorFV->fn?=%|4vY!>P{ohWPT7Jw5#nt~ZRq&9mq1;rTOvxQUSgS4ZBn>irS8GAIgn zi}zV^e-ZAYl!IV=mPNDU5Y$o@lI0Z^tSm!PLlKDPSnvx(5eh>x{VNORry&U|AK2en z^oRU`RYt&{Ecy$Aq&B4fX3@V8B(yR56N|oqAg&GiRTiy^gIGAeQA7(% zA9>r@`uO;N`WSDUfvc1j=RR}6#&srzJpU*T`O)g-?{q&E?(Td!+cv< zE9AxJ<>;$C1o>B^FX0f^SF?X!L-G1Qbv3h=$AB_gJHGCE8+-x($`wKI5~B(=OQ0gC z3RP90GOY@AUywqwN|kBwQdegV`l+1<%_V&|3>ZdIjAj64fWERR^! z4VX18-RgR9=sWsv7{O^A=#Oazw|SyV%L)POLKn6jLiX+Aw?lu>etMi%2wNxmG0c!K z5Al##x4ko2a!9@JwAq96cwZ1Vx4I%{MR+qP}<=GxXP2kY6H(>?hgU_PC$s!6)= zYSsJb?pD1S?JHEh-y4tTM)j^W`2vL@q9G_GWKXUtuUc$GwiZ>I<%+0UD6G+=H7HcZ z@?MqC0|9yz7*Ky@c(fJDq0mnu{ZJ^6^jihwmf9$!Z3%J};VvwO!Z(We4TWOyqy%!W zoD|{w1G$pW&6Gl}m10^USDI_$sJ$x`v+~o#apyyBnG!5RE?)>y0IA?9B{&U2sz8X8 zLa@AN=Z&kRvD$ck<^`)TMWjM+)^*)ip|b;84I&dsTwP>ZmkUWUg+5#7=EjcoOF=}mX8>J!AcXU-~|7%i4X)Q zRT8l8i1nTiSV;wZAl64P3S=eqi&$^K$d}dVCt`hOYgAVBBg7ivi=Lk%7D_ZaN{PPn zQ-mE$KPb*NX19;oD6WwoOYEF`OHrP2Yv^^4dnkYE3qR-B!TB|M#S@c=n4E}q;!A#T zvXeMKPo}14kYHwdik<|dlUP(5g?6aP*Ef)4V?DG3?)cHp{8nrdZCzZ#z~#jj(Wdmb z!sxiS9Xl2EF91C|3tb40ZKip^>5QdD$-Z&-j|n z&*MsT<>l`!f53SnU=f3779N6ls^T$?=RO`J0W#%LcRsNdb~b@w9H#r<;=(+Ccx1~T c89vP)6`$cofRg2H<^TWy07*qoM6N<$g3oH48~^|S delta 866 zcmV-o1D*WV3g!y15(0leNklK{Q}+fCSrz(2$|+!uJiKK|`+J*f)rV4fc^kZ$Gx6-}$fe z*pj@Xp0PzW6}~M8-JU(r<+`a-7P_}HGjE~GQUwbh4l^Hy2a7hD26U@q%wwz2877qt z!^3s{>^eMTXhVNT7jy>~`Lo4?&~=r&LK+?puLHB8rH%$HwUCOSRcIei4(;9T`rjMeYy~>-e{^6szTcEqb6|O+nLPQCu zmY#8iXG>5eh(fIp%|3rIca5uDn|twm7NXV=h2eB=>dk-hyC?IL6YOeYa{kG?FJT_LwivrLIqS=S>U=Xte{GPim0}87uR9ePE;#W6g8%Hvv0en zP$NnPYMsBpK3zDES_Z}7aPboRa_J%*Vibo{=^p!VuLP&K>w$QGpFQ3G0M`R!aP#0H zdwBQ&Zeo9Az}2J2ta|(it_+I8-RKTh>==c+C>0?XpJvhYI0Vg9fMnl(7VO^#NfSjN znrFd35Je~q$m0;_bmDWf`rzj{$$bDT9dLM_>o0FL11Z( z{wRx%ij7_wMM_-h*fFm38(gKdVd;1NV(j?%`0;-+{$dWUlG-@;4VTTF7zKdQ6Ej@) zvoOwS1LrU0Dn5A%8%~`p_r#BIlU7G!dkp5&XU?L+*)yl@0~ghim@;sBZ+G$=H&Nr} z4SNpw0H=()R@`E~{qhxDyn1@@roo50I&;`h>^y7+9E=AX s-3R=*(6~@|q);qBe-sNNp3fiu1E1kWfC5?4V&|3>ZdIjAj64fWERR^! z4VX18-RgR9=sWsv7{O^A=#Oazw|SyV%L)POLKn6jLiX+Aw?lu>etMi%2wNxmG0c!K z5Al##x4ko2a!9@OLqf*^p;+2#YBs@KNZwrv}K+kEH4I-B%N?)L!s)KgVSyYPC| z`|x^IZ$|qHRquDp0D1G)B7ia2eDTurnK%c1a&V*Wy*Ts*0O+($RX zxZgmoB62g8klUq%UC31ynmB6T9wqF3GI89+kn5xroscUQLX<$tK20g6?T{)FBBK;6 z-{MSQgfvD1GmAd3N;5GBnRehunp~mJ*25z*>F7|OvLYWk z$0uaU$uV^DMFI3IXJo>e1$qUBAH>T$Qo4Hq!w=@e$m|>`%+10`zF-P(eu1PG=9%gf zxiA*$A&GyU5RB!D7BH+fV%e-<f^TE&6q0t@B0CPZ0~H+Ss5}@7XEB zkEIWkFF3D8CLI;H45(zL205=Xtx>Kc#!k#^-Uo z_vT0MEq}myBH$5&XBHlUc&g$tjpsfdBv~>AP zd++`B-hcGn@dO62B^xu#^N|l{JcDdW?;#g~V5p@vY((1HB1X8iB@_&he`YimZ%2*x zcr0p?4;_hQCj_0zL*pq`Vxjn-3<=|7!@frIE;oD$8+4K&e0R#5` zx(^NMv(+;iR8!$Qve3=UK$oq43p3E&nx4J|U4|+|;o>OsQMiawnQ1_GaDsW_AasUF zB|~s=lfSqL7ioXm*3|>uok{*;@(y%8rLK^IixX@)0T(Hs(3~ zp&C2Q6;6*q6(OqC<5LS)U%q%g zcMWzy8b+04$45_|VvkOp96f#vRYH_UmD?*^mzCS7lBWWyt=;E3++Rbr0){@#fq&(I15t&f{{@cjgCOjN_j{Q9cIDdLy)vk z2%-fR`~*>mf{={;%z~9MNP@}-_7@iYDt};=7VsO3eup5gHK{*X^d|%{t&M(U(Z3Kx zwMKuPMc2hfuZ$u^u5{xDSNaZ)lG?EJJ(uysrICM;OA}ni^Kg{V#<_2}Wcu^@kXeD4No zZ0xn>fcLOVt82w3^OaYx;o$YFE6kh1S|Kk!GvjZH5ES2x&%h?CuV#O}h2rfe)XE6U zqhDLuonLpoZF~X$$`L{1Ax0BomWG0$=0sKg!?dQvef|TM t`;YFMc)6ep1c&p5()C9nKkRz_@jn!wMQH7KtbhOj002ovPDHLkV1kBqrgZ=S diff --git a/android/res/drawable-xhdpi/icon_bookmark_lblue.png b/android/res/drawable-xhdpi/icon_bookmark_lblue.png index 05f704b3c8fcc1389b94dc3bab6b90daea6e6c16..b99750b777833eaee647719e504b9a4828c5205b 100644 GIT binary patch delta 851 zcmV-Z1FZbc3c?Do{Q-Y4Nkllb-|LzLUtg4_;2bh-!kuBwd?? zLUruDuK{n)Mc02^bKuoPt3o9dUeT>rP^i4GZ&l!pEz_;#G4QJHYGEl9e$l;mP$(5Q z%D{VXp?j9U;FXDM`Q_kkQ_MDa<@pad)FCUySpPiWa2J9%LkVWUD-=Q$f#sW`1XDh+ ziiAijhE!-`z_vh17Hk6(AxIUciF9c7+mDXdH~ba{>2iNq{2S}XNA`YbrHf`H8DH{R zBlJKKt9NM}NiswWl8o-qqwI_#NsDMjvV#$NgpmUzYZci@VRzDlIqgW1Epm`*_?#Z- zd>E;6L@qQox9CB(HldL#@}Olpp$9lIK`T#pLG-SX(%MJpE|?2Ffmu?R4M0z>$bqhl zLt-6XKv#c`$c8@iJTd0Y(3dS*ArbVFls5>8EYSj)=~I$8orX-N$bgieB)&i@L!?8- z_mw1ee2__J9@yU`^-2D~G9};}NqvSy5m%%>kkn7ENEJZhJ4yY3L;+Xm&q(S_TIiWp z#6*c!Rw&Uw=qlryB^$*#cZ0!QC&k&ItCVZ!-co;*d(Vt(<~=t>g(dAA*Kodxp5kyD z?zM%ZHSsm{RI)9xi*B@cbRt1#M?2kcu`RKvhE^|Ki*yB$BG46~YagLi&5jk_L_LE; z&@nXFL)6WT75azU<9K0$gz1ID1C0WHG<(?xM&Bo9G-HNG1~WVwJ>D8WfEynX7$0I7 zAG1ps9|Rd6RT&?q86WonHnGJM&&m>BzA7fH#ivoztO$%p9@iG>CG*z(eIDe dmS*Mm#}&IxL+PJTLjV8(002ovPDHLkV1inWj_d#c delta 863 zcmV-l1EBoE3eF0!{Q-YGNklY(0ekOtd+)vX z-uLaj{oAjT5hswGlYsesN1gU$ zB5qO>I#TIQ2s+cL4rmg5v@@PQ* z5b1ggXi%Y-6n*_@Sbrah4iBIS1BXd)WDrdmJR*GGAeuDj`i*@9Xxcy@IrR2pANrmD zbpiWQaNK9?Q{4?en1^m=2D*F?+2x?SJ3W0Dx*XZW;o%1J4S2BC9@BvC`6Tn?bLb3{ zs)pd<0`Is057~dcdfyG*)hXUFbrrhqYFEg>!)La9hKCGUI=Y}cdy6f%&O+B^^+HO) z!(Y7XJ9tQ02d1I>euQ_8{0m*0c9@;eJ?1@+q3bk#Th=8x^CJ`NYGP#m!Tr~- z#*e`%Ov9*g?&j?1ZT9K*=BJXm$~TRw_br=`9Q1UV@~B zA`s29;1`G@6ozE(SFs|@K@wI9?B6WwY#l?T8_DVhmS1E0r`^Ht%&nf^=c{a^e z%fdLP4V+)Aw|IF4yH=K~J@E_NWYm$^8iRRtZ5=l2Ypd4JQ|d@eSvYN5oqWSlMi(}$ zIl!%4XVtZ0lX>gJNw_$9VvBiGSS#ekXJ+DK8G`c1i5WP=_0{atQ7Dc&%R^3B9-Ec# z33^w(4SE3&JR%4>#0WZO2|5T0I;sjfObb5l3qFtxJ~9nH)YX|oeq!e#GvHu6;OIW! p$A#vF!o$T<_4%Vz9QJ(v_#eAXL+R;*noR%z002ovPDHLkV1oS;uoVCR diff --git a/android/res/drawable-xhdpi/icon_bookmark_orange.png b/android/res/drawable-xhdpi/icon_bookmark_orange.png index 9535fb23d1abc0b236f21038b41e0782fbf352c3..e90409dc7d0c7a440df131783963e2b1f345d994 100644 GIT binary patch delta 851 zcmV-Z1FZbz3fBs-5(0lPNklV&|3>ZdIjAj64fWERR^! z4VX18-RgR9=sWsv7{O^A=#Oazw|SyV%L)POLKn6jLiX+Aw?lu>etMi%2wNxmG0c!K z5Al##x4ko2a!9@HZVq9_1YZ1Vx4bH_*qv2EM7*WPcvuN;hfx^GqIe}Mi}_ngy7 zFT7fHADx}5o6%mO>VEfKu6@;AYw`sO(?ruyNXVXCRbE}%h-{atG|LrHwNTiiCtFac zjOD#5pPL-?#L<7G%J66_ltZDHLVBT49_hCV$gLk!$niSlD#Be@42AC$@dpaU;#mpg zURf!^`Wtd3p*K?sxkHLMgj{K^iAU}4qL{9aCLVV_`;Q80Hg|p zNGSx%zq{zYAdL&};;tX8!W5ATy*c~#((+29)kB6n*2aI8<)v-=9Q0B}9W<_{+%vOe z((H_T>IxcZq8=ItL3)wk0W|7G1GM`3=>_`xpw%EUk;HyOrrp?)Bva_K^>&R+TD#S! ztjLB=cMqA;(+!<$kpn%;2AQy7fnJW`2hp}kN}KmE{9rbWtlp8r-71V^3#RZEnn|j8 zfvG-`31ff0Ba%4s!C0nf0K@4fmfHzNhNuUpy@MDX?ck(~G_V?p@foZ%kqS=W3o(KL za8e}!`;S;Z`GA#Fzz1Tz1EWAzQg4a%9*lfhjlL$<8@@&*MSo4KYrg3DDPo~S0|S)k z6FWutvGkSVY=chcppD|Z>{#OG+<%I44f#UXJ>-9)s9)@y;|J%D=qnx`LBz;#v=jfb zgOi`c4th2^HjV`2W25xUA)Umc5_)Z+CZCu@lF5nC4!CDVJO5kJLezS43InGntwb%- z-wLD0edd|BfMJ>UoIxi~{%iK_91`b`z1gP~z%UR5QGOjbz)O{?ZXrP{&hvJ$e@ge7 zjn7Ntc<;^MTmFFaM8G2k&n!Fy@l?fQ8qa+^NU~%Kpze5LGwf`_!#Gd(Kg5M`{_x0_ dKQernKPm#gMqB9M(To59002ovPDHLkV1m8Mw-%P4Xyez!M`%Ui5!u;aRqyT=!4G)sdz!0`!$o{VL z*p|GlpRr919p0CNZqFX*a{W{*3*DossYlRdsYVno&M}{Zizro@26S)6n8)5gXP8tm z0vC7rv%7GSrY(Ox8R+IG__K+5=rWb5kb;W?Y&ifIDYA6+LU-#KTb|v5uGgA{lz@w0 zdCT8$k+2FTq5GoDTgrbym$Z7O8@eZ4^#rG?_Gbrc73iq!;WUkbJwq3y*GXl zc0n3NowsMF&tG7VE}Wk}`xbRVR6w1_%iNUZ$EZ`FBI+GH#7#JK5cP@_MuYM9?AiNq zGzgP{MjvjnM>jv9kwFpI?AynXEsR+U3G>fJuA!w%pBpaJ7*xZ1mjY1I3 zvEWCDLKK8#=_eK}FF_JiKCu6?=nwe=tBio}So949acxL_&7yB1h-qW=OBQ_vK~x*` z?^yIs9Q4X6QsP>N4|A;_;3%mrOFwfJj~$tuJTiaARXhtv32mMGk1M8*E&#y7(J8L@ zQ&{J;h4c4H7au#0Eys^lX5v3^l2TXV39Hus{ zZS4V{V3$_UidE*d=P%&k#q%}hRpG3V51*Gamr4+nF3r4zO;kV4et8AOtKZNlD;$rl z%Jo_Mect+gfcqX1_#I;S9kciy1o<6R`5mVDANTnmNcta{`XB1*%n>iK^N8tlFz$17 r@AJ=v)&+v2g<|FRN3k&K`upR50=`CDwR(GW00000NkvXXu0mjfp{A#K diff --git a/android/res/drawable-xhdpi/icon_bookmark_purple.png b/android/res/drawable-xhdpi/icon_bookmark_purple.png index d96320fe8b02f2b5207c7cbf2dfb068075cb4031..9749098b0c2a148e8a7f9e190213c2b469fbe4d3 100644 GIT binary patch delta 850 zcmV-Y1Fiho3d#zw1_FOCNklV&|3>ZdIjAj64fWERR^! z4VX18-RgR9=sWsv7{O^A=#Oazw|SyV%L)POLKn6jLiX+Aw?lu>etMi%2wNxmG0c!K z5Al##x4ko2a!9@J#pfhYiHZ1Vv|tJ>Dswrv~t*tqAd$Bo@PmF)Q+AfKw%s-#VL zy>35-hjlw++(O;{jys*>y1h2!3p8RxF=(V@PoXZamOMnBC0&{oinvB-gy>NS8nubM z*X8r6iypa7bs2viZ-r`TjMB4FXjH%UTMg8v7U7y09D?pXk+BXq1a56;S)& zrdRHtP^);JnM$a2P(laPDhn+PbTeAA{S}A7i8Im7in^ZIa@F9$fCPTbIOW* zm;@HdlEnZ_@IS1&Rip2TWmDBCTl77|>fwu?KSk`6s<)R?eP>S* z{#g1!NuEB3qt8Q0VfI+!&$(|D=Ujc>+_qIG#r=O`&pH0!{4YMmYwLKmz83GqkL+bIE z_IKA$y*ruGB_!wGK!)E-UfhA<=ExJ$@c9Ex%|Rp7(h@R)%}oKnkLnkWL}PJOiN~Um zFx4TEY;A*}tu>jT+O&6cLaDQ(o!kqjx}epS3X@9_1Fjema-)B{2d?!TAgzOG)F6G3 z)Os_hQKpv^`ub6`{yq{N8bBQe4w2yS5!B_#Vd487L7k2`e#gE6)NP=TYJ3W8){^_$Pb0g#IXnbVu$+M^L z$4 z=2-9}L;>u!nvKA8@)V=6u8pH23Pu397W_|={NpnbhB989OZv+X5c8P8s~oDveNZM09d?U;<7)) zaZVmMKbCLtjhonW^G3NRelHH3@#N=fQBpgK_WC redAv)==uCZ*+iEX1C_2enG^g%C1 zB|JSFs-}{XCaAJA>8T9pcA0mf%P{;e(A5+&7uG-*MGqpwpeyAorO<^%(!E^hnq7Rw z)eK!K-APJ=u8V(fbU~MP-wMgl?N{@S>V4>v@A@qTy1#tq4Rk4SbS)mbPj0^B{smn; zT}yy&hac=fmvEDrM5xMU`N8aas1hR`gu0xcD0dL@5Xyj*UY=A)!<-_RUke}i307m�F$B?cC4icCIu7uzIXiIfg;h93z{c7-|JV8kY(&^Uh|Mi#-PR`T9}I`B?LAiQZNpYLNrmU{ zWJRZ6sy=@Tg}~=wk;ex?C>21`-NS;OZb(8XAEGK2e1<5Pf*`5*%7VrUNP;L3k{2v` z1xeub2P=5XqIVF)1}GKqhef|3h|x;wJBxlm5Utf{FN=ER8kLLQ%TM+7@lzkfqL-)0 zM}Ab;@ALH+@}o*|ipXQ>AKxpP^W%ztu7vNs6vuy(Jm-Gir+8oHaGkp4KHn4jr z9>-1hJwtgrzLyVho(Oov;F$%3AeyRZOryDv21%YwdDQJsbcCH%U>H9`_vg=r{{3Md f_5KLA?)~utU@b;#SuTu(l@P_fh4HNPRSh zBC%+F#Gnc^#1oAWG$!H=RGt;dCa9W{E66>gc_kdJY&OWHNCa1w)Qn7>gYrTIy*?PwhI;MS}Xj%E>x(i!}k4kqGFvk@3FNV z9<-PK*KP2mjf$k9+q@aNbkTitxF1`GhqpT18S5=fL3f+^HgqXVeSvO6FLUn(=pwYt z2thZ(e~myFGAMtq8@g@l_^)-_ple>P_fGYBC!2OU)$n{*NJ4jKl1-C$pi7dep$WQQ zyyOLRP5*jf9J=>?yrl0tbaC^63FvO|vRlw4%rnyn)#w>scIFLKjfRUuJ;nvbTpaFt zsMcTP0vFdqRZm1wh(;eg9KXaCm&PAH7=h3)*!@aw(%1{g*qg z8#md(%^QEPe_$B478Y5xxBy#Wk{aIp4p!`#ms%eMAsFaqQU3r0LCQk1Yc~sa?}DV3 zG7wF$-~&W86p%~nC$S>PWi~*5NS?6h86? zQwn09rR3$&ne*~UX?T>b@&fKXBB*YN;XP)lZV==>s;X|7<~{DKY9Q%7GOcQ;D>J&? z#LnGD)q`>G(S7wlE;#e~dotPl=Z|cr$MN&WA7Cv;Yxn!By#N3J07*qoM6N<$f@s68 AmjD0& diff --git a/android/res/drawable-xhdpi/icon_bookmark_yellow.png b/android/res/drawable-xhdpi/icon_bookmark_yellow.png index 0dd8a63261a04d6f8aa4bed3b71cb1838b58b9ba..cdea5a945b02749aaf5cffb6f55ed7d8aaf7f416 100644 GIT binary patch delta 849 zcmV-X1Frnl3cw1m{Q-Y2NklYdZ1b_lT9ehuI^X#pAXlBLZf&0NpPo#3 zvF(3URoVWG^B3CwZ%Y;u@{z^{7-c9G zlL^sG(_yHE4lSX>rWuGbV^l13+u^;lx0|hj2wg=2t($*u&-TLG(8a29ICON@2D|A| zcd)jz0}gSj0uH@>{3m_AaHvp~a2gmSy&D{WQ>9A86JZ}c^M&z5qSCW=FDXtIV&o^3qJB90m$#63^PK)s|xJgz*;Z01^XmUcR zK9vY}Q`3Jmn4W^WL{$kvO)W*WH4r4I3P@(>D43gtBwocq)Jnlmh~iW%Bn`hP=xcx^ z))272DLOF(tXu(~Df$9IhN-0fQuGXhbW@E!r|1O)X{Mr|r)XX-dU+M8=3@&BeC#z` z<(QVG5FhwH)zp0Q@j(c#vQ6vU58kQ!I)zJ9U+aH(XHj0~#D(+S-4rh_;nvdPT_=8k zn|$L+?B|u`l~p{ly0XkGe&b543f)4Rm%7)q7#&;d=A~2U3XNyQI=Qib1Q$p98|1q2 ztZ*Cds>pFQ1l7lpDrnNor`h)d7#!&FP$D0XM)L7^G1_)-Der*Oc!+@VK@8dsvrs+| zMB7QBD#{1b=s4U*`G6$lL#A{c)I|U;RbqynRk`RmFi!cKd@=4-IuS bg3})W>wZKnP@nK000000NkvXXu0mjfbT6FP delta 870 zcmV-s1DX853e^g*{Q-YNNklx>`}3W087D)klsMbFb0kP&yv9edm8#6>O=}gdHbhur1ag zlp5nGLcCGPH6>7_M3ay>nMBc&Ck3my1tn-{7L3+5l%%bd`F(9DQCqX+^J_uLS}dMp zQxXm&&Hr@*jwDRy84fibdEerY>+6GD-1rv8Aa`kC;1c9whJ1m-I?*~5w1WIo<<&$d zQRjpz%>p8?9SVPgv~Lg!(Zjq~<@4|<+IMPLmErlS5P`xN>BgWC5xUxX$ekM}-S|1k z)&H-Bbx?Ri2VO#`F(oKiD-`hCc)sP#a z0z;6i7D5Ceb@~hyICC0OK_Of-of#p6k<9kl6|jG5T*3{r$2}W+Zy%0!^^&FD zuF;2Y_cnSS!^|x@U~v9IuKOa{bg?^k;XDjHA_arXSEwjgF2f)t(lDBwq9RO9!YD1g zIHISMZ0qd75nf@=*6A6tX=d7-vcd8jEnX$5tBXwO6JA(bS|*9*C0O%{G#LFkV&(e5s1zx1u3aa_ z^=sf%2oG4J#P|u8N4WWD{lz8%AG2;r!2TxI6Fy)iCEzo$zJL*w6{)|(dL}DU8W_)s z^#Tk{R_JdK>jq!w`Bo%Lg>K%YLa*6Ygm0EIg~@;XslWeIVUlOqW{Gd-eo)@P*CqY! z{yIQ;t86>RH=OVCr+D=i4%}MJ*TfHO!^yYAdK*l)@7zU!yLWDr-X2R^ViC0pZM~A; zn>R)8J-rXGitDI!thi6~U~>l+b~Yan-Dk!Me(>q*-OYlL-Rq5S;u59@wJEdyGrr~m)}07*qoM6N<$g3Lp*&;S4c diff --git a/android/res/drawable-xxhdpi/ic_hide.png b/android/res/drawable-xxhdpi/ic_hide.png index 9a0f41682331ae0bc01fdf4825aee2bc496a5da1..c9f00c8ff29e47c6e3093f6332cef4b1a8932c4e 100644 GIT binary patch delta 1788 zcmV0p7UQashA$w-Q% z`jzntuht)mqq!&yP0`^!7k_y4I_E^)JK2=I#A4F6&Fp+GZSzgP|DNodjznj9+1}ti zJmDJ*xC_IG5e#=R;2S*Qz4^PBqq91)$LAKEM2~&$at5siXMfyfAHC?LSEAao0UzQg zlz^XnXajAzu6mf4`G{jE9XOu<+GQPfQWi~n3qvRahVx%;Iwfnncn)REbK7-7c66R^ zpnTw)(fLAU+2#(EFWh0f5Lq3=9mY`pFvcAn%U5=<4Pc-GF*eZNoOD^|OQ?AGlJz_` zsf%fkZ34{bVt=NxI>0dfb(?HGGt_~MbXnzF$UXR$)l8xQzd&xnFR8~3c3>cfG3=y! zn*!uEL~6G%UgrdIA5M5ZmC^lA*Ky^oomtZsIz zdJFjp-)?aGVhH&Q!?hyAA2S>0;sNi)Y*Mjl>2Fcp+vc^wJ+<>4(c zj0y)=5r3vUqz&g~MyFdrGRl-Q1N*z9nsZTu`3ouBM3?dh{e)kRW~z%Bm+^}zkmz%8zDjRu_mj&KWfaKfJ$-B=3+i*gQ)f&1VZo2ViOLy$lY zRczrB?wBe26O{0G5@QWQB#$Qf^cZtU!vr9KDt`{fNZbF83>rx%Z|cZei!Y*OeRhEa zOh}}$j>dQh|AIGF3&K0%#S+@qXXli10OD9cYrMsx|Cxrt8>FmdPoZOdc8WO6zd#E6 z=xY1;vnRsdm5#|PB&|i4NfbUIl*6E`eaT%t%k9v@1))_XLFkB_)pQ8TNt~!sevs(B zNq;?)>o5e{q zl&8omR9E*eV*bZcBa6%;smFHVSy+0wkuR+GI!H0rR^%T3IOe6K+u1N!#_G_M*u}y_ zon$K|o21_j}r>{nyn>iD8_&i3R3;(s_M zf7tY^clWIK@~q86coM9N(vEI`e`hRD+LTWTqVOXqKw5Ymq zMnzs2Yg4ZUSUrj7c+&}&ij-E{W7vV2FXrRLu6A7%7WfNK!=Fp|}HfnIy zgm~pviyN30F5}!H=2+?Wm;2Pb5ipQb)U>Y-esDBR!4P4_C2iV6k z&Ts>VZ>>||UOsv#8ZOlbBizey{~bOsV|;JjT;T2^rk!J;oFL2en$liA#U(&-U(|3P2bL!=Ng} zA_4(15Jyl$$z5^&Z*>erKz4UNr+E3tmdR7z1#>)Nr-(T64#|i;?6UGWvH7B eVC~D38Nd-($b#-1wr4p20000Q+uQpW?i?QjhT* z7dfFP3M<93oj6ZMoaq1OXJt=PCsR&nO-;?#))t*kudlCPTU*0mFsrMpL?W@JrDc76 zol2!{Zf<`6{++>K)YjHEG&GEkj?T@^jgOC`(dgOP*_oLc6bdypHMP9F+~40nKR-{Q zP#PN>NhH$J(o$<{>&C{$$jAr|hwJL<8X6i}Sy}n<{Xtc@6$>!$f z;o;%aO(DLl{VKn-GP4G(dO#*^j--i%ef9!b_zbYB`SO|AJoN7xoj)@cRRwh}a%|t< zTUYNr6fRA7s6(ZdwK#HmL;wJ1-$C?sZ30{gV@!KNO>Ip zrrA2?O)oY1_!xuU7O3DCYk!)0ctF~^Hv(2pG%SVbL5~*5?HiuiYD#$nAKppc%{+wa zkz8=J&3Z)}1v~W#;m0&jrs|Gf5w>TDEHpUfTlPL|-!A0z3vv_M-ePBE9Pok|D`!(o zJqxdseAIvKAVP~o73nWpR4p0rYy`mgm*DNNt^UGkU6n~|yKr^yfQnl6Qdo$mU+4~d z3As8RAar3VfQV4I66OI8H+8Hydmd&<7U@>iFo7fM?6~od@FvvZF;@*Fv#dD)J{{(| zoR-6b=ffvXY8K%nGW>jaYMWGL!^5_3o%uDA=7zsBg@}i5fdNQPN|NG)r(e3A;(cxJ zaO&tSTQ==`r`#g+{(FzdPs?CZp!Y>vph;-#p8qeJz z{-#kJWHclZ2M?O}oRfR)0XVhK-!r2mq|$_hP6eZQ7}z#omNL#nK>z3A+I^)i0v+Hm$xf2yC)7|D*7f6Vk2ts==f|(?rWf#mEoIvF-K3oMFI>;`a<4@U zmz5S_MBFz|rOR0>lszpDYcsjru`fw0l_Dei)W~(-?&hP-shBf`f8G!Pv-HS zyTM;j)52Fe=Asf_`IB#Be2ByFw)ykRqfDWI&Gi<|c3qz=MY}@YH{m|sa}Sj-O^fLv z<12F&jk7IL<`uCy)+pak0)p<)PflVJ(yLZ4Y<#$_prmq@+&~$r7!lbk6+v@HH$nLo z&gy#Z@OauV_UM-?N$KFh2ZP+kD%EDjSr(|?wy&0qXsIer>!%4F*}8d2P+hNNjrWD~ zAP=99Qs{GizB54)!bQ%I)gJx|BMS#7&A+8F`#P@!73xgbk zU!Li^^IYzl$}LBbe=RVi!thy#yhFmJ&k@f)YM`t5^uyauZIWXui=^(lA%Y?7p>8di z@1ux@*ZfWStaLu#9qYq|TbElPYtZZp0v(B>9HSsI{mV*)8&!Iltf@_ULd zf8&p1!v@DF&#HDlF>>@8JnGB3qo=1?swvWv18Sd9^7CaruTeYdPg_2LWN(WPnlqPU zsiqO8&bgwJX1Gv`G$`0BTBGmHQRkqwLct#4k6+xA=;AngwMwh5EF^~Y_2G&CB2-@iTgA5IbUj_0qC*ZE<%gD6Gt9d#>URi?*!Rx$Fd#Jdt3jSljnYx zi#=6*v%uXq+>J}Qt|kNXV99s>a*S31-OhZ&BYt);C`E>~>_<|`-@SzVuWCC!wm(Nn zE65W?SshLEUROufNA|37%}kpreo{OZyPu*ZL$`N%#dRqnQMjtTH4%h*vc|g-Mp3i% z%GJ48Xfe?3O?smATj0f?Yz7}}MY`lAAzq@eAj))XOghhurMdl!-DW4t$R(4vG^qn8 zZJUX5U>OCNS-(4KSbBRYHM@)AebyhSiJdaGBu4qjk&v=o@`APF@LuMamQjzK}Mc;gdlIOxYj+tnz#qCi2{qSlDE5eXwCv) zbLaXE6JedA)@m8;ayeBkG;w=nX0*EGkMfL54Y1Y?1dvdjB3Pag*8nS_BN9j@gPP?T zXECsk48-;R5`KsBj9?7x#ZFP>7~byndL|PSf}A=$&Ap!UCE%Fjy}E*BS9N|g@S})R xAmbZJ7)N6wwZA5TM6))`ek1IT|yA@kkC~ z&gSF5%nlzLm@!{4r^OuQ=>`jEXq5A`WERB^{NqBYSJH}&eYsNTaZds?-}4WXh{D#TU3pk>0x6<$E=0uPsJ zbfAU{&w>t!%MO3r(upmS@TBO3dP35gj;xWO>5N8PgU);*W=@CVN4KCui`f6tsSW;m zrBko?V|bubharBGbWGy6(RX6(dEbv1hyr+O+y1|9&-vNcwr$(yi{DSSN{S>~<@*5Z zojEfIX|^j~mCKhW66N_^RlI8!A>9#y>vs{xNGubjCYpbVjUbG>*F*QihL$vcD&2A% zx;x&4tK!jJ{?hJfFiZ-dr!seQ|0*fK4S~nm?miXCH1ky$;RYS12BHqDla*C=!NQD)C zwNijINY&IN%-)HMFiTQ13~7yuHAutMBw=<@+=G8n4>enm>Zz%Rv_(x1jPBX$M+txO z)r?a!4k=4biLHX1g2^IvwE)mIN6lOt0Mt^q2$NIdGE63@>ji*1>R1N=z0^&>GT;1elSut>leh+(?7wM?4nbh~p9BGK(Z^fZbBnj_ z?(u)N-7(&ZS8x#NbPe>KZh_w02;*&N^EIaW9nAmIDxv}IE_hqM{O-D`J6@T~cO()W z`CMhZJN&xoqVhfKm~yQo09+;@aM|7oyQ(*?4^jFs3UtD`$svL2EZ7S z`T2(qUT)%Jqo$j2*>LTqdWI7m$8Z3}ksDfuj2x?Skj&9JhXoyvbRg6bSciTcb9S&B zQg(;;U9JEF4Va{e2?f?J) delta 1035 zcmV+m1oZpP3-$}J`vHIENklEB4v=R<76M=mkvEMaaReeh(nub3 zWDuB42N_EZBS6C`GPKu1psc-QBr%47jU~vyzHS7rdmm{fx)Flzgm!($5Q;I)I;Sjz z#7dEij$wpmxWj*Czsev)nMT^p2tqYNyBLZiRPiCIYQRFstO2T`e-NP??5Ca5h(MZl zn6MB5YiAzTi%9emN8@osB0f%B4MGO&((I2hw=;gKfV{7Y&7Zwh$uN{AzzxEOywNhEG4PHE$TPZ1~ zv@-VqUbN*rpND5IEUT)PFZ}2EbZmmDt%pC=u6{n;f~h8QG{el0OmjJh zhnYLSmDcY&Fq0ypJdC_9Dele6;^N91#g$&eNS=uH!$9$fVm|*mgt9}wJ}c%(5e6oS zC<(pe{9AuM@f_PcKf%B6J$LnRNND|sS^t<_EU>}TylRWJDd&V zZ@7Q6Xoc4Q2EY*BSWTCSf%CTsY2)qv?5fDp##F9P3^!BoOdVAS0y`@PQC|)&9 z=&zb3^kP>Su}hoOHC60l9%L!v49um)iZ6c4P1om-uB~5LSh%vjc69!__i~e1flaKW zC{#q96)PJ{70Sh)2813%Y_aDbsRu8yCq93vM@_M3T&ag^v8Q^e<^-vB45?sn$8EWX)AsntS zsvtCIB{W(Vj#Pesh($07*qoM6Lru FV1lcs^v(bP diff --git a/android/res/drawable-xxhdpi/icon_bookmark_blue.png b/android/res/drawable-xxhdpi/icon_bookmark_blue.png index 1df3c130e291d86493d6638834a5a92825411f2a..8bef0043a19cc0acfad2be9b97bd3ec85335bdfb 100644 GIT binary patch delta 1259 zcmV(LZM)a*Zk_wz%>!7#e%^z%b|om6 zuGuJ5lZgsP*|k&-DsA|s=clmB531p5uHi>LX}0)NtC`dxY#VgCG|=q?Tgd6%`!v?S z_aLJ&q@`g4#l;yNWHE{vAL-~ghP&x3qO)i=g_~NUScpn$aIk+Iu&}`r*4Byw)Eag+ zi-;nk#Re93DaE8a7}Ey|I%pW$D~eKk7>RQV%VQY0tSD}E!C&!;9;{;gvCrv6zQ<2m z(G#Wd!|p(D4m*6cN$F9#!8Z$fwZIqah+ai&yjZgb{Ycj!2;)6i+qR9W*mknnSZmw1 zZEuc!ZgM^T&^>?2{|4Tl2K|(yg#p;)?UKkCN z6mtWxscaw{Dq$0tE6L`;=m5Vs0Hb-5WcCo)WEJy^;w;ziA6^tcFUw5it6jKlH(9qr@2xt5^Kt6|BZf%uE>7GOB+TMl&U9Dy)8G)PJy=DiNz; zbeM4t!)Uequyi_%jxo+L7)_7ViV%#pGQn0Dh2*=*F#3xL8eue9z8N!sc8qQ{Z_S5^zPi)y%4Ig2V zNn_xw?0oi~OD`HvwlNKDCmUZ}+LL|049><(lF@Kdbf}esqV-S_oQ#$b939~xIRZx^ z83kv5a8UdSXQN~!Ty%2~bi>6+SqC?pIAELLW}SZwhpW4E+* z9|nd0sq`BZhUw$W?^J5g#}`d*dP21)@HKx~AJ}fw!Lw&{a2vit`lPs-DSG$S*YE3P zip~0@sEDXdO!E3*764=&e9a_H@Uz~KjeD7(tEv(|R91B{K`;DF)raz%`HWLgScEu5 zg$0b0e-qwj8m567#`GV}Lz29s{fw!BxABHCq?8fun~uZ5@qhneL@7Ltu*^SiBPoC7 zR2f{9or>g|x9~L7GI%}YSC7i8;i0HlCO(&3^atBa}YAe3xySab*}>WxavHn|in!rl0Bu)r`-@+aVS} z01yDtN7^KAg$lU;)i002ovPDHLkV1hXxXixwE delta 1286 zcmV+h1^N2Q4&@H8Z~}keNkla-)3eAGcz+Y zGc&_7?^CYJWu+8ppnEi``CdRZy6EoHpu`F?y&37vp@>f_FV}pLP;+{QH?u&cmZ!4O zmjxYJzQ#(AN{yUAUOr6a=LK?foxPsz-$^1~7S zs`*NwHVDTAYZaTP9uBH!XOB7!j?(Iwv8osjD`v&9g*9+o%|gca)*uCHEWf#~7%5R) zr%ZV?q=@EGCTf4{kuvqQCh;nW6bc&0uqvcfm0@1+Bc=QX8KYW*OlK!#G~FzjT?&~! z8#nHOOsQUF5P;ADq5}{L=+svlWX6^eEgOT3mRN^XK zf>4?ICJd=x=$n5b6;@GA5IRONjzOqN&00_bp_3HjB!o($-3l*+cF=crK*+0Rs6q(+ zN#9uxp+YqyrwB4zD9#qh6y?~##5 z*hLAtE<%6Cqm-(I%s$ew4>FZXsm0)GU30zf=893$G5Yh(zUymR!PTgg^1;Hy&h4j1 z4xQW8MwZ%kojWvgdi%}^Snw%TkOh6impb-eeZBn5I~8HcfmdHlFAO16z&FpnS_%xv30Hf`7jGny)gsi`)yrELnP z%B_AFo%TXzC#-&0gN4b(bUHeKRU$4PZg!MqZ(Mtlo zH(-A)q?*BS>o&37z6FM6l@5-<0b&{$1V_5c0L$Ga#PZW!uw<}bY^|&qwxN~%Zp#GE zAh8UBCv&FQO_ra1?pp*|R4~XRfSbR#UMzE|RmR0(keD8V z!^3{2J|d<^V94h`%pVieWB$WD0EYjF=~sU+1o+LD--u}$tNFriH$5k|=de`BZ?N4X z9WP&!j(f1=<+l`9Q-ZArmo7cHl@hFGv=sSG)D;xx-H~rT}8M(Dq<<=sZTdQ+! zEepD}9_iLXs9P(rZY}+~wdU;7Vz*nX>~1aZyL7JL(t(ESCn@e9;mC!XBxgrWVV4fA wTs$pvo~LrLqsMge^TC#2^n5VbV()zLfBxS47fP!^ZvX%Q07*qoM6N<$f>xP$jsO4v diff --git a/android/res/drawable-xxhdpi/icon_bookmark_brown.png b/android/res/drawable-xxhdpi/icon_bookmark_brown.png index ebc0179976d424d819a62117284864cac2fb81c4..e6d79bb96232cf4f66cf92db68dde4393b59bd75 100644 GIT binary patch delta 1261 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 Z!3lH&0KiM^Ly-Ug002ovPDHLkV1mz+Y%c%+ delta 1289 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 diff --git a/android/res/drawable-xxhdpi/icon_bookmark_orange.png b/android/res/drawable-xxhdpi/icon_bookmark_orange.png index 5dae19f44b7c69e5f4f5de9320fa876044e389e0..f8cfe83b6837fc127d38fa5c36b1898fc164a104 100644 GIT binary patch delta 1260 zcmVpF}1Y&sc_h6C8;`N1OO1K}d@J=hV&%N1W*E#nA=tw)U01P>_EY)K=t>Rys7mDIuq- zQyP)h6(lq*jcFSQ^Ew*Tc@We)G|K5A z^(VDKoQ&mfg+6vFqw5rAvWlF2k5)b7L<@~c|PYse~K@fn?*!I)veHBqQ z+8%q_#@I%UZLEL2e{x)1y7!*U>iT{_yH93B27}O9{Eg$>*UsOAqoW74^Vw-LSOukh ztX(YK2zmoKokM-}%`Dl)fv;Wzf38&u&1gIMIKp^I#LFHL0^?QT~P2Kb-ap zvT&DD7p5y-=ECK3NB)zgeOSO6xxNNb8|< zfMpIqXZ_0R=HYKFGf>@hTn(KeRv3cLYV*Mw=!~(#79LTB39i{qp6=BCB%H07WoE-kdT=vqV)I}cPG-A3)WfWi zVYlacE}Z?un)n&c=9+nMF~S-cfs1+ON4V+ajCFs)&5y<-i)TWdkx<4XrJIFtmu=?^ zv}fUNq4)bS6=l_;Q{FF#cSxM*V3j&1yknzTVp*X5tcu^VZZENYVg##uGJ~*vVrw3+ zJ5061b=HJ#A5J)OluAdBz&@T9!s=KvRho~%YN05go~Wln{R!ADF!LdB>NLeppMt=A zGY@|f4G9V*8Xz&x%!SC=R*L+479w-SiOttRfexQIx6Ou314SAjGdsWRS)HTEIoRZv zJ+lZR=P7a?B8!YM%ONsAkpYM-mq(a-iqu17nK-mvpwIDRzGuR_o*i+Z8&vdX)~Yz-o@XQoP0rx$DP| zU(d0^HF>2dC{bHj=H{&c00eH`WSJJ&Y*f_7IhMGc4db(L_BKo8#I>=YD8JLrBK46p zilig;EYf~QT9gY;19inaG?-+@Os1#9>-(w5Q{(N2akjYFTshg@d?SN&wQ}(J$p*>Nu%b( zXTJ1q#{JJ;usj9cyi;B5n@#Uk^wpgupr=(0E8+6 ztI)4v&Iop6%I@*L-xd6z;g=LY;cP{JWjpG_k5+yydp^?*|Ic)XeQ<1-eXt$x?Sm6v WgaB)5xS&!10000kh>xS# z@};GFGY~E(CIO66TO|^5%c$Lo9!89yz0+5K4sw zG<)+r(1T|l%}!A?|EfoB39b%x)_MdBN z5fimFWXWeBMht%+S*WT;%v4ud)T{8DiKqaWMX~*F%>X*G0F|-w6s9SD5nU@ zDxh=x;KAe2sVJkF{7~A$yah^rnxVviPTLaZC2i0#N+?_@luqy$C!kbHVTuCKY3}AP zx|^XBD5B|#p|px8tb$T;*qa2c#XMm#w5GpP9w`0Bla7Bt=?9vk09yBX(tT(Z(07GU z8s%?Bp;SoU85m6d+j&cM?p_4{Liy+l_{!;tX@eYolv0hmj%t{=xbIBFfotSg8CD@T@bl$ITV6@yY?X|#!> z(liQ7sdgVmOLQf(1$G}cU}NwktDPK#4THR}bLuoJojwISUP^(jGh?hWb_TXmL=Eb> zAy$7FItP0mN`}CNi!65W0tAvN2@=EIEYv*=i6lyd$mPW>^3P?6B#Jw>Mo|r0)+p}V z;vqB4BEyi0r??D=Tw#$b5Xp!m@mx$6KvWG?XKqOt>!U$`~ki3QQLE;(< zU4w*A+@@YW~^w>g4au$3SmDc<23?%q3l_TF8d;f`RWC?BGZbC?GYn*pHt;R6mc4m)!dW8<(t zdo<97No@m*=z)oz7ol;@b6A?ES$MtVuU>U^!a`@) zEB@*wtQ2cjd?T-!`OVu#*l2wFhM8ZFXjXhwYCRcmdiNdz@8309&&^9!Yuw%sA3s6p z)5j0Jf;FyeaozkG3ZKuylwY)}cV2%*nIxRxJfqyLIEGsR6xSj*ZiS58idDH4By%e| z=T=zIt$3tcfl#+1ux^EZ-HJK86zp~@%I;Qp-=%W}mku;sKS^=_2uClkUUPO-pXbt{ xm5Zlk&hw=$a`c!^e?Hg{44n@K8=^ZO{2yP00BbS59zp;B002ovPDHLkV1m}HU^4&! diff --git a/android/res/drawable-xxhdpi/icon_bookmark_purple.png b/android/res/drawable-xxhdpi/icon_bookmark_purple.png index dace7815bafe0a88be6b87c702d44c93441a7e39..6f80c6b342f3bf572a5f0bed0a7e8e5184623340 100644 GIT binary patch delta 1258 zcmVi@`}!34e$j%jGv4SwXvIg5 zmpq4-I38YTI$F~;c&ch?QCs1enpV|#qD*O3TH>MHp`3r#>_I)w1_}c3iPc!O`QX>g z?#8y;SaqA4scnDTzjdEg@GL%@v&nk_t4}*K<>j!++#n9tZ-mX!BS((HX5)H^l@Ft1 zHZ__}wEI zt(FKYVb#a)`e3zE!ll9JH_jS`(T@^lIjjzF)&W?BC%S(XFzV#IP8h9_d8M%WgY*7` zRjJJR2}UOw<|K@Ml37K|V04;cPQz$fk<3Vf(HTZK1EVCFQ4FKs8DSbm#qwQV32cTL zWf(RkdGS3D|6!ED_@0ghuo+^EA=nhiH-)g-#TdI_Qz&08fz7@O#;Di_n78< zd}N3u z+-}#&aP}`3#jkLdEGcktn2X>rT%^b^aMR2MYleTDUt}9xwN!9HDq7%bo20{C>o^x+ zycO=!B?BHNsu;Jb33$kmOn4dXXPo*+;U!bD;HfjnxCA@lDa-GTQ6AqdvmAbJoCzOY zV>BD(FNA0ix&VJ^k_v@Om#KF75)@J; z1sZ?tZB%M&henDdL*;58RsO#Um1K2d3-nW=KcLQSiO^}MN;`BCB_S6o*Qjz0D!Bm1 zd?@@yrN5z&uPyYyzJ3#ckHDMPBwuw{CO%o~ z-HZp{zJtQMw?XgTe64B5t$+XFBa}XVcweudaebbSwVz<{sRyp|4O9JM`ck|dA^-$M z0T9d}zYHM3{SPPU@R>cwY}eet2?=7$Tg5RHKw;!YAtS}A6eLr0PGLdCBNYf$1XiJ6 z#helBR+L@geY7jkLBlU8e!{s?tarAfHPC1U*Ru4L)s}vyyR{GQ^SKYs`?G!U097>o UA(X**cmMzZ07*qoM6N<$f<(Dqs{jB1 delta 1285 zcmV+g1^W884$=;=UIKsLNkl? zToJBWMhdkNxF%9dVu3ois4hT4%MG~7SWY5k^>A5z840Xd3D>P$A^6^vNP?A)-@LpY zNm1|cp92Px#0YSy&oIQiUyEj4A^noT zHFQp%IB^m>)s+-01f^5Vr=S#~7)uQ3v~FPD&^G8eu>JIrlmpY0!O(3r8JsW z2&LaS$|Wcj(v$^7(AmoKY=utIg81IUe|VnF@x6|D(AmNJ3exQ8l?By7Hp_5NP z1fX-UonwErAB0YTh=R~L$|jCNCrCuAAk}pGOvky^oou4>=(&zFr<)*^LqvW!=(_pf zS@+A=o0{2C^QPA?yPrL{*#!rFqLf^i>)q40Z~uWy{f9UXhx#ua*uSrDPcO{nrcf%( z3>+C`R}3B*fSFXQi~1P5iuDe?xyDBrm?~W}ywD;)}T4^pM3K!cn2T!1jnu zJbuh39>GzXyrlSqWAr~=v*u|($9N(rDawnet9hQ?+j;wlT0dm^L2HNp$FqiE%cp7oyy0nsZ+l^(_w680djnf#nugcA>4d1e3pTpCr_-!= zuv4yS@r}P{<_{m6;GpT_2WEahu4(a6g?(kb`O{|zeE!sIUpKE%wQ>8teEkNYZ(qOk z3EH@_#&yqkD12W7OCeFK-hI`TlHq*>_Zd}QjbnHw=$u!> zf?kbBdNmO0)d;LtL%&{)IeRqN?bRr|SHt@rtt)u6pyBySiuX%6dc_TzwWEe&j~1;w vTrG27Ah^oaWjg)(U}I!NxRW$t}EYk`r00000NkvXXu0mjfH*j-j diff --git a/android/res/drawable-xxhdpi/icon_bookmark_red.png b/android/res/drawable-xxhdpi/icon_bookmark_red.png index d6f9c76aa49ec237d0e8b0828345b3506c9ad8b1..ee9ca2f038adc31e605b407d79886b6eada0e3a0 100644 GIT binary patch delta 1281 zcmV+c1^)W%4%7~?WCDNNNklg@Ih zVs_Z?pvGT7oPs~d3uh!?7D7%Glb|?)xFpR;Se7ObbMy_8V)%bY2soWd+W7=-7lRZq zF5q*$Wu!!QyMn_#CuQk(x3_PLs^j) zRf(@GgETQLd~q*Go8pd-t~qIxU-8L}xICZ#tl0y1>{$>5@Ed35**IA59Oblum68*=zLbz%b;|ci%vtSw9#q% zV0eU!M!wN@$&&sHrEgi{4=645=g*_68S=A=e+Vk;&Hpw) zN8vm#JRS+1ubs#mG9-qk2R%T*6J(@ajYX}0Xj4@xp zUPoZZ&d9F(o~)?vm!b}+bqAFOzcX;=db zLrE@^ZX)ukjG+5xWC=9|MS399I2-mPE>q+(1ZKmY@j&DXMXo@^V~kl1iD)lHdZUn7Ev+!PMxkqv zSS2oPeH7{wmo`~VO;achferFv{u719Ah3U4yow0zrqJ#X+^rKYUw)z3uaf19c-@p@ zwVS_Ry2)xO@w!R!T?bj|_MH$Ax^tVAf`X4)zEZr)a`*b~W7hq?dn|WXuu_ySQM*{m z-xI~6Xpf(zy5MH3d~N)IB?=E8q0FO)1(tXqSQ|?h<(If9^TT6Qc^t`b(Ixq!+-!fB zrpzbtr?B)i{)F?orKbVGG2|I%J%7;&Tb(bSbJjDLe5pDAWM==Q?l2sMyJ!EmjPU#; zICup}_6J|W)yrT%$$;$OB{=cDV(;rW5P9>um#<_eKEY8l_cj2rz}tU|w__xL04N5c z{qI!21Aqz+?VKttWHPh4M&6$9r>1#+2_C4C+364a_57~q2+@Yrr!Kayy4Ew00000NkvXXu0mjfTL5&a delta 1306 zcmV+#1?BqG4(txFWCDNlNklM%8W-sxe?IqlQEZYhkn6LK4_e2iw(c5d3c)RzO|Yf3B&; zim0t2OKt-z#BhI;g{o?-nCdDrwcdvnM+h?FtOaTg^w1XGzfKq?pJ(UEVozuK%`YY&s5m1*w z=^QUP2c>-aUjcO5Ht~{8Uqh#WmgGX|8~)7iP|BrG>Y+0_#-AA*g-$&!T9XHzE)LKI zoxD%oia6-Z?&kpeXQ2~E|H+0U$bm|C4=>Ym0V+8e5#5KEILM`lZpTch z%r|k6rg?v;WYWK~pmK{txCNCg`p6B93yrrqgxif5py4K>R0z!9J=D9oZ|k;xHr2mv zYv1PHLwDyPkV-@wVQ!>(*Y5T`L;Hq1S*&w--_V}+-MgAcU@nb_TnOdB!Ir~Ynoe*O zPBd*f+;Z>$LU9qrq$7m+9=1u(JVHp1p;&}8H_U&w7@k8&v8D%g<59N3(MHqbIvyql zk8#wF4Z=h`CBV$gagNgQ8JJ0+2AJA;lB05RCrmYv59ZoVaTHFq!JLnhVd3-{j@X&g zu#ikHSegBfBlN>8thmU4rS7vFk+a>fWKasMbqsL?hB{y^CG3YWa-P-Bk09)a4TRHr zk(GZgwjvyZT%yuYn7e`KL85Xcm_B3k#d z(B4*r=MgtwerB;>B+VCbyQ!Ch-TCe69S+uuu(IV1wiaIQ-u+gf_5M9xt_5Mm$y7cmUK)6_MgTO&RTif_;En3{p2YEJbe;S#Xo;W z7`gIB`Bh%h|NS!rdDh;~ORmZr<&-adWj^nEfskHwJ?BN^u$HeFhP-6ISFcB5YV`Fh z_In9SNt*FbzyC}cZ-b?_asT<&4@-rLfmbs#Pq(~5SZ`XUnYkGjiZvs?w>g`uvDhVgp&nT0`G3@895Cu@| zSGnpUH_nHQoR3vGA0%@=I=4E*g3iYyoezXMAAxl~^y_@gd9?<+osY6RAKrIXu)+6febCns+4|r=rrr|#OjV2q Q2mk;807*qoM6N<$f@^Jf!2kdN diff --git a/android/res/drawable-xxhdpi/icon_bookmark_yellow.png b/android/res/drawable-xxhdpi/icon_bookmark_yellow.png index df053f4000df1d3d7368379aef6f600c70af99d0..503eb851c19b6e2e1e22296539c994bc41299893 100644 GIT binary patch delta 1258 zcmVW^@=I!!^V5lBDTg?{@+H(^OS!-``^g4jj|I&u+<} z1xlOA%}{D_$yc?|=|4rD>W5Bkeh%w}(s7bJ4yE3_9J>rUp%IcC2|;IBZt7L%=V$!p znL2Ohyh+ds^P4cVvfn9nPx+fa9EQ?QS-lKe_xZzpXk~vkI&~jRa8W|tB{TXjw0`HJ zzo6A+96v+pIWs(m($9-KLl2Z*FvANd^*C!q8I;yD%X%o4neRHF^e?k4K&j)$j?@XA zEzGe6I-Sjhy@&J6F<;p0*b1H9%(ELht>&vX=p1C8gV1UFmf@jusE>L24ngN@x^IBa z5xO`6od$nn%rB4%oVz&iBtA$Nga17lxOgrAsYYW=4J?LMuU$91VdJJCt%932ZWvy- zcJ&Y}YK$pqg1gbJW81dxSlGFX)Z4XlVaN7uV_QezuBpV7!p-=ey)25od&c3W)aysR zk43W2>vvracYm-b{)D@7QvnbASp@sxp~CzMFB5-UvI%(k)%bMr$v!Sg-=t4VH`VYq z73C5{r{JyH|Nn7xkOdn&>i-9+g`dMI7ASQXerin}d?kV`NH76kb+!*9QrIsu0^5gc zVG%n)wG%N|)S4RDoSdW5+)3Efm}*#^K0}o=r(snsDyV0tsW5#Oc2%Yl0_QJK?812n zRGNPZNX(2-Xk-Qw6{Z{_m%BgAf3O9^7D#IBdEVv+-SKc{tUNANr>rGRs}qbjgSEM^R>&9vDZ4 z@quY(h&~bw<A@~>?Uc;|e2@YPu6W{DhlCNF|U=euzisZ{#&56(S z`Y+?bH*X>E_D#@#H}6%QamU`h{{W#6@86Ay&$zbNG4v4%ACs!XwfNv=2s1}L7~cw~fF6@X-b&H*e4cq9O!ioh!L ztC%x_-I%g_yzh4fKWO+R#ZNd}(O=n)`tYNbU(24)bi@BM-C-Xb+hreY$9wzW1Q@*k UzB!=rCIA2c07*qoM6N<$f|99ft^fc4 delta 1290 zcmV+l1@-#94%`l~WCDNVNklFXD4Jd-CMG{ z7BZ)f961G<+G-Uq0HJL}+aMHBaTaNi={`qvt{XC1{5z})LZ|7w(-5jsF%||P(>_4o z4YWfh82jq2gwSgWdkvw=m^%ql9Te69sR|X%3!%Sg&T)ST{i33jLFzHhc?_xOjIJC) zv-HC(gvz7xUr7B%Kl}-)VinO0p*Ixe4TPH2oCT#2dP`B>LZ~!St?)o-6a8cpggh!t z6+-AA`pGK@6{@hjBFJo~7~3IJlxOcg+(|KZ+PfX|A+w+2?1xN#_}~J_9Hlr%AyW{} zNg;Eri{gKD9fOQtDU}VG6Qtt=WU`e~%fZ!p>1xl5nO@S-`|pdMtCw2Am7|pM!9w4< z4IBG6Z`s;LmfE&%+1$Tz!@53L@F|s&3w?t-hIZ}V^J?!tvSHueS9^Bv8rm@keYq(r z6?%pb93)2^JTMGBsYZeN5IN+KQMgWnzTe3ae?WgdXQp96Q$AQZyNZNXorM*j%7mr!7f9s7d05J1C8!t2 zNnn5cBCL5;1{f}1A+{@*!H}WS!7(vFOal|(NLOiKxz<4}9oN8;#?IJUSut#7D?4vX z1oOm5z~LKUR;%85wbg%|;RNStHS=g3!~Fpi_eXBrA2OP6V^!`ClDR)R z=l-yu`{R-Gcp%jM5m@(!e%&8)c7L$j{ZV%Jhxh04x`O))8t$*8xW9xWSKKUFJ8CYT z?~7LMua?RAvzI%%OebF-Yzaly2SY9P)(8Iw7`*?!+^vt@00000NkvXXu0jG}f;Hi2 AmH+?% diff --git a/android/res/layout/edit_bookmark_set.xml b/android/res/layout/edit_bookmark_set.xml deleted file mode 100644 index a401f51cbf..0000000000 --- a/android/res/layout/edit_bookmark_set.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/res/layout/fragment_bookmark_categories.xml b/android/res/layout/fragment_bookmark_categories.xml index 61dde60e21..14a2a5a54a 100644 --- a/android/res/layout/fragment_bookmark_categories.xml +++ b/android/res/layout/fragment_bookmark_categories.xml @@ -1,12 +1,13 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - + \ No newline at end of file diff --git a/android/res/layout/fragment_bookmarks_list.xml b/android/res/layout/fragment_bookmarks_list.xml index 7b08d38bb9..a4329feb2a 100644 --- a/android/res/layout/fragment_bookmarks_list.xml +++ b/android/res/layout/fragment_bookmarks_list.xml @@ -1,27 +1,7 @@ - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/android/res/layout/item_bookmark.xml b/android/res/layout/item_bookmark.xml new file mode 100644 index 0000000000..6de5a2a973 --- /dev/null +++ b/android/res/layout/item_bookmark.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/android/res/layout/item_bookmark_category.xml b/android/res/layout/item_bookmark_category.xml index d15af3309a..777c3fb191 100644 --- a/android/res/layout/item_bookmark_category.xml +++ b/android/res/layout/item_bookmark_category.xml @@ -12,6 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" + android:background="@null" android:button="@drawable/btn_bookmark_visibility" android:focusable="false"/> diff --git a/android/res/layout/item_category_title.xml b/android/res/layout/item_category_title.xml new file mode 100644 index 0000000000..5c0e085d1e --- /dev/null +++ b/android/res/layout/item_category_title.xml @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/android/res/layout/list_item_track.xml b/android/res/layout/item_track.xml similarity index 87% rename from android/res/layout/list_item_track.xml rename to android/res/layout/item_track.xml index de5d50aaae..d3305306ca 100644 --- a/android/res/layout/list_item_track.xml +++ b/android/res/layout/item_track.xml @@ -7,7 +7,7 @@ android:paddingRight="3dp" > - - - - - - - - - \ No newline at end of file diff --git a/android/res/layout/list_separator_base.xml b/android/res/layout/list_separator_base.xml deleted file mode 100644 index 4ed5915a4d..0000000000 --- a/android/res/layout/list_separator_base.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java index 88b97ce7b2..63823bb50f 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java @@ -1,11 +1,9 @@ package com.mapswithme.maps.base; -import android.app.Activity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import android.view.inputmethod.InputMethodManager; import com.mapswithme.maps.MWMApplication; import com.mapswithme.maps.R; @@ -47,8 +45,6 @@ public class BaseMwmFragmentActivity extends AppCompatActivity { if (item.getItemId() == android.R.id.home) { - final InputMethodManager imm = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); - imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); onBackPressed(); return true; } diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java index 0a8fe66d85..4cf98171a2 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java @@ -17,6 +17,7 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager; public class BookmarkCategoriesFragment extends BaseMwmListFragment { private int mSelectedPosition; + private BookmarkCategoriesAdapter mAdapter; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) @@ -29,10 +30,23 @@ public class BookmarkCategoriesFragment extends BaseMwmListFragment { super.onViewCreated(view, savedInstanceState); - setListAdapter(new BookmarkCategoriesAdapter(getActivity())); + initAdapter(); + setListAdapter(mAdapter); registerForContextMenu(getListView()); } + private void initAdapter() + { + mAdapter = new BookmarkCategoriesAdapter(getActivity()); + } + + @Override + public void onResume() + { + super.onResume(); + mAdapter.notifyDataSetChanged(); + } + @Override public void onListItemClick(ListView l, View v, int position, long id) { diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java index 79f8b3ae12..9d5ecd4a25 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java @@ -20,9 +20,7 @@ import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.util.UiUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class BookmarkListAdapter extends BaseAdapter @@ -31,8 +29,13 @@ public class BookmarkListAdapter extends BaseAdapter private final Activity mActivity; private final BookmarkCategory mCategory; - // reuse drawables - private final Map mBmkToCircle = new HashMap(8); + // view types + static final int TYPE_TRACK = 0; + static final int TYPE_BOOKMARK = 1; + static final int TYPE_SECTION = 2; + + private static final int SECTION_TRACKS = 0; + private static final int SECTION_BMKS = 1; public BookmarkListAdapter(Activity activity, BookmarkCategory cat) { @@ -56,10 +59,6 @@ public class BookmarkListAdapter extends BaseAdapter return 3; // bookmark + track + section } - final static int TYPE_TRACK = 0; - final static int TYPE_BMK = 1; - final static int TYPE_SECTION = 2; - @Override public int getItemViewType(int position) { @@ -70,13 +69,19 @@ public class BookmarkListAdapter extends BaseAdapter return TYPE_SECTION; if (position > bmkPos && !isSectionEmpty(SECTION_BMKS)) - return TYPE_BMK; + return TYPE_BOOKMARK; else if (position > trackPos && !isSectionEmpty(SECTION_TRACKS)) return TYPE_TRACK; throw new IllegalArgumentException("Position not found: " + position); } + @Override + public boolean isEnabled(int position) + { + return getItemViewType(position) != TYPE_SECTION; + } + @Override public View getView(int position, View convertView, ViewGroup parent) { @@ -84,35 +89,27 @@ public class BookmarkListAdapter extends BaseAdapter if (type == TYPE_SECTION) { - View sectionView = null; - TextView sectionName = null; + TextView sectionView; if (convertView == null) - { - sectionView = LayoutInflater.from(mActivity).inflate(R.layout.list_separator_base, null); - sectionName = (TextView) sectionView.findViewById(R.id.text); - sectionView.setTag(sectionName); - } + sectionView = (TextView) LayoutInflater.from(mActivity).inflate(R.layout.item_category_title, parent, false); else - { - sectionView = convertView; - sectionName = (TextView) sectionView.getTag(); - } + sectionView = (TextView) convertView; final int sectionIndex = getSectionForPosition(position); - sectionName.setText(getSections().get(sectionIndex)); + sectionView.setText(getSections().get(sectionIndex)); return sectionView; } if (convertView == null) { - final int id = (type == TYPE_BMK) ? R.layout.list_item_bookmark : R.layout.list_item_track; - convertView = LayoutInflater.from(mActivity).inflate(id, null); + final int id = (type == TYPE_BOOKMARK) ? R.layout.item_bookmark : R.layout.item_track; + convertView = LayoutInflater.from(mActivity).inflate(id, parent, false); convertView.setTag(new PinHolder(convertView)); } final PinHolder holder = (PinHolder) convertView.getTag(); - if (type == TYPE_BMK) + if (type == TYPE_BOOKMARK) holder.set((Bookmark) getItem(position)); else holder.set((Track) getItem(position)); @@ -169,9 +166,9 @@ public class BookmarkListAdapter extends BaseAdapter public PinHolder(View convertView) { - icon = (ImageView) convertView.findViewById(R.id.pi_pin_color); - name = (TextView) convertView.findViewById(R.id.pi_name); - distance = (TextView) convertView.findViewById(R.id.pi_distance); + icon = (ImageView) convertView.findViewById(R.id.iv__bookmark_color); + name = (TextView) convertView.findViewById(R.id.tv__bookmark_name); + distance = (TextView) convertView.findViewById(R.id.tv__bookmark_distance); } void setName(Bookmark bmk) @@ -201,22 +198,9 @@ public class BookmarkListAdapter extends BaseAdapter distance.setText(mActivity.getString(R.string.length) + " " + trk.getLengthString()); } - void setIcon(Bookmark bmk) + void setIcon(Bookmark bookmark) { - final String key = bmk.getIcon().getType(); - Drawable circle = null; - - if (!mBmkToCircle.containsKey(key)) - { - final Resources res = mActivity.getResources(); - final int circleSize = (int) (res.getDimension(R.dimen.circle_size) + .5); - circle = UiUtils.drawCircleForPin(key, circleSize, res); - mBmkToCircle.put(key, circle); - } - else - circle = mBmkToCircle.get(key); - - icon.setImageDrawable(circle); + icon.setImageResource(bookmark.getIcon().getSelectedResId()); } void setIcon(Track trk) @@ -243,9 +227,6 @@ public class BookmarkListAdapter extends BaseAdapter } } - private final static int SECTION_TRACKS = 0; - private final static int SECTION_BMKS = 1; - private int getTracksSectionPosition() { if (isSectionEmpty(SECTION_TRACKS)) diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java index e834486771..6c6fb911da 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java @@ -6,8 +6,6 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; -import android.text.Editable; -import android.text.TextWatcher; import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; @@ -17,7 +15,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; -import android.widget.EditText; import android.widget.ListView; import com.mapswithme.maps.Framework; @@ -34,61 +31,99 @@ import com.mapswithme.util.ShareAction; public class BookmarksListFragment extends BaseMwmListFragment { - public static final String TAG = "BookmarkListActivity"; + public static final String TAG = BookmarksListFragment.class.getSimpleName(); + private static final int ID_SEND_BY_EMAIL = 0x01; + private static final int MENU_DELETE_TRACK = 0x42; - private EditText mSetName; - private BookmarkCategory mEditedSet; + private BookmarkCategory mCategory; + private int mCategoryIndex; private int mSelectedPosition; - private BookmarkListAdapter mPinAdapter; - private int mIndex; + private BookmarkListAdapter mAdapter; + private ActionBar mActionBar; - // Menu routines - static final int ID_SEND_BY_EMAIL = 0x01; - static final int MENU_DELETE_TRACK = 0x42; - - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) - { - final ViewGroup root = (ViewGroup) inflater.inflate(R.layout.fragment_bookmarks_list, container, false); - setUpViews(root); - return root; - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) - { - super.onViewCreated(view, savedInstanceState); - createListAdapter(); - registerForContextMenu(getListView()); - setHasOptionsMenu(true); - if (getActivity() instanceof AppCompatActivity) - mActionBar = ((AppCompatActivity) getActivity()).getSupportActionBar(); - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Initialize with passed edited set. - mIndex = getArguments().getInt(ChooseBookmarkCategoryActivity.BOOKMARK_SET, -1); - mEditedSet = BookmarkManager.INSTANCE.getCategoryById(mIndex); + mCategoryIndex = getArguments().getInt(ChooseBookmarkCategoryActivity.BOOKMARK_SET, -1); + mCategory = BookmarkManager.INSTANCE.getCategoryById(mCategoryIndex); + } + + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) + { + return inflater.inflate(R.layout.fragment_bookmarks_list, container, false); + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) + { + super.onViewCreated(view, savedInstanceState); + initListAdapter(); + setListAdapter(mAdapter); + registerForContextMenu(getListView()); + setHasOptionsMenu(true); + if (getActivity() instanceof AppCompatActivity) + { + mActionBar = ((AppCompatActivity) getActivity()).getSupportActionBar(); + mActionBar.setTitle(mCategory.getName()); + } + } + + @Override + public void onStart() + { + super.onStart(); + + mAdapter.notifyDataSetChanged(); + } + + @Override + public void onResume() + { + super.onResume(); + + mAdapter.startLocationUpdate(); + } + + + @Override + public void onPause() + { + super.onPause(); + + mAdapter.stopLocationUpdate(); + } + + private void initListAdapter() + { + mAdapter = new BookmarkListAdapter(getActivity(), mCategory); + mAdapter.startLocationUpdate(); + } + + private void assignCategoryParams() + { + // TODO add dialog to edit category name +// final String name = mSetName.getText().toString(); +// if (!name.equals(mCategory.getName())) +// BookmarkManager.INSTANCE.setCategoryName(mCategory, name); } @Override public void onListItemClick(ListView l, View v, int position, long id) { - switch (mPinAdapter.getItemViewType(position)) + switch (mAdapter.getItemViewType(position)) { case BookmarkListAdapter.TYPE_SECTION: return; - case BookmarkListAdapter.TYPE_BMK: - final Bookmark bmk = (Bookmark) mPinAdapter.getItem(position); - BookmarkManager.INSTANCE.showBookmarkOnMap(mIndex, bmk.getBookmarkId()); + case BookmarkListAdapter.TYPE_BOOKMARK: + final Bookmark bookmark = (Bookmark) mAdapter.getItem(position); + BookmarkManager.INSTANCE.showBookmarkOnMap(mCategoryIndex, bookmark.getBookmarkId()); break; case BookmarkListAdapter.TYPE_TRACK: - final Track track = (Track) mPinAdapter.getItem(position); + final Track track = (Track) mAdapter.getItem(position); Framework.nativeShowTrackRect(track.getCategoryId(), track.getTrackId()); break; } @@ -98,68 +133,26 @@ public class BookmarksListFragment extends BaseMwmListFragment startActivity(i); } - private void createListAdapter() - { - mPinAdapter = new BookmarkListAdapter(getActivity(), mEditedSet); - - setListAdapter(mPinAdapter); - - mPinAdapter.startLocationUpdate(); - } - - private void assignCategoryParams() - { - final String name = mSetName.getText().toString(); - if (!name.equals(mEditedSet.getName())) - BookmarkManager.INSTANCE.setCategoryName(mEditedSet, name); - } - - private void setUpViews(ViewGroup root) - { - mSetName = (EditText) root.findViewById(R.id.pin_set_name); - mSetName.setText(mEditedSet.getName()); - mSetName.addTextChangedListener(new TextWatcher() - { - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) - { - // Note! Do not set actual name here - saving process may be too long - // see assignCategoryParams() instead. - if (mActionBar != null) - mActionBar.setTitle(s); - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) {} - - @Override - public void afterTextChanged(Editable s) {} - }); - } - @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) { - assignCategoryParams(); - - // Some list views can be section delimiters. if (menuInfo instanceof AdapterView.AdapterContextMenuInfo) { final AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo; mSelectedPosition = info.position; - final Object obj = mPinAdapter.getItem(mSelectedPosition); - final int type = mPinAdapter.getItemViewType(mSelectedPosition); + final Object obj = mAdapter.getItem(mSelectedPosition); + final int type = mAdapter.getItemViewType(mSelectedPosition); - if (type == BookmarkListAdapter.TYPE_BMK) + if (type == BookmarkListAdapter.TYPE_BOOKMARK) { final MenuInflater inflater = getActivity().getMenuInflater(); inflater.inflate(R.menu.pin_sets_context_menu, menu); - for (final ShareAction sa : ShareAction.ACTIONS.values()) + for (final ShareAction action : ShareAction.ACTIONS.values()) { - if (sa.isSupported(getActivity())) - menu.add(Menu.NONE, sa.getId(), sa.getId(), getResources().getString(sa.getNameResId())); + if (action.isSupported(getActivity())) + menu.add(Menu.NONE, action.getId(), action.getId(), getResources().getString(action.getNameResId())); } menu.setHeaderTitle(((Bookmark) obj).getName()); @@ -178,16 +171,16 @@ public class BookmarksListFragment extends BaseMwmListFragment public boolean onContextItemSelected(MenuItem item) { final int itemId = item.getItemId(); - final Object obj = mPinAdapter.getItem(mSelectedPosition); + final Object obj = mAdapter.getItem(mSelectedPosition); if (itemId == R.id.set_edit) { - startPinActivity(mEditedSet.getId(), ((Bookmark) obj).getBookmarkId()); + startPinActivity(mCategory.getId(), ((Bookmark) obj).getBookmarkId()); } else if (itemId == R.id.set_delete) { BookmarkManager.INSTANCE.deleteBookmark((Bookmark) obj); - mPinAdapter.notifyDataSetChanged(); + mAdapter.notifyDataSetChanged(); } else if (ShareAction.ACTIONS.containsKey(itemId)) { @@ -197,7 +190,7 @@ public class BookmarksListFragment extends BaseMwmListFragment else if (itemId == MENU_DELETE_TRACK) { BookmarkManager.INSTANCE.deleteTrack((Track) obj); - mPinAdapter.notifyDataSetChanged(); + mAdapter.notifyDataSetChanged(); } return super.onContextItemSelected(item); @@ -209,38 +202,10 @@ public class BookmarksListFragment extends BaseMwmListFragment .putExtra(ChooseBookmarkCategoryActivity.BOOKMARK, new ParcelablePoint(cat, bmk))); } - @Override - public void onResume() - { - super.onResume(); - - mPinAdapter.startLocationUpdate(); - } - - @Override - public void onStart() - { - super.onStart(); - - mPinAdapter.notifyDataSetChanged(); - } - - @Override - public void onPause() - { - assignCategoryParams(); - - mPinAdapter.stopLocationUpdate(); - - super.onPause(); - } - private void sendBookmarkMail() { - assignCategoryParams(); - String path = MWMApplication.get().getTempPath(); - final String name = BookmarkManager.INSTANCE.saveToKmzFile(mEditedSet.getId(), path); + final String name = BookmarkManager.INSTANCE.saveToKmzFile(mCategory.getId(), path); if (name == null) { // some error occurred @@ -268,7 +233,7 @@ public class BookmarksListFragment extends BaseMwmListFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { -// + // TODO add options menu } @Override