From abca017f05dc4b35dc5346c00055deeadff19852 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 26 Sep 2017 17:47:51 +0200 Subject: [PATCH] remove unneeded bottom bar icons --- .../drawable-hdpi/icon_dailies_unselected.png | Bin 674 -> 0 bytes .../drawable-hdpi/icon_habits_unselected.png | Bin 715 -> 0 bytes .../drawable-hdpi/icon_rewards_unselected.png | Bin 890 -> 0 bytes .../drawable-hdpi/icon_todos_unselected.png | Bin 1664 -> 0 bytes .../drawable-mdpi/icon_dailies_unselected.png | Bin 412 -> 0 bytes .../drawable-mdpi/icon_habits_unselected.png | Bin 381 -> 0 bytes .../drawable-mdpi/icon_rewards_unselected.png | Bin 478 -> 0 bytes .../drawable-mdpi/icon_todos_unselected.png | Bin 1007 -> 0 bytes .../icon_dailies_unselected.png | Bin 814 -> 0 bytes .../drawable-xhdpi/icon_habits_unselected.png | Bin 793 -> 0 bytes .../icon_rewards_unselected.png | Bin 994 -> 0 bytes .../drawable-xhdpi/icon_todos_unselected.png | Bin 2198 -> 0 bytes .../icon_dailies_unselected.png | Bin 1205 -> 0 bytes .../icon_habits_unselected.png | Bin 1239 -> 0 bytes .../icon_rewards_unselected.png | Bin 1565 -> 0 bytes .../drawable-xxhdpi/icon_todos_unselected.png | Bin 3437 -> 0 bytes Habitica/res/drawable/icon_dailies.xml | 5 ---- Habitica/res/drawable/icon_habits.xml | 5 ---- Habitica/res/drawable/icon_rewards.xml | 5 ---- Habitica/res/drawable/icon_todos.xml | 5 ---- Habitica/res/menu/bottom_navigation_tasks.xml | 28 ------------------ Habitica/res/xml/main_menu_tasks.xml | 8 ++--- .../preferences/PreferencesFragment.java | 4 ++- .../ui/fragments/tasks/TasksFragment.java | 1 + 24 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 Habitica/res/drawable-hdpi/icon_dailies_unselected.png delete mode 100644 Habitica/res/drawable-hdpi/icon_habits_unselected.png delete mode 100644 Habitica/res/drawable-hdpi/icon_rewards_unselected.png delete mode 100644 Habitica/res/drawable-hdpi/icon_todos_unselected.png delete mode 100644 Habitica/res/drawable-mdpi/icon_dailies_unselected.png delete mode 100644 Habitica/res/drawable-mdpi/icon_habits_unselected.png delete mode 100644 Habitica/res/drawable-mdpi/icon_rewards_unselected.png delete mode 100644 Habitica/res/drawable-mdpi/icon_todos_unselected.png delete mode 100644 Habitica/res/drawable-xhdpi/icon_dailies_unselected.png delete mode 100644 Habitica/res/drawable-xhdpi/icon_habits_unselected.png delete mode 100644 Habitica/res/drawable-xhdpi/icon_rewards_unselected.png delete mode 100644 Habitica/res/drawable-xhdpi/icon_todos_unselected.png delete mode 100644 Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png delete mode 100644 Habitica/res/drawable-xxhdpi/icon_habits_unselected.png delete mode 100644 Habitica/res/drawable-xxhdpi/icon_rewards_unselected.png delete mode 100644 Habitica/res/drawable-xxhdpi/icon_todos_unselected.png delete mode 100644 Habitica/res/drawable/icon_dailies.xml delete mode 100644 Habitica/res/drawable/icon_habits.xml delete mode 100644 Habitica/res/drawable/icon_rewards.xml delete mode 100644 Habitica/res/drawable/icon_todos.xml delete mode 100644 Habitica/res/menu/bottom_navigation_tasks.xml diff --git a/Habitica/res/drawable-hdpi/icon_dailies_unselected.png b/Habitica/res/drawable-hdpi/icon_dailies_unselected.png deleted file mode 100644 index 2fcacb24c76d36023b15224f2afce40e47f7df36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 674 zcmV;T0$u%yP)Px%TuDShRA>e5SUpd}Fc3WhVki>KjED`^!ixABSt$ejgEBL=Y%o)P0Sv&($d|fO zR@e|DGf3@#O3k}a2RBL`w~31ij#Sx>@9y2bJ6p{W`NuQh8So5v22wB}Qs~m%xhyID z<$~B(bDJ@Zu5N!!U-UX}Nh)hPJq3_PSHq+ceKCylo=T{CA!k}dD`0OL!Hx+@ODbq7 zsH)~RV~lQdM9?c3y8=-ov@9cl8Jx5vn&onMn1`T*=pNYMUjL6iqU_072~;~5#~{u~mhS=#V6jcchJ&{z`^c90!Dr+V zB#KIEV11!)z{={D=)W(-Hn=nQ)}R{lFsFhT#0X{|CnsnzsWWFRA$F7vaElMqN?1+~ zBVY{tj%=J~Hxf%o_chv`*7q`)_tl-w0N0!F40r}S1OJ(UFO!|8_{L8KI{*Lx07*qo IM6N<$f*N)&#{d8T diff --git a/Habitica/res/drawable-hdpi/icon_habits_unselected.png b/Habitica/res/drawable-hdpi/icon_habits_unselected.png deleted file mode 100644 index f50fc5db8af78b3f5110ab272d84f78edb01e5ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 715 zcmV;+0yO=JP)Px%g-Jv~RA>e5n6YjXK@f)jaZqRyi84q~q@X})p`i(95J*TA6gUq6)QBgD^9FeW zYH$h)Bm@ZONJD|r1`3K4AcYbsX|R+VX4W^W&4I+7ZSY#zmCie!-JShrcD(WpkXnjB zia?4$ia?6M3`c;f>^nVPK4x?oxFKUpV9ZtL{MYYdBtbH9^$jW zFFRPmN3`%{iLtxVp}{B)Go!z4!IyUWA2Jl1vf^YEvpM>+gvMRH%y>2-`#)=1Jyo?3j zGl}4sgw5+pX6HZwEZP9e378yPAF>(q@C0HbZNQTpXb`M_GS%HeO)Ts6X!A$C8g2a~ z`o<2}-Ck}!(%n7@aI-P*q zPfMJnVoE0+dW>D zx=SvT$aFFG0?*V!JG)Qsm2a3rB9xV`hcZFScTqNFljo7aE97s{E{nVC^0)t{j7L%2 x6%HxR;oYB#yXr)0DFP`1DFP`1DFQPafnV%n#t76@$3p-B002ovPDHLkV1i5qMm7Kd diff --git a/Habitica/res/drawable-hdpi/icon_rewards_unselected.png b/Habitica/res/drawable-hdpi/icon_rewards_unselected.png deleted file mode 100644 index 93aa9bf0e1f535557bb90bb2303a5adc24cbe200..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 890 zcmV-=1BLvFP)Px&G)Y83RA>e5Sj}q_K@@*)6Ow~1cnv7ng9q`dm!jtDkRpnRHWfVDyZ8r4BmM#U z7l;={(}RbKU?oj*P*L<)Jb0*}v`2;Z(m*o)Ub?f{WO8z?k2(ld* zK)tH&C`FI)%mgWqgU?KR@N>7Y#83SE`36v5RXNq64S@HZ_cJs~9)b`g`9hhS{eC^cy?Mxb{+208`490Qe!gw&UnNj!R3nlYDb&N`aLHr3O!Pf8F z696JU>j)`Y!v^}}jK@q|yu!bMXU%cz#%41;0U*t@T0z;->+vLdHwHI0jl~myo|u+? z>H|nd%``UCHa5~h!)Z}_p;n^mMv~LEAuPTk=|Cv*3Z&BX8iq%{p~Xis;o7(ZB8eQp zg=@Txi^Kw6C?D~(2G|{bT5Q60lBsm*26vCnC`KZekQgi6vY>Na=TH#Z#XoeP53?6#F4h2) zMPI3X;1=673rZf`h(@Lb1jeow#7ifm=}Gl&3~p>1k0$`E z_oki%eYO5d9e2iKCc3_X!Ex)xW-~njoS30HHrtlW<0Q#+TC`qURr8xwm2wP?m=Is$ zQ+x{saVMArTfb}UFK^qZsw~dFI+T6qy&9wC0K8(03i(BD^n3EGfC$)sz?PvXzx5{C zYz)hO;00J{hEap3REsK*o7m6Y1gV!Z07*qoM6N<$f;I`AX#fBK diff --git a/Habitica/res/drawable-hdpi/icon_todos_unselected.png b/Habitica/res/drawable-hdpi/icon_todos_unselected.png deleted file mode 100644 index cd24b2842f15de982241db88dbfac044d607106a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1664 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 b{Hg;l2wiO=xx1ia00000NkvXXu0mjfe|(%V diff --git a/Habitica/res/drawable-mdpi/icon_rewards_unselected.png b/Habitica/res/drawable-mdpi/icon_rewards_unselected.png deleted file mode 100644 index f4bc18f9274271fdbacf6719860f8f285c277084..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmV<40U`d0P)Px$m`OxIR9Fe^R!dI9Fcf^Yg2b8~sBi_2&;ToTNC<&AKzjoY!42R7WrM_ut`O}J zI76$lV~s>q^CrrZY?C;t8v%lN5r3ZF%y=BjChAJ(z<+l@`35}So1V$&+8F9{Y{!pB z_7_UgR3&tEaH{4uh9dyv%Zy&g(3U-^wYH)+ozT85BC)}-@`8Mi|OF$kmz#p*cYZ4$sviC-3?I z;)t9Mzwgfv_3Io6<+c(lbwF0MDnm@(?{q-+w#tF3mB!?iZb22XjF%nH*wYfV1vpwZ zVUyz~;{7_xf%Hs`8R*OL^ue3-9S3+NuSmkR+$4FGIf5x1lIsZI!3hF<4c|^5Oe-q{ zUjEKtOtiU7@^A5R?)jg1kT?$D8pex-Z5pw_g{^d*Hf#r`{~B5cv&-!q_&W}K0#&Vn Uk=Ny4SpWb407*qoM6N<$f`KR3^#A|> diff --git a/Habitica/res/drawable-mdpi/icon_todos_unselected.png b/Habitica/res/drawable-mdpi/icon_todos_unselected.png deleted file mode 100644 index adc6ba3933a30e62cc14e5d83c11268a3abbc17d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1007 zcmVPx&sYygZR9Fe^R$EAvK@>i-msF^MN&wTO{B$8uu0Cdf4sCgcW@#qT77h+3=(SC*=od)py&ei?<1fc74mrrp0T^)DOKUGHn1-cF7#Zc>rAvRL}{f(CKlE&Iq4j zi_S@F;AdM&rD`$FeWpUMQ#}{*wtpd)vRfcWib({p9aR}YE?ll>Ku){vxs-jpnMWgh z666)-*xsp7UOKwfw@N6kKx>0g5HAjs^XA(WMZ6a*8spA z6p%+zy9USGc_DwHx6x+aqjjbP`BC)z3iK9is{CN zvjfQdmiE~7l&1~+p+IKeUxRH`~>CGaxbv@uLIPIA#D z`e{X~VzxgUXZ&#u0GV_M4$jLAyuEY=Ap}q!EUr}bCKh{}MTdlJf9AfdT?6oX>2V6Y z6L0uzH$w>mW#1q_l=p^-i9O*w1W+YrS@E= zcPm4x*S>0lw49Pu3fz8VK2tIWu6i_b@jq$+0*beBL1KVvFPx%=t)FDRCodHTEA;lK@gtJz0)Qpg_Q=lKl|oIUm&-bHoN?Yjj@@^A_gvpxb2Iy6=9_P37VdTd z^rH+Y1ImChpbRJj%78LZOa@Houq$)ca+?#kOiMmO+vC_s?vevV)0KdtWn9Laxj)zD z?a+aRJ78fF4D@5?pOVJgspHA=1AT9y@1?}R?C1^iDT_aE0yZ~o`TG}mjwjt+1W?N2 zH259^H4Nls&j36c9yV1U`(6Yzf`5nEzU1SiQ)@ApO3xr%_94OR5d8KTUi_=U6UkVW z6NJ%+aOVnGer?a$8hl8Vy@9XTi%(9Rgw=~z&5n=bR@bh-wP%0*gfUFWQ^eHA>>Zi} z&W}%-k8JE%F*$ZdOknVI;Qj4+48FSz7e=m`J+ZVSYJ>1s8*l95ezl&MKO}V3u>w4B z0pimFliVO>KCj?8js}Lud<^9jRxy`Soe98R>E}C>60C4NPr01HD)%q3@;NCx6M((e z%{Px;H@jTVQPzEV~rOEkN^ukww5)ezNwhL$GGoaOfdO`=3 z^-R(h2%U-8>}dtWma))ywE{vj8k;?>fY>q?8n0GBXhvhRrxg%e#zN!O3JA?;Z1%JQ zV#`=)yjlUSjN(nuK3}`GV9#(pPnqrsx&Qjx0Y1<~cCG-tdEMf6ss}K}^*m*|B<21Q z>o(V$$<73zktJd18D31D7GoV(2}AvcIPF&fwQQC(Ai4!v3EbziIBfx_7PsGT1u^ z50SBotMN{+!{Fc3J0TyxUIftF8+wC7EK{lZIBM%!Dtp9)!C&!tA4HhET7U=fzdV!U sF{!K!CPx%(@8`@RCodHn!is}K@i7h;V>3fHezD<2O!#07&!ycS_4OKVM3(|{t*_~C^q&2 z(OxkeYGHqg`~${BZKx=SKW_QX@phRvLc(zmc>CUL^LF>m+nw)cXO<(oL{^M|5ikNq zzz7%tBVYuKfDx!80e6(>%@seyD`#nI#OS@&D|p98?+e|maHo~EQxRqBAy286p3 zLT-h5<*O>57ZFk2gvKSgpfLinobTXegaTsUou|d&5&CrVp8Fv`9JIc%0(V5Y-NI}I zmd|hf)jxmf76yHanXZYUyRJdk!=BIxFM1oE5`WRrjmbH;9c)s1W()TE%bI_`OVkk% zhWtNl?nIARPh4%@?WI6o`N`Qd#Y-Km0ipIp_Mtu#+7SRkWh`{^lfz!NQ?8FR=%e&s zYK;I8BDufwMd!S9;H>Lfi_{tcoV8PBna==}WhKtb4~u~FB43ty;}4;eI&|8<=uYa_ zalf+^I4-HG+SNV+`rZR{&g;m~?+5)aPmibP)9rret9=9*03AYgYxlhe=p55Is^1R^ zwCM4)Kb8WTNZs1CkAS}S039KxouhibqT98P00U5TNToKOML=pRR zHo5XE!NkV3h7PIc#{G^HVMNRqC_45ikNqzz7%tBVYuKfDteP^(L?f XHO9gGIEa$P00000NkvXXu0mjfySj8D diff --git a/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png b/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png deleted file mode 100644 index 8adbb77954a5d333f2e62045c6630eee36ee5eb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmV<810DQ{P)Px&oJmAMRCodHTFpyUK@>knpJ`wPwTQA@xihkb5JZ$cNpMwUXu56_v=Z`wd@Oe2DpF5I=U4{4DR38m(n&e8X-$KlR>_g?kBNzZKFe4Ls2{eEXY?#vqi z4XS`DpbDr0s(>n>3aA3AfGV&b6~MTpr=FWuvj(@xzKbfIHUFjq51}x zS^f=QWW$}es5HY+7$et+P=64bR+gcIa)*g|lPD@;4$ivPgn*o=upTAyyx;}pOuhl3 zt+NkDFJ8m1wtcnJj49uXPaEr?jj;+mHKoN{WNk(Rf}2^T7{XPV$DY5?i;FVP$N2dh z_?@v@*t)EAkaP+_BzC6& z(r7QoRe-(h-8kHGag4%jXscPExpkskX79`8{49PMOWJ-?PXXF$X3}=L)AhE4CA9## zdKjYZ<;PBwN!%X7VoeV2C9YShkXnGt*YQ(r1GE9c*mj0sTHxz_Qs3l=b60v$e)%P8 zGW8n3y|4)M(;uftdyTNq4wcH|^pVCU^$1AQnU8f;03W@QC8pSGfIUZd8)R1f=@i&) zPx{{ez8?Xx*8qFpPU_jDb2_X3bOa>zWLovTEgJ zHUg?euu{KH0cbcb$;xkEnBe|T=KC18vD#cDW~TtOYR^l<)xXdo(>}*-tTq>k-6;SW zO-Mt!{~P}B(j1d{KE~gVo1=_%3pN9jThb!o6o8+ZkRAO=yb(`93hdPI*u?HUb>MRDFDB%;Wsv9`jD=_*P<~CE QQ~&?~07*qoM6N<$f`P@~asU7T diff --git a/Habitica/res/drawable-xhdpi/icon_todos_unselected.png b/Habitica/res/drawable-xhdpi/icon_todos_unselected.png deleted file mode 100644 index a846b575bd5c89d96561a9b144a714c946010337..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2198 zcmV;H2x<3;P)Px-P)S5VRCodHT77I3MHGK?y~BP8s6-G5F#(MVCK@qnFa@qvpil~w_F4i8h(b^d z2}mRXLZ)V<`_nS9w-prQBeOv@w1Y87M1Y87M1Y87M1pc20u--8HXpoQWKceqt(T}K{2-n5`&nmijIGB25JrbN&4+>0Ij2V)8N=uX z2DZ)Tqs`fc>~BYX9X3um0LOxSXq!UoIHP&QDb3+{49yuM4)6|n`_S@nh3t%>GDU@y z0Z>)Ny>yw@V#b$a&>1NjUzZq0?Ev#*&mh`>rO}p3*`8Dg`)wB=pj@UO6;7+88IPH~ zjo&`zp+)4OT#uKY$m&P^Gdz^(@zF3J(P*syg=n)4<7wA~&qcX@B z{&|>ZNvybJ(jHK`laJz^v=5qwo3%msDHyiCUnU)Rb}GANu8&q0p2V+G0as`VX5Fv0 zVbtJZG~ORz=c4ryyoz$Z5$)dvP)7&cN0XnL$ZlG-mH9~lpc)^hU!b_ZEEGmJK=6D1 z0DZ$4Qw((u3f1L&Dgx;Wua_2#D`NFlT`S7?2Gp(6>H$J6et7__RpVK`69z!IeQP`Y z4#9?*hvLd~M#Wn+A_N3Nu&JS5_Z(UPoQ8M018uqN&b;o z>8%J>IKrI9+uYA2#=3~U3vqYwx!ghk&pcG%FJ{#;KT+B~0JzMMmB9TD$Yq%p#;d^! zhZs_5XCffL?H3^4e2GK{E3fMT(S|d@w47pAq4AP^+Xesz50RB25=K3ks7pnmjapmu z^Em|px&3??{*`PzV7P*%^w?ls+GR?!$bP8T&h!^5GzQ?NGifl}*TthFisH0H@G-Q_NQ254 zk5dqEo}Z;K`W7N}J(%?l1iSzOo@KldM`lb;Q1vo&?wb+uycomNt8`^L$AW+ogUdIy z7?(t}ZgxSykv4$-+YLz;qfX3x2?E~UXtD(lr_yxHLP#?nG2%w7ohh0e+W^1=3@#s5 z;sYQQ#sdMy&qT8wX5*o676RVxXoJ>xypbM5zk9SYXu}wFehk7k0FYr2j%{vu47rA? zSRkNb8NAD@cVOz$nvD!^r_Qq=a4s1sS7FH*#wgcW(Y67A@V`t#@=WEJMJo`Z82<_a zUNEMxNag4V35sEn4~k11tXYFHxUnh+M{4Y3_8(+@xjali$vv=Tifiyg zGS3d}$OCc$>;wQX1}IJ+IQ<%<4NMsB)cCqO?!!K@S(Bl@;rfXfFZwzHKy*OZTZL)s z5VUwObtA4e(ROV%ySP2~xA{DM0-cX*8sLFE4PS(`veUO?0CH!r^H>017!+}uQ5B?h z23`*okS@Q2<@dHM8eo)i6&hP)rS z$qV=na5lnpP9+S0P=(8n=c$vb;fCoZ)n{;uTY;b%^Ul!Jr&|%{gcl+EQyBk@p%Upb zZiey`4Sce!qyP|tDnfh=qVg_~gJi*i#xkivyjbfmrk|bM9^?DNa~)luy}GB{V&)l@ zrowo2jOIZnQm)y~kTD|!V#cc?e3JlIP*O|*= ztApHf5%4tN%xw}arwjmX0P3Y^r+O)xukn(4Bgql_d@@^IEd415KvPy7;@L`=-oPwR z!7M+Z@$I}Z<1J|S1KwLxwbrfl_80(~Lh;WO>@sEJ;8Xx*PXY|FZ4QA;->! z5@Lh6%s309_YcGdlgPnF(|K3C#eJTL8+XNE-9fqtxCpoixCpoixCpoixCpoi{Pz&} Y2N2ECR40YkPyhe`07*qoM6N<$g78fafdBvi diff --git a/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png b/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png deleted file mode 100644 index 0a713fe5159411796bd0b297740ef10649f8497b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1205 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 who8KsN28fV=nDi$FW4X_ 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 - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/icon_habits.xml b/Habitica/res/drawable/icon_habits.xml deleted file mode 100644 index 437388fbe..000000000 --- a/Habitica/res/drawable/icon_habits.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/icon_rewards.xml b/Habitica/res/drawable/icon_rewards.xml deleted file mode 100644 index 36739cc71..000000000 --- a/Habitica/res/drawable/icon_rewards.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/icon_todos.xml b/Habitica/res/drawable/icon_todos.xml deleted file mode 100644 index dd9b06ee0..000000000 --- a/Habitica/res/drawable/icon_todos.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Habitica/res/menu/bottom_navigation_tasks.xml b/Habitica/res/menu/bottom_navigation_tasks.xml deleted file mode 100644 index 8ef31764a..000000000 --- a/Habitica/res/menu/bottom_navigation_tasks.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Habitica/res/xml/main_menu_tasks.xml b/Habitica/res/xml/main_menu_tasks.xml index 5a705d42a..1b58769d0 100644 --- a/Habitica/res/xml/main_menu_tasks.xml +++ b/Habitica/res/xml/main_menu_tasks.xml @@ -2,18 +2,18 @@ \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java index 8b7ad48de..62855cc9f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java @@ -68,7 +68,9 @@ public class PreferencesFragment extends BasePreferencesFragment implements @Override public void onDestroy() { userRepository.close(); - subscription.unsubscribe(); + if (subscription != null) { + subscription.unsubscribe(); + } super.onDestroy(); } 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 facc83855..c7324a23f 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 @@ -335,6 +335,7 @@ public class TasksFragment extends BaseMainFragment { } } }, RxErrorHandler.handleEmptyError()); + BottomBarTab tab = bottomNavigation.getTabWithId(R.id.tab_dailies); } // endregion