From c2d0cd89062f93ee9b93f298ece956d6b2b69f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Tue, 6 Feb 2018 19:24:24 +0300
Subject: [PATCH] [android] Added bookmark backup layout

---
 android/res/drawable-hdpi/ic_expand_less.png  | Bin 199 -> 167 bytes
 android/res/drawable-hdpi/ic_expand_more.png  | Bin 202 -> 155 bytes
 android/res/drawable-mdpi/ic_expand_less.png  | Bin 168 -> 141 bytes
 android/res/drawable-mdpi/ic_expand_more.png  | Bin 164 -> 131 bytes
 android/res/drawable-xhdpi/ic_expand_less.png | Bin 241 -> 192 bytes
 android/res/drawable-xhdpi/ic_expand_more.png | Bin 239 -> 179 bytes
 .../res/drawable-xxhdpi/ic_expand_less.png    | Bin 303 -> 232 bytes
 .../res/drawable-xxhdpi/ic_expand_more.png    | Bin 281 -> 223 bytes
 .../res/drawable-xxxhdpi/ic_expand_less.png   | Bin 356 -> 268 bytes
 .../res/drawable-xxxhdpi/ic_expand_more.png   | Bin 382 -> 255 bytes
 .../layout/fragment_bookmark_categories.xml   |   9 ++-
 android/res/layout/item_bookmark_backup.xml   |  60 ++++++++++++++++++
 android/res/values/styles.xml                 |   4 ++
 13 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 android/res/layout/item_bookmark_backup.xml

diff --git a/android/res/drawable-hdpi/ic_expand_less.png b/android/res/drawable-hdpi/ic_expand_less.png
index e1f2ecc74d3d0acc38a05d38f04963a0c2ff7ec4..4a101ae2148f8a96a89113e30989f01e394b4f83 100644
GIT binary patch
delta 139
zcmV;60CfMy0jB|wB!6y6L_t(|0qxQO2E{NCMbXJ>v!wZ}{b|bscx@2V(0dtZ6LXND
zAR;1)F-E&)C(KXNHo+*NcENbmi<o+p!KA)bqJ%Mv@BWozX3msjN>O?vcEKbnSAzOE
t|3{2L>243T5|tL?Q7H@&5z!|)0MFKuMM{N%JOBUy07*qoL<FuvV1hCNJRtx8

delta 171
zcmV;c095~{0mlK5B!7-cL_t(|+U=7;3V<LGMW>6nu#QkyRqK@2KCFRerC@}p(0?%C
z<}+`GkpKVy06-K%7`VETQTA|L{O&`>_`oGnUC2aI?PX%AW-@X^DXAth^2@49y=hog
zN}1iJ8|B40OC{0H&l#Dll-~BG;C8&er#xlaSSBqcTYa*cN+dF^e*7{eXE;j$006*G
ZxB#R|6s)V8{$Bt9002ovPDHLkV1m6NO??0W

diff --git a/android/res/drawable-hdpi/ic_expand_more.png b/android/res/drawable-hdpi/ic_expand_more.png
index 57ccedd2ee4adf0fcbfe51864147fe3f6e54bbd2..6f5ce22441cd7a9c88ab39eb586d848114f3ed74 100644
GIT binary patch
delta 126
zcmV-^0D=F?0h<AkBzIy-L_t(|0qxEK27piygyF=y_nxRLZi}8rVH9i7|1*H$+vrab
z5m9FDUp`%!s2#QO;xn#KG+<^ol*Y`W3-m;3%mVeJ3>b|vU=+%M5hw#jpnMpCS{N_N
gfDx#|5D^j43Ew|qhIyDog8%>k07*qoM6N<$g3eDgtN;K2

delta 174
zcmV;f08#&&0m=c8B!7`fL_t(|+U?H034kyVhG9Wm!ymNM&dwpUavrxxG$U9zo5lem
zS6D?j3(Ym(3#oD+JP|?&A%uj=jP3H-4&&<Lw;Q@Gl<jHzDW)=KovPi@%k;jri%Yl-
z-O%m5EA`oY4)Rev<`)o^>SKCF@fh0P|3Od!7#_u8f}<ErcqbHtkwEzvL6nb?M-c`g
cgb+f}1?ZsM(TfON#sB~S07*qoM6N<$f}18!Jpcdz

diff --git a/android/res/drawable-mdpi/ic_expand_less.png b/android/res/drawable-mdpi/ic_expand_less.png
index 22d5bb71be9a576b8f2bccb3164cfe806ec8e6a7..01798aeb115da37e451ecb7c33389be82d0df979 100644
GIT binary patch
delta 112
zcmV-$0FVEu0gVBWBxzJhL_t(|0b?KyjDk@x3jY89F9O1}H2fkIi_pe!D1cc)O~WrC
z8GI4h5{eB+HxQc`)eOfcM~(%1aT<VW$zF0S(1Thcg3p&wHF~&B8U>?Z6aWB%Prm4q
Sf}5ED0000<MNUMnLSTYfvMLe)

delta 140
zcmV;70CWG10jL3xB!6#7L_t(|0b?KyjDk@x3e;wP5&>bF87@EV!$lAVv1wws+_Vq>
zK^SHU)eM)L{^1hLU=T*Ogkr<d4FqATSfa7;lQ6nLxGV;#CD{Un86PT<4JY8cDv~Ww
uobz2Cq!Hvg0=}#Qsl{#5C>RB!008)}c371B5J><4002ovP6b4+LSTY0D>niF

diff --git a/android/res/drawable-mdpi/ic_expand_more.png b/android/res/drawable-mdpi/ic_expand_more.png
index 805c4989a4544a756e2441d7f0bbfafad714e9fe..bb1c6eeb8e966caa40b42106e00dcc79aec7572e 100644
GIT binary patch
delta 102
zcmV-s0Ga=!0fPaMBwtENL_t(|+U<?84FDhv!+H+y^rPO*5*T1@1X*LLTWW_frU$?f
zHuSOf&3)Ny@@(oifE#J#xB)%F<$8q3^$3yc5iZvw6~>q+7N;Gd52b*V1^@s607*qo
IM6N<$f(<z<<^TWy

delta 136
zcmZo>T*5d(r9Ru!#WAFUF<HXFfXnTm#)SF*EF<b}wX=V^Y|r{Ah<Ot8O2(C{cbhWh
z7e856`$OOU?_>R(X$?n!oIkul%t7AM^hK7{=Nw4m?BEq*KG}HXz>$?noQ{Vzx3gR>
oSQXWjXK__m@$QE}py7-RALk?<NcOYY!~g`Iu6{1-oDvwD07Jky7ytkO

diff --git a/android/res/drawable-xhdpi/ic_expand_less.png b/android/res/drawable-xhdpi/ic_expand_less.png
index 4be6697058c95542180fc48f8ffa838200fa8877..7d0fb2aae647b87d9299e045f1370c744e300810 100644
GIT binary patch
delta 175
zcmV;g08sz&0l)!}8Gi-<00374`G)`i0EbCLK~#7F?a=`S12GVV;e{M<ddd`Xz`$!t
zKuxQyF*5ug1MRZ^vljpW006)t$(~m^e(tlX@!K9zF}~CYKi(fvC4Rp7&8o!Pr~i(R
z|K^$F<Ksu<$H$MzkB=XbAAiaSN%x2sOS(BDdd7gZZoI|^d??Mau3byki0;JyJEH#@
d4*&oF01uh;LVw2)4)Op1002ovPDHLkV1fffPGtZ9

delta 224
zcmV<603ZLr0r3Hl8Gi!+003az3AF$K04h*SR7C&)03Vm~AD8hSmhc~#^B|b=GnxM%
zmhdj3{~ww4CYSaemhm8&@+Y13t_|Q~0000EbW%=J08#q?Qcnu;3mF@iP#PNCeUAVD
z0BA`>K~#9!?T$+dfG`XN^Qoq`djIRX^A#l}1(%s!V1^e;l3C<`m=}E!Uh`Fj*L)N)
zA4Sj?K@svxK@swaP{jOT!H{rF*r1@;e1EsWf4;Kn1_%6cqmfHjdp&TPcAC&W^Yx-6
aNgQr<@Bz=TI4Rly0000<MNUMnLSTXr24LU-

diff --git a/android/res/drawable-xhdpi/ic_expand_more.png b/android/res/drawable-xhdpi/ic_expand_more.png
index 5f6b80a5f68d769a9183bb06b4b41c58290640ac..8661d4c264f172c0193d4e233963b7e3567944a9 100644
GIT binary patch
delta 162
zcmaFQxS4T+WIY=L14B5|&vqbH<>}%WQgQ3;`Hj2>6nI<$)sl99xi?*Ljsh2d!2!{q
z{zch;vw_MOK3LEES##a|&&$u(-~Kp}dWONU?upR%N8Y^wkGv(=u5jq?W4q!0;^RNT
zsy+2Ba_{9A9{=s$0punDxdQLyKwPM-i-|PIK#K>giQ#5jAMbI@1#vxH{an^LB{Ts5
DzSl@l

delta 222
zcmdnY_?~fsWIZzj14F_c&aFU7H^3*v6-X=0_#i+1qujKQ%F{o~P5&rA?W6Xbk3fdp
zv=2a1arPIDg`X6re^8kIF=|^@KTrdINswPKL&l3!IwzkC{rUe|Pq?Dt6O+gipj48l
zi(^Q|t+%HQg&GWam>t=fj&OebKi~VQpom1NN!ZHpol|4<zTZBz>Du$)?R)opcMpF1
z_+QVuTjw}-ILI^3e8sfak26j0!fX!p3&l*fninR62xBH&?F*ZMgiq1VJJ<EJJ6XGT
T#k^Y#w2r~k)z4*}Q$iB}6p>#7

diff --git a/android/res/drawable-xxhdpi/ic_expand_less.png b/android/res/drawable-xxhdpi/ic_expand_less.png
index ad353a8100ec3a42f45729b938b5565dc29df460..6f8f515308f12fdee22c121c28a7b5c747ba602c 100644
GIT binary patch
delta 215
zcmZ3_^n!7MWIY=L14HQB&F(;Iy{C&~NCo5D3yf^ch9a&P8zUdQF=~xWP|Vdhpe}nz
z`T2*2miKZ%g&+`E_5S&dK%wVy!YlheD+kHCFR|+LxLnxf@u(x@xZuh@<x4elsz06G
znLX$8{Oz}oR(?v~ZNWJ4)8i-ZTpg3;H5L5omNZy!P7Gjrlq0b6`@g8VA2my+Nxb;=
z&Q>_Ra7p3eQl6a?Us-f3UoE_(Bw85ew(4<<TbAn_(TTS{TR>cJfPL9xonXrkMg<_g
Mr>mdKI;Vst00wefz5oCK

delta 287
zcmaFCxSnZ(WIZzj14ELrb19Ir3GfMV1=7Yd|I1JRAUEy9|NsBxr+omj<)?j;n+`-D
zfm|S|H1mr*i2YG<_7}NnAAu?%QXeeOs{!?klmz(&GqA4v&$xC?O6tZr^L2mz(A$)@
zVV-~1M_ZtLpQnpsNCo5D%dC9N^^QEw7gJ__{Fkn~*gJ4<QvJaX!hI|M2YG2Oy<=W9
z>B#oNOC~C;GEPkG6AmzT7I1LNxLH}vVeu=PZSnla;VDH4jusnKWNs+T+41G3;u4*9
zbp_FxN3||GuG|#y<6-=gTS=xb7F>y1v(7%|+~2zspSLeg+>(%NefH+>#cQIjtynxo
dBFJl{ZJ-~E*aEgJR-oG$JYD@<);T3K0RWnbfXM&=

diff --git a/android/res/drawable-xxhdpi/ic_expand_more.png b/android/res/drawable-xxhdpi/ic_expand_more.png
index 79920756fc0f38d03c07f12c7337b6bbe92a0c7a..e6f290dc8d546f31c007ebc2f73a9a6659dffc0c 100644
GIT binary patch
delta 206
zcmbQqbf0m8WIY=L14HQB&F(;InWu|mNCo5D3mZFG3<X>+ZazP+Vd^8dC9=s+&88?e
zzWBc2P1FDFyg-#eaA3~o|J&A2E<CpT{O;!mu7Cb5Wqvd=Y{}iiX@$XabSHLMoZg{%
zZkmVdoYXsF8vRp_uVgOmm~uQ*M6>_0Mv&a{z$G?*i#;mmxVugKWYMeiv{1_R)Z;JR
zQ;xqB(d<wT5_Dgp)aOwuGx3#$($zwjRgXJL?D!xSe_(wdeQf5I9kx**zNf37%Q~lo
FCIIiXTVntK

delta 265
zcmcc5IFo6DWIZzj14ELrb19HA3-AeX1=8}<Kgv!2AUEx!+_Vo$Gyf~h{}1HKPXnTl
zKm-(2oB0W>=A*(4pvsR5(?4F5%ee{EDO3{V7t9cS>FG><fyWo4JpYR<Tj^2Xz@GF~
z5GdQ=>Eakt!T9#faX}_W0cMA}-_t(T`%nAJWgYrUW&z)V#I&@u_|>asZ#x`ZYuzI}
z>Df|=aGQ;N-iFHQ(G`!D-}o%(|L4i#<cFQ}liV(OUOrr`q+9Vwogs0N`-~TYYE><r
za;b~lXTAtjtNNm;z)>Y~u-}d~#j#)MMWD-r{WE6Hyvrbbkav3TKk0O!V;DSL{an^L
IF(ots0DPEnl>h($

diff --git a/android/res/drawable-xxxhdpi/ic_expand_less.png b/android/res/drawable-xxxhdpi/ic_expand_less.png
index 41af6e3d053a73130656f538a4bb12512f15fe15..29089efdd56597ab26b5e9ad9321e2ca9e43feaa 100644
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGompxq^Ln;{GUfP)3<{-d!QM<|P
z&A-Xohe`ujwk_@bVLWN#h3ZSsKAc?(G6fC_Vy}Pyue<5v`JF0FAKfJm{zznb+%DLo
z?_{x$<LwWnFORz~^y@p>@8kIU<M|wpi$CIvl|&w|R|HA_MU_TTt8~Wyechkq{7L&2
z4}2`Q=Z}k)O5FD|;_+O;rjPFhUwv!_>i*90^@n3i-Jj}~l0OQE&K>{XvtfP@Kip*u
a3?H~Z&B^#yroh_{67+QSb6Mw<&;$SoI&^*j

delta 340
zcmeBSdcrh8vYwfNf#IrKI~S1h2=EDU1=5PMzsODhC^zkc(u|M)|Nobt_ECQN$A<s^
z6{mfYoAFs;`bYVhAC+c)m!JI|C=Nsl^Zx@$rCFckrhihN{#ky;M}_I%7Z+ci3N%Zi
zB*-tALGSf{RmP*onAEl0z2y{_Ef+Yh=A+}Kkl}x-z7?owv!{z=NCo5DvqwdbIEXMG
zv`<SrVSlN0HD6ohr$t%~dBTDq@H6^c>>Yll@?3kKm+UV-^WS(bzu~-nf;|5pyZ;Tf
z{}_M2VgA<1{)V0LXG87tAM75N_$5;04UXF-^wb;>`Q4!SjnViGv)hYy4k79G6E;UU
zznJr7KJzs^v2lN?h7FtQx9xmWk1sg(@7h8`eqEs4+@CLY8}PJWH0yo2`Tp$rX|s%(
jHMFN)wQKAEffKUES!_EBQ`+_e-Ou3Z>gTe~DWM4fRb`gj

diff --git a/android/res/drawable-xxxhdpi/ic_expand_more.png b/android/res/drawable-xxxhdpi/ic_expand_more.png
index 1340e32045dadb8bf8c8feda6fecf89d398ea900..7cb33816a4917f8e3bc05e0f7e21230e63f25c83 100644
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3p#Yx{S0Mc#71#x>wE~K=l?3?(
zGla7?{9iZ0q$d?9GR@P)F{Fa=?YV`bhY|!>9?oCF=yl+T@+HSUwu&$D+<8YjtCf|@
z{_M*S_tIQi(k{3D>aBU%ul}sNR=9TIUc25KbzkQ-ta6hHz0M-S;$XUnQGh|XP>kh(
z#SLzz2Jbe84J-{R3_6SooDAL!9!v*>7$$*)RDnVXoDBX98E_%Es*WI_MfO65uK!Qx
S&3y@UA%mx@pUXO@geCyvKUpRK

delta 367
zcmey*_>XCVL_G&H0|UcVw{|Wd<rm-+;tHhYr+=24_CbF7NBL<V<!5}7pAJMH<)(j-
zoAyy*`X@Ocdm51a!Fc9>?N$Hfr+<(KDF%`1bN|at|D-VMv)-cr3Nt_|3-<9g0!@@E
z3GxeOaN7OsXmZk#Cp#1V{a?k(^I`3}kM+FP_S}i};agId0hJx~ba4!+xb^l@B-ddB
zo|eR=)xt+_?sECQKf^gg(cnSD1bME{vI%v!BRas~g?>o;<Ci+tde?976`H>5qU&rG
z<*mCivI<{R#q!Q{k}5T|m1$i5Do&C2*Vj+18ybH9JFxrue8Z>r(hW-=8ED^QJik9<
z*3qNeTJP-ZJR(+Lzpdf-M%Fw0+AVLA8SAp867APD{65HfgJ1tZT?ym2#oQa>*CYs?
zI`uC3pvs(sbqAX~1=)VLa;Y7acz0afr^`rK2@K}*ckh<b^gDLGALt_nPgg&ebxsLQ
E08S06sQ>@~

diff --git a/android/res/layout/fragment_bookmark_categories.xml b/android/res/layout/fragment_bookmark_categories.xml
index 1fd8eb6c4a..1db4c50a18 100644
--- a/android/res/layout/fragment_bookmark_categories.xml
+++ b/android/res/layout/fragment_bookmark_categories.xml
@@ -5,7 +5,14 @@
   style="@style/MwmWidget.FrameLayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <include layout="@layout/recycler_default"/>
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <!-- TODO move backup layout into recyclerview -->
+    <include layout="@layout/item_bookmark_backup"/>
+    <include layout="@layout/recycler_default"/>
+  </LinearLayout>
 
   <com.mapswithme.maps.widget.PlaceholderView
     android:id="@+id/placeholder"
diff --git a/android/res/layout/item_bookmark_backup.xml b/android/res/layout/item_bookmark_backup.xml
new file mode 100644
index 0000000000..a2c25a9cd5
--- /dev/null
+++ b/android/res/layout/item_bookmark_backup.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
+  <LinearLayout
+    android:id="@+id/header"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/margin_base"
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingRight="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_half_plus"
+    android:paddingBottom="@dimen/margin_half_plus">
+    <TextView
+      android:layout_width="0dp"
+      android:layout_weight="1"
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textAllCaps="true"
+      android:gravity="start|center_vertical"
+      android:drawableRight="@drawable/ic_expand_less"
+      android:drawableEnd="@drawable/ic_expand_less"
+      android:text="@string/settings_backup_bookmarks"/>
+  </LinearLayout>
+  <include layout="@layout/divider_horizontal"/>
+  <LinearLayout
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="@dimen/margin_base">
+    <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      tools:text="@string/bookmarks_message_unbackuped_user"/>
+    <Button
+      android:id="@+id/button"
+      style="@style/MwmWidget.Button.Start"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:minHeight="@dimen/nav_button_height"
+      android:paddingBottom="@dimen/margin_half_plus"
+      android:paddingTop="@dimen/margin_half_plus"
+      android:paddingStart="@dimen/margin_half"
+      android:paddingLeft="@dimen/margin_half"
+      android:paddingEnd="@dimen/margin_half"
+      android:paddingRight="@dimen/margin_half"
+      android:layout_marginTop="@dimen/margin_base"
+      android:layout_marginBottom="@dimen/margin_base"
+      android:layout_gravity="center"
+      tools:text="@string/authorization_button_sign_in"/>
+  </LinearLayout>
+</LinearLayout>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 8ae0e9b9e8..a6fda744fb 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -242,6 +242,10 @@
     <item name="android:foreground">@drawable/shadow_top</item>
   </style>
 
+  <style name="MwmWidget.FrameLayout.BookmarkCategories">
+    <item name="android:background">?windowBackgroundForced</item>
+  </style>
+
   <style name="MwmWidget.RatingBar" parent="android:Widget.RatingBar">
     <item name="android:progressDrawable">@drawable/rating_bar</item>
     <item name="android:indeterminateDrawable">@drawable/rating_bar</item>