From 5d7ccd04cd2fbc9cafe5dbb9e3da9b06ffeb7844 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Apr 2017 13:45:02 +0200
Subject: [PATCH 1/7] improve login layout

---
 Habitica/res/layout/activity_login.xml               | 12 +++++-------
 .../habitica/ui/views/login/LoginBackgroundView.java |  8 ++++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 7cd221b0f..6ce4a6f85 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -33,7 +33,7 @@
                 android:layout_height="0dp"
                 android:layout_centerHorizontal="true"
                 android:visibility="invisible"
-                android:layout_below="@id/city_view" />
+                android:layout_above="@id/city_view" />
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -41,10 +41,9 @@
                 android:id="@+id/left_cloud_view"
                 android:layout_toLeftOf="@id/cloud_anchor"
                 android:layout_marginRight="150dp"
-                android:layout_below="@id/cloud_anchor"
-                android:layout_alignParentLeft="false"
+                android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
-                android:layout_marginTop="150dp"
+                android:paddingBottom="460dp"
                 />
             <ImageView
                 android:layout_width="wrap_content"
@@ -53,10 +52,9 @@
                 android:id="@+id/right_cloud_view"
                 android:layout_toRightOf="@id/cloud_anchor"
                 android:layout_marginLeft="170dp"
-                android:layout_below="@id/cloud_anchor"
-                android:layout_alignParentLeft="false"
+                android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
-                android:layout_marginTop="240dp"
+                android:paddingBottom="400dp"
                 />
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
index 34f704a9e..f84fdcd9b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
@@ -39,6 +39,7 @@ public class LoginBackgroundView extends RelativeLayout {
     private int width;
     private int height;
     private boolean didLayoutStars = false;
+    private FrameLayout.LayoutParams params;
 
     public LoginBackgroundView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
@@ -50,6 +51,7 @@ public class LoginBackgroundView extends RelativeLayout {
         super.onFinishInflate();
         ButterKnife.bind(this, this);
         starViews = new ArrayList<>();
+        params = new FrameLayout.LayoutParams(0, 0);
         generateStars();
         animateClouds();
     }
@@ -72,7 +74,9 @@ public class LoginBackgroundView extends RelativeLayout {
         this.width = parentWidth;
         this.height = (int)(parentHeight*SIZE_FACTOR);
         this.setMeasuredDimension(width, height);
-        this.setLayoutParams(new FrameLayout.LayoutParams(width, height));
+        params.width = width;
+        params.height = height;
+        this.setLayoutParams(params);
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
@@ -83,7 +87,7 @@ public class LoginBackgroundView extends RelativeLayout {
     }
 
     public void generateStars() {
-        generateStars(1, 10, 20);
+        generateStars(1, 12, 25);
     }
 
     private void generateStars(int largeCount, int mediumCount, int smallCount) {

From 6a6a7addf9a284dd6c01f6421b7fb04a8d29a81b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Apr 2017 15:11:19 +0200
Subject: [PATCH 2/7] improve task filter layout

---
 .../drawable-hdpi/ic_add_purple_300_36dp.png  | Bin 0 -> 181 bytes
 .../ic_close_purple_300_24dp.png              | Bin 0 -> 278 bytes
 .../ic_close_purple_300_36dp.png              | Bin 0 -> 387 bytes
 .../drawable-hdpi/ic_create_grey_400_18dp.png | Bin 0 -> 243 bytes
 .../drawable-mdpi/ic_add_purple_300_36dp.png  | Bin 0 -> 159 bytes
 .../ic_close_purple_300_24dp.png              | Bin 0 -> 212 bytes
 .../ic_close_purple_300_36dp.png              | Bin 0 -> 278 bytes
 .../drawable-mdpi/ic_create_grey_400_18dp.png | Bin 0 -> 208 bytes
 .../drawable-xhdpi/ic_add_purple_300_36dp.png | Bin 0 -> 184 bytes
 .../ic_close_purple_300_24dp.png              | Bin 0 -> 334 bytes
 .../ic_close_purple_300_36dp.png              | Bin 0 -> 464 bytes
 .../ic_create_grey_400_18dp.png               | Bin 0 -> 295 bytes
 .../ic_add_purple_300_36dp.png                | Bin 0 -> 314 bytes
 .../ic_close_purple_300_24dp.png              | Bin 0 -> 464 bytes
 .../ic_close_purple_300_36dp.png              | Bin 0 -> 650 bytes
 .../ic_create_grey_400_18dp.png               | Bin 0 -> 386 bytes
 .../ic_add_purple_300_36dp.png                | Bin 0 -> 430 bytes
 .../ic_close_purple_300_36dp.png              | Bin 0 -> 878 bytes
 .../ic_create_grey_400_18dp.png               | Bin 0 -> 463 bytes
 .../layout_rounded_bg_lighter_gray.xml        |   6 ++++
 Habitica/res/layout/dialog_task_filter.xml    |  13 ++++++---
 Habitica/res/layout/edit_tag_item.xml         |  26 ++++++++++++------
 Habitica/res/values/strings.xml               |   2 +-
 Habitica/res/values/styles.xml                |   6 ++++
 .../ui/views/tasks/TaskFilterDialog.java      |  19 ++++++++++---
 25 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png
 create mode 100644 Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png
 create mode 100644 Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml

diff --git a/Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e11b6deff9b2276a0c210a6c8b71736a27a25595
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e?^8c!F;kcwMxZ*CN9P~dS0bUVdy
z?h(tG$0j*#B4IMU_c8_JKSt}V=X5=_@%yBWOl%M^jZ18?nW$vK?G^sH2{7<7p^&$9
z`L2em?C+1v-mp#L(`qS+8~h2G)7$HLVBn18NmpSg=MBrX@@dBml~-~A-NE4L>gTe~
HDWM4f@RvH<

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d19ca4a7ddac0d8dd348c6282039d4bf955f643a
GIT binary patch
literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0002pNkl<Zc-rmP
zQ4WJ33<hA_z4S0{yA;zMRR&2-3>g#tpG89Y&<9OyKTrx9J3G@-7zHUvL5+YW9|KY7
zCON8ro<24o7DNTiTXNi4&?JeRL@8>=?9Xp!Gj*0Q6n`BOI=LPIOxA#MMv0&xOvy(b
z5-m}IB~bvzlrH-m6oo<hP)NK+1y{LGW6;K!LeUteQ-7Nc8pCcKDU@ZpdN-h^URi22
z*(*NkUrU?WW*|^bpP^ATF~~LpfshUiqyBP)$k=8sJD|m=kZWXL*`wkScJA_!um5EV
cQczc*4~#FJotoR(MgRZ+07*qoM6N<$f;fX|A^-pY

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1edcf3bb1e03b6fbefaf42120c75b240549861d9
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ0003>Nkl<Zc-rmR
zK?;LF3<Xd@FId4IpyzNQ^cG#Wb<{&nM^JDvrjC=JQOP1(lUG7aYW8~A?23^oOkoOB
zn8FmMu<O9?E^>ha3m26X?CHX~Fksw>8m3$g8aAUW7`H^(J-E>Jv!39_`A~C|2-sMB
zx00}9!cnMqNRH6NNE{n#@9;q2DAZ@qGh=>T3Rk2=#lE09a1a#7<`IK~p}1D6vA}+%
zz<vcsp}rgwmh;`S6$eLgFTq=IA}GXmPZd5$p-^WFh4V#=*f%9Mb8!^<(ENvMk!Mdz
zm^mYCYb%;FwPNV-FlQJZ6snyNA~;D@K7|NQ61BYN;5amDZKHtWQlLa|sZekn0u_2B
zLU5^3Fx(MP5ZqBv?6{Dm71y7c5x5(w6&o;$!qw>E(ST7tTrD;3OQ8>cc}V-|r&@(6
hOkoOBn8Fm6CVmj`_q!Fs^D6)V002ovPDHLkV1m@aqpJV_

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d08e8f7fc193c36111602a7d8eb10e54f06b95a
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|oyF6VSLn>~)y|$6}kbyvJqIt{7
zh-M~<rfGZ!g-l*9n!vF3`Xc9oX)>B!^X7X0@tOK)z5UB~DK{gs&+a$kUY4OdcWG_j
z8Att>udSaQStTdJ5_!X|in-wUp*t_+E}1dSlZdEypU)8Cy*ebPf`>z={esLI1_7qY
z{`PF8p*%j!S2Ie24Y`&al=&jl_)aQ=XR(uE4`1tsL;HC`I1;5+%w$%4GmG2lhOW2?
rYj&`ru3Mu(*@uMdt*pB7mQnV*R$hN#Wm)MD^aX>btDnm{r-UW|TZ3Cu

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..389296895e2c435ad5e067b0b9aec007bb633b12
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB(mY)pLn>~)y}pr?L6OJdV$Zb5
zIV!~#y|Z6(ie>Wg`An4A|6}e^?nNuUn5hOcaR@A6QmEZDIgKIrgpH(vLjwbA^Pi>P
zuN5r#n7H>|!=EpKH`hD7+}0D!22{zlprpU%UupxxR3_bZ3Dv*n9e@1<Xd{ECtDnm{
Hr-UW|!X`T(

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8629e98459ee05d31b7ae4b333ecdb85a981f9cc
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjvproLLn>~)oqCtEK|!Q7)~WqP
z`pRQj;<8S;a=V)vJ8tfDRCsc@^7Q-5HZe!{v3^WFB2c0op*c&5v15_MsWXB{SQ{V7
zsR-6B$v1UZ5Z<GD^5M5U<+Y2Cv)VD%Fg83mp*mgYXyantpjMW);;dQkrP|7sHU95p
z*5={N64$a6(vw+fpyIG9VzohaNJK(NjL>009sRbuCUSG;bNNL~-~MdDF2&zKXEJ!Y
L`njxgN@xNA1;0*&

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d19ca4a7ddac0d8dd348c6282039d4bf955f643a
GIT binary patch
literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0002pNkl<Zc-rmP
zQ4WJ33<hA_z4S0{yA;zMRR&2-3>g#tpG89Y&<9OyKTrx9J3G@-7zHUvL5+YW9|KY7
zCON8ro<24o7DNTiTXNi4&?JeRL@8>=?9Xp!Gj*0Q6n`BOI=LPIOxA#MMv0&xOvy(b
z5-m}IB~bvzlrH-m6oo<hP)NK+1y{LGW6;K!LeUteQ-7Nc8pCcKDU@ZpdN-h^URi22
z*(*NkUrU?WW*|^bpP^ATF~~LpfshUiqyBP)$k=8sJD|m=kZWXL*`wkScJA_!um5EV
cQczc*4~#FJotoR(MgRZ+07*qoM6N<$f;fX|A^-pY

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..98fb7cadc2a6da3f6c2d291174a5ba36681f1926
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe>7Fi*Ar-fhZ|pADXErrB>>wq=
zb;P@IM!QfmQ^OB_f&c7}4xeb7nAD*paGLRB><UMPJrhEj4>kS}7g(+&$@b{?#H0X=
zN#*|(C7=0vNwg|TG99*G$R;S8eS?RwQhmad7wnRsW=A*|NQ!hFo}dsUq+;e=Cv3!W
zcY#0=ucP@3hMjE>j5$&~40g^eW4f||d5M(KgQFZ_JPe*QxMpQFi)RC!$l&Sf=d#Wz
Gp$Py&2S&O8

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9673011ece9b720e4f43b1d41303bbaa8ca337c4
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!^`0({Ar-gYUNsbCFyJ||AwhS|
zq`yihF6mnGsx3HL>hD!6z`)4F!XcpG&;TJB{!UeMXn+eM7`aTRCO~<!*`aD-TEXHl
eS-45MuNXC7ybrlxq`MaA6b4UMKbLh*2~7Zel`3Wc

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..19335a7ce455b86e7273311413f9e24ac5e87880
GIT binary patch
literal 334
zcmV-U0kQsxP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003MNkl<Zc-rmQ
z!485j5CqUBek3iu`B~mTLi|V)EJ;l~P-5v!L7l^1+j&OVWzFq6n{O^7fB*srAb<e>
z1h|A6LN$aiK2#s?pa7PGAED+@6Byy+nakN@4kG80Azm=QAuKrjtL_YdUAd?f;S*;z
ztY-j;C=S2(EtEpI+TlxHqpkn}3t!p?_8_3)5sfT`XlsN=b>j8|1SLFjl-NSh!lP%Q
z6oM9>G0d&~+O+VjX*7kH7(<`{zw{UK84s~N8(`~IX_*Lic;+Y$0pv6(#1sn!?CG!$
zjX2^<3W_iXeM#j^u}}bVFl!Nrqr$@wIhXaMuDXWkSc|Q(!eVP+Ew*Z`7CYu@QQK(&
g1Q0*~0R%wT6UT<&e2?!hXaE2J07*qoM6N<$f*28nwg3PC

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a36f5d6831e211a503f529f1f850d2ead1b1171
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0004(Nkl<Zc-rmT
zL5{*O425A<<!}@ZF~{Nx9Yz}H;f7U7C6KzHLm-ZytNx3(cR#fxcEaZPHEhUyKmZ6J
zfB*srAb<cO009ILKme^7=#bK-G{OhkrkqlC(SSyrYs!%FD?%D^`g;vmD<o^2L4-8L
z874@r8t560H_|hlDbijE^gUD9Bj?IU|KU8+DS?_hf&wWAr}!<lC{%&uf@8Ugc_O*t
zSnq?zf-Wx#zZ4ekic@1JT@%S2r&g;`14)8Yvlp{OlHt^DRxOaEI3C@6lktH4%md1C
zyv7}$Aces3oCm#w6b8q8V3vy%21hYb%y~P);HXBfpCU;HamvwXA00<Mw9iG7;Q+)Z
z#*Z}1{F;{e+#RxN#w`VUr+sK5Aw|Q9a9ZLDRML2cK#Gdvc@Q80vK(1Rk)q?sk(P8E
zEJ0e@S-CsX;?Bwo4+11WiW#yS(h_l8kxGmF5jU4PNGB!GF8CF^ztYQ`76rCJFL4&*
zSgvCGVAp_6aJWd$Ul9NT2q1s}0tg@i5I_I{1Q0*~tuHsB9d)3J_H{J?0000<MNUMn
GLSTX!tG&Gd

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d91ce7318b81daf863863909dd1e1eddbb75685
GIT binary patch
literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0002)Nkl<Zc-rmQ
zJr05}7{+l<Vd8EyaRH$R@CL-oI5BXs-pG&LrM^udA*A2-X))>W-+!Smg|_0HS6iwo
zpaN2NrUvS?1rVd&l%QTzn-jFe2p1F*vsYlODD)E=G@u!EOaYS1)H|Z?XwW<}AL?d7
zJ*Wc`v>sp+N@8l{3^C0Bt58}@ED$riO)At5xes*~%o5e3KOL?ZVOypcAP6QD1jB@Y
zx@m`nV0=Mvj1R~c(;$D)+Ef@9P*RKy<b!#}z?eW;Fgj3^3!?*#xiG(gAec~)#9UGy
t6vtc`Ul1Il16?Q7x|)~Eh64Hn&=*ZyDu4UYI(h&A002ovPDHLkV1f|sa)$r_

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ad24c3616210e6c71b54aede8f9feecd968b62a
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p|}=Ffw|&IEGZ*dV6a(?*RoK2S>Nh
zIx~+Hr%0J8&u4WI>~bnO`dZLE`N^jIwHb3`m<$+&4HB5t5)QEV9BAO2(E#K!GOHyp
zvH2Wed82o3Q!vACKXH%OQw}sRGPChW7$gwMsNP{`yV{B&EZ)X{4TssMSO24!koC_v
zc=N%V>{IbdL>mav{rUPK<{1r~61beLmaw{%VfN~1;SV{B3xQ$6;OXk;vd$@?2>{ZB
BU2p&Z

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a36f5d6831e211a503f529f1f850d2ead1b1171
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0004(Nkl<Zc-rmT
zL5{*O425A<<!}@ZF~{Nx9Yz}H;f7U7C6KzHLm-ZytNx3(cR#fxcEaZPHEhUyKmZ6J
zfB*srAb<cO009ILKme^7=#bK-G{OhkrkqlC(SSyrYs!%FD?%D^`g;vmD<o^2L4-8L
z874@r8t560H_|hlDbijE^gUD9Bj?IU|KU8+DS?_hf&wWAr}!<lC{%&uf@8Ugc_O*t
zSnq?zf-Wx#zZ4ekic@1JT@%S2r&g;`14)8Yvlp{OlHt^DRxOaEI3C@6lktH4%md1C
zyv7}$Aces3oCm#w6b8q8V3vy%21hYb%y~P);HXBfpCU;HamvwXA00<Mw9iG7;Q+)Z
z#*Z}1{F;{e+#RxN#w`VUr+sK5Aw|Q9a9ZLDRML2cK#Gdvc@Q80vK(1Rk)q?sk(P8E
zEJ0e@S-CsX;?Bwo4+11WiW#yS(h_l8kxGmF5jU4PNGB!GF8CF^ztYQ`76rCJFL4&*
zSgvCGVAp_6aJWd$Ul9NT2q1s}0tg@i5I_I{1Q0*~tuHsB9d)3J_H{J?0000<MNUMn
GLSTX!tG&Gd

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..799d3a1c245f5483f83b62a7441c7f6ee78b2f7c
GIT binary patch
literal 650
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p|}=Fa>(LIEGZ*dVAL~?~s9jTVfx>
zUiWCtFD|xW>s?+3KHxB!*bx%yG-1Mx&&TpVzQ1upUg7w>LbLe!(|aEt@f0}2k;Wp7
zk7!7EU%QP{?fug8(PbO@?Vj7QTij~+dinX4<)^vKl492_T+|!!*rIFE)kBLG{XPDx
zd)s-YGVboSGVawHQMo!?w`|uWWn`~slRwzi_f6y4jL)TSEH)&5+ON*@rReV;v7W8J
z#Pi=WPQG|3acWeFz(uE|sWI0kUpSOBwXQ&ILF=(q8%;$eb#21dp1r>_WB0X<S#s;&
zFfB~nkTt*E)xkN@)#AXK&bGr{MUP^bc{@c{x-3wU64Q?IJ#O&xc&BjXoQ}3*T@fvt
z)uiOKv#wr|%Fx`PG<~OT=QK9$s@O+D87nt%v@SWnVCmsSA^*;~dbhi3U7hzi+q2zu
z_1buD-cV`J^}BMpx^L~>BqFsbWX`>w3nF5B?Q`^`b``rB9Q@-ga>lj&bk+2)b{5>v
zu89ceyj%DC;Mw@FWT&=&CL%Y4o=3jCV3fSn<#gXvzO}4tLNeASxaO5QHBHr-adYCu
zsJ&5)-Pb-{<?`5a?ft<63oH5Ac+PrzpW14rcu;A&zw(76O$$3&orSsE)WmpvbtG=h
zYL?Y|Xs>FqXnvPj&(Ep9rr)sbnD%ngv%Y;VZrpb~UBX*6JvFkPTlaD|+pZk`bIh~W
ze`?6}{kciz!L#-27iVp;Uvtuevq|z`PXa#T%;cY}GbMVTuC@tY225iNp00i_>zopr
E0E4<IQ2+n{

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a8ef022c4ef6ac52e7e59ba1d92345b83b7bec0
GIT binary patch
literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ0003=Nkl<Zc-rmS
zJ!%6n5Qbqn!M!0N{_A`MS1HrvGA8$PVfF@wq_MHfTq2DF$p|*!B3_NOBkeb0iuV9d
zF*C~|*EEf*F=sG?8O&g{!N$}xwX6xYpbpdz^-XPRfO*upMP2u%8FmX5jnjmR!Xd$S
z3=|uO1Y1#`5x5O9?5+pyLd_9jex^RC*B-bv8ti&ed?n)Ese2^Yf7>q>=a2Uj(u{Sj
zbS^H4Dh=b@sSu8ZDhcBr-!9yiiz)?+L3QDvK7!{7C=nbg>aRUDLV`)44ly%T0ya1*
z2Mhuw4TC{R!aVAPf|7#4p(J2Zs43EaMOaiH7&Iys29HXC%`~85VG^ig2~-SB6^aW}
zhvL9gqC&7ot*8*}MJp;NY*17#*x;xfuw%P$Tum?-lq3uaB?W^+Nx&dcA=sqFb@gB`
ga|~uMgBeUizvri4|2L}PssI2007*qoM6N<$f+sbY)&Kwi

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0618f255039a6f88e59bdee5be6804cd876582f8
GIT binary patch
literal 430
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$farfw9!n#WAGf*4vwgf(!}*%m=S`
z>6~HXHMq|ZJ*V+Z*-FcxOPOv04on^loC=%@j4BN*6IdoN2muAaLX0Y4A)o+A2(IRW
zdaChkMiv1F2J#3d4uu8=Lc{`d2G_Mf>){F!c5y<qr>`;=g&LH?f>1{Us~TYzvJKdD
g;s^pf!SsC#Lqqu9D%Ynwq8Na{)78&qol`;+0Kha$KL7v#

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..468665d42132a0b2bdc2e8690ba4e56b01388127
GIT binary patch
literal 878
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$farf!Wm4#WAGf*4sO=eoBD?ZHeKF
z7JJW5-6?tVM9&7H79O>fBo2Gt<$ks2k4mrKlR0m}-P%?2?$zhdUy@xc$TERJ$brd&
z$%BDYfl-A~r2!}~2`t3m2^Inhpr|ofusv3O_q<w<+wr@@+UGOO?M&aCz5BJl#Uk5T
zUmr%T(N<d3lP=x&LgM^3twpaYf&~AzELT}1`C*BoRqJz!i`ov)AA35M@XZVANIP^{
z_M&RVzS})+CeriPb*wuW%yjWY_qJW1nrgpq=Uf#1q2~KUju$^06eKSSRkYPf_wQ>s
z*|F?+@KZe<!9Z@Csq>gs6|<U`-<te_#bxb>kQ(u8l7ZGXq4$rKyIc|SfBM<MTd}H9
z{kzK}Z)TUZAI}slDNS>E`|(VXT9uoNU`3i$h`sP437gHnsb?BAxX$+^+fEfc`fz5c
z-WsJv9yZ4OVqs1q-Ra*>UisVpzw$Br_e$kO88)(Rv)z@tj$ckSt7B2Bn57$Dp#r4x
zo>zc)>&thlD^)msW4_BQXp_jjY?=#;|BJRwO9c)J?|GEhna^Kws9dGbNn~T+u|sMV
z3|eg(S+i&DZT`Rz!V>tz=z@#GcL$N(eHNk@CUq<-k7Q;MaQN54_+)-Y!<}Qhd)wKS
z8upxGIB`0pLFReE9OilT440-abZ3hCB(bXZS7O7v!Zyi80uJA882AH=9r|a?YgnPV
zz`gID!xf$j9XoY9W-&-veqq1(q(RH4r|i}WdDaz|c6{_UQmXj%Hisp{$mU|lgGLRe
z3qIOmiv$ib2WC4M>z8*qu<*O+GL}YZhbJzs6Isw_&3Rj?iG7h-gVp2AZVtJQW$aU0
zmdh$tD9jQIFq&u9;TE@N>dNy+1!{k=osyH>_cUq^|Ni&&3qDkS&R%ykz$WzFp*Z~=
z1$U>5#x!ME%=0?m_^re2{k5fYx>vBw%kp33ujmymTh0|IX(M{S^>2$tDf27;4zGtR
zf0_Mz%Mtj6@7aHWsfUAq+FZE(@TQy5ykwWvT@|~|9ODKi-3D;d6><QjW?;evrDjCZ
gg{5V<nqB_!kxmb4%>#aa0OlhGPgg&ebxsLQ0MD{**#H0l

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..29b12a15b0a5232c43497a3237316efdaf10e031
GIT binary patch
literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0004&Nkl<Zc-rmT
zJ5I$w429uK!wnmOlI<YY!XhXT1?vb;DLbNo0$T7DK|+xtG9G)9W1r&Rz$eA?Qg*{I
z?AUxnAP|8FL?8kYh(JIcjS*;4C*4V((uZ^_?FsbLiS#0UO?n#PQUlH5m>@;RsYc3x
zQ-zcTM~#FEbg95mAt8TaSCvTn3`4pG=_V4;Vdk6}BfUof`W?ux(zzkhTLhr#YGsLZ
zjSe)olv^P6(lIj7fBT#oq`u@3i@XWcAoZmueDoc12~si6)_}Cfhb2fVoGk%$N}MG~
z7d01W5pb3u!CshI;kY41!ugAIiVoz3Q#Fvc0tADz1`rfZYalqBmOzj=t$<*0S^ynz
zo>6hUf#7jGfjn{UTj6*Cg~9Ov3WZ}06b{D{C?t**P*@xbpl*EU4vA9>6dtDr$P?#b
zD>z!9G&mZdR5+zT>2OMbQsR^VrNk)#N{O>35CqOzKrlFK06ik%v<8C1X$b_0(+UU{
zrv(r+jyDiIjwetE950|SIQ(y(Km;NXfe1t(0uhMK_6^EZsuEvq!}I_E002ovPDHLk
FV1f<JvpWC)

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml b/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
new file mode 100644
index 000000000..5603a1da1
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/black_10_alpha" />
+    <corners android:radius="@dimen/bar_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 3978da75d..cc7882445 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -8,12 +8,15 @@
     android:layout_width="match_parent"
     android:layout_height="2dp"
     android:background="@color/pill_gray"
-        android:layout_marginTop="6dp"/>
+        android:layout_marginTop="16dp"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="16dp"
         android:orientation="vertical">
         <TextView
             android:id="@+id/task_type_title"
@@ -80,7 +83,9 @@
                     android:layout_gravity="right"
                     android:text="@string/edit_tag_btn_edit"
                     android:textColor="#6133b4"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:gravity="right|center_vertical"
+                    android:paddingRight="0dp"/>
         </LinearLayout>
         <ScrollView
             android:layout_width="match_parent"
@@ -93,7 +98,7 @@
                 android:orientation="vertical"
                 android:showDividers="middle"
                 android:divider="@color/transparent"
-                android:dividerPadding="8dp"/>
+                android:dividerPadding="12dp"/>
         </ScrollView>
 
     </LinearLayout>
diff --git a/Habitica/res/layout/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
index f46126812..0cd4031ba 100644
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -1,17 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-<EditText
-    android:id="@+id/edit_text"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical">
     <Button
         android:id="@+id/delete_button"
         android:layout_width="45dp"
         android:layout_height="wrap_content"
-        android:drawableRight="@drawable/ic_delete_black_24dp"
         android:padding="0dp"
+        android:drawableLeft="@drawable/ic_close_purple_300_36dp"
         style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+<EditText
+    android:id="@+id/edit_text"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:layout_marginLeft="8dp"
+    android:drawableRight="@drawable/ic_create_grey_400_18dp"
+    tools:text="hello"
+    style="@style/TagEditTextTheme"
+    android:paddingBottom="14dp"
+     />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 5f979b249..cda78452a 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -264,7 +264,7 @@
     <string name="delete">Delete</string>
     <string name="name">Name</string>
     <string name="description">Description</string>
-    <string name="add_tag">Add Tag</string>
+    <string name="add_tag">Add new Tag</string>
     <string name="privacy">Privacy</string>
     <string name="write_message">Write Message</string>
     <string name="post">Post</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 1ca1a6604..20f5a2c79 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -351,4 +351,10 @@
         <item name="android:padding">8dp</item>
         <item name="android:textColor">@drawable/radio_button_text_color</item>
     </style>
+
+    <style name="TagEditTextTheme">
+        <item name="colorAccent">@color/black_20_alpha</item>
+        <item name="colorControlNormal">@color/black_20_alpha</item>
+        <item name="android:drawablePadding">@dimen/spacing_large</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
index 5179c7813..48ff9d240 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
@@ -3,8 +3,10 @@ package com.habitrpg.android.habitica.ui.views.tasks;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.CompoundButtonCompat;
 import android.support.v7.app.AlertDialog;
@@ -74,11 +76,13 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
     private Map<String, Tag> createdTags = new HashMap<>();
     private List<String> deletedTags = new ArrayList<>();
 
+    private Drawable addIcon;
     private boolean isEditing;
 
     public TaskFilterDialog(Context context, AppComponent component) {
         super(context);
         component.inject(this);
+        addIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_purple_300_36dp);
 
         LayoutInflater inflater = LayoutInflater.from(context);
         View view = inflater.inflate(R.layout.dialog_task_filter, null);
@@ -117,7 +121,6 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
             });
             clearButton.setEnabled(hasActiveFilters());
         }
-
     }
 
     @Override
@@ -147,10 +150,16 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
 
                 }
         );
+        int leftPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getContext().getResources().getDisplayMetrics());
+        int verticalPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12, getContext().getResources().getDisplayMetrics());
         for (Tag tag : tags) {
             AppCompatCheckBox tagCheckbox = new AppCompatCheckBox(getContext());
             tagCheckbox.setText(tag.getName());
-            tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,14);
+            tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,20);
+            tagCheckbox.setPadding(tagCheckbox.getPaddingLeft()+ leftPadding,
+                    verticalPadding,
+                    tagCheckbox.getPaddingRight(),
+                    verticalPadding);
             CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList);
             tagCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 if (isChecked) {
@@ -173,6 +182,8 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
         Button button = new Button(getContext());
         button.setText(R.string.add_tag);
         button.setOnClickListener(v -> createTag());
+        button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null);
+        button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray);
         tagsList.addView(button);
     }
 
@@ -258,7 +269,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
         tagsList.addView(wrapper);
     }
 
-    public void setActiveTags(List<String> tagIds) {
+    public void setActiveTags(@Nullable List<String> tagIds) {
         if (tagIds == null) {
             this.activeTags.clear();
         } else {
@@ -313,7 +324,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
         setActiveFilter(activeFilter);
     }
 
-    private void setActiveFilter(String activeFilter) {
+    private void setActiveFilter(@Nullable String activeFilter) {
         filterType = activeFilter;
         int checkedId = -1;
         if (activeFilter == null) {

From ebdb29279a0f0cd22c9559ef824a531759e0b648 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Apr 2017 15:32:50 +0200
Subject: [PATCH 3/7] fix various crashes

---
 .../java/com/habitrpg/android/habitica/models/user/Flags.java | 4 ++++
 .../ui/adapter/inventory/MountDetailRecyclerAdapter.java      | 2 +-
 .../habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java | 2 +-
 .../android/habitica/ui/fragments/tasks/TasksFragment.java    | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
index c3a67acf2..3027f3e4e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
@@ -133,6 +133,10 @@ public class Flags extends BaseModel {
     @Override
     public void save() {
 
+        if (user_id == null) {
+            return;
+        }
+
         for (TutorialStep step : this.getTutorial()) {
             step.user_id = user_id;
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
index 336ff4f70..29f563c24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
@@ -87,7 +87,7 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
             itemView.setOnClickListener(this);
         }
 
-        public Boolean isOwned() {
+        Boolean isOwned() {
             if (ownedMapping != null && animal != null) {
                 if (ownedMapping.containsKey(animal.getKey()) && ownedMapping.get(animal.getKey())) {
                     return true;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
index 4fd17edca..d9197bf41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
@@ -181,7 +181,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        if (classType.equals(Task.TYPE_DAILY)) {
+        if (Task.TYPE_DAILY.equals(classType)) {
             if (user != null && user.getPreferences().getDailyDueDefaultView()) {
                 taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE);
             }
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 ccf51d0e1..8edc5e433 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
@@ -181,7 +181,7 @@ public class TasksFragment extends BaseMainFragment {
             if (activePos >= 1 && viewFragmentsDictionary.get(activePos-1).recyclerAdapter != null) {
                 viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
             }
-            if (activePos < viewPager.getAdapter().getCount() && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
+            if (activePos < viewPager.getAdapter().getCount()-1 && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
                 viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
             }
             if (getActiveFragment() != null) {

From 3883241fe222c47d24fd4fe685927c9a8487dc6d Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Apr 2017 16:18:27 +0200
Subject: [PATCH 4/7] animated text in setup

---
 Habitica/res/layout/fragment_setup_avatar.xml     |  2 +-
 Habitica/res/layout/fragment_setup_tasks.xml      |  2 +-
 Habitica/res/layout/fragment_welcome.xml          | 15 ++++++++-------
 .../ui/fragments/setup/AvatarSetupFragment.java   | 11 +++++++++++
 .../ui/fragments/setup/TaskSetupFragment.java     | 11 +++++++++++
 .../ui/fragments/setup/WelcomeFragment.java       | 14 ++++++++++++++
 6 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Habitica/res/layout/fragment_setup_avatar.xml b/Habitica/res/layout/fragment_setup_avatar.xml
index f0bf3fe6e..d7438ea6e 100644
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@@ -45,10 +45,10 @@
             />
 
     <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:namePlate="Justin"
-            app:text="@string/avatar_setup_description"
             app:npcDrawable="@drawable/justin_textbox"
             android:layout_marginLeft="@dimen/content_inset"
             android:layout_marginRight="@dimen/content_inset"
diff --git a/Habitica/res/layout/fragment_setup_tasks.xml b/Habitica/res/layout/fragment_setup_tasks.xml
index 9a5e49ac0..ad2aeb780 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -43,10 +43,10 @@
             android:padding="17dp"/>
 
     <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:namePlate="Justin"
-            app:text="@string/task_setup_description"
             app:npcDrawable="@drawable/justin_textbox"
             android:layout_marginLeft="@dimen/content_inset"
             android:layout_marginRight="@dimen/content_inset"
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index 87889d109..327b0827f 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/light_gray_bg"
-              android:gravity="center_vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/light_gray_bg"
+    android:gravity="center_vertical">
     <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -54,10 +55,10 @@
                 android:layout_marginTop="18dp"/>
     </RelativeLayout>
     <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:namePlate="Justin"
-            app:text="@string/welcome_text"
             android:layout_marginLeft="@dimen/content_inset"
             android:layout_marginRight="@dimen/content_inset"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
index b14c63570..cbb83d5cb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
@@ -6,6 +6,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
@@ -63,6 +64,8 @@ public class AvatarSetupFragment extends BaseFragment {
     AvatarCategoryView extrasButton;
     @BindView(R.id.caret_view)
     ImageView caretView;
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
 
     CustomizationSetupAdapter adapter;
     LinearLayoutManager layoutManager;
@@ -131,6 +134,14 @@ public class AvatarSetupFragment extends BaseFragment {
         return view;
     }
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser && getContext() != null) {
+            speechBubbleView.animateText(getContext().getString(R.string.avatar_setup_description));
+        }
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java
index 41554d345..89ac4b104 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java
@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
@@ -35,6 +36,8 @@ public class TaskSetupFragment extends BaseFragment {
     RecyclerView recyclerView;
     @BindView(R.id.avatarView)
     AvatarView avatarView;
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
     TaskSetupAdapter adapter;
     private String[][] taskGroups;
     private Object[][] tasks;
@@ -62,6 +65,14 @@ public class TaskSetupFragment extends BaseFragment {
         return view;
     }
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser && getContext() != null) {
+            speechBubbleView.animateText(getContext().getString(R.string.task_setup_description));
+        }
+    }
+
     public void setUser(@Nullable HabitRPGUser user) {
         this.user = user;
         if (avatarView != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
index 1c6f44d1e..677530891 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
@@ -2,18 +2,25 @@ package com.habitrpg.android.habitica.ui.fragments.setup;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 
+import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class WelcomeFragment extends BaseFragment {
 
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -22,9 +29,16 @@ public class WelcomeFragment extends BaseFragment {
 
         unbinder = ButterKnife.bind(this, v);
 
+        speechBubbleView.animateText(getContext().getString(R.string.welcome_text));
+
         return v;
     }
 
     @Override
     public void injectFragment(AppComponent component) {}
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+    }
 }

From 1021615d1c43fc2a907ef70452f5e944e21138ff Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Apr 2017 16:49:43 +0200
Subject: [PATCH 5/7] new icon for custom rewards

---
 Habitica/res/drawable-hdpi/custom_reward.png     | Bin 0 -> 1214 bytes
 Habitica/res/drawable-mdpi/custom_reward.png     | Bin 0 -> 802 bytes
 Habitica/res/drawable-xhdpi/custom_reward.png    | Bin 0 -> 1614 bytes
 Habitica/res/drawable-xxhdpi/custom_reward.png   | Bin 0 -> 2471 bytes
 Habitica/res/layout/reward_item_card.xml         |   6 +++---
 .../ui/fragments/setup/WelcomeFragment.java      |   5 -----
 .../ui/viewHolders/tasks/RewardViewHolder.java   |  10 +++++++---
 7 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/custom_reward.png
 create mode 100644 Habitica/res/drawable-mdpi/custom_reward.png
 create mode 100644 Habitica/res/drawable-xhdpi/custom_reward.png
 create mode 100644 Habitica/res/drawable-xxhdpi/custom_reward.png

diff --git a/Habitica/res/drawable-hdpi/custom_reward.png b/Habitica/res/drawable-hdpi/custom_reward.png
new file mode 100644
index 0000000000000000000000000000000000000000..607da81688e778fc49ff4500a8d9df98986695ea
GIT binary patch
literal 1214
zcmV;v1VQ_WP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px(cu7P-RA>e5nCVXxK@i39K8T7U7(t9i4Wgn^ROAEyx-l{O#XzDFJP-{8IaE-@
z69Ij{af;LqyDYQJEW4Y2$)nF1>Q#4F*KAW$K=45DK=45DK=45DK=45DK=42&9@tgl
zExXm<DV`J$ilydhsOGRLi@u99;(XG&VnU8;(oK=F-Z3Qs&&59`WRF$i5|M)<tJ(-a
z&na<I{EMKy{E5LfW@RZ2bE<q6*Tf#tcEnrNe~CMdBQl^XHiA_g6ZeblqU})Tbc-*<
z0>PYFo5a`?ah6Jq%PLLqd)2?#zz&wIo(W!2eLS}1rONB#*|>c{C1cBeHQVAr3J$y%
z>xSy0%J${#;sn4#5r7M}uRpg74AwbTW&fhn5b5(P?CVT!1b7{hJ}<Hn1eVp{qjcHH
z+njJn&v%K(Me0P;pW+YkgE%ev6;U&LR73CqncXX%E@D1oEn<gwO&k}wTB18sW#-6R
zFp>Y3$ZD1Yws2qa%#fJNJ)fsww(ecg$BAXNxx<&l-(s`K3bXol$DdIBp7=;4naC8C
z3T~AZoWoMUc($>LWs9;^*|K&ws=5w@UlmCt0NGKWI6-3*9NT29=uoACuM~Y-@lM1J
ziv%TrGt6ORYpgb3H)M7<L;@RNYr{-Yso*q5yw+qB%g0K;h+xAjRhWZgo{FTmsaH<V
zYzb)ubA{Lz-R$KADEkWIobsVzxTuO3OFw~%Yl+oH^r$!>8aVe`xvsFUEYb+RU-oVP
zC)`#+5CQ}!e`ce6HX14XgA))8K8f7ThiM2S;#5@2;Llc8EbYHBLwSx*OAjyJ_a~#V
ziD!;~pMR#JdLDvFCJae|Z#1xGgK<f~no0C|2l)3TrloJ@A=n%1zre6=UVP@vMEqmX
zKf|zpE;+_{#VB=#`FMug1!r?I@e<Cbfnb!(s8|G&7Q-b~U?#|8g}q?}uYJBlbt19B
z*R7A_gGiqX@)peX#7BY0k{Vn!fQamYbI7=IL#Zu2rvI1>Bx#HwTRI;<a7HB}30QzL
z`9LInTo4V|(kJ?qbx3W3TBYdKgZ_9F{D|jY$|b(&J5tsW$VY%>Og*ZTL6KB&W=Tk(
zp;Z-(!wCkQK5dN(%MAgq)CyPl{`JR*zQf{xXc4zl^$wA3{8hvl#t`d;s@e2WB;Cv$
zc?rhQZ{kDoj@TjsJ{;O&(k_N~>KqY^1+-%GQ}yL37(>{;+_UFI&a^+DY8HU=%sHPc
z=*_s1w_wcWt{oRyxptAW+$?hSa3{lg(WjGY=7VYoHp@BJvoWo&>Sf;daMcBs`-fgI
zThEZpj;z1lN{)>o(&q(pmJFP=dIw)w#0x{D&kN>!8Mqs}MXr&01S{Jon!Xj)35**A
z^{daXE*Tfm({Fb*YZ{0p%ku%5PtpmjPOc!C&!9-zC}8LEi)aM<vCY~n{gg<8;P=0c
z*Hg(gI2v=^?&J!u52%7*esp8CH=C#7ngYj<07b^;KTvAQ$Y4zHK=45DK=45DK=45D
cK;wDfACv*N@45y#%m4rY07*qoM6N<$f)V&i@Bjb+

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/custom_reward.png b/Habitica/res/drawable-mdpi/custom_reward.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd3b100f001d074e20910390356bf38148cad8d7
GIT binary patch
literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px%+(|@1R9Fe^mg#E~K^TYQt@WxWiWH^dRRxubek=az>IVhE0~IZJRjF5PRlLP|
zJkPpsOomOmZcHMwKX|gcvy+)$-kJBEG#a()2-Fd%Bhc3fEK5fBc^hnomC3t)KmK5X
z53m5AW3pC*>u8*WE%9<l*Kf>w3m!XvL`kDz&JHhO6&TI0@B;dw)eO25zQZ%v1RLQv
zWYG+R8ZmN<a3O!Wi>vJ);TrTqqYSD+=e-IBN^@gy02Y?>q3o#UK<C4f`*0?o+&pN6
z!HA^4WY}^`smxOt`_)wa({Xmg2Jrq9xEgPvC-rL3Ju?o6U`68O2+x*`>)<}Fq*&rg
zU*=0EVFEN~)Mnu!%!4w?rohasq%sk-K58P>2n{Z)x&sfuauKp*OoGdP2A)EyHEBco
zT*jcaYJd90mS@e~1C5*je~@PH!$mj?wsjkW*Tw2)(0%i$_-omcZRMTIsu^_*;uJFC
z7JHNAE*u390JlJqI#!Qv1|9rH(P*?C1`WP~SXNJ-R>iZ4qD-ipV67{ys!0-)HxG4Y
zbV);+dYwN+ALmLlJ^FXNrV-pu&r=<H|9)WtsMhQ>2@d9MnvKZ1H$(2xrPTH#QiEou
zl+_M8+CS=C?4>vj9A~c|xgzW1dC6;P@D1PaUqu=1p;MHS%iMnf_n3(i%e#+z`zbTM
z)p*ue@X=N^QiCRj1C`NpI!(c7ex2s(-kSvz$jF5`Gu?7jM(gR+EJ>-sG6O`P_uO29
z)36pg?XMZ$-G)l)#h??ql;>a^#vo1xOUXPKxjCq;UJW|2d(Y()%a2&V|ES*4zffWD
zuMEZvCPA4*C^VBdTF{${LLFry>RYqJ5N@KjX8-IXf@YtE)r_0~&)}$O+zv!W&cFGd
z>B_S_J0HC&Q(JTYf?Uz_u-JO6n33;b1T2<qdx7Uc$aDJ%T!Cx_JDIRO_9wRklYhx-
g)e)#8@LxsXCr2!R0trvAvH$=807*qoM6N<$f-hftg8%>k

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/custom_reward.png b/Habitica/res/drawable-xhdpi/custom_reward.png
new file mode 100644
index 0000000000000000000000000000000000000000..96965ead21074a2cfaf8de7a86f9a285f8879d9b
GIT binary patch
literal 1614
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
M07*qoM6N<$g16ECc>n+a

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/custom_reward.png b/Habitica/res/drawable-xxhdpi/custom_reward.png
new file mode 100644
index 0000000000000000000000000000000000000000..70d56591148f1409e36b7bc73d80caa5b04e8c6c
GIT binary patch
literal 2471
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
UEgnJgkDeEog^7)EJ(?KvAF+UmKL7v#

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 5d5c9dbaa..b0d5fca6d 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -16,7 +16,7 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_gravity="center_vertical"
-            android:padding="5dp" />
+            android:padding="8dp" />
 
         <LinearLayout
             android:id="@+id/textReward"
@@ -27,9 +27,9 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/task_top_bottom_padding"
             android:paddingEnd="@dimen/reward_spacing"
-            android:paddingLeft="@dimen/task_text_padding"
+            android:paddingLeft="12dp"
             android:paddingRight="@dimen/reward_spacing"
-            android:paddingStart="@dimen/task_text_padding"
+            android:paddingStart="12dp"
             android:paddingTop="@dimen/task_top_bottom_padding">
 
             <net.pherth.android.emoji_library.EmojiTextView
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
index 677530891..e191769a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
@@ -36,9 +36,4 @@ public class WelcomeFragment extends BaseFragment {
 
     @Override
     public void injectFragment(AppComponent component) {}
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
index e72d4c5b7..c37b2d372 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
@@ -10,6 +10,8 @@ import com.habitrpg.android.habitica.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.Button;
 
@@ -27,10 +29,13 @@ public class RewardViewHolder extends BaseTaskViewHolder {
     @BindView(R.id.btnReward)
     Button rewardButton;
 
+    private Drawable customRewardIcon;
+
     public RewardViewHolder(View itemView) {
         super(itemView);
         priceFormat = new DecimalFormat("0.##");
 
+        customRewardIcon = ContextCompat.getDrawable(itemView.getContext(), R.drawable.custom_reward);
     }
 
     @Override
@@ -40,10 +45,9 @@ public class RewardViewHolder extends BaseTaskViewHolder {
         this.rewardButton.setText(this.priceFormat.format(this.task.value));
 
         if (this.isItem()) {
-            this.rewardImageView.setVisibility(View.VISIBLE);
             DataBindingUtils.loadImage(this.rewardImageView, "shop_" + this.task.getId());
         } else {
-            this.rewardImageView.setVisibility(View.GONE);
+            this.rewardImageView.setImageDrawable(customRewardIcon);
         }
     }
 
@@ -57,7 +61,7 @@ public class RewardViewHolder extends BaseTaskViewHolder {
     }
 
     @OnClick(R.id.btnReward)
-    public void buyReward() {
+    void buyReward() {
         BuyRewardCommand event = new BuyRewardCommand();
         event.Reward = task;
         EventBus.getDefault().post(event);

From 3f8f01b61328ed7e4067437983fc5fe243aee406 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Apr 2017 16:49:58 +0200
Subject: [PATCH 6/7] fix taskrepository rebouncing

---
 .../habitica/data/implementation/TaskRepositoryImpl.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index 448aa7288..03e85cf85 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.playseeds.android.sdk.inappmessaging.Log;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -69,6 +70,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         if (lastTaskAction > now-500) {
             return Observable.empty();
         }
+        lastTaskAction = now;
         return apiClient.createItem(task)
                 .doOnNext(task1 -> {
                     localRepository.saveTask(task1);
@@ -82,6 +84,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         if (lastTaskAction > now-500) {
             return Observable.empty();
         }
+        lastTaskAction = now;
         return apiClient.updateTask(task.getId(), task)
                 .doOnNext(task1 -> {
                     localRepository.saveTask(task1);

From 5fa6aa45cc5dfc6620a11345cc92b6ff435bd784 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Apr 2017 18:31:01 +0200
Subject: [PATCH 7/7] 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)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px%_(?=TR9Fe^S4&7#VH7^+&TYmAq|_qp4Q&#F7EX(>7Dl1jqD7-Y)KKF%iy(V0
zgA}45iim=0#;Z_nauc+35fYItq6`8T5d;O+QcX+Exu<U?N2lAJ+x_nh26Ycy{>S;w
z<NyBWCGy2*z-Pc`z-QpUV1SDm<-K!KIWtC$Wg0y{lH^ZzzWVzmFfl-TG@U-g?(&Eo
z#!a86L`8&+IBgQ4%R&@krnkCAhwTE+3GEY;E+Eh>X|y|3O|PO?dCCs!)Tf+iDlQQc
zx`iZHIXNz<V=`H&uS%zm)+CP?#90)&rR~^6k~@*$0|fep5gK5#9tNAi=oezTV`mI}
z7z1m_=wOpXu?=?7u{2ep9?A5(5v4>C^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<usxnQ=&Y6l|tRRa4iCS=Di=@k)&1{CtE7
zA1;PXuLDp@wB6wIUIP_t_is-9(b}gcnF1S@RRp_|FT<`M6veWcu~%Xg7s){p^E7>>
zic$nu@u8Hcieo1%uFl}R{<{+{U$^9m_MVbzyoC1Rlky<F$xp_q?)Z9&)ec2Xk*=Hr
zCaJ+GAHp&95s&=r>xng*>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
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%X-PyuR9Fe^R=sN!K@@*)c9RRF2x&F78WOZqQ3$7EYp0C{&D|xOMYOcgB88O}
zYQTtl7lUAxKfn;u#)!?KaCm-zg+x#SisV%Car^wuk&w->d(Ijc6?R~ld0)Tz?R)dF
zL}^PikY*swz~9XP|IYGWPKpRT;dapI&;)-pF-irw3SDnkI~C7NaNV@GlC23n9+k|8
zZ*&P@1HyEYgff`FLjPng0MG#;(%2PddM1i)kCgb0=@%xeFr}%JF;R=(X$FhjK;IR#
zV?haa!`3cBXQ@HY%X#S!+M?!elp&}uFH#m6ImU`E50`lyCAkRscvQ)}yj%mxeY#{n
zeCk?RrI+}SE5IBK;)czw2qAE<4pu(R>Jg;wVbDFajZE_OfT4~(S4F0p7y*6g)Rs`Q
zw5pB#P?TRNbxGl3wLNSJHJ4mpqZ-Pg!Q(X{2V1;i6BLUOKs_9t&o;o@e3;H}lUoR}
z2)QoZ8oJMKTi}J7N_ok`&=G1hlvZ^$ViFat2;p>9aO7`hguW!o2H;jD%Rk_!@YOx>
zW|g6_thj^wUvy5No_3OEWJT!x(!x1sb-6xM>p7G(A*+(@lmu=r{m@!ns#Y1=389BY
z*^T&q+}5vca5VGKmg}28B@Mo-jl$B2%fB1WOZcl;(K?5nT)B35&Ks6Jc+EYnGaE=K
zWaj|%ZHnn&VUnw+k10o%Od9H|klzGg;vOOCM&jRz$i~rMU)}`Uc&j$Wtx;$VF^}+y
z-6>f94@G8Z3zaC>_vC`#kSTW6(W&Z@g`n+E&lBH6aS8u(gyMcc>YrvH&A@-3fu9eq
VrW7?TvReQE002ovPDHLkV1m!<KvVz#

diff --git a/Habitica/res/drawable-hdpi/add_habit.png b/Habitica/res/drawable-hdpi/add_habit.png
index 9f9c7e51f37074823abbd40c5f818efe5959717b..575ace09396ff938553ae6b88c70345af6dd692a 100644
GIT binary patch
literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px&Q%OWYR9Fe^S6xUHQ4~IBX4lo0P$3A!2&pIxi+acsBj_RMQNpFS*dKjJDg<Am
z2lplDr3loD-OWb>pMs(i0*Uk?2`pTS(4-cWz`#HJ%bmHMJMPTR4%eN@*2QQBhI`I;
z&(C+y%$$1%z`fiGxD{|K;8x(jr~o=y<@;9VovZ>!woc+%ZJIk_9TAxoH|v`wAB-~3
zL<(*Zy&z+--|SRy8DW`X4#^CzhkNmhDE_8I;~~~fOKc;j1w{BtWb>}r2#!!gmX)NB
z(Y<cq`2>V=@;N|7nf3ahHuwO4Sj|0Ffa~!H+Y2gOC4x!MZa5pfk8>hB5f%%xCxl=2
zmcj*5LXi*05@FV^GPsvsg&U;awAx8lfa{V9$Eke86Z-yyq$rkCOx_0%Gqxv0K0=}l
zVHY>1aYf{`9au1mtMuqqy0zTa973X2qn)5{i74*~{ZUp@%mr+T=y(cV&!u3km_&tN
zeIW_(>QAQNyeKC6VKmf*Gom>w=9p-IJ1d)?hptS3!@Q|duT5~B$<W;z#}ApgoMC1f
z{0hK84wzA-WoRPtsc6oMIVQTqz(?f5<^Z}*?d&<>LZVAmu!bqPYxdJ+Rf2I{wi|^+
zB?)Gk3L~`p8asr)0Tveqpq>Y$#>{)(NeMUfvXadcYHbIg!;XmEypU)pj&I0OBc%rj
z1dyH}jBq^`VvBr?JVs6D@^)WBqIOA9f>*RRf3veI<h+n*<k-6!MNv+BB}m4`8u;NN
z=W0pdogAPDim;EWO8OjA)V{RBE){`;qZC4-jywx&^x_)x(d#5pClQ`6b_~&}6$tUQ
z(~<3?s0P}>xxbmoFO$R13<HMMbWX0L--8Ki=SHu?Qi$}9HcoRp`tsiz_GSU$2vuee
zB^;r{_Am2P9=V+6>gZnZl|b#4M>u7*)jp<AGk_HIVs?`6J4BJOgEa74yBJgax=drE
zNzRHJuH*}+vY?HG^e4bzh`LFeh$Q#ch;|Nw(o!ea>fzF=(nKf2+jKVU@yK$Ij#nS5
z{I2gm6&|S2@xLCcU?mX6yw%r;X8r&_>j^_ghwD}TW+VPgB+nQ)By|gbKn&-z+V)F3
v=3}y3>OVu&ZXxcxTLHHMZUx*5<gdVQJ%Q}UTHIip00000NkvXXu0mjfo-wmb

literal 751
zcmV<L0ucR)P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%sYygZR9Fe^R=;agQ4~JsB{qZ72r3jo7sWwa7wuGa5(l9!LI)AGFKwVjiinGY
zm_@pXAO(e{X*Ur;1^pi)1_#Md6&-}24i1X8+WdOQ@4hr}d*6*Unr9T=g}irueD|C$
z=bn2KqG&}Gh$;|Opt}{|R_PZerLR_@WAJZlh4~#j3zf02FqY$jZNHV!TuP33M2|=)
zY1`Bh8`I5njxU(8tc0>Dd8L4{7@eUwy*D?RdVPhi64OX5LHkUfse5Hg2+>6mnuy0}
z$jx$I$Ha9-$#>GSb*V;s*rD_8EI&2<Ha+XgS0wS=TU@gFP21zNT>4O>3D2WL@U0=_
znBcNQo0LsFS~h*1(uZgH8;%AkXrmc3K*$9AZM`i**)chehIhjx*%l!XIfY)i944Va
zQ`?fEGKXQ`jWMtbx1$&Os4#s_XZc|Z{B7V)>pt|%%kdl!>NcDFON2lqg#>4t0nm-}
z%=7}fl@RP|==C)5>J38cjt_+k5RwhF%vE}T2yYcYEzFlI^$Ohpv1uGxKgbL_o<DIL
z0OL76#|tp2PunX%$erPjh;mYov^rl(II2$={S_oE>i$m3fu<G_&SWx<dRr1*!}MO$
z8y3tTnF19W-T$PYsz-~dd-*9up3$SDGOBMvU4aUPnr$_>WW>*lN8QZV6+*cZoxtT#
zEfJ`=-zSrUg}(1g)w_x<dPn`19bo1+c)wFN+^YNYi$nhL;h(@WWz!c%!VU!5f)vkn
zyG;hR2iUzJw77XE9URGUMaTI)R4IGvz1?>(C2+kJvm}@(2_p6SzQ$uklYJ3{Uqeuz
z^%v6@5W1d>(X>fMZT2gqM>#i;AE2sNbR3>)Rz>%REqA4de)gsQIYI%ljln3b24esp
h8KMeA75LvO@B`g#$ishalvDr!002ovPDHLkV1i8mQlJ0;

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)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px(Y)M2xR9Fe^R%>h&RTTct>~sq)l?3sJAU-hRDSs$F3jDANB$8m`4=RKrun$mt
zB?c0NA8fz}Cj5|qHreiOjhYaefC*8O5(p)srVuC+HAD*<s7Vn}iP~V<?p(gR?Ka!G
zbDb_E7@d=xnLFoozkAL-_YUBbp8-Dueg^yu_!;;&Wk9@uNv%=SG8t6U_8u?xUTs97
zM+wf1UV!G>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=<j$~y{zBS`?0$P*wfL8^Za~{
z><ZMP(v?{52ep#GzI8RCqNzy*8X{^_doO-U_u_0igA)#Lg$w&48B&u?zSS}5<^KDQ
zSskYr>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=<d{<B{oo{9<bTi>;z?@lig07
zT7*t53+<FE%<?53?4y|BHZ3cLJOSm*D+%hip%YL(SIY?EZv76$<#={4D%9|N+^A)`
z*?9ci#qA-Ckv*2QJfGNz6Y{?cjXeQn8Mo>*xe+H?Lfr>iPqSaRM;&_<vJ3m+B5Eiu
zqr8mDUD~D?G6NMfauXjj1!hOrQ9qaE-5g0`OEQ8j%<%qI@5{A#R88kU!VUsY6XXU<
z&|N4N7x6k1!CrJHR^-+wwN_2&?Lj+%jAf)l<h{JfeujhD+^8=RL^%O&<Sq5C+f3Xp
z2MKikOdG*jaY+}lGj@F}rmV$_n*#bwEaa?Zp%0}q7{C)8wv*?P>yg1e0$)cj;>2qv
zkkor3W9cvKX-$=@aVw%T+Nv3?#Vun0X;8@<=xN$KMjlQ6eq<1zEvuKmHKAJ^liUc@
z<XA|@%pIm&^KB<%>2LdN1p@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<L6u`gyE?(A+Is4(hc`Dps!M++X2A{mJT?(GDxtOlUjy6~|_1H%&%L>~L
zR42ZvYRNg>iT53ECa;VBZva(RdPAw$lPW6iJMMMmzMY=|KLdUS{%0Au3Cw4QTlIir
Q=l}o!07*qoM6N<$f~kf&)Bpeg

literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>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&7<krc37gR8D7zQ3Y|5V$3OT8KX%~)V;w%?Hj#p
z&M1M^NGWu_Mqb5Lx``yOk>oa1)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~<RPVkcyAk@()^2k~)-25`Y
z6yoqP)X^%OS1f>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-DP<Tvrzu0CK4O#U_jrn06iq)4A3>Wxf$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#JFbWW<YLDI#1uA-XLHF_1mqKV}F%O}o
z+l4um5y^)-%e2vPv$$wL%(`pAk%!yyzqyt(%K=TN*sL=`#!WBbYdoOoQ&=Yxb+2hI
zr(>ws=@_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)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px(2T4RhR9Fe^S6ysWMHoG^-PTC>d1;G<mIu2SlcJ_E)<hr_eei+!U`VO~4Q0z-
z5~_(3On6)$wIM#iLtDC_Vw#djcr=8RXbFmqN(@2%f-OI(@uh2Mx`n&<^Gxk*_U_($
zw|6TfBzHD9GxN=SXU?4Y=4XK@MG8a;L<&R-L<&@^z|o|v7`LRhT7NG;<z)<O>rcsZ
zF$eEEg14Zs9)e{WgWyxlzLy#dr`F=MN-HNUw&}klq9c~9%G&sxU_AoVXix(F&GHlr
zO(a}z24en)ior?^svnAMkhH`WGl5vKQ<!pQudL7J@e@f|^qVHJgCz27YDhI&L+VBA
zsA^aqM+0r!*?x)N^ZYvb71F>SX&$_dtNlsYUoiR<s#25#tcHW1NwS3ir&h(WyQ^Pi
zea3)@sKFForJ6sQKANNm&QbMNVvKNt@0d2PJnm(zXcG);k}-v2J%dOprC9Y(3+=un
z6YH?k-}}Fo&`Zya^EQ>}R0_YXY{A}2BufdDDyd0sO)I;!UuiuwQSRGMGzgdLKv!Bl
zC<P3vS4(nXydY?ITV|g;W9M*>)?19JR(ES~Z7C!*awtWe96A_`iofrQX$^cR%>zj}
ztH~7GP1!|K;iOsak+jsAK9%xNMDxHJ4M?&RF5p@0qV09Pi%ZG6NOE^4TChXM<TsYo
zXD2c2!U?E^A{wv36`qTI@fci(cA^=d=_5uTHN|AhNG@y~eaO$`ahAMZ3gG5yBL4rA
zM$;0%F^LmYwu_;0lc&OaB>lBHC(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<b^pKqm0`ohQwiOK%MgH
z=VuFC`gGgnx<4^pI6@pJub*lhOVxL`oqxrE#_Htm(65{Hja8PuvZN{J;NyojK49b1
zJl;<5IQyuqV+BJX(W%;h)*vSr4MyR4F0u`IY%_MusZUu>>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<<r`!R
zR5ZxZuWjL_f5xx9TKi+$_0<wIexVd~RD2Rj`WU0*1|Z5K1tJ9^1tJBW3<drLy!3`S
TKzsGl00000NkvXXu0mjfxHu3<

literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px&A4x<(R9Fe^RZU1#Q4~IRej3ckML)DjP-vlGKhO|F5Yna}j3Cm85J!DODZ0o=
z+6_h0rVz@+amJ!WixKI^s8!fPjU<Y)Bvf2vU_n6|MWZwC^j+)9b9^)18EE$|JkCAm
zp7Y(0@1A=fkuw|x90eQ&90issAeMPKI6Y0gf#S4TFuBP~(}5e}Qw}goB{>lq2(f4K
zBN@aLWTx#)Xn!VSFl|PZ?g#;zS&pm;^_=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;<vUX%R#9Di4CEaYM^&sPeLQ`tf&v7aulg__NQm>Vi
z>KUsth+T<JQ?aVeWVHxwBAOE}D)+hRt^x~$#d{ohBZwYWq?9t&o`H&0Ces<056`E@
z&}!;~*MtOnnu=#cL?<>RDAfT{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-<yk>Tu+L9(U;;6<vYw3hq)3Ip@eKUXhDPayQ17X@n3;f0slkXFu
zv8&P8Md+n1v%hFR+I$@vxi4=u)t+n@bC&#nPSX<dxOu`fMYBS{ZMlpGa?<4z5fxJw
zfB0H3+k<|Y!IkfKxhYx~7K3X2zgXO|uYr<5`8QuN<ii+?v3tcr4uP}^WrMYNv%=X_
vq|epAWz0k9jd$sxoE1j_M*&BHoD}#CIJ7D{=7OgS00000NkvXXu0mjfOGJ^1

diff --git a/Habitica/res/drawable-mdpi/add_daily.png b/Habitica/res/drawable-mdpi/add_daily.png
index 768973c1cd6f1c3f9d2b72799089ab047108ff68..51e2ed5cdfc86886cc6a29ce2929f546dde21fac 100644
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%6-h)vR7ef&RliFdK@@(o=f#s4)T_=S8asdd0R|2c#4?aZ4#Y<9)It!i34~N9
z2x5~a5Wy1^8%c^30WAc<LNA2~T8Q=vq9B4vh_35CzrAy0oSj=0C57CBnfKl|@0)Mu
z$ITIyth58qW(TtU{2pykU(j@l<JlyC((z)sC^jH*h;$LtAQQ!bML^h+W1a{823-xp
zb&M@k)zNq&BW$%sjmy+Tk0I8^O!Js%0xgR1S`zeGtrJY$$UDfQZxBwO?okEuk7~`m
z<7|q@(3U*H;xLzgAL2@#%o(<3(p>G~*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&@6p<R-3V0wtDgUhPRW=SF4z
z6h3f;%%X|OZGC`H7`1Lty-~2QG1u;qn79sIjm+yqRlhRZEjC`DhOmXVMKQccQOBhL
z-0BSl_Juw{#<KdF)>iVB_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)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>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<H0EKjL`U6v(ihlsVOUHXuTn4===a#4!_W
zb;_6x>?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<tXK|TBSN(TbQDg;#szO9hf`aPlEjAdA8k!+rxIyBslXNCF;k?Gnt
z(tn<r?LSY|uKGP&bpuHW^t8{n1wRR8i8Sng-M|;38+rrirjtwn0000<MNUMnLSTY>
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)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>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<Ac=7
zeSPt-_<cPrF3Quo9emB){0mQpX!kA`S$hC<JomGM{TEkr1s1p^_gD2IQ1XOIV8WA_
z(mDAoe((S!i}FDNJ3%;R9`4!U;uu@^ozNr9@u=T50ihbiRtU$X#7jq@tu}}S<1>;^
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#7vT<JXcu1-KrjZJQ7CAB#8jC^{-$+4cfqL$K~vj<R?19-Smf&qG0HpAKpaY$;4-
zOFepJ9({J=M!35fIgu2qWL)g%hpxUu@AT#?wtPcVR~!5c$LXmUTeWcY2L9#-egob~
V#VM`Ws$~EG002ovPDHLkV1ljAI&uI2

literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$>q$gGR7ef&Q@=|bQ4pSax2FU-h-jfjhy*M&D3)TS5CnyQRoe5`I~5B-Ym56M
zRCLcfQ>%rYHtFK8G=YE$K|uut6|Dr}<aYet;*;Hl^~c$W_==sGZ@!s%Z)TS0{k-`O
zaQKCV5&2XqQj0LDu<tROg^n_F{Ljw|6v*4s?J_Na@K=aRexlYvt|Osp6yFW|JikyY
zt~H4wS>v~iq9u}#h|uU@fq(jOqt6XU63M#;^W1MRzl8s@>ymy!*5H9QAo)jDbYPs%
zmFYYm;*|*zT;uKp3K-DH`C(~rGV;~f<;Xyb!U=AQ^c^p11U?$}<<ioQd)8`Pxpa-&
z{|a-o9a$hZAj=r&H*zWF*wTr)wE7dEoj>4j(-`z~h$j??(KLegyhKbx(1)3+p(0Kb
z9_IUC(BnQcQVq-?<IrL{N5`6tRXdGYw2BrjBxl&eBC|Z;2(&2GyuPVeWx-$3F}A~7
zTE652UhtAcIu;wJXL8AmfBNot`<iO{y{&Bw>kEF@Gk{l0sZ@Tu<4?|(eM5#!U~@ho
z{LF{ltH@ffn8vVCvj+59#L61-0Jr22bAefHCgPR<HD+1VXULC96{nNr6kkO0`kU6a
z?B<Q0NJ1Hoz>upF*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)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%(@8`@R7ef&Q%y)zQ562}dv6qlu`ntmiXsz3O3Fo<V2O~lX;rf*=x;2e5L$+t
zB!nV@phd-~iGl@Uw234Lf*?V{!bM3~7)l9}G?e)J=AFJf@y0iAW-Mks7w)^~-h00L
zo%5aZfZWI_kW;{?fb#9*+xAAO5(k~U+$}&_pL96)OeuUPsHL$}b-QQon)b2wu#Ayr
zNCeXm9JDN4asjKYP7GlOC^dlRTyK!L?0knB_hKyXM%&$&W!>UDO6goj;86nio{Oj<
z*N@qU8OTWnQm72PUXzFGp?hjp-*<$iflDznyUn1RXjgHrPPnv)co0f3M`w`O;zPyS
zCQ%C<oG}#cGmxK@{Zw=TwG85z_UC<prvMrs&^Yf%$<TYLZ9Y=NI?lw;6_y!5HTQ+g
zu)M^=fhilqB%b7%JD#{kx|OPB9z`a40|Auj$zt~~i+<Kb6Lb<4`Ju3hYa6qgaQzBQ
zG-rMhf91>IQ2#52-=4dTqVP4oS9rz%4sR{N_?JnPQ{G_A#&&%d<75dcnQ<`g>-(fg
znr}fCmk_0tktAOQlNs*ox*}KYSqxIrU|p-SBWw<y7m(nw*Pp=^rTYcaoq2HyyRT2o
z=nM3dXdAopnyC=A9fV1CC@&Ayryr<q31=GY(h*91lO;$BB&CLZ$Hly`Yp}fe$XLGj
zflx@r))wIe9~ow+_LA%+$+y5jgP+Wc^V=zs4t#!JEX&U5^2AI9oj-a3p*w1x`>>v`
zTE)_mdhh?oPRa0pK-y<DvYv~wfjzK;awo~Gafup+cfP50MDDWKY#UT4s89S07x?Et
z>Kd)N#m;MDV>D^dKZl@<FTZWvjC$3o*u*O%A*l*jld$cFj4CLQHZkNWNvAARjc9kC
z4~v2J6=-J5U}lvj2K;34cl@xkd)}>=`MGIjS`}R%_9xZQ@0-m&>l$W5mc!%}$V!1f
X$M*FO;G)7300000NkvXXu0mjfK5cw6

literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>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<V6G+rF~=5XHLhygt}mJ%E3bxsq@}AIU=<UX}I+&
zuKslKVbR01`xTGfd8Cbxm^!=n*?CzMedRJsSrVDR_}HbI(i-4sF{hi}&0-79-_|72
z-$+5-I))`cg}!H`v5!8_#KlQ$0RwabJP90pqT0n|Cz!nVhmRZLVShe@-my6xp|3_7
zA8~?N6B8#<iiq-oT}<9h^)<(yAzcdtH}QqwH|+SWTolqyJMh_HjK4Uf`*=o{B5s0d
z2Av~4p)g6fOQj(kV}fy#SG`-%jO*ioDl+^XUP6Zdk%l7$@+BFx0z#GD?Fa%)aGD3)
zu4>&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@=A380000<MNUMnLSTYR3^3jR

diff --git a/Habitica/res/drawable-mdpi/add_todo.png b/Habitica/res/drawable-mdpi/add_todo.png
index d468bb980c46dafb12da8fb87b0a2d49e7c1bd91..f7fbc2f056e8f6bb654227ad2b23e244a21faa8a 100644
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%!bwCyR7ef&R82@!Q562}^QohaKU8Bs&@75#Qd}f~V6<ovMbM^&i$KjM4q-@(
z3feWaY!z5h>P+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<kx|Il
zj|f>;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@LgXg<vwx7gV%AFHm5%q$rgy>Z
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?}(!<T;GIoyD%qFHGk^2(Oia
zGu?x#UxNnCYt7&n)Y&jmFL$UaD(h}eHm%*^XfKt|{KU?(Qp~kqSGjKW%lBLJt<W#f
zy>_He+3Zib*9x@*o2E2mepH5P3vaGkDip97S5)AiEAShP>jQtjx<=yw0000<MNUMn
GLSTXwc5`9?

literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px%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_K<R40i*
zj*ZK=m+1R)nol-k_%-K|-&)XWO_+Njp78^`k*|K7DN@NiD`a?7ix=nkqVn+~*2IjQ
ze=;#0*ItUNGO|%XEnZ0R*J6sVMPVZI<t(4}()@*49G58PIAMaj74I`i<~j(Flor0%
zjjTN4WBx8aiY>z$6WSu=2MGtSOZRx%<eKZq0{u2#B`iGD;2U}RD}7j$2Cqq9u4>P<
zc)CPS|1^+S3WKJoxsEKb@%DqWwq6?v!P4ZsfEN_-EEMM)YyOOwSPyYs&#95xmDzI}
z?^+3APjp@^o0m)QycJ{a+pej5sXl-`4ERld5QMmUzJ5v*yq)B(o^?;^F56oQ^I&A1
zIL388D%uM8zZ>^K>WMrii<siR+S~b0J}zH;T}0ij0ApfHRUX^eohAAfC9d<4FIiip
zSmjnePfdgZ@~SULqlX*|o3|F}N0>ioZu^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)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px&;7LS5RA>e5SW8HhQ4~IB9*vpM!ZsC_*#sp?1=&Lpr39fx6ordgq>j_Wh@geg
zA{=)bQ9HA7#s|@&7A+!Mgy2Stk_-wFj8KD8qmbU}{PW+={nMGhQRjd9K<<H`|31z+
z_k7<u_s;wmK!{*KFd!HZ3<w4U1A+m;fM8&07{G;Cw(TNIk4!*XWf+I`_-_fY6c~Yw
z90o&sgBa0cqgThFS5dEC(9e!fPQZvv!G?S+sAbo7o^6yqz+fZ-1HBTwc~HgDv}}yb
z+mgZQj2)qccQb&ajDeR2LC&Y>b(gp26@;y%Ulf~1c!UgIIGymaq6s@<<0c!H0fsBs
zi6}xNFj!|YhGb?Po>fqGrV&3TQ%W{x31Ew#<wj(9M&MjZwh($LgPW<po-aycQF<lK
z0_krcogA(|Ej?tHPUBg;j|kmsOQ5i{6uB?M;xcTZGLU4rF%52%Iic`u6Am<0G9Q&(
zNKr$0><{BHmC3AT%Q?19iok0Ew1$9<rh1^{^lcoc{aa1@xSo9Fe|rii$?*OxV;uvg
z51GyYbJ60td<|mx76-@M{t$-22|JxGDDY+|f$`yarTh-QbESY69dMYyWpi*`nNHyA
z<abaplp$|k2O1NmGdT2F*>kJ8e}*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^<gJEx_grEQ|i7?NWfzU5{CSx(*q}
z7*_1)zNTJec<hsVrjNji%eQxVX8Qc?bi3L^Zx6hh8Kb+J0{SvnGBPtZ*V`fUgn>6Y
z3DxxWQ12(bAI_z#XG|Bs+FGEiN~rzMq3T~SHH&GEKQW0$<uU5S0MbF!O8u;u!aNQ7
zu8a$UL?u>L8N$K%pt07nEKy3~SGsU|Lc#5$%ctZQ#~OHfIp`8zrfS72dCybE$7N;n
zJHT-@+<&lMJ&(wf9v6NkKjj2XLMML#^EKm-xTUq0t`g--BnBKP8f4?}@4{I|LZ1LA
zF|5)C<a=q+MU&A*kI3c)1wfk#U37Q<9UMki4+NM}0W~#rxvjAWjrtb)f&syRU_dY+
g7!V8y1_T3t0aJPl0)kpAd;kCd07*qoM6N<$f{pX#7ytkO

literal 901
zcmV;01A6?4P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&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^<!uTfJft<VmNQwA*P!6A_iLU
z+(>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
zHH<T08X#p^Aiv&AzJ&gl1S&FL5dR3OU()vkZa4D^oWfBVIDT-RsV0C@F5a4IA8%qi
z(3htbVdiSMV>o=1H%{Ro9ZU}Id@ILrQ*Fjsu|I#_E#ndwMgZGz7g__X(MTC>Jl!t7
zxb=$lOD<x7mm%PF^Fdf(&M|INFp|@=sSW`i&-Fb7c@stOLrA1iHFybGI)TXVS2P_y
zl=Ux2R3o9wLI?{#f{x2vgeyO0_3)FP3@|;&^$QCYPWI>VB)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)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px&)=5M`RA>e5SW9RVK^XogX=}7CEeO>Xst7(nL5xaO6cJI-qX+8?1pA0RD&oPD
z@g#_%7Y{ZqYDJWKQ$g|O69h#>e4!Qepn?e27dFZ6@At=~HYGFJY-`<?`C&6V|7-s5
zo86h&5LvMdSOzQumI2FvWxz6E8L$jk2L1^H%4^oHR^Gsh)-uyP1bL40n%}D*6a5Gg
zJ%s<Iwr=&dSX|LUd-w9>{;zZzz_t`iHkNj!=o^ZU0pvx~xJ3abTKFhf+m}hA=!0T<
zj`@SihcK-~U<AdzMs!j3H6v6aM-&xILh;FPIYnDesb?BrD$^N6-_yZ$14-H=_bBRY
zG)(PFJ5@^hek9S#Z&27Q6qW$<NBrcFnA5v?PC7-m0Cc*OqC-$^*5$(Ete2ESOOPat
zg1D@j_KXCaew5NJyH2TBApE#QVqIu5WiSF{mu6*?eBO0JeK92(Ya3pbzRZ|RGdRv#
z99qNBf{_dp87y%_e`~rlU%#q*0vIf4rByTG0UB3PuUz2}FcZG3#UHEVIj?bJ;WsJ(
zQD~FP)RQfELINDoWITv*`I80;>ylIwxy^Bv)Y(mX-!s@7<C-r_(<C{LarL=1t+Soy
z<_4@?PkqhJ%E|S0?IVY7@H<+gvtxg{37gigixa(XfL|Tj0Z=C;N!}jf&`Z&Ye7{X~
zXg*~+|LMm!z|pK1+w?K)wHI_baawt=vlY|(23QfMt4W96$N;XapiBqkKBQ=)v?5hg
zssGQN`8SqOSIr*&tww;0!jyQNrgPPi{HIWc+u5n!p^=NQO;iJ9MzBp>&)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@<H)9^J10J
zSD)qoTE^WYS}I)@V5y7+&EGhKl{4!OS5!u7<qBHiwjRrXWxz6E8L$jk1}p;;pMl?x
WR|V`kg=Sd*0000<MNUMnLSTYPpX@0B

literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&Pf0{URA>e5S4&7#Q5gRJJE4f6xTr;CVHpirgeXL`>anaAkrokQ<BS;AqD>IA
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~&tuxb<Fb#!z
z_=THI*94*gX-+Ub6ruHQMwW980Y-vR>SShd@}o_l@0?Uj$7mG6*Mp7s06s|&{c<v*
zlR+l{{W|o$VDqC6=Onj?Ho)IW5-PWtI)hQZ<%C=1Bvi8LIPFovV>s66qn*tWp4VY@
z^6qxohqXEcbEiGZLpq#J-qS7vNTM$x)B%iR0<i7e5d3zvg6y9b61=n3{G?U2^a#~M
z@o1Zf>av?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!<Q@Bzf4DytgnM`+ZsMEqUvv^I
zd`MmEo!H&7IL8S*usF`@nVO(mgL7j9+wJ$Pbr%72YN4|g0je78#kT(337*`AgycvX
zVDXd{sfS!Wy0%}p0M~XyAWd3~X2CvRnBqvFE2s%xsU{P!$hwefOIQx!Z`>|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
zcmV<T1qk|yP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px)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>KgDy<Zv#+2K<?&wA(~PIGj42<8|P!0Qx18@=jT3)Cg`{+X^*#4{KRv<ZUTOK
z3~Aa7fK>qc8rEM1>q|>M_NAP=&P561ya1FDYJiaq3A&?GL9HlCR)k{rXhltp;50jg
z$elto`vLM+fH{<M{Va(EOHsB95gM$orl)y~lwCdMr;E61uAn*|Ww1DV7m>Ff=BqY1
z5+C(8s|Xr`cHw@y!MPo(TRA`+W*Q>XYF9}_=oMI2X~{}@c<dx?!uSY4_MtL<3)xk0
z$Y%iDY{@vjN(?$<PZ4o!q26W%5M{eRajUK!a%ChGrMg`7jm?Kq^Xze~zdk;fmfR}L
z4FK+q(^CwfCmVct+2y%~A~fGtX&MxNX$S++w2c$=3&QZBEr+Oab>&tO?b3g91k-bq
zIax<A6r$&R9yyw<Do$B!kETPk9ODt5BQl5a@_7lvTj13;MBlp4n1^;de<3t(=x*V0
zx`tF<osO4^o;5&huq~CMIL%qxBlI}veQ}<kFr&a3jU_SB!3J3#oS+SsjHDaE&g-41
z1TYe&X&7)mZfK?f7amEAP=GwBo<7`vU-J?~?j7K-Eh?fOTgB8Qy$VqCIDOF%+w^oj
z<QB7hI({NOt9(veoNkUwdm*eHgdvqUF=GI>9Vz*NQ@*=VUN<&QZ`&CGL-y8pibkhQ
zsxhvZ1909}RNNjsz#mE_<D@A?(78Zm%;yUrYhlPS0H{FJj^Zll0oW6G6a-LkmIuaZ
z3;0V}AB;UyQBKdQ=!PS*x+d~oMQtMi(r=oy9>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#cZuT<vt?A`_aV#f^Yrm#=N{W+XVaoj4HfY1sw041n{OZ
zcVu{CWN4;gq8JgZiqgboMDTAX-!Lih4*TB8&&!yB5e<}-(!OnP3FRNYl2SC4F|{iO
z?vmlqpv5zcn*HbQe?OJnT%=u7MJ5*qYJj<TZ7!|(-$!sRIa}MJJ)k|HJ)k|HJ)k|H
dJ&>IT{sDFB(_q(Q<LUqa002ovPDHLkV1f{#z~}$~

literal 1365
zcmV-b1*-aqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)4@pEpRA>e5SX*pVMHv47-L)-+wZxECC?H})4M-m}niv}uNibe`GL2C|yEmX%
z;{_8<HP&dnylCPYAZNQR_~1i*A`pqU6r+7<4Ah{BNi8CxB`s0AQt9rVv*R~s_iWDI
z&TO|eXgrggo%yfx|KI#GXU-D2%|*aPz(v4Cz(v4Cz(wHyivU-fdS6g<38E058%dC_
zTDv*xF-;(-p$0GQ*{1P?%D$=uw4jJ0=qFUp7E+GDrhE;wv2!n<bMmW1G8PgyQHFL4
zrX(}%s`Jq&$rPQHP8;f|#mRZKGWdHHD;puEmwaCONY^O}`Zj%*-hz+Eoct&gK=7O3
zj1jyR?&AUJObdX6wtYWOnu9Vwha;kKLeM%)(BxzKal6K6%BYzvtnfvwFeaf30gaFM
z?-JYeB#k4X&6R8{zQ-C=>Vf<kDPuw3SJJWbKZuBB*e}|IK~rSV3EiM$vpW5Rq(`xu
z588DrjRX7m6oO9+K`XwFh|4PJNxm`x)S|ghkVqDG2X6>`!v&p2GlIg<ZUmygL46Dk
z4D@XxLmwiEcO6{hMF7m4@6?Ly{CPpqKwUyb26hqw-)+&D(3>IJ54shBk9xe+9n|<M
zDUSz)-(cDUogO679Se#Ck{YsX5$P%=I+k)#Kd%IU^k)VBvQd1qsFCh?G|Gwi4$&rb
zTIau<j&!`kF9ZE??5Tq&jUK4>6xh~CC`+h<-;?0yA0YmnrN<t6N(SE_7Ml&7jw8vz
z=>&Z&<v0Z1hwd>`m+3tEypP;i^5)cPT7gJEZ?w;HaHnX^9j%E_jJ^o>5$PGa7gcNm
z1jO41BciE8<7tc!!}d;;)1h!bhwOf88P~c31#{^sS}qwtcO2)fSx8<FeTq6a$Ka31
z;H8d-X-xLmnx>68p2ttsD*)u~K@DF~Zmvv*nk64PtwIRoz#<sqqc}Q;!M+{I*z0{&
z&c{{oXXoeGxh_NALPmM2>I8u0Rs^`Uyqi3?IUb@-pgxxztiX(10%6dMq-6vBkl71b
z58^eGIgcM@0tk8-CE)lnF#{sH1_9lLP5T~RX6+Aad>(eMBjA(%Ei^*?L_mBuj?s4L
zCm<ViiW_zT_*0fRKw6kK__SDr)8+&cz7D~ih2xzqUK)Bp<G*k<Sc`q~ECTA1v*Dx)
zSl5zDv&RA=i6rWluBQ5qUQSigQ)XDnu$Yf?{vv|DAN(;Su@WnB1lNga+;gVPdyN%5
zQLifaV&6`*GJ$a0$ok+7!}rPF$&r+W;{3zndb$;fyou)zAnwDnOv<n-Ut(8o!O{7O
zq!+3w_dq(C-hr*xZ6woCO!}m1;z#!J@6dTc^opJX=V*1>pru}e#)EPGQ)OF=T$w;E
zPNfa^GOk8+T8?XJxICKI$F;v=4IP@YgdA-DG0}mDkSCfv`F^=s<FwO6B`eUmVZ?gT
zWbO3y5(xondP%Wt;M-e%www=ii7Tz~eEQ5Rtwh<GS8nW^!pmYA$0Z2}J$0sx9sm)Y
zq^CNIWXLPq(zB%e0Jn6NeYR*Oef9LbO1C5dl|e;0<D$F}P2gV%rXd9Xoa%#KPFIqE
z|LT?odmJ;TC*RHp(dA*@yLe6WGj^H%BQp}`s_rfY_6tCiBoIA%ZPM=d@#}{TN#n(2
z6wB;-mumd4JcZ^0#(zG6k`gM;-rv;xVp5-Yqu#eXe<d!~acLI;7XcRm7XcT6ONGGS
X;KZ_Pq^u2200000NkvXXu0mjfbmxq>

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
zcmV-)1&jKLP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px)E=fc|RA>e5S#M|@RS=)Ky`(9jjZH}*rhbZ)qAe7^Sp6WiN(8MR1dWYo(<Ij;
zS`=#)>L2v{;wPa<A<E^Fn9zVZ1PzE96fOO5RS^53Xi!9I8cMNB(<Z5!+uP@FF89*S
zvbVQ)d#6SBg}e9e&AgfU&CHwkc0&}l&;y|dLJx!<2t5#bAoM`!fzSh?2WsL0u8CBe
z&~!r8&(F}V9MdjV)TW4T6f!gY3gtgz?u*t&%G`g9|FSKs+OTE-NBdP<HcPKriXMfv
z>%A<75p#+uX()QDZ<x<}@s>-gI>2;V8FN$gDk*va#;jd2h$#zYv-q6{pcHK)rgrc}
zY&;8y?2*_Y4KO3NjwadAncyYIwCB&N0vvf(-H@H92^ig>wZh;@06E@NPoH)U@PeL~
zUii%gx)=QY0DMn@mT73Fj(u<PqMdg*u5Qca=riyo;=_E*PV*X94d76(T4yn3V8Av}
z2w<lH?5P7O{>sY$O&g4<-2mDb0a&Ezyq=d{z?nJv9P|w^Sk;@<(mlq%+j)wOs{&9Z
zR3tS+lgOz(q6pw7n$}ZK=TZKnm}0;4PH;%*gK*m0e%D9+GJ5f)X6euhIHC_?De7|D
zLtZl6XhFe=%xfFmO@oiQ@h8;=q~*)PipWi`X{IM?0S*q7boU)OZF*pUSC{Cp><tkZ
ziO^wZanOp&>79`ia40PAlp{m)1_lV_dkexceS`do7F=oX1Sfm0QgC8JAb_bpwGGj0
z7eO4s@er`NfvY4f?PdfmGCQ>}9Lpc;vF_7x)pXgU2_s4`^(OgSJ@3}n0-Wdx6hW-d
z-z#z6S?xE`SrMq4Qi|tHnnDWSCuf)d&@^XX3LG-!=Hvm@>0IaMcOZbcKembz9HtlV
zPOxcLSg54$%E2r}s2E5;;BcQk5wU2yUB2IOAb_Zv<JfyKfOyVLp%e$HfW<(T0{2Z^
z)nWaYklhAnuDZIp>2sTd?%KCxuj+@Q0T|2pyA(BW|3tH2zoc3^3(81bZOxiAExd4K
zH|S$BE~f>GpkGC9k+g%8C_BN4Y+SBa(h^1NtY3Y0zJCOuD0G69eJQCc;EJ7dAU<3$
z_R0=}PT39jI}VhhhwjL%onMS>6lI&6Z@-W@vAWQ>8KKivXkOrkpH?loMVbLm1Je4v
z_z-uw$tyJ%D1w(R(;jolJSU%DE`GhGlro`9v>KzdNj}9QCw#f9^hO>W#xSz%JE+Kz
z7WANBmQv>TV@dwaYYCn$J8(4g2@g{2qu3Ci^y2rT1&W}T;7VyY(0Aa$`F%uBD((Ud
ze7;gyvhKP92yhRvMJG{Q)=2@v<JaSOy8j^vz<(u0od(NQ3=w;sa@19boQ3E;gQH{8
z$y@Gk-&M3{Yvx7VxsEs#)WOlqZ_ebVp*Ux!8_eB9(|3NT=SB~zjaHUga4U&eCbgp9
zP8L0g{w|bM?d&UtL3^w5=p}l!P;Eoeo+E0FvQ+W+n~ECqh2JJ2#|#HtYuP_(H;PAk
zWd`BOH|cR<$M<-HL9gsf^2{<J__uF>*bt|1fj(+iiHL5&QT>3-VZV%FORsv<#ccd&
z=XV=p-A{<#B(86xJxM;}#uH@DcZ#|x*?&vs5wfg&MA(SlI`ZAl@7?(H99|7>##mnA
z%WL}c^#+}*X0)^(d+$4f_C=MBQ8Z?;_IRc1D_M749TSxRD7EH44=`YgS{HELm=Z76
zQFPV+9ZGpNq=y~|JrH^z^g!r=&;y|dLJ$1!J@7Z}-Sxtnc%Mc90000<MNUMnLSTZR
C?4z3i

literal 1103
zcmV-V1hD&wP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(2}wjjRA>e5S6fIFQ5gQujB6RB5k+Ju5#2O;sF#Q=D3T1UD9MK+aNP@36i8Ph
zXd!}#o+^S|cj+OGwltC;x=~c(i`eDCB8?ujvLMikz}(%_cea_BU1w%z#)XjP$a-e}
z|3BaP{>!-xk=xt|xDjw8;6}iWfExif0&WB*Yy?;?nMdmR)TBgPD2X4VrNA!cL^5&u
z!Wea9vU`kEi!aK)=W5=ZIPfUM^WOE--Xzg+key*lj?pljI5WSL&a4fwxT&oLWu65a
zQ<EkipWfR~H$Z%?V)%?n)Pm>7Qj!Mp3Ml{A2$l0BErBcmyXDBrslEYvkN2y}80rdg
z&+`N|OPsDCL+z?OTR*N0#DctNI6<A9QyC`uAj=f+h1ngWNjc}NDL`A1ftmgYyQJDF
z<gWu~3kVJROKA=ZF(fp5bDV(`86RCkG|N!muO`b>wX2bRGMkbyP$z2B+GLRb%4OPU
zmAt@_v|x6g5y_okvjOBk%af=&8+ko!9rEjgVfI4L)=1{afmn>osOgg_P(}yqFS354
z35?`|e0PFwC}kreZ=1ZpcI3d1`&5Cka}oWw{xCHgku;L4<guVPqvjox7x<1GNF->J
z7>p8XRq9&2rdo72pQk?S^|>T3@EtjTLu#QixKm3q>gVecBlJ4#=LfWM_1TO(4#7pL
zot@s914OgMB-m5Zb{&+%G>AP|A7?Y2Fe4A!$|R$kc8IIC&KzKLOkz|k6;huHBzkWX
zYs0$m!x64^LXgKHbzQIKqkDJ>t{&}J%wmhR-7r_~8zSlhsW2EZ{2j$4D~)y=oaCF5
zoW#ldAQ)wpcG)<~K$ckoO)R2j0&zWUL|(w)xLuQi!(}fEtghOT1K#ouZ(UhOO!T^_
z5aOy3Rh>WvbhpY_i04DMLtx}dbjt|KOzy}5)b}z}`Sw(Af-amWDy7LqRWwWQgdOUq
z24trg5HG!rl(wUpz^17j--XgpOkQe3?3bQ88ssbDaXOLG$#f+1JkcAYCv%hmJs>+W
zEZkM`1l`7%0xa?i$j)6m<F&SyGEi6kY_)a}R-Q<^XvLYj%RLoO|ER|PSFYcOuy7A!
zaeF|%eL)E|jJ32bvE%><KS_sFw`^VmT}`?Uw3LSJbQ=ykajzGjmTQLMv=PsRFu<1q
zoeh+rbS&QcRm{xZngfgmwF9xa7vg(h3hMSJ&Yy2uo%R`vyj68om1Admh_9}rz6k3I
zs={&ff1_mwqi%7>IRtSZ&Z+a4->lkiG`7*lMV*i0_YuT<<a}y(a`iUC7jkPEFhelW
z1tYB5M4c1WKiP$H!dwBF@D4aCA&*SaQ7%38Fy5QXXu4Q#1l$O?5pW~mM&Q4Tz;B{+
VgH3Tbn=1eS002ovPDHLkV1hxO1oZ#_

diff --git a/Habitica/res/drawable-xxhdpi/add_daily.png b/Habitica/res/drawable-xxhdpi/add_daily.png
index d77159c52c6dba89b3fd68a181f101a895991c94..8f4bfdc8653929f30369907c6f02c055b600ba7c 100644
GIT binary patch
delta 1332
zcmV-41<U%i3EB#OiBL{Q4GJ0x0000DNk~Le0000~0000~2nGNE032%&!2kdN0drDE
zLIAGL9O(c61r$j{K~#7F?VDR@Ttyhizwhj6<2_q1!3K+3DR`mOVg*Yp#E60g#p}M9
zDoNTj5d<#}RT11LAEatT(VET13+ju$6ra?G)`wO!)j-86iVq^F0ez|@O`2x+obf+P
zW^>N&CT5Q_yQKRK?9Tl^Gr##}&TP(vNSu+Z7?HOPf6h4q+{_W>`_vsF(-8WQCPhcv
z+v%0e>wKo(K7Bl-*3Hb*3mD8+V)}~}y}BpQ6ZPuYDDT@4NurV8r?vz|`Vt^bAMTo(
zqHCblTd&^iS^5lhx|Ob|znJd(U{Kxg_(7i3NsV+3wa`xn)aA1QZ4VV)iH7gN*dM4E
z?3Bm!e|$ySvQfpDkdTI<6&nj8dGhERSnK3@7tpbuH+gDVAxoLDPFT{clKF5@b<7p$
z4P<0sL0(k>*9lAoG?7awdai$rr(HJZ9B6KjdJq;g0t>p#<v>=VjluqrO407V9Dlu%
z@=3}#1qzs5O3_!5eKJWOt=3_tY30%OfgJy2e^q!v%-QlgoK-$R9*n}oU{0_{53N~C
z*J7{SUo{}6-~9`zqn^+CK6PUEJX@tj)PpuQA-xCf{$}zq!54E#Z<)Al-<gHtNOX5V
z^o8j#2KC+66z$wL!g@cWg`>_mfL~WC!xUn6_u;rRYU-@i$4bbmkX|z7bzAKl==MyO
zf9G}DM^CCt&dksRww;aTG9KNyca(oNaa+DK3k{gMVx5FV8kjo$(RcV%x{Ypz6=e_|
zKu5MDfvL3sChPlj8?*+o0`AunXJG35(i7fW1g_KIx=P=czswoXvTW%L(+P_xyS6lq
zmm>>-%-eh#!A~pGlf?T*_*>M|pPJ71f9QB2jAVthJ`%GQbY`L0*J6{k`y#6Q7m&44
zLMRBT+FxT+-)Ol5YFcP9Uw~Sk@Yu4ntR0ifP0}trjib9*EZ=n`45`C)8(P0%Kq;Wl
zqYtS@46Ye%$db2AU4U8!+OQ?B58n7wTJ!eMfY#%e+ab&Rs^l65w6~MSIg4M>e@$|u
z{pxD`%ysT$$y-J&Kn18}0+!{(LItR00+!{RJ>~K4=4BjH#!P>k`GhxpXoT+!Xy3bh
z5(ChmmU6O(TApqJDnKn0uq@|p58XVzk&E+Jnf|I!O^p4r)9I}Z(^fNmXFye9{)v#(
zvu1EU``Zxy-o(#UU-nSTGb=y^f2d^wmgQQ;LQ`J+B^~aS&RAwyl4}{D#ejB20pkAC
zuhF=za7zHiU+eFLMK0cq#syrwjwxScvjtP@B))w&wE4ukxx%!*+g{tT+Jviv8%!n>
zA4j<6wQStiJoWy`9S@tb#s`Q;5Wd316Zq|T=c3<b-HW#$<*_0#ymySBe@>wHpH&i{
zLkntlts>REWD6DVZ%|gBLu)#~{<~HNB=%!cZmE@5Pg+G+erUUtUaY5nJ!M;B$!j36
zN`>o=xwKE+j~!qq4<y}AVhh!kSA}CbjU|5smh)PFo)5e3b9rA$(vVWv>X&f+Hyt|=
zhUyuU?fG<T{>L3l{`6$VTd*tKdrzsf3MlclLp4KluK(+!qRao!LTf=V4fI}rGzQ2k
z`f9oIre4(V9p-<c@zoG+nLV^olOaGYlNO)?)G`6fa$=#DfjT>frab>pQ5F6y_cuk0
q;c}t`k*XRWgn$qb0zzQ568IN8S}PvnrPu@j0000<MNUMnLSTZs{E;XC

delta 1179
zcmV;M1Z4Z#3bhG;iBL{Q4GJ0x0000DNk~Le0000;0000;2nGNE09Ea?M*si-0drDE
zLIAGL9O(c61aC=1K~#7F?V4R^R7VuY|FfHFqegrwsX|2*DmGN80g<HmQre=R(hByW
zRy3Ogq!lWKLYt&6RG<1_)jqUwHvy$D4G4-4TBsoSMQkZ6h_>`iBrSq3S)tjOY<Bve
zo4v`^Y%+Uu=cdVe2JX(+nKNg8_sq=h&HxgVAq5(Lo+koot_G{MR+%=ur!`(nYTQZn
zs0(5G?oI0#3j_ENMbsmKD{UEdD@^;@%FY>})2;fLF5=4xLlwH(v+C$X-je7}>C4b~
z$B5BrtrWJmX4NH2v&hx40wR=+gwmuEc!`7inBG(GTg(9taHLs3KU1tUl0}WqpbXph
zQ|Ebq#(!&tU+7T-!FpHeSOA@A*Q<vM_?|{?b7km^dK4!faAIW=ojbbK(2TMnE1d(%
zr1TpaxJqxS3u#MaaeC8VwM(#h?<w^-va*tb8dr*po}Uiu+T3IO=))oXF;1h4th&pm
zb;=ae$e4B&1g`7o3d(s?Oz}k&(aiEDQ%C)O>xYK$9h3V^-bHW<XfTI^G-^Z1uzUh|
zE0t9@O`eM^v-qM^$K?Y*wD(lLNS{vWEd=nkX;1K6c5tLMGrmZ7x9CGGKI!S!_$b?=
zPjZ+1)yqfxFh;uz3h(;L5(>sh4~{8o%b<gc^=>|2C4pUGb}-Yv<`wLu&NhPS;5OfX
z6x_iG`V>WO7&#M)iAg)gOJ@J+)PrdJDtd+&_=@|3W+}zJ2sl@If>jlz52V#F1*e^o
z?7N>G_)~3FMM^6Wa_d0=ont%@#}hw27ctkQV1E;KMD5!(ps4oDyY>Re@=BbpLBYPb
z<DBE}G8Qb0GtF;`FT|lgK0v^tI1HYDR;Rx^Oe-+E3YlUSZn1d~_p|p`EJN(Sw*B$t
za`>7~^qHS`6~_iBQN+le<0|jUP@5k91}t#ha~@=hS&#}K0c0UysTL2i0CKuW*VLhD
z@en+nuL3zs-wUGJDWC)2s=);@>JUcC6tln*Ko&qwr`W;QZ?7H0=u*??XiedNVeju-
zA6fdJ_tj24C|?-q9T_d&F^?Kf?4S3eufRa3fGX&3!HEbU%PXrIK>VS)I51Xcf7DeE
zAYii(h=1V!<ENv>RRO4UaOfTR7$E$s<#JRoetRA#g$pg~uhsEj?&or?lvWKIdi+dY
z;Q?jJzR5KoG&iTy%3L_`0&jtTG%~THlnoOt2_8Lr4HeGvQ1bsfdR|_;G&wl@@0N0-
zAe_l!jn&MUXG*wtukYCx)5w7ynIagnpmcfRlaS436t9XY#>4s|pW`nlvB~Al4nr>V
zH|epJ%ksFN|Fk@IULw$XovBk$7kCZqN;$cPhCg&)-%~Ze(WTN)l~k5W8Ra?s07cD}
zJQF()&$@b~4)$-jewBc>8YR4F@OjUlZ+;U=;XG(u9aAhukOIg8R{#kh3js^Dc#s8<
t(_PHmruX|R-6-?35(|;A78tGw{0DU*5+JAR(}Vy3002ovPDHLkV1g`-GAsZ9

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)<h;3K|Lk000e1NJLTq002|~002}71^@s69BUB400001b5ch_0Itp)
z=>Px)3`s;mRCodHntx~<MHI*1>|HJz<w_$c)du}T!QvlEL8>5>_=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<I2&oC7|`1jE4EPa%k<Yh(c2t{;m2hi8_KrkRl&|xh3qqsW0u6LCOL^orE2edsz
z&L<f2FI{$(WBw&TybJd3G;Ml<M#d(@ZnG{<wgUQIRj!%y={OwhS4QF7S-{-#^e*vr
z+#ri-o7gHJ!BzTP+kk`X;ouLt>^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+
zlZ<gY_3)$OGQD~np^h&M19c3v=-6JQxxF=6qG>8=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`xUxXsuDXVs5W1Ofh2iU5<fnt^5|7tzmZ$w$~oRb4F7B>t?v
zQObe$|LcWRoqI^h3TSQ1Po)!Qro*V7JTRQ<UA5vd`nEWMO#O15tbqP;^xRh@`!*Ux
z!k2bN-HH~&Xj{<~96HZH9l}(m7-$4goJM8Z&KPJ1pp9qc5S|1JVUwW0LpecUpdA4D
zP1<Z$BU*no%W*OTZKH!Thx_rx-K$}>pqbKYO8vQJ%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)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px(jY&j7RCodHnO$g9M-<1;xx2<7Dq2J_MGFNB4TwGn3bBZVJ{2EIQLsuhF&n{R
zAJSLR6?_sws3K;wNu^B%4f-N}LGfGPN<l<X1ESSxT5bIzM%{bI|Lo1ZyGwR=X4@Ox
zHD@51xpV$=X682^J9jRT1R)><gn$qb0zyCt2mv7=1cZPP5CTF#2nYcoAOu1J9HuN2
zDyf|GU1}pmD^TQPMO1HD^qtAj$){-N6>_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)<m~p8Ckr9y9
z61#PuK0&LeYR4GazZ2cmsnfL<;tp*K+sw2mOqWSm0rE05E%1TSz0Qn<RfAz|1Kq#~
z`|}h7u78nD-7pHY1MCm^I@jd1TJ4-<4?`OcZeOEb5amOD$IC0ns8s+N23`OOAOit|
z+3Fl*@KMx^GsovjQLi@Q;CCvK=G8@oRh~I&fE=dru17O<{{iZQD(6tLd9nwUMB^Jq
zZ3Y?Yt=Nnuy9hJ!uuVanb&e%^xXngu(nJO*l~D7^rCmXVp69=sWS?=YPqnJ^fem}o
zS-fj)3Z8A^7?x~ic*z>|oL9F|TwV|vAdK1+98nhs)nT-A!GDhnZ7}?mGgfyhGC-r<
z&ANK}orb8%rXJ<eBO9HKCQ3lp@XOU4REili50mJ7{fs4b881CM0-NK|ogi%+uinK^
zp}l0Qk4k3+XndTmzIyH7qoCq}VwK~Zqx1E3Y&LW!)I-<x0Rh%MY?`4h(9}X~1*my1
z>pf$CEp#aAHp)53K-6jm8GIBqW1s2w6m8W;Tyx$mDyo4@D?mwo^VWAYtNpY7g-ZRl
z;I*l5EuE~PBu%<%w_5?abMWFy9Q=B9XLykN5zVRgjz!fz*@Fxu1&{#B5jfJWCg91R
z6ik`r%ZI;k<Rl|fR(sHhQZ<@!U(si1y8k6Z(OsL*S7T<0rPryC*rOkUv1Nx&1nF{d
z!FQpS#!K0A%ZLKXn~T?lud?|}|1vw_wMM=+7LV;qUtV}CKQFaTS$(2LLnfh)Z-(o5
zj`){+KmR8U-wk*#T#7GZ6SW^aKaSVar!9N<fyr;d5>uYH*;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-RVMUHuj<uOHckVMcVH01+vhaz@QJ-ARIrmYd=5Frc
z>pnx9`)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?JC<L9H<}5B-|{P^Umv`M)6=ub+FRe
ze(hvBWqM_LcO4|Jqv|*P?L){h?XdB>iRJ|(76Bki<Nsq`mq0D8V%*Kr&Tzx!zKSzd
zoL{djZRlY*1%e-Bi=!QOF$Gm}&zogYGz)!#Me09F%6ZrQWv^SuTr?LID~F>;dKACF
zh7S1d4H8Wr3{X8?6%4QGSvC7JF(e3~&83fwfvml@%_ki3`vN>Utz1G{F+(<{ch)2^
zM~GGGd2Arv#c-e0H<xQiIL^RzM>ploxyzBXPxLJ0gjGUd-tPmQ-WY?8mC3>~|Avpd
z(G4mDC#_VMN5iopFMjxt$@#?JytJ=EBCXkf(U(|>=>{WQYrVizK<{Dt=Iz8#B6N5{
zt3u1(iOSliD^BSx`WkXSlzuHwEswHPwRQ<sNNV7S-VzQHrI118!g=gJwaUtE)=8f}
zDS+DQ(}&<iiC`6UYYOLd1yu)m=hGrQ{;siaUi{GHbX<a<d1WDnsL9JBc@D%aH(6SW
zz<2bfE-MwXpLd9pQ(kz<GJYl9d{j9kEe%Pot&A2_hV<1h=Sx!ifo)?j=mGEF<98zb
zsyxZh(f3rL<}O*SX{L{W^{QgJzQwbirlpp8`Oj?F805Kly@#1ldAB4|W2C!+N-^7*
zA!`>wGs00Vys}4!YF-eIw-D|FSH%K^1e=-6e74T9p|hf}oNqS1Av|D<l4P}0M?ji7
z)A!NXZXEH@oeQQ_(I}sbwR@5wprKBr9_MPW1A3v^D<=@#%GLNG(}OTT1S$=bN~$@%
zK_jiiW9P`G?kgo<>{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|`M5boo<Z
zgN|;zt&m^&BHo%dl`0!GgiFjX8evD3eP}59#m>6ZwF21Wa>`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`>Fhy<voOX
z%s6O#ns?d$ne-L8%bXg@R<_jsu04VZ+K>yv6{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<MaqM8m=CwYhOZF3j(B{Re1
z_fxb75{`<v>-sQ@6MdwNYK!E9nOb%%2r(+OMSwe3WEQOkCq39JS|aOh^Z1g+A6Y9y
zxkn`*1<xt~8v`R{*G{R0L-PY-`gXm9ZvR#vnomc`%m>{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!n<Og98ADwpAJMBEDJTs;<~l6)K`XWP@!?=uv*=fD#?<Kq@vP^273
ztt#cpVS@quU1F%4^$TfpSd~Xem-f^bGfhuL%41xDXzSZB>tb=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_1wxK<ji25D$}J1T4z%X
zHGB{An4F7$PZbl5tOgXgW#6u3pL^RLJ!_=4*i6@`o2Xx$cOmIYWLNt63(#Hj@qhL1
z?WXTtvP~U(wiF&W;(CV1^lx}U_~ZlT?m{-B&^EO@9bcEM5UnpQm+At3xhSk&n2lEP
zFXx50Or*(gny(im-Cxz$fMtkkBi`VB7l`XSPzAwbTCCjT=z*G(w}N6jLI|7+&*k(d
zcKO&?QDM(#O4*2IHGFo1x<&R!cGhl8`bCx@|L}`PDP5hV2atejR6c&;-Bd$ZMDos)
zy}{yYWZqO`^``DZ`gd>0!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
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
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
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

delta 1665
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
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"
                 />
             <com.roughike.bottombar.BottomBar
                 android:id="@+id/bottom_navigation"
diff --git a/Habitica/res/layout/floating_menu_tasks.xml b/Habitica/res/layout/floating_menu_tasks.xml
index 83f6619af..c237864d0 100644
--- a/Habitica/res/layout/floating_menu_tasks.xml
+++ b/Habitica/res/layout/floating_menu_tasks.xml
@@ -1,90 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:fab="http://schemas.android.com/apk/res-auto"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/fab.menu"
-        app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fab.menu"
+    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom|right"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginRight="8dp"
+    fab:menu_fab_size="normal"
+    fab:menu_colorNormal="@color/brand_400"
+    fab:menu_colorPressed="@color/brand_500"
+    fab:menu_colorRipple="#FFFFFF"
+    fab:menu_animationDelayPerItem="50"
+    fab:menu_icon="@drawable/fab_add"
+    fab:menu_buttonSpacing="2dp"
+    fab:menu_labels_margin="4dp">
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.habit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginRight="8dp"
-        fab:menu_fab_size="normal"
-        fab:menu_labels_paddingTop="8dp"
-        fab:menu_labels_paddingRight="8dp"
-        fab:menu_labels_paddingBottom="8dp"
-        fab:menu_labels_paddingLeft="8dp"
 
-        fab:menu_colorNormal="@color/brand_400"
-        fab:menu_colorPressed="@color/brand_500"
-        fab:menu_colorRipple="#FFFFFF"
-        fab:menu_animationDelayPerItem="50"
-        fab:menu_icon="@drawable/fab_add"
-        fab:menu_buttonSpacing="4dp">
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.habit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+        android:src="@drawable/add_habit"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_habit" />
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.daily"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
-            android:src="@drawable/add_habit"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_habit" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.daily"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_daily"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_daily" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.todo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            android:src="@drawable/add_daily"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_daily" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.todo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_todo"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_todo" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.reward"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            android:src="@drawable/add_todo"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_todo" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.reward"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_rewards"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_reward" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
-
-            android:src="@drawable/add_rewards"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_reward" />
-
-    </com.github.clans.fab.FloatingActionMenu>
+</com.github.clans.fab.FloatingActionMenu>
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 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@color/white">
 
     <LinearLayout
         android:id="@+id/gearElementsLayout"
@@ -16,7 +17,9 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_gravity="center_vertical"
-            android:padding="8dp" />
+            android:layout_margin="12dp"
+            android:scaleType="center"
+            tools:src="@drawable/custom_reward"/>
 
         <LinearLayout
             android:id="@+id/textReward"
@@ -27,7 +30,6 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/task_top_bottom_padding"
             android:paddingEnd="@dimen/reward_spacing"
-            android:paddingLeft="12dp"
             android:paddingRight="@dimen/reward_spacing"
             android:paddingStart="12dp"
             android:paddingTop="@dimen/task_top_bottom_padding">
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;