From 55efd226bbace04c56bb6e02d71ff9da04fbe249 Mon Sep 17 00:00:00 2001 From: ganfra Date: Mon, 29 Oct 2018 20:29:09 +0100 Subject: [PATCH] Add quick room category to list (WIP, not clean at all) --- .idea/caches/build_file_checksums.ser | Bin 659 -> 661 bytes .../core/extensions/CharSequence.kt | 2 +- .../home/room/list/RoomCategoryItem.kt | 16 +++++++ .../home/room/list/RoomSummaryController.kt | 10 ++++- .../home/room/list/RoomSummaryItem.kt | 2 +- app/src/main/res/color/color_room_title.xml | 6 +++ .../res/drawable-hdpi/ic_add_circle_white.png | Bin 0 -> 404 bytes .../drawable-hdpi/ic_expand_less_white.png | Bin 0 -> 185 bytes .../drawable-hdpi/ic_expand_more_white.png | Bin 0 -> 203 bytes .../res/drawable-hdpi/ic_search_white.png | Bin 0 -> 492 bytes .../res/drawable-mdpi/ic_add_circle_white.png | Bin 0 -> 266 bytes .../drawable-mdpi/ic_expand_less_white.png | Bin 0 -> 153 bytes .../drawable-mdpi/ic_expand_more_white.png | Bin 0 -> 158 bytes .../res/drawable-mdpi/ic_search_white.png | Bin 0 -> 306 bytes .../drawable-xhdpi/ic_add_circle_white.png | Bin 0 -> 509 bytes .../drawable-xhdpi/ic_expand_less_white.png | Bin 0 -> 216 bytes .../drawable-xhdpi/ic_expand_more_white.png | Bin 0 -> 248 bytes .../res/drawable-xhdpi/ic_search_white.png | Bin 0 -> 574 bytes .../drawable-xxhdpi/ic_add_circle_white.png | Bin 0 -> 770 bytes .../drawable-xxhdpi/ic_expand_less_white.png | Bin 0 -> 297 bytes .../drawable-xxhdpi/ic_expand_more_white.png | Bin 0 -> 347 bytes .../res/drawable-xxhdpi/ic_search_white.png | Bin 0 -> 899 bytes .../drawable-xxxhdpi/ic_add_circle_white.png | Bin 0 -> 1086 bytes .../drawable-xxxhdpi/ic_expand_less_white.png | Bin 0 -> 375 bytes .../drawable-xxxhdpi/ic_expand_more_white.png | Bin 0 -> 447 bytes .../res/drawable-xxxhdpi/ic_search_white.png | Bin 0 -> 1143 bytes app/src/main/res/layout/item_room.xml | 9 ++-- .../main/res/layout/item_room_category.xml | 42 ++++++++++++++++++ app/src/main/res/values/colors.xml | 7 ++- 29 files changed, 86 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt create mode 100644 app/src/main/res/color/color_room_title.xml create mode 100644 app/src/main/res/drawable-hdpi/ic_add_circle_white.png create mode 100644 app/src/main/res/drawable-hdpi/ic_expand_less_white.png create mode 100644 app/src/main/res/drawable-hdpi/ic_expand_more_white.png create mode 100644 app/src/main/res/drawable-hdpi/ic_search_white.png create mode 100644 app/src/main/res/drawable-mdpi/ic_add_circle_white.png create mode 100644 app/src/main/res/drawable-mdpi/ic_expand_less_white.png create mode 100644 app/src/main/res/drawable-mdpi/ic_expand_more_white.png create mode 100644 app/src/main/res/drawable-mdpi/ic_search_white.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_add_circle_white.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_expand_less_white.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_expand_more_white.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_search_white.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_circle_white.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_expand_less_white.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_expand_more_white.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_search_white.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_circle_white.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_expand_less_white.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_expand_more_white.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_search_white.png create mode 100644 app/src/main/res/layout/item_room_category.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index da03d8866f97c64ae3ba926c508a6daad03fe884..5dd499e43bf8fe0023ecd7d218c1e4b5cd1cff9a 100644 GIT binary patch delta 75 zcmV-R0JQ&;1(gMmm;}K?>5P$_h?ArNKa*$yJd@)AL?WFt-4f!BFNqE8lw$EA2~KnX hDKAxXWpZ;bW^!R}V{d75lQID|0TGis0UMK50zQe+8`%H= delta 73 zcmV-P0Ji^?1(OAkm;}ILkuQ;)hz=(&RdZ!>b1!FMZf0^}lLZ1clVbrqlOzE@lb-=Z f6Mxpspp Unit)? = null +) : KotlinModel(R.layout.item_room_category) { + + override fun bind() { + + } +} diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt index c601157f..b30191eb 100644 --- a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt +++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt @@ -3,6 +3,7 @@ package im.vector.riotredesign.features.home.room.list import android.content.Context import com.airbnb.epoxy.Typed2EpoxyController import im.vector.matrix.android.api.session.room.model.RoomSummary +import im.vector.riotredesign.R import im.vector.riotredesign.features.home.RoomSummaryViewHelper class RoomSummaryController(private val context: Context, @@ -10,6 +11,13 @@ class RoomSummaryController(private val context: Context, ) : Typed2EpoxyController, RoomSummary>() { override fun buildModels(summaries: List?, selected: RoomSummary?) { + RoomCategoryItem( + title = "DIRECT MESSAGES", + expandDrawable = R.drawable.ic_expand_more_white + ) + .id("direct_messages") + .addTo(this) + summaries?.forEach { val roomSummaryViewHelper = RoomSummaryViewHelper(it) RoomSummaryItem( @@ -27,4 +35,4 @@ class RoomSummaryController(private val context: Context, fun onRoomSelected(room: RoomSummary) } -} \ No newline at end of file +} diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt index e1b7db47..c4b10606 100644 --- a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt +++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt @@ -16,7 +16,7 @@ data class RoomSummaryItem( ) : KotlinModel(R.layout.item_room) { private val titleView by bind(R.id.titleView) - private val avatarImageView by bind(R.id.toolbarAvatarImageView) + private val avatarImageView by bind(R.id.avatarImageView) private val rootView by bind(R.id.itemRoomLayout) override fun bind() { diff --git a/app/src/main/res/color/color_room_title.xml b/app/src/main/res/color/color_room_title.xml new file mode 100644 index 00000000..1cda9bf6 --- /dev/null +++ b/app/src/main/res/color/color_room_title.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_add_circle_white.png b/app/src/main/res/drawable-hdpi/ic_add_circle_white.png new file mode 100644 index 0000000000000000000000000000000000000000..97e105bc680fcb9b96b1e2688778c0bb6aafc315 GIT binary patch literal 404 zcmV;F0c-w=P)WdJcSxG1zc#`_#NJ&vbduc9qT%n~jAD*hvn3=$5TuB12If?G52yK{eDl%gQ zbL_fIXvo}W>Ixz#m$U&KiosDzB?uK zQk)4c)XY7d8RF%!Kgffu@u(hl~(33H!W6|E+n y9~%bPcKTR{?pU#(cpYImnB+IT|M#Jv6nX>5rjRlzvn5vm0000|k1|%Oc%$NbB8a!PbLn>~)y&A~XpdjFSk#S*| z>`v9ye|_1w6kQ(L1is+>etJIhxdkg$^-K|P5pZM?bP153;LpprOX25_dkd`Dnw*l) zXox)Xm>I}%Ms9YJF;nZIC)LKMnr?FOu(TeV5oo&LLsO;GTHSeXw3oT)u5G&&nzQur gb1$$-7v?*t--}3D@IIuN8R!-UPgg&ebxsLQ0NE=;O8@`> literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_white.png b/app/src/main/res/drawable-hdpi/ic_expand_more_white.png new file mode 100644 index 0000000000000000000000000000000000000000..74cffcf202d1beec33523538aadcf2c4608df822 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBCV9FzhE&{od)1q(!GMS5LQ|8R z^`ohO?&_rlA4ytirrhC^Fl}l6#k8hXZThMLE&`4$f-VAt55XVyq#L0FR>CnZcpFkvwo4bAmaVT_hX~uxNgV4#bUqIU|C4L8?OE#e(og6w8 z2~AJ9z;Pt@CEiO)$-#e-cjwQ0_wL@)h@!~&OEM~;{|?jy4L}o+0~&)mAhT$o9>@oM zN6Gd9azPE`Z|DkW}ZOT3F|IEL(q<_ z{RFiofqD$)K_OTR6c8U@63AznQ4M$tIuPHk1W=QlrZ8ojPU(>V%_V>aB;Yzn+HK;$ zkpP;IfU_Jx4OZM|134t1n*+#XZQ^X8F$uWH0dzzBcM?Dy5^#%sCQHx}@%JQvOq@-z z4Kr@n8}Yr9>O(F|drL9kl=$sIS5iQiI4ENau<4!3%#?Nad+Awb7!rh_&{5NOjuQ#2Jr zlevan6Hxpn9oIgRt8`qily!jSWf`$V(@hJb6Mw<&;$U;a4)_9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_white.png b/app/src/main/res/drawable-mdpi/ic_expand_more_white.png new file mode 100644 index 0000000000000000000000000000000000000000..e72148d7c9fa03863c621bca3778cd9a015dd9da GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjsh%#5Ar-fhfBgS%&#Y^Bcm?ZX zF`ioPl1>Ac=`q|=jX(GW+#duA^M+n_=wnsz{lAdS<&ohZ`<-GBHn(UT?(9uT@m}O% zIA=;oOAhD7w#l=65~m5|T3G&E&?s`)y}K)r+fBD2f#G84^(p5sJU9WgkipZ{&t;uc GLK6T{GdP_9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_search_white.png b/app/src/main/res/drawable-mdpi/ic_search_white.png new file mode 100644 index 0000000000000000000000000000000000000000..97351f02fe4b9cebede861073caa5c28aa9f9f09 GIT binary patch literal 306 zcmV-20nPr2P)`Wa3qx_uohR6`b>tTF+x)c8*MV_X6AkA&ubki zrL&}*p9X}ag4B>Y%sDBr1*}L%IX(n@lK_43J1HVDl1t*GnA9o|V?d}B-wuR!3dA=B z6bMF|U;^LS6wn~ZG{H4|l_{V@(A5Mz_?}Z&z%{`Qe6=YcM=;g|Q}|A%fB?Z3x8+-C zPkO+2n9>JAfh0Ik58IL|#WR~u7Mf1ZFqgXX8l(HT=M`>CjXm$Tr3B zb*Oi2pJR^VgOEAid=+x}gv|A^FhCXq^bq!6fATDP0iV(ib#w1YW&i*H07*qoM6N<$ Eg8S-w-2eap literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_add_circle_white.png b/app/src/main/res/drawable-xhdpi/ic_add_circle_white.png new file mode 100644 index 0000000000000000000000000000000000000000..08f5e1281194d0a3890f4c7e97b38e801d38b5c8 GIT binary patch literal 509 zcmVY#qEFuW* z+g-+bJUb4vhF$}^=xpb(HDP(ixL2w5O&Bt{NIOy8+vL!?8$@h;Fp zCdeD4&lb5wnmzKvK8oq|6G|0sIKx$fWQY*HxZawp7{6w+2kRuK#O6J;uKJW-FX^; z3B#@D6i~U*6{r}_ZL${FAY~naF4N1$EuhlY5f}*;xYiL^2o{*@2&@GQtaJoo!v@-- zlbw#hL9jsbF9dS`2<84I&V4sJ6f7{%5$FgOxYV7@Z3POv>Q3eqcLD{*Y1RWxVGEi) za+Y>U83_`&H(3)mQVeQY<{hb-mQ_Ll0zKQpR^+kqQ;y19KxIDHc}9*ni@Qt5jXwtF z@_OLtahmE}d9c{v2&vqcMQ_ssM_WvFD)%J}4c}8gUjq-Dd>2$P+ZfJm#(#~l;9;A! zO?8_&Ej)H~hZ6d{qGJP^RhFUH=q>~b0c*Yi7r!~IeXqQj00000NkvXXu0mjfFK^j_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_white.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_white.png new file mode 100644 index 0000000000000000000000000000000000000000..0008f33b1dfc2e3ccd2b0848d520508a89d005ed GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt`JOJ0Ar-gYUU%ebP!MqqEDz1q zndPFl^HzhXhKI?@n)yql_e37CUCbs~#c9^}>ZMfl&J wwWj~V6u^t>KsI+)(ioYTHDj=^@8;vEp*)78&qol`;+030(*CjbBd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_white.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a0f9e645e14b51ced38989541877ce61f5a162c6 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt{hlt4Ar-gYUU%d=57erI-2&0{fPO5*oohDZ*`u%dt2Y18K?;k8V<}kc2m_w=9py|v)(_O z>wZU+|C#-r7Rq?e&OY!+_8xaZ!G@ooa$I?|Kc+UsxkS~x_m*+wxooWYQF8u8-HtCm z)>J=`J`yK5zj9)&(}_o$^Bh($ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_search_white.png b/app/src/main/res/drawable-xhdpi/ic_search_white.png new file mode 100644 index 0000000000000000000000000000000000000000..f9d04518b1ab626602fe6c6b8d62965c0e3868b3 GIT binary patch literal 574 zcmV-E0>S->P)_M-M$#e+yGC_aZ$U&H!eeT7~seGO4c{iC*}_agWJ)o0Lx=?GgW z!=&VAcQteeJ`f}``I1d`cB2`Fp?Mii2`B+2@P7p|Ko6J!8(_yc{GI|`AbpAgMc~D- z9t)sw3Iajk!EhdZKtGni8Srknk2fGHTOeq1@_S$alz=$k1N=Y&C66ejM(vuJ?~G3K)_id_*Fb1*WK2nS($D<(!HX=%Qjn4g!xTXGf$!nwWTUE{a_d`7T7a5(`vt$=U+D zg(AQT<(kXrg$l$~o7j|y5R>Ab-4QA6bf1t|vfjqZuvrnu-^pAL=xh-}#fY^BN%oEp zuvcY;cwm3xFu%lPFDavcNZ1KHIksgk>UFk~auRzsY+}TJE!o>DdA1m_8gul(Qqerd z##V~;^JCUkZdq@$W;1NZWWmxgk!W~nYq8Bs;+XrIEfa~lmo|5sCK5F-?M^pLByPO4 zy>2E^_0so&x)X_0`(RP?x`4*Uz9)y!Z>m;KUVY?K0!ly$C;``e11^I(^pCv{-2eap M07*qoM6N<$f*{%P#Q*>R literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_circle_white.png b/app/src/main/res/drawable-xxhdpi/ic_add_circle_white.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdbc572a7843a0173f0c253e7b16fabe1564f2e GIT binary patch literal 770 zcmV+d1O5DoP)jM9>2Y$SksgY$A2! z0%;;`MN@sRu0BJbok0du6;wu+keU*pn-+46EF#ZR5HyMGA=h9(9b^}*PAIRST} zGjk#aL8Hhw@Rx05Bve83$S?4pD`YMtK?BG~2rp~MBj19Ckt&3nePqa&pb~Nh;isXF z)v2K2NaWm?^wgE0fxs`TZaL7oC+P@Uhj{azThKhjpVwT1Mg!UB*w`nPIRt%$bh2ez z&=m6lcl*7Zsn`^BlAxd?TY@GXobo;dQO0cu+Dll_j;WwBQ?V-)L7iT&A-x1GIeM!2 z5=41pBB+*uphI0j1;YY+EP{R`Pjm#$I^4MV6hwKcBWNWfLCZRVHZu~mp(CiCk)WSC zf-V>q%#Ci&bp$mt5_G8}sGX6ZmIz`HB$t@nq|I*9@|c&6;$1$;tH!_cR!7iGMuJ}G z2pW`fNAH5!aR!2_CKbiS3?_i-XR!LaUbFkEUt|cg_ z3Ko0w6Nw4BLB_!H_{%n=lh42~A4C)ER|&|WGENDYM)2km5cCR|hd4h(Eax3Km~y32 z+WiRS{6PA_(I7buWj7*{a|*Y!2G0K!p%ICkqV76PYru3S9Rz+^6-?G>qfk!wq_qI$ ztm@ozI0W6_0)((nYX0w|+?Ale<&iI*#N4PIa>?eJxcXC60XT9fhh99#Io876$fJYa zVJf<{RXt~na}BOKo^;yNG${>CwhRmGRaGV}x;Sf<%xA5<&6u2NvEynIc)3B>(^b07*qoM6N<$g4X6$ A761SM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_white.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_white.png new file mode 100644 index 0000000000000000000000000000000000000000..0e077276330b4f2f40d492a2814bf1dc042aeb72 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!A3R+gLn>~)z3Iz!$UwyH;<^K( zE407n&wmxQs#(m1!y;q$`;(k^BHh?0shu_Gd%U1bfPs;Tg+oBWp#eeyxhf6~V8IJq zcb74k7Cb9tzH+S7$?IsRqt~%c2e0EV`$8C(YX^zW$@9px_+H+xvczQ0-w>W4sdF~= zY?^}VT$-Zk?=DDdN~$wy$}YDKVx8l^7YQi99LvB7a?}hXvF{k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_white.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_white.png new file mode 100644 index 0000000000000000000000000000000000000000..9173968c8fc4989056ba4bece5b8f9e8023c9895 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U{vySaSW-r_4Z~oUy}n*Yhu{~ zZHMVmrE}xTjQIGExHvn^+}8fX-17X1=?!0e!o6OeC~;umP-tLa0uf3Kj4T2UV1flE z#*`6T)@Z)zzSM=K&!R4~Kak0mGucxW-N{`1<2Y;&Sb`o6a(X)iIE(-E4i z8>HoTMemz-(EMKEoonj4RT_o&p4E4qbnxT~>uCxnAEbPBEcP(6nAtirmr;Fpph>Ar z>#3_#3PY?igO3Jkz4aAze;ac6N`Xj!tq*5=u_4qiKo2oN{ldWL0`VUc$AbEk!ff{@ VSKG`#lnV?r22WQ%mvv4FO#mM%eiQ%z literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxhdpi/ic_search_white.png new file mode 100644 index 0000000000000000000000000000000000000000..722ff819563672e68a9b509d831c64a2fa7d24e5 GIT binary patch literal 899 zcmV-}1AP36P)y9{Umv>q{joim{E zh*f97P+&D2kMc9h6_9G5vtT&5n!?vRj)0~jrj?BVRnu*P8=y@^Le5(X@FwVp@cW7r zpbzDdGPC7eK>`T5Qg8kn@UKY>-nm zzd;0gh^vf^07C#j2*0nn9d}GB&SqX%3h<@E=RJ-miXRjK*9-^uNa1Un>yhhN#9498 zAe?i>?)fg~uEvvyuETl{IcYFrT7~wQd)p_6{VA0l;YnbwgE8k73At@M4z?9WI;)(zD??VoS9 zA(<)#>WWpTTk|m?XK`9lwrdlT$-zdk<7vXSFImci2uL1xKy6K6Q?Jz_lopl`)DC&? zDj?ZRa6{O)TEgx_6VH%+JPB;#dCnqME@Pq$FH8@$gBBf>cN=Aghp)bakm{15(oNcj-WCbOI@f zm*9%{qzIrcAT`oH#V)GwAEZXwle7v_Bkjw46r@6$H;QsCTmT6m0VIF~kVpUtAOYlF Ze*qRnf}$J5j9UNz002ovPDHLkV1mQMj!6Ij literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white.png new file mode 100644 index 0000000000000000000000000000000000000000..91967dbf080e7ee7ce4ea3d2bd4edb540cc9b641 GIT binary patch literal 1086 zcmV-E1i|}>P)Mr=o4aZ=l|*aPp2Q^F=_F<*B8q z@QvXO*9F`rzN&DuOjNrnpepdQ0eI%u5{LkybS^4sQsa}qf`a7pytQYoR)wR%S+0q{r_w(Wf!L*;Hl-m zG*<<19-9`x+lW6P;KY1adyNIg1avqs*19Z!(`HJ*IY*WoTo*8}5_DT65m4vIY{PW{ zoEj4XMj#+|UP}w$3(FP+#Lh1m=%@qTvDCo z+AavtU;B{|z0|BEJOgGtGR~St6#)5 z8v<}<#9j(IX;)$syFbIle^F@tBn0rWUDFvX{uFWE1p!Q%a_c!V)8P%OD-yMn?5E+Q z9G5dtd_JltFI6|`rl#t^C444sN!H9nXBmGI<^vse^3wG()!tVg*oApYYRped!2axL zAb{d`OU!m`2-t_u)m-=V4%hhWOw#H&&U?0YG+M~=f{OwUuA(kET=)guRZU+6?C&Q$ zQF{m6xf0&V;?0y?+V!yg+QK%=Q&zrv=RI6&uQzn%RfgO}%*T9fq)>Ejn&Q5lJ1Rl< zLdXJ+4o?ly)bEpE(fKhe?$xZfG0gZR;9rY;eB=wCI>HUYeD(rAcf}9CajWD`#Aft0 z{vJOT)Dw;A{K+bH`FF%il_3BE00ck)fB*;p5Rg6o091qQ(^E*TMF0Q*07*qoM6N<$ Eg7*L900000 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white.png new file mode 100644 index 0000000000000000000000000000000000000000..27403f79efa796c81d6064d6df7a7c61de0dccc6 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V6^jeaSW-r_4Zb5)*%Op)F8Z-oH0=_u7wYjWJtTS?5~bw`u%tByf&7OQ?M9*15k@Sr`~t7#bKD1Q-~Y7#tWF zIDqCbC}0uHn6An&_gH*CcSGG{cjXXCd$EO=eoW-JdaU1hg+-l+)76j30$Tm@jRCcP z9tx&O)MvDO`M7_2lHjG|_w{3gfmHnYUe^@{btXk*(tZlneFv(X zZ@=!P#p&}G;vWBRFUXmEr{k;KfAf~ZI{ixf*d*(_KfLUnv41%?F5h5y@x{e=XQr3$ U{?%3O4h&ERPgg&ebxsLQ06!&)G5`Po literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white.png new file mode 100644 index 0000000000000000000000000000000000000000..dde85bb7709df0f094f94365e4e18529dfb71b56 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U~KbraSW-r_4bydpOd42YoM7z zUeNcz7x%8jZWS=RctjxJ#j33H{_jq7?lE?#|DM*fF)+@Jfx&@+fdiQ-ke<{i}vh^tnDSh*M zKV1HCSum~k#$AiQXWVYglc?7^)Wa|Rcu%_6A*91IGu4tQ$XIIoAHNc za;P3Z|HIgXdEuKMk^ei+x>)r5k1G9hCS1^1;8g$ozeew-ap)df|H15w7)S20^`ESM z&Ei;lY<-Db0dLFOkLf_6GKJ6LEz=%{+X(*Vb-Mj=wVY>M*M+h_r_v8iSJ)!E|JTBr zHFkCF(SjR4{fJ$+^vJ5m<-5d1wEOPAO$u9MR(E`M;l@ipV%Mu3(|TOKPg+X5=ltH4rJdiMR_{IP)VYihD(q7*-Yld4dA*JN~yRAmLNORo4ZScD2l8DMFo`U{H=reeB<_lC2Ghn| z6HtX5=kEaJ0VWa$c9HXh3ReW=B4@ZeA@#q!OWH%kv+9a~Mr5~B9%4e3$dT9$7X)Ay z)>(Zt$kC3j#O4w4UA9@kC}Nynq%pA=VxI8OW&yH?DYFJ7_gE6+maPI} zh>v%*0m;=O;w-jNK$|3~4+ahMl9E_kZ4@vqNovv{0goiHPS_}5QIb@XK?0g3vCi8l zK=!dVX{SP55^KUn0sE4q3JelZD2erpjRH<2N#z+NAYT&eF$vHsAWdD6-Y)2XZo+zR z!buwiELb!Qy)B7#$;FA-ltBV!B(cu8xD=5vr1<=a-6t29B1#a8Tr~y=s6)gVvvoOo zTawtE0Ro;#V%)U(dB6x_e0@n{Vx@@P8Y4CfC_{X_pJ_~N5fR@N+aJoWAdI}{xW|G$zg2}S zemdlhVxer#9Y=1AJql>z(~j(Rc)Rb~=G@F-ybXqL^NJ=wrO44vroA?7sa)v+4Zgi2 z<)Ij9v2VxE8Lm1p$?|ggk}siOFs=A11!VT&95U}MDRwV3ixE?yc#x7WevXS(%^Aen z&RN25xh^0_4DSw^9c|b}0hv!i%76l=n0$Zekc$E`_k?wg#eWN26c2}($r6HoAU?*z z{i*`~AOC>;eHahZ23-{J=X2TB5Q_imlw}WQvV<@%#*YOp2T=Hz?Cc{)UfO`m0y6NE zDg1E6Ru)Cy6zlnzCFOe_-@D&+0sr2t`SQesm?0;`n$EH4&kw{rVM)vbT7Ax0diD}JNPv2J!jeG6KAmn7V21?if&!*1sN$1=>?Cy1Ff?2`RTrNG zc&9^U@kxNAJL3ovKmrI7KmrI7KmrI7KmrI7KmrI7Kmv&W@DubK=*O$7;Qasq002ov JPDHLkV1hGl{7V1; literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/item_room.xml b/app/src/main/res/layout/item_room.xml index e822c5d9..c19e5a54 100644 --- a/app/src/main/res/layout/item_room.xml +++ b/app/src/main/res/layout/item_room.xml @@ -10,7 +10,7 @@ android:minHeight="48dp"> - diff --git a/app/src/main/res/layout/item_room_category.xml b/app/src/main/res/layout/item_room_category.xml new file mode 100644 index 00000000..c0115b5a --- /dev/null +++ b/app/src/main/res/layout/item_room_category.xml @@ -0,0 +1,42 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8f3ff78e..5dd52be5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,5 +9,10 @@ #a5a5a6 #5f6268 #7bb2ea - + #929eb4 + #c1c9d6 + #2e2f32 + #9fa9ba + #a5aab2 + #ebedf8