From 5fa6aa45cc5dfc6620a11345cc92b6ff435bd784 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 17 Apr 2017 18:31:01 +0200 Subject: [PATCH] update fab icons --- Habitica/res/drawable-hdpi/add_daily.png | Bin 687 -> 830 bytes Habitica/res/drawable-hdpi/add_habit.png | Bin 751 -> 921 bytes Habitica/res/drawable-hdpi/add_rewards.png | Bin 990 -> 1202 bytes Habitica/res/drawable-hdpi/add_todo.png | Bin 869 -> 1101 bytes Habitica/res/drawable-mdpi/add_daily.png | Bin 512 -> 603 bytes Habitica/res/drawable-mdpi/add_habit.png | Bin 561 -> 687 bytes Habitica/res/drawable-mdpi/add_rewards.png | Bin 644 -> 793 bytes Habitica/res/drawable-mdpi/add_todo.png | Bin 589 -> 776 bytes Habitica/res/drawable-xhdpi/add_daily.png | Bin 901 -> 1062 bytes Habitica/res/drawable-xhdpi/add_habit.png | Bin 917 -> 1052 bytes Habitica/res/drawable-xhdpi/add_rewards.png | Bin 1365 -> 1527 bytes Habitica/res/drawable-xhdpi/add_todo.png | Bin 1103 -> 1396 bytes Habitica/res/drawable-xxhdpi/add_daily.png | Bin 1205 -> 1370 bytes Habitica/res/drawable-xxhdpi/add_habit.png | Bin 1235 -> 1362 bytes Habitica/res/drawable-xxhdpi/add_rewards.png | Bin 1981 -> 2200 bytes Habitica/res/drawable-xxhdpi/add_todo.png | Bin 1668 -> 1911 bytes Habitica/res/layout/activity_main.xml | 1 - Habitica/res/layout/floating_menu_tasks.xml | 140 +++++++++--------- Habitica/res/layout/reward_item_card.xml | 8 +- .../ui/fragments/tasks/TasksFragment.java | 10 +- 20 files changed, 76 insertions(+), 83 deletions(-) diff --git a/Habitica/res/drawable-hdpi/add_daily.png b/Habitica/res/drawable-hdpi/add_daily.png index 634e94044c59dae77015753c1cdf4f94b1da4d49..8277071880be1f87e665607aaf61a974ce405df9 100644 GIT binary patch literal 830 zcmV-E1Ht@>P)Px%_(?=TR9Fe^S4&7#VH7^+&TYmAq|_qp4Q&#F7EX(>7Dl1jqD7-Y)KKF%iy(V0 zgA}45iim=0#;Z_nauc+35fYItq6`8T5d;O+QcX+ExuS;w zX|y|3O|PO?dCCs!)Tf+iDlQQc zx`iZHIXNzC^f-cQNNj)H;KxQx!fB?nqS3=diu>&X0<+pA zx(MC7_8z{JS+nB<^a8#P+)qeNp|x%Gr8M=)n7oFAt<_DWx3+TH>db9B6_XoawIe{Z ztF4Cz-PmbvKzW!fzNLjgQc;q%7smE-DN0kH^VuDzzEm4H@h){(LQ3K(QLL{+N>NGx z_LOKSNNeY2RXJJA)@16!VB?EDf3A5-G> zic$nu@u8Hcieo1%uFl}R{<{+{U$^9m_MVbzyoC1Rlkyxng*>K&=ylEHMhNfY!Za(HVAosMgw4&_QbPOm2nK4ZlcYC9iK zEL9}3F=vbbS;6(U4ut%y6D|B!U`p5Hx1)I;W?wM9$24A9-bmNTu!q?7Ix=cCI9B^? z2>(mlwQ^e1GrVKesvqnWeR6bR{aMu%2vNHECeQq)aM9t+XaNWMbXktvUl0wQJco|V zS8`eM&E$0iN{r&c^aN+==M{Qz+G{}H&S$`9z-Pc`;O{W-1H0VN>iI+HZvX%Q07*qo IM6N<$f()F94FCWD literal 687 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 diff --git a/Habitica/res/drawable-hdpi/add_rewards.png b/Habitica/res/drawable-hdpi/add_rewards.png index d0ebfd91943cf9f3bf757a10c8003a7ed383a980..98e497f008c998781bb9941452965cb1424d3d68 100644 GIT binary patch literal 1202 zcmV;j1Wo&iP)Px(Y)M2xR9Fe^R%>h&RTTct>~sq)l?3sJAU-hRDSs$F3jDANB$8m`4=RKrun$mt zB?c0NA8fz}Cj5|qHreiOjhYaefC*8O5(p)srVuC+HAD*TFIFF{t;**tkx-oZ3+mO0^N#E1g#^>u&{2Y{O%UVc2j71V^lqwcJLmD zU1H&FDAW@4lN_(L99%Z}nskmJ#yF4Arj8(==XlZeZoI?qSKR!JKr;@WB{++@3`ZNJ zxgo3`*MV5F1L2fh7#j5CYE|+z@GyNU=zBhrlwXJ1=Sk*M>gJR$KN3^+wPqYp4&LH~<>b%FACo&c`NE9gB=`B8e4k>*#?re5WVW_3 zTYqZ(xr>;{*Hh%9BWx^P9+xgHS4v4DiWdoXm!q(c_WQM56Du{PZ{+=16j08zgp&;r zvv-N5Su_>+t0ANk5KJS;H=+rtC&2Nv-9*5V0f!<6!zz7A09)DdReAhoc1{Z^HrF4g z9n=t1n4qe-nC)5@D8r6^Txat9`eMX{#qmbN%IM0t=;z?@lig07 zT7*t53+*xe+H?Lfr>iPqSaRM;&_yg1e0$)cj;>2qv zkkor3W9cvKX-$=@aVw%T+Nv3?#Vun0X;8@<=xN$KMjlQ6eq<1zEvuKmHKAJ^liUc@ z2LdN1p@YOs|VO{SKaofb{mw@SD)!9?f&ud%v?NfF#gdiI2koP zG^MpCCr_T8-6kT6e?}EnVEFfTE)Fk;Ag|gwHqs=XyPxLdh2DdJrn|1*%Zug90Ylvi zBu6=e&c8LYP6a7WI~FQ={2a*|75nI$qr)!6dQ*r&Kue^wyGO3?&N;9wx|<(@$YHkq zz#sj*iIq~L zR42ZvYRNg>iT53ECa;VBZva(RdPAw$lPW6iJMMMmzMY=|KLdUS{%0Au3Cw4QTlIir Q=l}o!07*qoM6N<$f~kf&)Bpeg literal 990 zcmV<410np0P)Px&m`OxIR9Fe^Rb5C^Q5^rDyE(Pg{J@9|?O{DkB`W)TtA`4TKnp8EwC$=x2&|{@ zAzTl=1qKn==2jL&7?Sm35Ezo$OW*a7A$_1JQC2HQp}Y6=JHsn?+r4cQ>LGUE?EKIF z>-^5|{Qq}E>5*n2%|M!gGy_o#u&7oa1)d1Fubwb!v8H|$~u_DhnF4p!`AqDZLjB=O)B9-bn zqZtdQEviISoKv+`qVp~v8`LM_oHKtTmBJ?{KZo8N>|j6jb|L#*ybeI_HwV};pUisz z%muX}AoFKnREGC_D+kz**aNgZSlsWEX%x@;4tIVT4ALjB%+K|l;Mtl_+{)+~F1PZY zhZ~Y%3JAAIR9|j9X)m6XF^Sr6a0?i{3np5F-|5c7W}XoTCJBWhO0&4ILj9mTEbJ=L zQXn2ESwefJLR2JKsKn`Gon9Aj0t4R13VnmGs1?FK_m8&|PV*xvK$1#R3ZsCC0ds=7 z%@8WVj(etvxDui#ibBiLl{Jli<^!mDxNU;(brB;10O~nwMr~~unhw6HhU?#cX(KYQ7tynng~z<4y=ny!pRN*HtyjP^RNj3 zyaJ!vtODu~z5tjFaF($NI)ZqJx}nlK-7Zcv1r%YKQyFf0H7;si;UA~N5U&B;dwgrA z>(8=~-^Fv$bq&G=P`c+`lU{JH@jyM;aY(+A72PBOgs6{9B&f;DqZhwIR6G}^ub`tF zwi=0%jQHoV@hT%1>ZxT-DPWxf$cNqR_yZu(u4Sb z-d~duw>#1qnj&U3{SL{F;l0lCA$N@b!nUc4J+j$oJrox(voIZ)LskpzYznZ`kQX&f z8B&S6h_mg;deJO%Lnr$HTdSFUF?v&m7LzQQ7}U=Sv|-Swenfl}Lr2R;YPF>J)5Q0M z+w{8C70YgUZdA;o4#e|_nbJU!+tGnCYOK#JFbWWws=@_0ib@)q$e_qsy?h*ZDI&VqJK54Pc=IK;vG0i}lf&YSm-+K2qv}&(nng9R* M07*qoM6N<$g6inYJOBUy diff --git a/Habitica/res/drawable-hdpi/add_todo.png b/Habitica/res/drawable-hdpi/add_todo.png index 5d3ad7baae819f8ec40a485b954e2aae1c3696f8..0f309e182cd36968e0d8936b51bf55cf25f92c51 100644 GIT binary patch literal 1101 zcmV-T1hV^yP)Px(2T4RhR9Fe^S6ysWMHoG^-PTC>d1;GrcsZ zF$eEEg14Zs9)e{WgWyxlzLy#dr`F=MN-HNUw&}klq9c~9%G&sxU_AoVXix(F&GHlr zO(a}z24en)ior?^svnAMkhH`WGl5vKQSX&$_dtNlsYUoiR}R0_YXY{A}2BufdDDyd0sO)I;!UuiuwQSRGMGzgdLKv!Bl zC)?19JR(ES~Z7C!*awtWe96A_`iofrQX$^cR%>zj} ztH~7GP1!|K;iOsak+jsAK9%xNMDxHJ4M?&RF5p@0qV09Pi%ZG6NOE^4TChXMlBHC(Ux}(T-Wt`oP8w7RPuwY+ek5P>Kct>gCjA3d%aT z;6+kn*m=CBb57=Woi8SZB5J)nUc0;fmxkoVu@zq6F0$;PNf#?=e5m>^U6vS58(XD3 z)Xn6~J=`dEeiS(zCvdkHxF*Xh^W7u8=-GD|Go=>-FN`-Ok2k31wZz)_IQ4=lvxQQ$ z%-hGH$@Lyl_e)8BX~{ai5i;71Y97>+@_{HbKN6y4qtKAC>pEkwjmx{A@2Tb7G>M#z zcINsvV<_MNpL&OMzpyEg=$v|L25R=C0p*f4a-(cv>`id+q6w(Wg+77?o}Wp!&nM>B z`5gRK6uuzIzf8ZdImcdn+Oy$8r_EhYWsYaAZ0h#%od0{`po5BL`Q7OmQl25<Px&A4x<(R9Fe^RZU1#Q4~IRej3ckML)DjP-vlGKhO|F5Yna}j3Cm85J!DODZ0o= z+6_h0rVz@+amJ!WixKI^s8!fPjUlq2(f4K zBN@aLWTx#)Xn!VSFl|PZ?g#;zS±^_=G7M4awnpE4n6gapN~?Kr+wri)71qzbJ0 z0UR@WM3v&x734#CM5EPV@j=Dxtj8{xE_OS}h4FbB28nzZ(W&~V=t{}$gMTqn#}!^L zy;N)P8_WcC%nQ1TSc{6=S#5=wS#;OYa}-Er{2=qz4lp&gNQS8cHTQS8>DbP&SV+yW z`q~Ob3_6ZNKboS&$bt-d?7A))Nes&C4FJ~wc-$zYcAW~Tj3k5OeW0U^!qg%pj|&BR zajW`8NSLztQ4{;R>-o})AbS;Vi z>KUsth+TRDAfT{BOtfUs*KD>AMHXcUbK;BQtRz}Ern!Zpk(M=ZRxYh zR1it(uTm?>$QK>?N6~;!%0nWNT5IQP6GCw-b8_kBwSq}f1>ebw=irF-otc=X3s9{P z?c8b2&os}5P$nFz>=j9CLe$^`@LTac4t9%&*0oIYv^{io>+Ae4{G(VE^8(}-qM)X1 zxJ<=vjqV;*b7f-Tu+L9(U;;6Px%6-h)vR7ef&RliFdK@@(o=f#s4)T_=S8asdd0R|2c#4?aZ4#Y<9)It!i34~N9 z2x5~a5Wy1^8%c^30WAcG~*xr$;ByZ|9Y96>kd~pQD=QBebJG?B=5Z@A= zJ-WeTm*@GoynvYdU_o$jM(-}p=)g=jqPs@)8oW~wXZG{u3+fG;M2`KlsoP~5mbuB_ zDTqs9_e_ct6IsV_hJSTT&jSTRA^PDEz0ygK$pZzGS&@6piVB_z`-BRjzn`U;K{29b)ng+sVJ59$YX%4sP_au;_z?Ox`Cb z1Zafsgh6-=$=lhTc&AFPeoe8;<3f$Z|Fn^lNQmqANTPo46VyutVLh4|{|&xqMMcs; pK@s7vAvZi%gj<43JMe#Y;0j1Om}%&o8KVFI002ovPDHLkV1nRY6(Ils literal 512 zcmV+b0{{JqP)Px$x=BPqR7ef&R542fQ4IdxT@`676a*0waZyky4lWM<0}*j^5^YNh9UN3dp@V~n z&{68ps$Hw-qJvIub`U9oLsu14sEC88Aa@sY!js4Ku2MIlfso`&zL&i4?tq3gHn5+h zU@k^;$8qwj+sH;}CZC{Q6?5~28)##facU}=SO;N(L;Ii`)^}DZ1ME~FaHbO$qPyZj zCRFQF1J%DWk>u{9LSVrnEctY#py5f@m?CLi1`eG`8GAOc3wZMBY?MZ1v75CFgaq-TJfvm=zQHv!Pd&I2?k1p522NYE z0nb&6ZHt1Fq{jI;g$)A<6;plh1{$_C3omN%UwqF7_g%R7%YjagXM?-F;wJC*kqK)~ zQa!O&PqACAX=0EEd3MX$Sk?2I9Vo7VXpuF*ug~I_^dUeSyXDbzE=v3SeGDpx*#ma! zI;NsIaiZWqZq Cb>D0N diff --git a/Habitica/res/drawable-mdpi/add_habit.png b/Habitica/res/drawable-mdpi/add_habit.png index da6ab2b2cb5d686a520a30b08f1476c2add86817..54bd1dc25071b81a6f1d1802e7ec992d648a55a0 100644 GIT binary patch literal 687 zcmV;g0#N;lP)Px%X-PyuR7ef&R82@!Q562}b8JTY87m5Zau$&hm6Xt?kZ@6(uth{d3&ETpObJ^S z1kJ8RMT-bzbew7>1ubhASXn_kp*Fd25ol0o2+oY}-FrHB;>vxajM6mFVlKRQzVrLt zd(U|fsIKY_{O>m)*4tpZpH3(TZR`0qYjYHSHf_b^xrZWe=d2+d?WYGEFbsiNJJ5#- zI|!&30`oq*tq}Hd%uG`Nr_QIuvT+3r&@wYfjcyLtg@e=aG4a;+*?25U!$jzgr^Q*@ zZsTVO3NK1b&nsMJd)oLM0}9ebE1zt+6qzr+gwm4|zXahUZ!BVm`3Y@Lh46-i;^ z^O~`KHnn_&ocxWmk|wh^CFU{%6lB85SX#^&dpXiac(wi0{;bT$AAjk*X^LJM5wncD zj9#wv_0T0R0)-pp7B%_Y-w?ORGrE?A6JG0hvuAlF5LQaIXk+xq`vY21gZe%`)w%RE zK@karwM{QqqL~YA%Ot4%k7ey!c{s>9XSnwxwzojIlndMjsUhQ#Qhn99W>M(h(nMb3 z9#7vTPx$>q$gGR7ef&Q@=|bQ4pSax2FU-h-jfjhy*M&D3)TS5CnyQRoe5`I~5B-Ym56M zRCLcfQ>%rYHtFK8G=YE$K|uut6|Dr}v~iq9u}#h|uU@fq(jOqt6XU63M#;^W1MRzl8s@>ymy!*5H9QAo)jDbYPs% zmFYYm;*|*zT;uKp3K-DH`C(~rGV;~f<;Xyb!U=AQ^c^p11U?$}<4j(-`z~h$j??(KLegyhKbx(1)3+p(0Kb z9_IUC(BnQcQVq-?kEF@Gk{l0sZ@Tu<4?|(eM5#!U~@ho z{LF{ltH@ffn8vVCvj+59#L61-0Jr22bAefHCgPRupF*S)Hyctty9WO@&IwH>$x&EAG-4$(QJ00000NkvXXu0mjfIok{S diff --git a/Habitica/res/drawable-mdpi/add_rewards.png b/Habitica/res/drawable-mdpi/add_rewards.png index faad5bcadbe4fce11baaee94559f0a06954752bb..6d26f7a63509d52cabb6bdf4c6246195f257d900 100644 GIT binary patch literal 793 zcmV+!1LpjRP)Px%(@8`@R7ef&Q%y)zQ562}dv6qlu`ntmiXsz3O3FoUDO6goj;86nio{Oj< z*N@qU8OTWnQm72PUXzFGp?hjp-*<$iflDznyUn1RXjgHrPPnv)co0f3M`w`O;zPyS zCQ%CIQ2#52-=4dTqVP4oS9rz%4sR{N_?JnPQ{G_A#&&%d<75dcnQ<`g>-(fg znr}fCmk_0tktAOQlNs*ox*}KYSqxIrU|p-SBWw>v` zTE)_mdhh?oPRa0pK-yKd)N#m;MDV>D^dKZl@=`MGIjS`}R%_9xZQ@0-m&>l$W5mc!%}$V!1f X$M*FO;G)7300000NkvXXu0mjfK5cw6 literal 644 zcmV-~0(Px%K1oDDR7ef&Q$1)?Q562pOJXes>sY8p6gxykboFl$2SLQa!6FrnO%#OAjt=Tn z9Yvc)MQ||cA}+S8O>uEh!HOcaokTRX8k=X{d&lp-Hgd^(>7bL41Ia!2obUX7_dK8@ z9R~iD0clNe`>ghR9_~Z2Q-O%T72muQIHw8Z3q^U_w3#z$UySZGa7hIdj$oYW{jPPm z(!?ZcSQYqKt!uH+wEe2$V4yh9&wg^uCEExBW3`6iLKh*ZpNt6Vsfo!o8*=Evk^DuulyV4fYPxh8|H$!+|K`l;;X z^W4^{Lo0$}oaKV{aDqiu5^2ew%js<8nz1W_0UD>cM>9@0u9sfye$T)WD<)nQ?4jc$ zDL!rktT#~e(Lj_NB5(y-6EDey3g!Fq+5QlW_N>Rf_JC#2-%`{ru{FUG#BubplaN>K e0y_5pkAdIx#m)mr@=A380000Px%!bwCyR7ef&R82@!Q562}^QohaKU8Bs&@75#Qd}f~V6P+O)3Z#X#N@yXrNg|~`q8~`htW+%L*~~kgGj!$gc)XdQMT@!cxaZt^ z&iCE(-E$vM97P5GcLmhn9`M#F+OTS)SrKZD61)kUm~OqMmJ7uxm~c2wHA`7sCPEv7 z8~lAHg*u+I{M|4sanb5iU)Tl_DIO%YcSvI1k&09EVir@3u$QYkYF1-?cS>!ktwxxs zkAct#8`}kFxQD_6U3fIuMTh->^H!L&sLD}z#-I;tqBz-_P^*4GnrtDB`-&?s3!$as zs`~1U&0C>k;1bKYVn)%Ek8IJ#10gdA2mHu{Jg~x{v$W3shIuMMM|?mHdrzx;O3mm!?;Kd6y?{o(w@^r7LK0J*6zR8UR0uSX*dinQIkKu6d{6aKMDKg&KtfX? z%M#pa?^horF;a>jEZGhr5F$;cWwfIBw6KVKNTc3Mr2Rlib&z}JCfdqPG{*NjC+nI_ zWaQ4=;}D*d05SGoy7ROhSYaYTMsM>(wY)2xAi#1@LgXgZ zzrX!BM%m1?)ify&Jol(&Ur6~7F|qXnPxa8YjE(dBd@krU+4qjX3cbN@UqChRP@JNf zH14ttPrH-2;*Rs$z7?Km7(Z@g5p|r*rd&dL<+K$WUuFqkB%im8j3vl?H;0W*8oOES z{pl>uv6SOxIXd(qyhPgfB{Uq`=O}98zhOo0he$Z&C?}(!_He+3Zib*9x@*o2E2mepH5P3vaGkDip97S5)AiEAShP>jQtjx<=yw0000Px%2T4RhR7ef&Q$cGJK@|R8vzv_tEqG`zMLc-WiWO>TDLwR5P&_Ik2wIc44I+ZK z>M8#qr_!=%lJ*)9Z=wgKnwFrZ6s*Owy@*}}MJ?IQJl}u|L(**mJr(j`n3*@<_r2Zk z%>cdVIdE79s2hPwg=0ToVpK7beFU2c+nEB^iHJM#I~FLrd^TueRfPHlTw_Kz$6WSu=2MGtSOZRx%P< zc)CPS|1^+S3WKJoxsEKb@%DqWwq6?v!P4ZsfEN_-EEMM)YyOOwSPyYs_xmDzI} z?^+3APjp@^o0m)QycJ{a+pej5sXl-`4ERld5QMmUzJ5v*yq)B(o^?;^F56oQ^I&A1 zIL388D%uM8zZ>^K>WMriiioZu^6Sz;`{`mUBJ24t)#ujRc*jTDEm_-@{(= bNICEinN-DxjmB@400000NkvXXu0mjfmZS>m diff --git a/Habitica/res/drawable-xhdpi/add_daily.png b/Habitica/res/drawable-xhdpi/add_daily.png index 16cc1773ddda8120c0998ba2340ac1e8b5053921..f4f873e41b8846e158971fef8699ff9e2a236474 100644 GIT binary patch literal 1062 zcmV+>1ljwEP)Px&;7LS5RA>e5SW8HhQ4~IB9*vpM!ZsC_*#sp?1=&Lpr39fx6ordgq>j_Wh@geg zA{=)bQ9HA7#s|@&7A+!Mgy2Stk_-wFj8KD8qmbU}{PW+={nMGhQRjd9K<b(gp26@;y%Ulf~1c!UgIIGymaq6s@<<0c!H0fsBs zi6}xNFj!|YhGb?Po>fqGrV&3TQ%W{x31Ew#<{BHmC3AT%Q?19iok0Ew1$9kJ8e}*uuUWdT;sry>(@&+6w9sVQ=_q&DsZ%Uld+c%v- zy$dY0p6Lv#1E*5Wq&>4oJ!VIn_NC?DL|XvTK~pCK)Y$>bZXcpV^)N~&;AOW1+V$uf z(V3Fq9_jBlVw0$APl*DIl?CyAqI0YLCLjAl``ePN_!3?508N*uM*>Mg=;!t0K=^K{ zjuz0^G{93q{6cYMFJNr8xL)xky5a$vF3~_yr)zl3eTml*b6{6%Uw)4*HD$9C3mMGh zpG!CS12P=4IWF7WSpaBT3=8ULxdTk)=;=%Uw^6Y z3DxxWQ12(bAI_z#XG|Bs+FGEiN~rzMq3T~SHH&GEKQW0$L8N$K%pt07nEKy3~SGsU|Lc#5$%ctZQ#~OHfIp`8zrfS72dCybE$7N;n zJHT-@+<&lMJ&(wf9v6NkKjj2XLMML#^EKm-xTUq0t`g--BnBKP8f4?}@4{I|LZ1LA zF|5)CPx&KS@MERA>e5S4~J%Q4~IR{*Xk;O+*l`qEM*Fh@zmP7DbR16j+NKXGRok)240P zAZTSjGinjKNI`_4$bz7Dl{@K&ekei%DauOIdHGJ?9i3s`bKZ>iTD-)2;qlJB_nhyX z^SyI_9+7E=0mFb{z%XDKFbo(5v>6cEmU)KB1aB5L^kZHpiq!M>~PuUJi~AQUlqvor(6sca8Kf1j*oENO@jk5-jK#F$Lh5A>W$Q?@x4y z!Z!0joC8`3+-%`hQ)#*js4Y%7y&i%{Q-IDQiFQ>4tprjr9$=<=7{3F9m*BL{W@?nq zL2U}J`%*5{Y@%!U0#zjFCv00G@5U2@t{n=}j%Z3eEoA347V?_#8t*>CmA@wFFaoec zVcHkHD&F_Ba@9nd#$Yp38Kes*l49J;zO#wPQ92EH`oQ=d=yih-)Dy)m8zo8fZxfiB zqz$Nf0oFdq;ANnvu86OAos)8@7V8p&(2-BB;Y&UOW?b;>I?7EfKnN^A$Dslz!OVc5 z8OOxpIvFe^F^jE$rCdT;Y$Q^iigSIozo<7;ovyuh0$^)3w$K4x$N6@^(r(%bU=>WF zc0G3+m58u_*Fs-wOV&?-=u@Io98n3>OSdD&C$SCpc+D3ZS6;-$!2Fn7@(C!HkR70J zxVYWJIWX!6<8GhI3Cvx(4!D8*>My?%I=|;(X!J+LO38R~XzORcn9urEE}@aJ^7WQI zHHo=1H%{Ro9ZU}Id@ILrQ*Fjsu|I#_E#ndwMgZGz7g__X(MTC>Jl!t7 zxb=$lODVB)tZn%tg7CEFm{yqUK4h zWv4US==GPo%r@#KNVV_#E~FZ;TfgKQa2u3I!Xw`;D~g5pH-GBgZcN`WU>GnA7zPXj b%Y%VGfKTIvqG-VR00000NkvXXu0mjf!o-$K diff --git a/Habitica/res/drawable-xhdpi/add_habit.png b/Habitica/res/drawable-xhdpi/add_habit.png index cce99f37978650513327c3893c36875af2bac122..f4959d0299726fb8b0ba151b644959c795d69fa5 100644 GIT binary patch literal 1052 zcmV+%1mpXOP)Px&)=5M`RA>e5SW9RVK^XogX=}7CEeO>Xst7(nL5xaO6cJI-qX+8?1pA0RD&oPD z@g#_%7Y{ZqYDJWKQ$g|O69h#>e4!Qepn?e27dFZ6@At=~HYGFJY-`{;zZzz_t`iHkNj!=o^ZU0pvx~xJ3abTKFhf+m}hA=!0T< zj`@SihcK-~UylIwxy^Bv)Y(mX-!s@7&)x>2F#^mU zu6=(!1OcHDpw|L%E_{Y}NIqKvCq{rR(K`*HbXmPr-SuR-{7q0$@D4qNL9W0_$XL;U ziltNO2XYzx0&Fw`3~=FIOB>GsYXl^|?7x{#OXC+H(>4K!W8!0JbuzffbS%7EmvYqN zp^lEjvvd8{1@|`O?sIM9<`p;Mah2Hudty8T8~>`Dtx$_%szi@~DE7|ng?x(X@YRB| zH#H;II`LH@IwP%41_2Hv-6ke=Md#=^?zQ2z&-Y(Ppc@c9z%9ez=ZE_g>@#fz$gKr! zr6?6$ZtqgvrjT*>h{`{Fc<-L$NVvbfkv5sYiEVHOYa&&5`jfww=LN9a#>{P^Q=xFa z4Z5kzW~V4SuMJb^@<+;iJ>;br?M~Sw`nmI{`XPBUg%ue9gy^MZ{@u9i@Px&Pf0{URA>e5S4&7#Q5gRJJE4f6xTr;CVHpirgeXL`>anaAkrokQIA zm}t``h=QQe$wd!B7g10Uf(B(lC50lmkRA(Z(IT7)EzSA+&LxL=+;g3mH;HrL&N=5l z-~amld(SyTWSU{XFkl!k3>XFs1BQWu8Q`Tf@12&KnRz-4+zv`m`BL~&tuxbSShd@}o_l@0?Uj$7mG6*Mp7s06s|&{cs66qn*tWp4VY@ z^6qxohqXEcbEiGZLpq#J-qS7vNTM$x)B%iR0av?Q0lYR93J$fO*=pWMTEjdC|KO6!=o00ZfHxr)??qdI;!S&FLHiNs;vOH_ zWz=_#uaYhXZt%BUbV`jWssea7kKyS^%uscy1IyK3Q5DG5Nh&T9k^{Uz2UBIqu|=P7 z@?J^Ka~R~EKzC5OBtd7CZLq)5?uDL30y2kfVl;G{kGlCq@J*^}P8giEZy;aZ1mIvb z9={y`B2f+9CVRjXvwOE6iw2>v;0VF}$5HMgbgMudJMUNM##8mdQZLSkK_$Zpc^}<6 zw&*zI%6S@AVKUp_%bDv1EmOyBu1x@ru0l~gX$^OhFA%7Qa8;O9rwoFB3;ARk(4$FF zyO2jQy1LO;ARHEJe7v6<8d@YAX56W=TPVs~vZdZiv=#XL;MKLtv9-Td?`=r=dDAA4 zpP7G$UeO8MJu6k%a#f5m*1X0mI)T|4I&asOX+&4!|a;57?B zPF>3wpU9Y(WQx;$s=AEcwcg|(1sQDf4_|NdzZBIMWWXb(75x$C!omNWfX_!0c>f1f rp9>QPV;C?D7zPXjh5^Gs0Sx>B`>*F1D0~S700000NkvXXu0mjf2GXOW diff --git a/Habitica/res/drawable-xhdpi/add_rewards.png b/Habitica/res/drawable-xhdpi/add_rewards.png index 12deece929415fe2c575f20b976cad89ae496a3e..08b316c7ab0789c4934a66a7d49bf2b74cce132f 100644 GIT binary patch literal 1527 zcmVPx)u}MThRA>e5SZ!>SMG&5S-|L5BTi_s6Z4(tRDnT*9A7}!JKlnj{ksnqKAoQ*! zplL!i;fI>o#6)YNmZC<}>jx4Drjj7k)B`ms)sXrXL@mZd8;Vqs1beNvSDL$9pLy@z z%iH_#_O5rPnB81&cV}j2=b4$E-5!x{+5_4H+5_4H+5_4H+5_4H+5_4H+5@?GKxDJ1 zyIY#$CumPZ(k3jtM-mlhvwl{xf_@j02FReM`gZZ1sxD=Ky$!NtWRgCWk{(c1UJyA! zSB0Q00C_}3zcRpfuY3`ad)`ti=p?-P2?=@zfR|uHKNR^@Hq1r_x?7MXP)`S>pi9`( zi@6*7j)Hh6K>m?QpDUAq&5sc6w8nxucXS9ZkJ~(QJGv!=)T!$ftxU^jYxBz2p<4jV zNA(@zJviA1fM-El0FaMjuYH;JQv%req^u52(IQrc&3u`ZCi35XO1iHG=@A%p2cob5 z{9))h?X5;8Gzs`lt<`mipM7502ap?}=U$anN&sb;7TU^OCS9?|nfmS~SseJ4nx})b z3$mr~Jb$c)^rQ9*G~}z3JCSN1$H*$(pDcvsZWUoeMJN}U4v#DgT%gZkNh6FYWgR$6 zm(ZO>KgDyqc8rEM1>q|>M_NAP=&P561ya1FDYJiaq3A&?GL9HlCR)k{rXhltp;50jg z$elto`vLM+fH{Ff=BqY1 z5+C(8s|Xr`cHw@y!MPo(TRA`+W*Q>XYF9}_=oMI2X~{}@c&tO?b3g91k-bq zIax9Vz*NQ@*=VUN<&QZ`&CGL-y8pibkhQ zsxhvZ1909}RNNjsz#mE_zx>$C5Sz+?(JZME`;VT(2Q%T}_J! z+H3RKD@CyG?t!Y%bjZ4Zg<-zYb#BcUDn@vG;#AjexitJ29t1>N@wW`XiV#Vz!e7C= zE$j#tUAf9A0St$!92;!rO(e-<=#&7meC=KlK=(5L@$+orG?m3@%r1CS0+=r=@W>8B z7X$v!TEWg>p%5U=Z?<%c=mR3tKGzgL{Co8v0Ig$CD5ddt?!SRdx(Az93>FVZMrZ!+ zBE@{1z381IM86<;-l^0y&F1zW*8FJG@Z4&*$9e08^~za~BH)72LzOOCxv@=5X40Q@ z27fCJy5s~sF>@gj!){Wp#cZuTIT{sDFB(_q(QPx)4@pEpRA>e5SX*pVMHv47-L)-+wZxECC?H})4M-m}niv}uNibe`GL2C|yEmX% z;{_8Vf`!v&p2GlIgIJ54shBk9xe+9n|6xh~CC`+h<-;?0yA0YmnrN&Z&`m+3tEypP;i^5)cPT7gJEZ?w;HaHnX^9j%E_jJ^o>5$PGa7gcNm z1jO41BciE8<7tc!!}d;;)1h!bhwOf88P~c31#{^sS}qwtcO2)fSx868p2ttsD*)u~K@DF~Zmvv*nk64PtwIRoz#I8u0Rs^`Uyqi3?IUb@-pgxxztiX(10%6dMq-6vBkl71b z58^eGIgcM@0tk8-CE)lnF#{sH1_9lLP5T~RX6+Aad>(eMBjA(%Ei^*?L_mBuj?s4L zCmpru}e#)EPGQ)OF=T$w;E zPNfa^GOk8+T8?XJxICKI$F;v=4IP@YgdA-DG0}mDkSCfv`F^=s diff --git a/Habitica/res/drawable-xhdpi/add_todo.png b/Habitica/res/drawable-xhdpi/add_todo.png index 2aa5f19bf5f89ec459689144b49f1d0eaf0a0846..6e4e4d411471c62d01e9410645926f40880c87b6 100644 GIT binary patch literal 1396 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 diff --git a/Habitica/res/drawable-xxhdpi/add_habit.png b/Habitica/res/drawable-xxhdpi/add_habit.png index 2211590e8d15588a6a0996d3f8ec54ecc0fb3829..7e2ea8cb41b72bb28532f50c41ecdd346a7c4e91 100644 GIT binary patch literal 1362 zcmV-Y1+DstP)Px)3`s;mRCodHntx~|HJz5>_=iOW5o!+vm86Xa z3Q^F1#Qt-l;Gcq(B3^T*SOqKoLMSLjD$**nAVSq5N-H*$rdV4Wljh3q_?^&M=dQOu zW-}LZn>TRGo0&In=6&|f-0tiWabf~YfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)Aj zFaajO1eieX2nbgmeNmMIb4Bu8*;{fu{p45P5Oa$iH#1OKlitLi^rR#jAxU>5zh<$M zSqA<8!5j`!f$G(|_%zFWG6AiR$r}LiGb!nwEQ9t!A0cSp)dTeS6FY>0oH|)A(IZva zCj^jGIn{g5M0Pt1Hw(_w!L^qAr#KkmYSuOc_pB~mQ z7X~AGp_?$%IN(}mTSI(|dzEknB5DVNDH={YjulWCU8fBrwEc3K_UdxZ@()aZu*KbO zmg8hwpo7|&6g1`HzD?U(PB~WHaTPGeoI<~ix{jh1Q0yz=o(loR{3ZlU=%49#lE+p+ zlZ8=h00Dbqvbs1OBSK$PtwchF46`4 z%M(P?mn8#g4w`3~fjYjrOSXqPo_CA6_n(ogXXj~qOJ!2Qqr-S2`Y=h&w!JGr_l?W` zQ~%O>b233dYt1rFb?!CGg(6Llyd!=$>(a_|O)BGQ=Eb!7N>51IjjT6-p1wqD@F09B z&cXKfz+Z51B(6^{wDBJ5_$qZ}$vd87qPg-WIyt|eZcJ1(6mUX5YZRS{T>%<27hX|3 z*EY)sQC2^lTG|U9{h}Le^GZdiqqbAF{koxV2UO60OyYu?2>t}lMokE(-b!bO*^YNn z*WsWx1X^u~mUdIOmt`xUxXsuDXVs5W1Ofh2iU5t?v zQObe$|LcWRoqI^h3TSQ1Po)!Qro*V7JTRQpqbKYO8vQJ%RVu_;rsH;`QWM0Si2zP^HR!N zb+sUGT+8iw!7Kc@>*o#Mw%6CU%GcZL;>!5O=r%kCgb{-YzYG1-aecD1;X6?M!R;`X zd&mXfqmJWy)VI>wY`G7;G%p7w1<|KK7|Bd=x<1J_p?d{Tn0U#wktkm=CXFWc$)JF! z?34~|8={?KomwL5T7X9AtjKCa?01C$dQ{W|K4?y#7^uMt>s$ru5mePzZKB5IgKI-0 zS!@A%?ezm^no~26MRf}T`3m;4J9N8O5RtllRQyfrnK|~PTg>uuk+E0%tJczVr6!sS zb82LpS-AP8={~yd-~s$8ZPdDx$L_Q0ulwaW=i4U7SC@e@P{#xuo8t&&ppFSRHpda_ z7^wAa4{n>nK0@Feh7%KD0!)AjFaajO1egF5U;<2l2`~XBzyz286JP>Npf?Eo2jAr^ U^ZAjBh5!Hn07*qoM6N<$f-6;o^#A|> literal 1235 zcmV;^1T6cBP)Px(jY&j7RCodHnO$g9M-<1;xx2<7Dq2J_MGFNB4TwGn3bBZVJ{2EIQLsuhF&n{R zAJSLR6?_sws3K;wNu^B%4f-N}LGfGPN_Mny^Bv)(vXS(^=weHGDGw;Dp*oUB~_(m z>YN#)j%6txv}u=PBhs3KNmb{*q~l1|E*#wvMe84AXtz$<1nU{p)rQ68(Uz=JCJ*r* zW;)J_p4e1m(kP}G@PA0_;CBEG``T2d0(%1*yasT-49dh~^hIkI{~A1(isPjW`T3`l zDt_}1`Yy~<^lf_&?+u?LNc_~UW)ErX2-q)PCc62e{}kE(J`8d%24R)|oL9F|TwV|vAdK1+98nhs)nT-A!GDhnZ7}?mGgfyhGC-r< z&ANK}orb8%rXJpf$CEp#aAHp)53K-6jm8GIBqW1s2w6m8W;Tyx$mDyo4@D?mwo^VWAYtNpY7g-ZRl z;I*l5EuE~PBu%<%w_5?abMWFy9Q=B9XLykN5zVRgjz!fz*@Fxu1&{#B5jfJWCg91R z6ik`r%ZI;kuYH*;GJ(f>x@y&U3vpC|>{w z`t?Si5TFCO;CIBTT&_^*RDo~(WtC~84IJ&U08r^F-VY0I6>ekpG`FSsoNbQ^0Wlvf zQSd|DywBG*Y;1!Vk<-O=4#!5`!!T_xrhUtK&#>8EnLL?JuGq;hDybVl&7rmN!m98j z&D{UvwI(@9o3V`z#hCe-|F6R-fDGgWkN`3eFqo}o(Cq0=2d33cnyCNAP55V?!Kavo xfDjM@LO=)z0U;m+gn$qb0zyCt2!YWg@CN4S6V)G9qaXkP002ovPDHLkV1npRH_-q9 diff --git a/Habitica/res/drawable-xxhdpi/add_rewards.png b/Habitica/res/drawable-xxhdpi/add_rewards.png index 0916d6d8627d14c6da6bd86c08342ed628483487..c85a15f656cf22f74806b3c85de3487f9f363682 100644 GIT binary patch literal 2200 zcma*p`9Bkm1IO{rImb{GV-u-RVMUHujpnx9`)rAi`{vvC5BNSF-yhzu=fCiNWn`!g<`m`x003Ye%tMnun*Dbmwm*e>^R@f| zh%?dF0+jbde*yp?6P<^eX8!{ICW3tgPy(GZYnP;0X=0%G>YD}}0-74)Eucy&3pZQ5 zu1IcifrB;3n2(>2nVm%<@+#jQasic>kLwkY?JCiRJ|(76Bki;dKACF zh7S1d4H8Wr3{X8?6%4QGSvC7JF(e3~&83fwfvml@%_ki3`vN>Utz1G{F+(<{ch)2^ zM~GGGd2Arv#c-e0HploxyzBXPxLJ0gjGUd-tPmQ-WY?8mC3>~|Avpd z(G4mDC#_VMN5iopFMjxt$@#?JytJ=EBCXkf(U(|>=>{WQYrVizK<{Dt=Iz8#B6N5{ zt3u1(iOSliD^BSx`WkXSlzuHwEswHPwRQwGs00Vys}4!YF-eIw-D|FSH%K^1e=-6e74T9p|hf}oNqS1Av|D{Fch{dtmq=O)YW9%4j-l%;vM?aP|5zT-cA0Whhpe-;HXd91Eh zW}R#LqOY|bzxuBDG@evkhT>EvH!sq|FkN}7{l>5#gEiPprl4!VErmTuI$>VtLAw|1 zKD@r`-p%4-x6U4B%dq7h^Qxtj&uu8x&AY?&!i>TfX9`W!R!^E=OIOk+i|`M5boo6ZwF21Wa>`y+mR>dj0-GPatI=G? zdx*f01NM<~N4Mvb4bF!&xerBix%b{WI2%q$4!=rh_!5)V5qVc~g4x;ckbA3>BmJqO z^^GTpj>6|av{&^<=81P{>JBfT#t(XDq&Sx)%MAnQgzFxOnBzCwf-WQO`>Fhyyv6{izHbJ>|nwwu_%br1R)tp}pOTt9+B z;)`Xf19D?d5W@=@Nl$7(@TMaM-80q7!K~f?^A^K@GN57x8(?%pKq}PTVF9A@bO5jQ z`sFbYedIYJvSSkz&!BK3w^H0k2L?N=Fj7X`+dUoI&e-sQ@6MdwNYK!E9nOb%%2r(+OMSwe3WEQOkCq39JS|aOh^Z1g+A6Y9y zxkn`*1{1@fd75Zm?uek?u~67|_+0 zK9yS&n?_BrG6~%X>^eS*#xI9I?Nrg>tUdoGcAbN(AEjca9<$%RcWZS|zk0)K63dHf zDYLXrME?>Ct$waII%7IeOGGPW1fwWv+PsX%ftJ+lW+wBc$%I!vUiFN#66d!@j{UyT zK9RCpTJ5KZ#%MTK7FeBM#LHnG39GGcdrJv8YT4vBx(O`5ndA=mbRJ0Q`rL*9bn_r5 zw_nQY1GOzjDr!ntb=i`#*~LW*a*r1Gteo zS2~z;t}xF^L}y-*w~oS{DoSLEiAxh0!C97ZoZe?S!GMi>A6Nkis8F9~b0Jff&}Fq| zTbWe7Bp--}lN06Bz$A3xJ3H^7@ow8HPZ{rg9VRR0bm2m8R1l#TY%aK#kh>xa=&e9b zcHFumH*Vdf`~lHOISl=JfFoDSkS*TVnW1E8wkZZt0jB04#~G$HPbUrQbGDKev_eU^ zgh;YJd{?rPj_eb1PT$)3{=4{D7#>k`ZzE4N!*|q1FRu{dy_*be7`g`5;V^S6n7Jl? zS~HmZk>3Q{krES*ePB3GG0{M50Gjk%Ar;JzUk+5{$2JKM_1wxK0!QXPj6{M&`!9Zh9i_bn2r0|%wy2le9!Zs#h^G*$znbJxk z(&c3Nk`b#y2aB_9CWFN35y#P9dw&e+!fj?=1d?KUO}Lu#ztGW}jo>$X?ULq_vH0g| O0CZ4>56iV2BmV;(vKZa~ literal 1981 zcmV;u2SWIXP)Px+cS%G+RCodHT5D`nMHD`>yM6L#A>pB={2(Ag{2@k(gpdXZU?9P0v_>IHx9#%K z7!e;aY0Y9xlt@Ix6x?=ONFc=O4-gSh6Cm=?1g)Y(=hpg_BO$M4+kEZg=j zz4vx^K{Auv%-l0)&Ybz~IcLtyE|D%80gZr0KqH_L&Un%72lSna!C7idJ}!~rJ!Pxlx4+tOK5^FL!V+P8D*^Z_qcGdkl~Fd1)4^_J~2x zLeIrYrtr`+m33mPdbd;i>@X$r)Gw38k!xMx03E~YrAPcB@jdg@R>&4Iy0`&YOJ!L6 znK(9`?T}w~DEas>=gLCjcf22}^~=iuZiU$=>3P)Y1t{7<4=6?Obq*wMR41u-T>!VX;ABz(%#C0Fyp%3uUOn_kFH+1jLmGsTA1wqnKB@GKXsoHL8 zSlkGJ@rkbfgD?9Fz^H_eUc1Lw!Ixc9BFmZrY9k zLPF^JYp{ZFt7$-@20~1r0mdclE>(p&R1l~a_XNUX27-H$FPBDxp#fZG*at|1q7mB0 zZs}&BZpXNZLH6bnv;r|C(2LnHW0;w71DrDep`@ZtoaxEuuMy3l`QeJ603uE+asVo4 z>wiG*m7e_Q8{WT9*HdEGd)ffvFODhru`FykSzemCDAWZG?_@tk={cCoc$oD*91nK# zz(B3o1FKmGd7qksBozRR0!yK3AUbxjl<6SoeSmX{jqCKa)dCC;4WTIQF#7~W3Ouw%@zqsQ2`q%O-*~}hP~8xe ztILAo8WX)9dM_HK>D-RF<^pb8l>q~&m&;o5*`cKrpjh1C*wL$C=bB_jTket6R2mX( ziV0xEb09^78)X}3&3I+*XoCjQzP2{r(9GaI6fSsB@usuRn2P~~;`l-YosYNCz|MF8 z%Z?<{U?s=P>qUIKHGnEn8=^5cE$jTdMTa>W9RC&IL>wf$dZIbUIk!J zCcKjjN)N1Ou%ZnRH{>Z=I_iG87!;n3V7kYSV#1(8@S6n|FtM>wdP_@@F2)Khj8Efc z0azCS+R@mnS%sTvB3#qd7XZuFe`y=$PGq@RJI8Gb&@X_XQ4uCCx|wFGug6k`U)oJG z(f5_=@2iFzKCKoBS)8uU?rTgc`ZMNYJ(Y#&yvxNr z88414$mgNModzv+scAkyco$!vGwFv~_n=MmD$C;S9A~W=xT&1w%b`t7xH>PDLU6-zZ`F% zAJ+3QzjN%t1>JOit=P}+b_*`k+QFO0{DlRS@8r6}u?5*xDjDC{QS{EqW}1aXPh%cr z&5N#d(4z>rjqvxw2-Yodzq4~j^^V48!Ss_SgU zYD;9nI!`M29Rt+XW;|{f9uAs(CgLmC zac&e50?tIV4yX7HKSrn&AWXqlJ`R>N0&-6y;2ifDw5vQU_PUXusxgiMO4YUCQn~cq30qV8Ko^8W%E?nS|X2e=)J% zetkJv!P=iEA4?d@XDV~|OQfZ(ZO~l+WD4Y)88mjq7U(+xw*(iQ%$d~1@SEThmVz*= zD#%|3B8Ri&i$*$Xz}F2R95Iq!lPZ~Msc{(xS6PN%PaJ{6x+DcCEsEX(p`5GX{I<~T ze+ZHS1m9b2wH_(N1i08dvrkYf(!Dw>KA*@v+lwx!x)&`?1k?Rt!IM0+FP3Y$nki`v zN+!)e@xTHD|19HvWWy&Lew*qllTIf8cB9|XyI3l~)&TW^q6SC<)CU56bZZOh10ct{ z82`~=MBHV3`B<> P00000NkvXXu0mjf@VlHA diff --git a/Habitica/res/drawable-xxhdpi/add_todo.png b/Habitica/res/drawable-xxhdpi/add_todo.png index 8f073f44499d52089cc9cbc8d07d863909b47d4a..57294482f973154a353a0cc10205f7747a08ee68 100644 GIT binary patch literal 1911 zcmajg`6CmI1IO_V5fYh_Y9(hLm)cJVD^1nlz(K4e9z9#c(_&EN_Ny_Zm-Ctw=%jShk*adHWUTAl9No0$e$5e;ZWy$#jbqf)*+tHohO#EQ#b8m zBVH#wKD5dA8_K-* zDMF+qt+0vJn?WbUKAKEdaZ8l$t$Kb1#QmiYbD?S}BYM$1&gHK%9cb5~MU;Y|qCC-8 zxPI0H55kM|79j0Y-7jFJf)NAjFy>m>yJ{;@EC;t(&&XS*ypuk9%aHpX zUrvGOaRuX**)t-xMA*_#smcK6g(W(s&R{}vkhxcG*hUaGpYvZz1|D^kwO@&9U=93) zL0i)b*uM}Lf};$?)#Gn52WOO}E`-P)ZtUBdXB!%eh>9fAH*6t)F zY@zYaJ^y^q=Nw1X?fuLYf#w?EA=O&ih18O#er*}j;XQZz8SL_u@H+Y#l(9Z5;m z*kH%@kEIEQRj3~((vDEA!np0GClBf@-UqtP*M79gwJc&wf$sS7gT4uQ7%6loYix{2 ziO%veFM?SM*BEk_gAQcuR-_sCo^Y}XP*TQzh6Nqv(T2pHxjp(M z|NW%FLaqzhgMygXM?k?d#q(v8d9?azgV)%8wJeHRibBowa}b^mJ3Q;|Z9=iF(kHLf z0(m+ssT!aG@n_K`wjCv_g+gl0)S=<3P_J|2H!i6vYVF_GC!eq5_3wdL;#G(goLP*} zVropE^e3i#FqS6T9H!{qkjsJ<1ZCoKX~84(n2mhY@y zwTW3Rhv(-kzw8*ShkH{j{&&nJ4|nx@4cp{v#KE~Q7c%SxZRsN59DO~3c79l73iS$S z4z#nrP|=#*fP#=qMW6lcCLU_sl8ZaP`6AcQr?U0h(5^V9fRM44)l^7IwA5`C?Qn4y z%H4N=AD469i*oHR1xng_9G`mGOcX9%q@ zzq7?tVV&=#c{Xw^=mbW#a&=pL1aXHxA8p!DsNNzkW>@>mcj@Cy*VBPc$V{FXXP5QnC$}T0&~w4^fMFTTSS`?i zwjRlq=WwSr*Y^~B`o~^R&nR|h1TzUovCueTC|iQ8BetWBcuSDd9eb+#efx=MnSk(& z6hmH#a!eRgO86)+%J_mR%M}VcJQ_qA zz6@eC+RvR~fDRLzuW)ITDv+(*NApfz(uwm>EhhiE<%P*GLO*A;DMUcNFKFN#D-v(f z1gw>g{zwv}bl)h=awIIGl~#lLu7KM=g_Mpzgg2aHs>F%By*fgj>UY9W8s3;|w|-C{ z9OGyCq}`-WrJj@wkETCKIo$)fv0L=&O?`L4V2y-8^|>a+b8XlyxgailN+zbp?e(@N z@$PY_}F*if2?P{?ky=F8_{fI4RUm9r;P#V71>y@`=e0 zMyMWXE1xiL{Bsz27M~RRt3Vebg~%3<)?%TbzJt6dUE8znj4}_Y*uj*e{{Ui7n#uqG delta 1665 zcmV-{27dYX4ulPViBL{Q4GJ0x0000DNk~Le0000;0000;2nGNE09Ea?M*si-0drDE zLIAGL9O(c620lqdK~#7F?V4R^TtyVe&+O)lXp9;ZO-z*4egvsip-t1I(D>1orkmY6 z{?BG-xw*N?-rb!|Qka2s=FXit=ge=)N;&c;r0R>PVz65(oCMiMd@e6USc zM6c2wOnDUxFUnvlBa8`2g8=pBVuD&UKs`* z_PCFKb(`zbp2XfNKfcU5fB&k7mgi>104zu z5Pe<#H0`+F;4qoI1nJQ$)CSr2umZTxctII|)#Vy2S(dZp({q$A?HhlId(WDMYLW=Kz6fFJ0KYTj8X*QpR2aB?ro8O z>-eDR>|f}5vEi^SS^*7&WD#OQ6${4piUz|tLb#N0P}auc^vzV1hP^^^+g47`;XJ8t zm%PD6W!7C<0Zon39q=Hq!7*IWxZ7i0hNKTM>I;Cp5yMt{fu!K5fQ)$~Zg9du+CM!> z53zn-MJpf#n>$m6Njjfu+ZqA~NIY?WT7Xf-rUfBo0tY`%i{+zRZ0d4uY6XO>Y7FiZ z;y+jxna?_$!v>*vYdT0?;INKJ6TQ!HxDC&}!nLlF*bcgcWhw`;Xbav)q;eU|Pi-Bq za9C$gP>x{RuHtrK0j+K57C&=aN73s+8Co=-Cm{)JCEKZ-lR#(8QL2VRvH;$HQ=_hZ zg*2wxI_f0_#0zkPgm*`sDj=uJkpDV|pe(77WnnvU&2X?e}6VLqbds;;S~2h$xN0B3LN+$ZSNz14JF$iTE>91ihvE+{c2K9iZfL7p$m#qNS>OKzNuWW@gVijch zl?6`acOkFYfd9y_DHf%FCsi`YQ?RWj{62cNu}7S+iO5ScD?s_M4(&fMQCINsCT56KmGFGoWhwjI&1g_K7ziHNvug;2@`Y~Fvfu86e7;i zf+9N7&?&}K_ZP8|6`*|BSH6+nnI5K(rmj&e7!lsRE+59&WG)*($q$Qv+iY7F&Fd-; zS_)zYP#Wq6P#QqmV-S+KkC6gYuwKhAeoCX?+%}Uw2N@YaGlBmBPk=}YNMD{p00000 LNkvXXu0mjf+6xFd diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml index f2a2d565b..8190e1788 100644 --- a/Habitica/res/layout/activity_main.xml +++ b/Habitica/res/layout/activity_main.xml @@ -82,7 +82,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom|right" - android:layout_marginBottom="-5dp" /> - + + + fab:fab_colorNormal="@color/white" + fab:fab_colorPressed="@color/brand_500" + fab:fab_colorRipple="#FFFFFF" - - fab:fab_colorNormal="@color/white" - fab:fab_colorPressed="@color/brand_500" - fab:fab_colorRipple="#FFFFFF" + + fab:fab_colorNormal="@color/white" + fab:fab_colorPressed="@color/brand_500" + fab:fab_colorRipple="#FFFFFF" - - fab:fab_shadowColor="#000" - fab:fab_elevationCompat="4dp" + + fab:fab_colorNormal="@color/white" + fab:fab_colorPressed="@color/brand_500" + fab:fab_colorRipple="#FFFFFF" - - fab:fab_shadowColor="#000" - fab:fab_elevationCompat="4dp" + + fab:fab_colorNormal="@color/white" + fab:fab_colorPressed="@color/brand_500" + fab:fab_colorRipple="#FFFFFF" - - fab:fab_shadowColor="#000" - fab:fab_elevationCompat="4dp" - - android:src="@drawable/add_rewards" - fab:fab_size="mini" - fab:fab_label="@string/new_reward" /> - - + diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml index b0d5fca6d..1d62124ee 100644 --- a/Habitica/res/layout/reward_item_card.xml +++ b/Habitica/res/layout/reward_item_card.xml @@ -2,7 +2,8 @@ + android:layout_height="wrap_content" + android:background="@color/white"> + android:layout_margin="12dp" + android:scaleType="center" + tools:src="@drawable/custom_reward"/> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java index 8edc5e433..d147a705d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java @@ -29,8 +29,10 @@ import com.habitrpg.android.habitica.events.TaskSaveEvent; import com.habitrpg.android.habitica.events.TaskTappedEvent; import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand; import com.habitrpg.android.habitica.events.commands.RefreshUserCommand; -import com.habitrpg.android.habitica.events.commands.UpdateUserCommand; import com.habitrpg.android.habitica.helpers.TaskFilterHelper; +import com.habitrpg.android.habitica.models.TutorialStep; +import com.habitrpg.android.habitica.models.tasks.Task; +import com.habitrpg.android.habitica.models.user.HabitRPGUser; import com.habitrpg.android.habitica.ui.activities.MainActivity; import com.habitrpg.android.habitica.ui.activities.TaskFormActivity; import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter; @@ -38,21 +40,15 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder; import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog; -import com.habitrpg.android.habitica.models.user.HabitRPGUser; -import com.habitrpg.android.habitica.models.TutorialStep; -import com.habitrpg.android.habitica.models.tasks.Task; import com.raizlabs.android.dbflow.sql.builder.Condition; import com.raizlabs.android.dbflow.sql.language.Select; import com.roughike.bottombar.BottomBarTab; -import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import javax.inject.Inject;