From f376cdb2ce1c89d29db0a417652a0abf529eb374 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 30 Jan 2018 14:56:55 +0100 Subject: [PATCH] remove unused drawables --- .../res/drawable-hdpi/ic_action_warning.png | Bin 325 -> 0 bytes .../res/drawable-hdpi/ic_menu_white_24dp.png | Bin 116 -> 0 bytes .../drawable-hdpi/ic_message_white_24dp.png | Bin 188 -> 0 bytes .../drawable-hdpi/ic_people_black_24dp.png | Bin 315 -> 0 bytes .../drawable-hdpi/ic_people_white_24dp.png | Bin 325 -> 0 bytes .../drawable-hdpi/ic_settings_white_24dp.png | Bin 557 -> 0 bytes .../res/drawable-mdpi/ic_action_warning.png | Bin 236 -> 0 bytes .../res/drawable-mdpi/ic_menu_white_24dp.png | Bin 99 -> 0 bytes .../drawable-mdpi/ic_message_white_24dp.png | Bin 148 -> 0 bytes .../drawable-mdpi/ic_people_black_24dp.png | Bin 217 -> 0 bytes .../drawable-mdpi/ic_people_white_24dp.png | Bin 230 -> 0 bytes .../drawable-mdpi/ic_settings_white_24dp.png | Bin 380 -> 0 bytes Habitica/res/drawable-mdpi/menu_messages.png | Bin 0 -> 350 bytes Habitica/res/drawable-mdpi/menu_settings.png | Bin 0 -> 727 bytes .../res/drawable-xhdpi/ic_action_warning.png | Bin 371 -> 0 bytes .../res/drawable-xhdpi/ic_menu_white_24dp.png | Bin 135 -> 0 bytes .../drawable-xhdpi/ic_message_white_24dp.png | Bin 247 -> 0 bytes .../drawable-xhdpi/ic_people_black_24dp.png | Bin 380 -> 0 bytes .../drawable-xhdpi/ic_people_white_24dp.png | Bin 402 -> 0 bytes .../drawable-xhdpi/ic_settings_white_24dp.png | Bin 674 -> 0 bytes Habitica/res/drawable-xhdpi/menu_messages.png | Bin 0 -> 735 bytes Habitica/res/drawable-xhdpi/menu_settings.png | Bin 0 -> 1743 bytes .../res/drawable-xxhdpi/ic_action_warning.png | Bin 499 -> 0 bytes .../drawable-xxhdpi/ic_menu_white_24dp.png | Bin 186 -> 0 bytes .../drawable-xxhdpi/ic_message_white_24dp.png | Bin 347 -> 0 bytes .../drawable-xxhdpi/ic_people_black_24dp.png | Bin 501 -> 0 bytes .../drawable-xxhdpi/ic_people_white_24dp.png | Bin 535 -> 0 bytes .../ic_settings_white_24dp.png | Bin 1036 -> 0 bytes .../res/drawable-xxhdpi/menu_messages.png | Bin 0 -> 1197 bytes .../res/drawable-xxhdpi/menu_settings.png | Bin 0 -> 2843 bytes .../drawable-xxxhdpi/ic_menu_white_24dp.png | Bin 235 -> 0 bytes .../ic_message_white_24dp.png | Bin 436 -> 0 bytes .../drawable-xxxhdpi/ic_people_black_24dp.png | Bin 650 -> 0 bytes .../drawable-xxxhdpi/ic_people_white_24dp.png | Bin 690 -> 0 bytes .../ic_settings_white_24dp.png | Bin 1421 -> 0 bytes Habitica/res/layout/drawer_main.xml | 4 +- .../ui/fragments/NavigationDrawerFragment.kt | 51 ++---------------- 37 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 Habitica/res/drawable-hdpi/ic_action_warning.png delete mode 100644 Habitica/res/drawable-hdpi/ic_menu_white_24dp.png delete mode 100644 Habitica/res/drawable-hdpi/ic_message_white_24dp.png delete mode 100644 Habitica/res/drawable-hdpi/ic_people_black_24dp.png delete mode 100644 Habitica/res/drawable-hdpi/ic_people_white_24dp.png delete mode 100644 Habitica/res/drawable-hdpi/ic_settings_white_24dp.png delete mode 100644 Habitica/res/drawable-mdpi/ic_action_warning.png delete mode 100644 Habitica/res/drawable-mdpi/ic_menu_white_24dp.png delete mode 100644 Habitica/res/drawable-mdpi/ic_message_white_24dp.png delete mode 100644 Habitica/res/drawable-mdpi/ic_people_black_24dp.png delete mode 100644 Habitica/res/drawable-mdpi/ic_people_white_24dp.png delete mode 100644 Habitica/res/drawable-mdpi/ic_settings_white_24dp.png create mode 100644 Habitica/res/drawable-mdpi/menu_messages.png create mode 100644 Habitica/res/drawable-mdpi/menu_settings.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_action_warning.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_menu_white_24dp.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_message_white_24dp.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_people_black_24dp.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_people_white_24dp.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_settings_white_24dp.png create mode 100644 Habitica/res/drawable-xhdpi/menu_messages.png create mode 100644 Habitica/res/drawable-xhdpi/menu_settings.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_action_warning.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_menu_white_24dp.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_message_white_24dp.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_people_black_24dp.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_people_white_24dp.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_settings_white_24dp.png create mode 100644 Habitica/res/drawable-xxhdpi/menu_messages.png create mode 100644 Habitica/res/drawable-xxhdpi/menu_settings.png delete mode 100644 Habitica/res/drawable-xxxhdpi/ic_menu_white_24dp.png delete mode 100644 Habitica/res/drawable-xxxhdpi/ic_message_white_24dp.png delete mode 100644 Habitica/res/drawable-xxxhdpi/ic_people_black_24dp.png delete mode 100644 Habitica/res/drawable-xxxhdpi/ic_people_white_24dp.png delete mode 100644 Habitica/res/drawable-xxxhdpi/ic_settings_white_24dp.png diff --git a/Habitica/res/drawable-hdpi/ic_action_warning.png b/Habitica/res/drawable-hdpi/ic_action_warning.png deleted file mode 100644 index 55c68431b19365d5da5b5a47aa133357ac9fab25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P)9gB+3ebu&_IBx0|o$J-6HY z=Xt$*-Y4?;NPii1>hed4XPzj@7rO*@i&DL-lqeNj_B6u2ksj)L-F zi?~g>qslvRZ&c-qV{DG(h6Q@q^q7|mZb@^a(XmE|48m458p^Z?kwI9CvPQu^5i*F{ zQ#NM!BtiyJA51F?m&C{*?n1v~g#;NSEh`;G9!Zcv(gQ`Mp@EBS*)c&I7j4F6!zr## zl*AH!tYl!|k1|%Oc%$NbBtUX;ELn>~)y>gI~!GVMM;FtR) z>o^=+q!0eLIkYTSueJdQzVT=97-cEQUQ(20VgeFCw!(sbNB(*DWRAAR^UMSq!{F)a K=d#Wzp$Pyxy(5hP diff --git a/Habitica/res/drawable-hdpi/ic_message_white_24dp.png b/Habitica/res/drawable-hdpi/ic_message_white_24dp.png deleted file mode 100644 index dc9341cea44125755c60adb141be14201fcb76ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBnmt_{Ln>~)z2VJuK!JxPApF~{ zc?%wRI{Q!9Rd90|N2Z#t@QkheJ@*%_QVr&E>|T(&q`zZd{BfDpQ47|6ysA5a!6B(J zz;%N4iR?&W5jL;u&Sy2>EHnt%rTO@nhk$=|)4!V5yPF$Ql3r=8P?YZqI3uhflia8< m!&-o+n6)YChy54N3!FwPBM)0fo)iE&hr!d;&t;ucLK6V`utrt@ diff --git a/Habitica/res/drawable-hdpi/ic_people_black_24dp.png b/Habitica/res/drawable-hdpi/ic_people_black_24dp.png deleted file mode 100644 index 8461410d953611533d3dac090991ccdf2a02c176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)hlVhJq41Q80TfDV>H32T8pAkjhV$UxSBsGwjW4vw8Nx}3t+q_`fK%PpQc9i`dDrNtX>Zk(JW2EfI zp8W%&n?ib2%6{hA*MD(P^V0{7AU$$r|LEBlh%Q5^yu3sf@gs;nDo54Ik$vNDqHgib zG1f1%i9=lC8aJ&gT;Kp3&^q?)gFC~$`#8Ny+~E|9t>ZReueOgD$daBhMAsJHzuxPe zpn*iHafGh(u)XUIlE^E%w!`+WIV6!eTtR!6q!jw@|96mOS(ddTeF73cAr-nC>Gl8s N002ovPDHLkV1llujLZN4 diff --git a/Habitica/res/drawable-hdpi/ic_people_white_24dp.png b/Habitica/res/drawable-hdpi/ic_people_white_24dp.png deleted file mode 100644 index 9fabef1fb2781f9e84d700f58b35c203a61c8741..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P)tBLSmu39fBWlwW($oXiB8eqrfDjzJ!b=$r_8bv^>FQ2|Vp0rV>TCNgFC zGe)>JMAU@Oa0*}Hn{oyx@Cn`js^Ok5lQkyDvk`TzdQe4H5)F5N?ET XNklYg5o74iWdZJ^ch4D3lS8O2$CkC7M4~PB8Uj0je>=s;9DdTBq-R} zSSw02sd91s7p9Oyc6auW9ECXWH3xR`adviQPkcfM-(SM_FH}RJ3!#p)-w=A%2t9c% zA6xy{&_5q?G;OI{gkhRFOqZ5)x{E8_P*0hWeQ|c15aZcH$Ve6udCKoYmRl>G0 zE@)~dz#K1mMUFW)oqAT0ENw9gQi>eYZiHqO$&waAw~8E7ZiE&U$#S$ECYgX{%jRu_ z#2iZ2|O~YUsej;kw5u>TdAnfy@ilEbG{>E0UC5{BX%;{HTQF_447zAeDEd z5im-fnj1+P!gAda_@w6@yMtM(J0<9JLRDvNBuaHwt_GK_o?a!b=hET7U-(@X^ vdMc>CD(dD_T5?V&$cb#Mr~iM))Q!+L4h0lGcIz0^00000NkvXXu0mjfryBBT diff --git a/Habitica/res/drawable-mdpi/ic_action_warning.png b/Habitica/res/drawable-mdpi/ic_action_warning.png deleted file mode 100644 index 04365b98a83fff787e991bc76c3911aeab6cbf0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i&7LlfAr^vX5AGIpbYy6|Sbv5i zPen;tMQs@)ZvX=vu?h$aPZI28NjsCSFZQ}H_n76S{(xmV^+zH%Dd@$UaGE}87qND- zp7hC4e)aPA8U;tJCS5o8sWb^RS!J{Og)!5$IVT?^xi0X}C{|@&z4ZHu4bQ#UuFczW zFY!b#&pWm%*G>)BogIeir+Q|{1s+#q4)-lrx$$U1W45!CSZqy6iDMtL9bbxQQqTH{ b|1NT}Ni8n0URPBDbUuTptDnm{r-UW|3PMv) diff --git a/Habitica/res/drawable-mdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-mdpi/ic_menu_white_24dp.png deleted file mode 100644 index c62db8c865860add1df1b7335b5f70279390fdc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjTAnVBAr-fhfBgS%&#Y^Bcm=ES td8Vw!#?1*PliZan!Ne9jiJ4*y4DzQ`?VKm=-3-*l;OXk;vd$@?2>|EB9IyZY diff --git a/Habitica/res/drawable-mdpi/ic_message_white_24dp.png b/Habitica/res/drawable-mdpi/ic_message_white_24dp.png deleted file mode 100644 index 6979bbe5b16749f4cc75af27a0e05aab58e1ef9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj(Vi}jAr-fhfBgS%&#Y_6Y^%$` z@@V>hP4@K-H{@rtUNMkii%Z(va4X?~u7ar(`+U~LjwVtr&I%oDTUqrpG8s=4#5;+Z wTv&8y;jV`_bQY|7_(Ck;Zo#hbUnU0`o-}L|H~7z)4YY>A)78&qol`;+0O4OVJ^%m! diff --git a/Habitica/res/drawable-mdpi/ic_people_black_24dp.png b/Habitica/res/drawable-mdpi/ic_people_black_24dp.png deleted file mode 100644 index 8e1f6d905b4d69ac03e467cbe36b60697e88871b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj3p`yMLn;{GUf3$iBx_b z9G_+!zopr0EDDfU;qFB diff --git a/Habitica/res/drawable-mdpi/ic_people_white_24dp.png b/Habitica/res/drawable-mdpi/ic_people_white_24dp.png deleted file mode 100644 index cacc7cfaeab7d43e9d2de9eaaca31b0be7080e4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmVIwWpuvKdVFz?J2~9N6CLIXu^fLIpl(!W?N_yfcX zfLI!c!+>}X5FY|!Mtl||qZ#t=KVg8bCJvVcd_es2Kjq*V5c6QOpp$^cYe3u$#63WK zgMiu=Y!<`-@edptCPL!}rj{9qr{GZg9f-qm#epdhKf>a2CM+q08H-OI0I@NlWLk@+ zsT)r+>_t;sPE0;Px1fib7FYuD6EsaXpuvHzmIa7!p{WH0uNf{2;(_=lj)BZu5bkKy&0$w0~PKAsH3Sw?taga!bq9O)gB!dd7gFw6u zi2Z?B5{TzQ3pRA{8;EBDu{aP10`Ybr-bbjgqj_Px$7)eAyR7ef&RND=MFboWBKiPl|!5W~h(q&ksgD?ba(0*2G?^2AM2Myt)QY9=U zwl8F()B`;amka%DT33iFlH1`VLEJe^7k<|J8;9_%-JM~1mNxwk-ceA!6fRH zsG2bMT9TkEAnnlRYwC}${>m(B-=?mfisfpw!L+V&bkjXseF8Yx1}%9F`2iM;+GcS= zCAuPhsyr2vOO3VU1VRA2MzepCk2L5xRx7?GNFI2R`vbsBw401iaT(!RijU8^6qtd` wAg0fLYMFByd77f*6FhSz0&MX6GtN7-H&C11urrlx_W%F@07*qoM6N<$f^t}sQ2+n{ literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/menu_settings.png b/Habitica/res/drawable-mdpi/menu_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..31e75beba811fd8fb3365e3392671ce278c1e12c GIT binary patch literal 727 zcmV;|0x127P)Px%kx4{BR7efAl|5?|Q51#~gV88LY$RPkZSo5Ou@o(>ZPpYbSOnW(D+=3KnAT#2 z`~ZnX3PDJjK9CfeB9MTMps`6B$LG0o&v0jUU0lHz-Z|gr&c{7>rl$S@RaH$}hFtg3 z%f@MVf8m%G1ozQDm|$i#N*Z_s4{~q`eNO$)Ama-(b04O*P5-it*q(s}on`{>t_H?Q z=ppglO*+afbd3XeKN4D!K)L~BV5ya$L8J#y;2K;k6R_XF8?b(gTyTng9*G7swsPE8 zD>hS3tyi~-f@k=?!TG}1H!ljJgT9~engQe!9pDE%i{h3f@Y;+5ms$yv8fo8@MRqQ2 z_flymot))-3tMGD_HCEG3%Pn1c^%GmI(q+Zg?ALaN2WLN3d4f2$g9n`!XfmQ?pT3b z&B5kbu#b#^`i^iM!(~0lPcV=^9ERKGfpHVQ!kuK~3-%!#gb)1+6e|{7Rg2&#NqC`^ zgRu+0>jWE7g#I~sm>}fM@F$65O~r%=gpPa>z9C7_ZUIk=$v~x>v1}5}luqYlo0Ecv z@F|@2R*=rWXpJ^@%a45zK8Ke_J^}$}&X+6V1*vr(?5%p1M0}MBx*nzi4HO23-TM9f88 z-H{M!EFy?qjz>!1;_GNFf*o(69-E@UV}kK$=jdrri})(OF4BoxBgtQh%xj-J$MjSOrL+Zp)gCwM$IBJ-r#8E>mq%CojeR4dct#Q-{LLm*r zQ7&i?X(Wzvfj^|tIBM{PR1ilE)08-Ba6{_G(STVnjt102x*JCm=0#7B2|w-fSO=av R;CKK4002ovPDHLkV1l|Ll*j-8 diff --git a/Habitica/res/drawable-xhdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-xhdpi/ic_menu_white_24dp.png deleted file mode 100644 index 36859f094a65ce6c7160049049367832dd46176d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCKTj9OkcwMxuO8%NFyLV}e7}E- zwX3(3$O(pDKQ5Ws*8`P+!8?X!vJ3~Z8$_8H7y^#^S4v3Nj^#=^+ WmQDHkYu}7{AQ4YjKbLh*2~7anb|sns diff --git a/Habitica/res/drawable-xhdpi/ic_message_white_24dp.png b/Habitica/res/drawable-xhdpi/ic_message_white_24dp.png deleted file mode 100644 index 8eedc8a387dbf13708e118fbd0e484d28842ac40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmV-U0NB*Z>1M22^#xNf|KC7teBlI)C{A!Rz(4IY8inL#F&M0Lt=F x0B!jQfV%t^fWG`1K%)FNfJ}M#rQQGo$_EQs*g-jx_gVk|002ovPDHLkV1jc_U_t-@ diff --git a/Habitica/res/drawable-xhdpi/ic_people_black_24dp.png b/Habitica/res/drawable-xhdpi/ic_people_black_24dp.png deleted file mode 100644 index 2f2b7eba8fb159585f465115be3d6c1a6f43f6b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYXDP)!OLID$_PRi34Co6Z` z&Cf04`SJn$oaYa2X3FwB&+|MlKow2&5uuG50*q=7b%cn<-)oi8fu-nR8ELJcE9|8L zbYLUgpqTRVU12X*g=Ms#u&;}Ixh5>5tAu^1?e+SwjCu+CNZad0(|$l3meHlW&!HMD zqdj?_LnYk7MrflT?{lh*TUd$^i}F6_N;pIdZ?S7sP|R`fd7jWbHgSRmy6E9E*26s- zIK~Fp3~d)5!}nSNc5s0RHl}x+V;cdI+QOHxPpp6gyubk2Gb)(H-;TunuhtO4a?-+T z!h<~s`=6HZ1k2eY7BE;<+Q*&2Cgc=@txNm3SC~Th-!Dn~IGZr-`+k5Q;0Jh~=Xw90 a=Y0d2LxO=FP*8pV0000*qdX)h)#AnK-Ul8;v1FneAsY`z^=v4;X|Mmg%#Aj08>ksH4 zKK1fme?U51rC{b^ie9h(LAFBPEWlj-UjHxA4(H(Qm$R@1rpkN6Fw`NUELaZvVGORr zQ~3PlDO`gw*aypCR=_oD;Ul9LeSNNh6Y!qGa|g#@HB9q3qY}RGd)|$wz&3bHdK|$P znCx<1kEC~AtOPDl{FsBqE)Q%wTe{1;9~%Ibp#k>01W5|FvkFx)e#`d0Eql0KnLg^gZfiEF9j`tUKs$!Z|6ZJDg5~{ z)&s^?0>}kjCIvqQjbP$^2q$ZIpk9y%GzvOPdVYa9NCS+U1WyS2%*@xAEPzqhU&R00 z3+BQG*bw^IIv1b;^raDikxM-lAOmzD^s{{`K#yXeYfunWg%!k5HEzb3qVH}BKpW^? zGC&BFXR@#IL19VXMoz8NJ84HQ@G`dSHbunyG)Z`0slTvI4OF9d{$Eedk7G^ZE zDARWgn=1(*pm10TW0Nv_^HE9P3F;`(r8scKu}RfnrE%kion$PV->j3mgm#5~w$0fC zb($S$KJi~)2?5_p1iEx3xyxfg2kDqCM zy*{1pA2|AT1n@EdnsfxHU;uc8rk`043CZsX=R>yx-~iaBZ(46%1bMS6(f|Me07*qo IM6N<$f@}dFJpcdz diff --git a/Habitica/res/drawable-xhdpi/menu_messages.png b/Habitica/res/drawable-xhdpi/menu_messages.png new file mode 100644 index 0000000000000000000000000000000000000000..b00a39dd1ded321bbd5c2ff732cc341ee9f9c7f3 GIT binary patch literal 735 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/ic_action_warning.png b/Habitica/res/drawable-xxhdpi/ic_action_warning.png deleted file mode 100644 index 2d20532223865279632d3f78a653149308b9d114..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVW00w{s!T_*97=R1_HPobp4ysfsB1I1kL~nvW z?(93;AV0N>e`D#V>vZbs>i)zq#IU5C1~a^(DJSR>0B})C&MxKvfH`)`2)e`1ZcE5H z#%dk3!cqR9C$#sNJLe4BJI$HX!~3tGH}vuaUBk4iTsiw#7=sqr%M)}D+a@`3PT<-g zbxs#A&Y)*>(*~Wxw^7QRK0ducALyqGx&dY5R5^!Ol7f~vNE0*#bq{H<%9%E7(O||3 z(uVCfRyosz?Ha3`X~MRJRnD|vyMfi#Hr|+~1=}sG(t~thYrrZ!NFKIEta5^+VQaxE zJxCU|R;+S@Bw_2oDm_RJwjQj~gJfXq#VRLA0=9mvGJ@h^OTj8DC>FL9tg?dQU`xg- zXECs4V3o5_*fO!I4O=!=wP728RZZ9iVO0~h9IP_GeF$uASQQQ8z}ALU(I7f(?N}8K zqQTaMRq-GSY+YCt5Aws-ja7yDVC%-J$|ez5RoWmJt4g!MmT+0s+9>q0sx=dAiI-Ka pjZla9b;{vO~{XJk7NRdt^SmBd9 ziR_F*5KTa~Co@o?fWmV=Yminj8>9@PU{)-1<3E4X z`z{H_&&Bh^Y0l&j#rk%4L!LkghEJtRsb10;N zt&>(@1{#B>tDnm{r-UW|tn!6x diff --git a/Habitica/res/drawable-xxhdpi/ic_people_black_24dp.png b/Habitica/res/drawable-xxhdpi/ic_people_black_24dp.png deleted file mode 100644 index 40449b855e395df1141a0d4ab016c1ea7c226702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 501 zcmV=S<0! zQc5YMlu}A5rIebA7F@!2j9?hwa1l*$`|)kVYgisHuqj|av|9AR3e1F&(lg=g$28U<;c}dzx~YBqXU)_?WjYxwqe3yKVwZ8fu+na8j!6!zWYQ=&^BFSjv4vrsnwW6OF-AZWNiC>bp;5|B1|b?~|pQ9;659 rL3)rLqz6sjlu}A5rIb=iDW!e_D6^)&iwKEP00000NkvXXu0mjfWrXZ3 diff --git a/Habitica/res/drawable-xxhdpi/ic_people_white_24dp.png b/Habitica/res/drawable-xxhdpi/ic_people_white_24dp.png deleted file mode 100644 index 752be5067fa60effe4789201472b3291994a24d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmV+y0_gpTP);-L|Wftkcr{&)ATDM35`>9ADxi%{qXL*eam4s z(sQ&GcC>~wHe|fhZrX3tCpj+h2LGQ|bZ3V99k%JGA3UGlf3kM2ph_e0Bm<&asl1?8og&a83wLzex@A;(dEj@G#Qddq(0 zkiRHDziZrml4ZYg$RNtkK#jYPw(AE_Cs^OV{s+=P8b||aAPuB}gb+dqA%qY@2q8uw Z{{WIps<>D2Z$AJ4002ovPDHLkV1iUy4q5;J diff --git a/Habitica/res/drawable-xxhdpi/ic_settings_white_24dp.png b/Habitica/res/drawable-xxhdpi/ic_settings_white_24dp.png deleted file mode 100644 index 7df0935c5848c9badb105896d16ab13e6b4742f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1036 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_menu_white_24dp.png deleted file mode 100644 index c15d6346712c5931ddce3c8aedc7a3881366462c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGon><|{Ln>~)y?Kz6!GMFs@pt~O zHwx<;l$3LrXHMTZY09%t91ILV#K@q)z`(-Lz`!8Dz`(@d02N%I%J9q`8zGFC}seq&x4!+19w_V666ZaSW-r_4cm6*I@@4)(7vt z=motJ+}jkfwnE}7kDiv?;n-LEU$SfxU4GfKo~Mrg-nQ=Vj*}EG=mdFj_pTOXUuld6u(a-tP&&lRw8B=M~%MUKL6Bb5Q-a*z=tt3q>BB zTgIM#nd`x!)aAd5wq!9DCJB3i q13wzENc~=5%)rXvzz7PoEs5WIdlOmMf9+}kIn2}5&t;ucLK6VvGn?`N diff --git a/Habitica/res/drawable-xxxhdpi/ic_people_black_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_people_black_24dp.png deleted file mode 100644 index 844f535774e8b0113a2c8912c2ec07c240cabef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 650 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U<&kfaSW+od~>i7D8|sR;O|QD zl}sQekaKf&y2j2!27HebrEmNFiipj*?VGcibM=jFll9*0-r==*+uOS{&HdjzoLl>S z_w(v=Kd=6O{W@Uo23h@yJze>eJ_$KM`k_kFIO};F;VL=xCELGwZkAEmr*_0dhI+3b~;- zzh6}B@P5<0Uutnk;s5Q^9AeTG|9p)opT9!%lY-vlZm|zni|*Dgx+^gK7GwO^%XihQ zxC>Wa{}5UX6twB^etIbUYw7pSBUitizkiRRnz^JltDi3glr-3WM&Ey|-O9otpy1HJ gz{mt-fP{hIKq%v5ZspHA3~qsVp00i_>zopr0D^HIWdHyG diff --git a/Habitica/res/drawable-xxxhdpi/ic_people_white_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_people_white_24dp.png deleted file mode 100644 index 5c260dd3b8c9e27d0df46e1c5af8a49da8361261..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmV;j0!{siP)T)PMWbJ?FQ+`?}U=Tm)2+nQ~h0%BRTP=w;KTlK1_z1yq*(k|Dk? zvRf*6-%mq8KY2s)UP=$c`}PASlfSYu+Wx-P?|e69rK`Pt`@i$w;I8LV#{RyMfc>~{ zlbwD0|7vD%-zO<$eBXb-Omf#K6JA7a)8A z!mpt4M>zZuo*2;0YB=_X4WaLZq^u6eH$7QWdkd{))@ildm zJMvy|zwa@ij*OOrauavmkOMMGYCE{jcJkWSzO#V8rMWDZ>-@Q{$}(x1k87_d&m8P~ z`_(c}uHnC{GFM9H;T#R+t*`yW0o7%@e8gTKWSdk=es{Hx{R9C;WQ}~rexGEO6i#ry zP5$;{0@}+x3SM`mO@eQ*$G-M|8Zbw)6x=d0^Eb~r-RJ&y0ZT|v3*yg9QF-rU|GR); zq_4s8=jN!t{V1S}ydZr&mr^ljAL(yD3YbfJn-z2R2LAS=fb*ocvoU8c>2E&@ctLu5 z9&`5p{q0AQ@_e8FYkTw|000030Lb5Z6#J!+009C72oNAZKs5mZ1PBoD1^@s600000 Y0SwTZM-d+50000007*qoM6N<$f<@_2wg3PC diff --git a/Habitica/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_settings_white_24dp.png deleted file mode 100644 index 0ade7cfa8e26daa30c2c27ea2fad8a8d44ca7d4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1421 zcmV;81#4UC^bfeaCtz&#ZWL>dGF!58(x2hyY^ zA=C#&BtYpCw-VEoa?=`0kp@hymlE;Pf&}a^lP)Ih_mywY*`3{Ook{))Y4ROr=GUIH zJ2Pj$VE`~piAZG{od* z1D`!B08*=n5x_hFkXj{-0M-vx0EMV#)OEFld?Ds_UPql{1aKa;Af|7VP&-jKP%Wt0 zp#XRs)z&Z29#kD_2`WwF8pWt4aA)*?&DZcNO~r5w^>4px5Qs4$0N9)&*ml&1sGKC9 zrJo%He|A9Cos#*rRr&rXtMCngobS>M_CD&6x&@3ttwj9+{_PfOx$%|Nn$Z?ZTJIV&h`+s&e?k+nnfVU*)30C3?z>}z-B;N`4 zGit0006Qhu1KMtG0JOvXNAf(N-9=5|1aLrdoYKDL0`RirR@;hg1E8A7CCRI{HEY(u zv;n*uKv1;lJB}(v%|T_NMk!@MZy%uybuy3*;(Im$T=5tP)n)deCP%nk(u1%vNd?oT zwb}&G)7`W1>fo_h??c69VY)V zu-Ez<=@7yxl`EEg043!U2e+Mcu-|{B5=slR?;l6~#fcjXHB-8o9=N%{*93o&>A_4* zsTJV3A21zt)p8(vfPWI9iea@g4Lo(k#-R>dT<1@A0AQ-ceFBvoo&wKJd1^##vGAvT z9Nf+0m@XzL*7w1}sH4rG8V!RgbqJu`(AP5%;AGs7hC$772;e0{U)w?iV7e;GbO^w7 z0Qk=k0hrn-hX6)fcm@an0nk@nhCyY?Ey(XfxX2-ZxrV-83lV_nGPKMgfQ>_G8A?N~ z+brxZPdEfnZ{ZnG5yD1nJoL`a+bTs&fx%UZIIPMsUI64m;)@xkR_OphwPl}wP=!gS z0BAP!Hd8q|pE3Efn99-JszlEYfI3T`F*h|Xt2UzTT`MpSUFxdVaPls*P6vo~w4a^$^BrVu?)vBRt-Q z2BT@eGv@mox1nm`j-|(BTg2LW99hgNJ^=OpwDm9`4lhz*9$TZ%n5{JnA5>Pex57 zQvgqc{u!V5P+y{6Rktwuet??+B%Z#bV6pP)HRwHI_nziwX*?wpJU8VxX{-)DP_X)c zmS%xI_n7?ss0>Kn`=BLds!g!49mKFs8hjCXBe1XwqArf znxwKyW$uv>$XpQB-RVtwYEaXN%JVU=LudRqGA6zO;ve2hRe&AP`&LjBn7uw5^ueub z83C*cE#Cjz(ZvMg6SFy1%OBZ2mp})5C9?pAOJ)H bAQU|SJKS=oMOq=c00000NkvXXu0mjfZ|8<` diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml index d45a57a18..e43b817e0 100644 --- a/Habitica/res/layout/drawer_main.xml +++ b/Habitica/res/layout/drawer_main.xml @@ -38,14 +38,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@color/transparent" - android:src="@drawable/ic_message_white_24dp" + android:src="@drawable/menu_messages" android:layout_marginLeft="16dp"/> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index d2ae72f96..600220e75 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -5,10 +5,10 @@ import android.app.ActionBar import android.content.Intent import android.content.res.Configuration import android.os.Bundle -import android.support.v4.app.ActionBarDrawerToggle import android.support.v4.app.DialogFragment import android.support.v4.view.GravityCompat import android.support.v4.widget.DrawerLayout +import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View @@ -33,6 +33,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.TavernFragment import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment +import com.habitrpg.android.habitica.ui.helpers.NavbarUtils import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem import kotlinx.android.synthetic.main.drawer_main.* import rx.Subscription @@ -45,11 +46,6 @@ import rx.functions.Action1 */ class NavigationDrawerFragment : DialogFragment() { - /** - * Helper component that ties the action bar to the navigation drawer. - */ - private var drawerToggle: ActionBarDrawerToggle? = null - private var drawerLayout: DrawerLayout? = null private var fragmentContainerView: View? = null @@ -77,6 +73,8 @@ class NavigationDrawerFragment : DialogFragment() { super.onActivityCreated(savedInstanceState) // Indicate that this fragment would like to influence the set of actions in the action bar. setHasOptionsMenu(true) + + context?.let {recyclerView.setPadding(0, 0, 0, NavbarUtils.getNavbarHeight(it)) } } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, @@ -222,41 +220,6 @@ class NavigationDrawerFragment : DialogFragment() { // set a custom shadow that overlays the main content when the drawer opens this.drawerLayout?.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START) // set up the drawer's list view with items and click listener - - // ActionBarDrawerToggle ties together the the proper interactions - // between the navigation drawer and the action bar app icon. - drawerToggle = object : ActionBarDrawerToggle( - activity, /* host Activity */ - this.drawerLayout, /* DrawerLayout object */ - R.drawable.ic_menu_white_24dp, /* nav drawer image to replace 'Up' caret */ - R.string.navigation_drawer_open, /* "open drawer" description for accessibility */ - R.string.navigation_drawer_close /* "close drawer" description for accessibility */ - ) { - override fun onDrawerClosed(drawerView: View) { - super.onDrawerClosed(drawerView) - if (!isAdded) { - return - } - - activity?.invalidateOptionsMenu() // calls onPrepareOptionsMenu() - } - - override fun onDrawerOpened(drawerView: View) { - super.onDrawerOpened(drawerView) - if (!isAdded) { - return - } - - activity?.invalidateOptionsMenu() // calls onPrepareOptionsMenu() - } - } - - drawerToggle?.isDrawerIndicatorEnabled = true - - // Defer code dependent on restoration of previous instance state. - this.drawerLayout?.post { drawerToggle?.syncState() } - - //this.drawerLayout?.setDrawerListener(drawerToggle) } fun openDrawer() { @@ -289,12 +252,6 @@ class NavigationDrawerFragment : DialogFragment() { outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition) } - override fun onConfigurationChanged(newConfig: Configuration) { - super.onConfigurationChanged(newConfig) - // Forward the new configuration the drawer toggle component. - drawerToggle?.onConfigurationChanged(newConfig) - } - companion object { const val SIDEBAR_TASKS = "tasks"