From 5243f694b432425ac872811b2560d67d0cc3cc79 Mon Sep 17 00:00:00 2001
From: Zoe Abrams <zoej.abrams@gmail.com>
Date: Fri, 13 Mar 2020 12:27:11 -0700
Subject: [PATCH 1/7] front-end changes

---
 .../res/drawable-hdpi/party_invite_accept.png | Bin 0 -> 1371 bytes
 .../res/drawable-hdpi/party_invite_reject.png | Bin 0 -> 1273 bytes
 .../res/drawable-mdpi/party_invite_accept.png | Bin 0 -> 878 bytes
 .../res/drawable-mdpi/party_invite_reject.png | Bin 0 -> 842 bytes
 .../drawable-xhdpi/party_invite_accept.png    | Bin 0 -> 1800 bytes
 .../drawable-xhdpi/party_invite_reject.png    | Bin 0 -> 1522 bytes
 .../drawable-xxhdpi/party_invite_accept.png   | Bin 0 -> 3040 bytes
 .../drawable-xxhdpi/party_invite_reject.png   | Bin 0 -> 2553 bytes
 .../res/drawable/party_invitation_accept.xml  |  10 +++
 .../res/drawable/party_invitation_reject.xml  |  10 +++
 Habitica/res/layout/view_invitation.xml       |  77 ++++++++++++------
 Habitica/res/values/dimens.xml                |   6 ++
 Habitica/res/values/strings.xml               |   2 +-
 13 files changed, 81 insertions(+), 24 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/party_invite_accept.png
 create mode 100644 Habitica/res/drawable-hdpi/party_invite_reject.png
 create mode 100644 Habitica/res/drawable-mdpi/party_invite_accept.png
 create mode 100644 Habitica/res/drawable-mdpi/party_invite_reject.png
 create mode 100644 Habitica/res/drawable-xhdpi/party_invite_accept.png
 create mode 100644 Habitica/res/drawable-xhdpi/party_invite_reject.png
 create mode 100644 Habitica/res/drawable-xxhdpi/party_invite_accept.png
 create mode 100644 Habitica/res/drawable-xxhdpi/party_invite_reject.png
 create mode 100644 Habitica/res/drawable/party_invitation_accept.xml
 create mode 100644 Habitica/res/drawable/party_invitation_reject.xml

diff --git a/Habitica/res/drawable-hdpi/party_invite_accept.png b/Habitica/res/drawable-hdpi/party_invite_accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4b1584d1748c623bb4ca84a763656631f111ae3
GIT binary patch
literal 1371
zcmV-h1*H0kP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)6-h)vRA>d&nr&ztMHt7Q*}LQ}X%d>Wu}#jG)Lsq|`kIIpL{zYfAn8>tf)y2!
z(teO2`0}y+XsHqqtS>0Oq+hC-20^9y(1H~eFJdc{(j>ICUZRagy-0GG_HKOsbJ@*a
zZ|}0Z_dZ{4c6a7^e*c+gW@l$kP!ZBymyb5gOiw<Ll60RWx{XK%g%qtMWV13a#jF(a
zZz3@+h|Xz(PPDamj(m61uK7aUvpsid!<n~Q<5v@XQi?vdu$`eBommodT>iKaa@b$z
z8~$bEJ{IUaITp|pd8aX^&A&(~`7*b5x`mzl&8Wc;v!scGEvbe#Mtk=_nC)a+z~l0$
z=k!lg&q<lu&)^-lJvb=HFjGQk`!{Xvc>hzeD`}^yEdimQ4+m1o_%V{yYsYB8Wdubu
zkAKJc&3mKE*;-aWcVysBj_;vTwR$c<^ac<5@K|sE54p<VzLxJ{aCBfdgP$xnJec4U
zzQK@>F=r2`ic)@(uX5R*3Gvi;Pye8mKT81!8>r`Y@LN?X|2+|B(0i@IDJz69U=j1x
z1CQoHL&~8vTW0fR2*6Z{*`^XPpNW-y1tze8(fl++0Ot9!O_gQ}yLq0*6{D%VF$UBd
zmgdH*vGq;7#K2Q6)ELy?*hUXvc~I@}5CTTElvz}zdO$7A77~~EVNupL<`yeOo}p*`
z^}buM08~AoR+TjZj|M?QgBf`xU~x%|>#`=F@X+QJYhC%&nFT&ZrvI4ylXW><&%5$#
zRBH0n)4S{YXyb}Cw0GhQ`X+YCcxEpn=GxbEuGa7+Rc`n;Zvzd69-}*&1LV`Zba?$E
zw8?Q#$VRYx@fm1OadAqmt!tu>LObbJf16?O<i8i_?A#UO+HMByULFwq4O^bn<y%P~
zhaRPl`lZQk=&!T%>ctUCVQ4x`VE1zP1Rd6MRs8mbcKV<@OsndahT7nj({$kS30L;g
zm1NM1-2>@Dy%VoJO`Y^!u#cKOKBL;(zyC<DN53_$-DJS78CxH2EO4DbeG5Hv!<L-2
z?`i3x54(3}z#od9Di~fl<ZT-cA@>RJM|d^~_*xX;n^WIs7<;%iM2FTrNOe5lBS|S$
z$Q+qIlToga3or4e6PsS;#>i`3+Z8<OzR<Z%nb1W%v3dg?xcPqGEm5l#O3D<ya`89~
z&zy7P%DN7-d)1DaBv%3er1t<k=pquSYxL5McN<O@Qc3E+@Fk7>Ghy5-Mh5JHzkR>r
zzJ188L30>c*_cmVrG5OSJr(=a>TzNBg!r1bDXE}7jV{FK$@8C4G!e^!nN23>*|DM0
zz_T~7YuISb^6c=2m57;Z^R%0Vjs7?3(3<_?U@z)oP7f!q(CF#0&uJn)W1q%x$@F4Q
zO%cJ!0CpjEIJRL?0U}`ZHx8}RCUI=Mw?C}D2e8FmEN2L((!+E7FET3u*q`TC<M%;r
zB(Q=Rv`T<FT;Tor+Q0|3IH(_pC;<S+;Q}k;9pUOuU<9j9X$ZhR3l10b2i5uuMtx5R
zjD`SQ;ADiSkO=ZsnV3y6n&2`7;8+JIBh?s6U;^9qM^707AS`{XBf>mU#Z5vhoCS*r
zTOB!N2>_|uhZppGg{ha^GmF*P018+Nzyoz6!Y3n@?FnxAJf}0@<j~5Ws{N2}Spkq&
z&Bv@cL&)4O7(83H2DWKJ+f&LJO3gIv1HP;VteHvA+v)+mFn(+HuLfoj$k*(jJ+2pm
d>q`FJ=6~JS{iY1&<o5so002ovPDHLkV1g!ipIra|

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/party_invite_reject.png b/Habitica/res/drawable-hdpi/party_invite_reject.png
new file mode 100644
index 0000000000000000000000000000000000000000..3afda7ce217a2cedb81febd415038cbe55a9f8b3
GIT binary patch
literal 1273
zcmV<V1P1$wP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(vq?ljRA>d&T1{+JRTTct>lCyVNFy6##7!5t(L^D-fKU((JIjWJ0h6jNG=cDA
zQWtExFd=~eF(D~5Y7=n92G|)5Py-ucbt{W*s4;FZMxgwq?d5#;&YOAj=Djy>-h0!|
zoTQyQ_uZfGd*|MB&pl@Z1&BF%^kw}2=p#V3>u?(Z(+?wk`nkppFApK+KYc!{-|uSu
zO{{z67dd<ON#5xt>i}kSv=7hBC%}^a;bR!n)6`fZkG1{JfOie6<(f=PD8c5XX#!?s
zqz8*~3}$Hz2IV*0{KPdq1gatLB)ZHQnVclC)RLNjxqP_`KVAPq)jzIp`?b_FG}BPz
zA6;hS*!AJ}vS-g?ny#q`m;(o1$MdDD3Vc(VL36henZYV=P|lzKyU|z;37Dag_aV5_
zvbP?GklHZVEmM<s;+nADOL}OA_V3jtGrjEK3Cb>0Gwm?Mqm0#n>$r3&zUy*6@%G8o
zg&(74j3i)}4c|QQQdFlEsC%lLdmw5#)e$If*xy!U*(ALg?uk|2=J3X@*#p*8I&0G!
zGnoXi(KGG|#bz-E+SU-Tc7C}`WdKC#BC*-CsM@2lgzO2sfZ4WNI#sN$#HCb1zkgy^
zHDKL?7M-wR5P80HDG_T~tOlH8ws5a7-^L%kRiE^oR+rwS1L!nBud*n|tW}_c;}Wa&
zgexbpb%}#bI-u+@i@S`>-`CCCoIf9=_?F&b=I4RAzk;>V<sAdSueX53RL*Af7_8-e
zVqNcg&)%f+f<JNy82bv?@J9TEd@}SIu=i8o;3&}5mE5+`Q)1RzpzZ;C4Q$jr`gy4Y
zd^rSkcLP1Dz$6j`zjccn=bg8KZCj(qY^qkaa}%rnGs?mO@a;L^arqJzM<NKGQ{B1^
z+?dWdX-&6{N<c5*d4%i!<mq@4QQ)U8=9w|j*Yt~ep7)i+tAW~VMXrA?A!>m_t^BD0
zi1*%g-}#?!zA*3{Q2wO`in*9aX`-dzNx-b(9w<&o;?$XX6Z!ie1;6<!WF??Mry^y?
zK)s3NInl_(X2Kv3Jr^;{)Vsb@c*FXKRh)IIAECJ#jrLIk4EN=iFnDg*Z%)Kpr~EVO
z2r|n(pr#_HM1iNZxi^<=VslQb-R~*^4YcNwIPm_MQPwHx#P<88`ZPB^Mv1Lsl&V9h
z5&fC9Ypa!Uc0Npku19ZgwO^K!b>=j}&A#UI5k}qyvy5Y%GCF4u9yB(Uv_yvw0^d!!
zLoU;V<xV13<%h}LCHGZB+*r&;fR^UmM7`~g0!K}JeH@?<m0O6}ztCuWUgMwH&ja6F
zrU6w1czdN(%sv5|Twr{@Q$(@)2@#r6Cz@Q)&8+eHHWy+f*0NLxxHyX@7usHA+>Z$n
zYK4Hst(g(k!c5z8AU0wQNDTp-*3ryJTP`IR+#L+3o@xk?n2r8wW<-k`(rz1hYO^&F
zDW^IDgzVz*-f-K%hc_IR8z8<&0({^yBHlhNuB0Y(?)dDC#mRq3($Psi60@q)%*e7@
zCzod39Jg$OFFbY$1smCoy=&(OnoZx|QVT^(!#Q-Wa4IQ?Cs?i|ID(Z)<&OQSL6}s>
j{@5c-gx^>4=Qb|@Qq9ILVCZ|F00000NkvXXu0mjfYJPL7

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/party_invite_accept.png b/Habitica/res/drawable-mdpi/party_invite_accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a2c8b79b87e91f5abf39086c38d9ee9010b0900
GIT binary patch
literal 878
zcmV-!1CjiRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&C`m*?R9FekS4~J%Q562}d*hoKQY%QPr;yR4;6$4;Ttw8OMfOKfwx~_pLZPS#
zf)+)z>IXvz+BOjp2}1O@Xc2)>Eh0uDg$!~GLnN`(8J*iX_jUcr=lii4?SbCm-gD0P
z-E+=8_gsO1Uo!o`njFjQ%me%L5_N#Ig%CEYODQve$QS}$2GC)~?3d|eQ#Occ;U|<#
zx2?{OPFy6IqY|>*PoCEW#4!C&S@FoFbn@gkFP(V_B)VIp;>Y9#vUXZZEb}rl-<lBk
z35n}+xp}2$L(90EoGSsf>#<xrxwgSgDeN4Ds?&;<9CY)>90IlPZf>F&KPGoqg$44G
zr?7lAVK#o;()?kj+$;i4ymM~~4Xy#1gcUETpXmuoTIb`KXW8uq-nq8VBim*S#?tds
z1UTUe6?1LeZDb6U+<z8T2%MzL_AE5p-GIF2_;gq?E5V^q9^iAnSl~>Iv7FjM)q*Qr
zb~N*y;uEOIc<n6A8W$@oZdVvwUJD6c9bJKYHHT4YdGCiY8Qb969)`J>Y+bwp_iLL_
zUsj2$Yj=5xsx`)rI2Vhrtgpc4QX6*?2T*24(K9-TGrdoJbr?HBDWPsOUuh44?d8>I
zTfY}EBZBm=0UYmsgrSKs4-LH}Z9`wFddh3uS~|BnH?FL~?ZiF>{&u7f$38s_2u>$}
zuJfrv<OR%Y&1)Kvsy(DeEqi3uM%-Ap8zsWTtKl!S^LC6(25JKw6I7KV^heDEYP3<m
zvBh>S$npFH&Q@(x;?IV<aq9CE<Rqn4h))9jlmmhYNM8cC`a6|rCZI|1MEhVD&iB4R
zo+^F#kGd#sqk<|jiPnrmgmvx?yvMoT=L-Y}7&}5q&_Rwn5rzcIT84>heXoP6xymv2
z(wAbVdle~Hibb6iDaKaEkh@paKo%8n+PJ!o36p0O0o5W=_c|?7<X?oP+cHIf;kb3?
z?zPC!T>Uy3OXK`MO(`={Et0?<?p`&+LXEmD*RI!gXL&$RF6P5zDhD(;kIYh*8#{>I
z<$pOHtjjjo*55nVc&;AMi#$4yl_hwb&LrUwDbDl!H-ZIUfej(hA^-pY07*qoM6N<$
Eg2}9voB#j-

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/party_invite_reject.png b/Habitica/res/drawable-mdpi/party_invite_reject.png
new file mode 100644
index 0000000000000000000000000000000000000000..1767d39abcea5b924a6cb06b518aee5ee68436c5
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&1W80eR9FekS50VBK@k4-HEALVEu{#h3SK;U@Fw)AR|UbdHxa=?4+>taCNWiy
zRg6?E_2^j;JbMjzQ>Yg&LX8D!F)^{m{5-$e_qO?I`noSZqXWsl-JP9pc4pqpJOxW~
zbGdPR-aLbrdme841Qccg#h;K{f{PNAvyL(K3P)z%s9f%sw-@}cg10Gpetrh^W(I9s
z<ZR*~es5n@;NS%kvAkMY*$g_fuLADELISn=B3$=61*C$61nkwI)G|_ud#X^V58@lB
zfWGxk<0TKw4LUT$S`mlh7Y12lj{@%Ht0&QJzNSx)4gs|P5rqxJ)LFH<`o5c~M*)5F
zpN+SXgBwIqA{jr`Z3)NhX`hSPqrSNTkWpk4Lu2{ty9(%li_YiWu>H?-K9*kBF7Siy
zBUgrv_I{9q<~0W8adCxb0eR0y2QJE`bZ+5;(i!ek>8pK`k@Haylhv`=!;Vg`))_7e
zU?YQBm8sp)x!tS<jgynW+Ed{1Lm-*#<&=5h0r318AbhsOy5i`<VsoI?0=Bn-SRBY_
zfppqCC1ai;6dwn+wgBO?B^EWut7;Y}s#OBr2P$P?f;B0#=-oDRlXKo$)@5J#Y>5?B
zxtFedXTkBWV{uY$ETGfV3}L>-jV4h379L!nl&W?Tkp;G9ksIE*3)KDM_M_&_!`yrq
z%XO&$n~5+a7RcTL9A9^FNA`9nCc?-9zAy;c$=H%HzxH_rxOT$}JQEYLABKp{AY>b5
zLp|Vrz?J>c1m>gVaF!spqkA|T1!7~s)D(k`tzIVIiFWb5%u6)n`UhZV$3~jR!~QYa
zRGeZht1&38$WO((dzA(<3bF<#7%>Ig3uSh%T(VU?5>=&R7C~A8-6Bc%Iw~TTY0Eqd
z2rye`{uf7}L(#|5Q2$R;D(YynII(jqP#ck3!nEamUrHSp_=sxl$vbJCIgQdCMct0~
zeG>@e9tC7kTOyr2&1$v8>7TqE@@cjN$}&MG^1G=g2D&%Q^FRAIH42#VZ+)Ks25Ckp
UrsnQWKL7v#07*qoM6N<$g0@SA8vp<R

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/party_invite_accept.png b/Habitica/res/drawable-xhdpi/party_invite_accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..648a9fea3bec32677964390ba3d256723c5b4f9e
GIT binary patch
literal 1800
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

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/party_invite_reject.png b/Habitica/res/drawable-xhdpi/party_invite_reject.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dbfde2291761a08b4186ab35bae9c45c2224193
GIT binary patch
literal 1522
zcmV<O1r7R%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px)tVu*cRCod9ThEUaMHGIo84bZKStEGF8=D9><wW#gFrWty8^VE;?&1gs&1$0l
z4a&jIdH_du^t1;;IB-yi!~=#CdIOW?rbiYdaibx)JLUIPPmMh@-P1p&Yo=%CCA;0z
zUG?7kzWQDDTE(-Nci!JG`uJ5ba!5qyMCBmv_rdIph`}F4H}P*1?;hgaeLP>s{XH?e
zZ|OH*ZrCKA{;3bW=FGX5q_uTgjJ^&qhhd|r9fPcQMa>Tq)YkOUg<s0{x2R)%ewc+%
zP@0eGc(EYHyx5nZj0dW}LQPX-wxP|>S!;%tp$RZcOSAIVKTGiB0|0+^XpgceQ2i6h
zR%Gv<WnEr=lqE}2n!*GaV^kK-zAf7N4DEJ*k^!&JRW`%~pGx!Mx2lTfl3xlDVCwY)
zvSro){AhlY9&)JMmYSZ{M&tLq+H(_N7SA4)R_iJ{x99U3^P65DND$2H>c!i6>;!od
zo5gn*q_zEH^}rJa3Ix7cA9H}pR0GWA%e&;p&GXVSALh_KzNCSEA;*t>tfx+Gr#X>I
zfCYd3=2i6YZ>1@#)O*!ya^l#08VTu5fF(a^;8_y%nZBpUz#0&?d09=-QSH}(Eb8jl
zm^{TxA^~A<&kj$Xj?X$VPoGGz>$RlOA(j9;&i^ZSs@dBYAs$2IQ*tD3p3v6^*cl!t
zIh7mdivV|dFhl~A#pWKhuYCmA>1|bJcs<Sz^^=%5b?=d`CJ-)c{=Pr9xqXjwrT^sG
zVec~sqYJ3+8o*WExE400qm5BWY~jka^RiO|+Uxn>Mz*BwxG>@yyOf@N!R;qRY5+Df
zMzx+FG3G9F7Ngy`v5zAJU?*pKq=VHGVE6ERZDUoDRA9B3;agY(xPdus(#9MTV0Ujl
zF!084ks~kXSIj)j>r>j8Yj)pW9&_uuTzT_^$jN!Z?op`s&d=HO6a0H;P&ZLFib3kT
z>)G<<PGt@gdteVOitpRUn`P+{JcU3AC`(O<f@fap@K+O**aJ*_4$)Sr^6-!UOP-3e
zkkAXB`B;0X%a;H<>)BlC`dQt-x|E%SB=FRcwdoWBp>t>gIIHs^SxFchcz_1>8kztP
zD*cEnJ=dwxifazeV)PxKvD$kt`L=Ojui+MFdLAW>1QOz8l;A^~Ga$enQ9Ca@T$4zM
zni@TLST{2f`lH@>xR2`-oSCtJ4~=saDCL;hVVSI}Zn6f9hJd)<-m&F6My469fB=T2
z_?9^EtoHnKG7b`eoijni<am@M@Eq#$OqP7O2<#jM)_v%<ItPJwBLfpg=K`)K@Od;1
zf0r(1olW3g>3XR!EBLt4!I3~6J_Xp(1a{wojY8oiiN0k8?-Y!O1VijW7>9>Yv@&Ji
zbK#WN>C7_DCy_v1UPSK_dpHqd9A267{SA>Th@zon0UxFe+kCWRqz>xxA#KcD3!t=W
zYqGudQK@#glVi}bxSr3`nYpwqd0*fiW?Ul&BXxwPdJ1qXmDv)MA>dM*4Z9H(Hi1xQ
zvjo+XqN0N}LcnYTn~;pa+}RQyjWry|4gu}6vK9AY2VYm*xgari2(W+=dy8ISW5<HG
z$K${lkuC!4xjAERcd7teG&X=RJEMTZY{N(v>px*`SdBPf=h(1U#uKkLUg-_0?y3Q_
zVG|(m7<UhbwOO6~z`|han27Q|0xSuPx<=qJ?w?c#L}5=5CWj#Egh=vO0xSuPx(?)A
zVY5}q2n<Ovf^;#F0KT*lmJB?eRDth<qC^R6AORLPqOQ>~T$?x!=res!kyHX~v^Aox
zWs+(Fea#RlPHy^!!9j$zgQqVbO;zKE(c!VpCkIFO;>$$<Gf(v=GbF(Fs0chp-O2TB
z4)b~w`odu7oZk!4pWHRTftc#g<{SyUPVI-2Q4%Z>)B5RbFA<iEY5aIPjtEOe#Xq0_
Y57G)m-H#_zLI3~&07*qoM6N<$f)dN!mH+?%

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/party_invite_accept.png b/Habitica/res/drawable-xxhdpi/party_invite_accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1d80f210dd095314a734a5a96be199ac8914d5a
GIT binary patch
literal 3040
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

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/party_invite_reject.png b/Habitica/res/drawable-xxhdpi/party_invite_reject.png
new file mode 100644
index 0000000000000000000000000000000000000000..61ca7908243d740955f11a50ea369ddf22ee93a5
GIT binary patch
literal 2553
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
P00000NkvXXu0mjfL59Xg

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/party_invitation_accept.xml b/Habitica/res/drawable/party_invitation_accept.xml
new file mode 100644
index 000000000..4b0624866
--- /dev/null
+++ b/Habitica/res/drawable/party_invitation_accept.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--Infrastructure for animated button-->
+    <!--item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/picture" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/picture_pressed" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/picture_pressed" /-->
+
+    <item android:drawable="@drawable/party_invite_accept" />
+</selector>
diff --git a/Habitica/res/drawable/party_invitation_reject.xml b/Habitica/res/drawable/party_invitation_reject.xml
new file mode 100644
index 000000000..f1025484d
--- /dev/null
+++ b/Habitica/res/drawable/party_invitation_reject.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--Infrastructure for animated button-->
+    <!--item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/picture" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/picture_pressed" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/picture_pressed" /-->
+
+    <item android:drawable="@drawable/party_invite_reject" />
+</selector>
diff --git a/Habitica/res/layout/view_invitation.xml b/Habitica/res/layout/view_invitation.xml
index e11e8db8a..5eb207171 100644
--- a/Habitica/res/layout/view_invitation.xml
+++ b/Habitica/res/layout/view_invitation.xml
@@ -1,32 +1,63 @@
 <?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">
-    <TextView
-        android:id="@+id/text_view"
+
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/invited_to_party" />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_gravity="end">
+        style="@style/CardView.Default"
+        android:id="@+id/party_invitation_wrapper">
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            style="@style/CardContent">
 
-        <Button
-            android:id="@+id/accept_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/quest_accept"
-            android:textColor="@color/btn_success"
-            style="?android:buttonBarButtonStyle" />
+            <com.habitrpg.android.habitica.ui.AvatarView
+                android:id="@+id/groupleader_avatar_view"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center"
+                app:showMount="false"
+                app:showPet="false" />
 
-        <Button
-            android:id="@+id/reject_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/quest_reject"
-            android:textColor="@color/btn_danger"
-            style="?android:buttonBarButtonStyle" />
-    </LinearLayout>
+            <TextView
+                android:id="@+id/groupleader_text_view"
+                android:layout_width="@dimen/party_invite_text_width"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/party_invite_separator"
+                android:text="@string/invitation_title" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginEnd="@dimen/party_invite_separator"
+                android:layout_gravity="end|center_vertical|fill_horizontal">
+
+                <Button
+                    android:id="@+id/accept_button"
+                    android:layout_width="@dimen/party_invite_button"
+                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_marginEnd="@dimen/party_accept_button_start_margin"
+                    android:background="@drawable/party_invite_accept" />
+
+                <Button
+                    android:id="@+id/reject_button"
+                    android:layout_width="@dimen/party_invite_button"
+                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_marginStart="@dimen/party_accept_button_start_margin"
+                    android:background="@drawable/party_invite_reject" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 8148fdabb..71d16f093 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -13,6 +13,12 @@
     <dimen name="section_top_padding">16dp</dimen>
     <dimen name="card_margin">6dp</dimen>
 
+    <dimen name="party_invite_button">31dp</dimen>
+    <dimen name="party_accept_button_start_margin">5dp</dimen>
+    <dimen name="party_invite_avatar">46dp</dimen>
+    <dimen name="party_invite_separator">4dp</dimen>
+    <dimen name="party_invite_text_width">140dp</dimen>
+
     <dimen name="bar_size">15dp</dimen>
     <dimen name="bar_padding">5dp</dimen>
     <dimen name="bar_padding_small">2dp</dimen>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 97a96591a..36240ef65 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -888,7 +888,7 @@
     <string name="id_copied">Copied User ID to clipboard</string>
     <string name="copy_username">Copy Username</string>
     <string name="password_too_short">Your password has to be at least %d characters long</string>
-    <string name="invitation_title">%s invited you to %s</string>
+    <string name="invitation_title">%s invited you to join their group %s</string>
     <string name="someone">Someone</string>
     <string name="authentication_methods">Authentication Methods</string>
     <string name="local">local</string>

From bde4af1b9eb5a9e2dd0ed7e1009eaf36b5100ac9 Mon Sep 17 00:00:00 2001
From: Zoe Abrams <zoej.abrams@gmail.com>
Date: Fri, 10 Apr 2020 19:20:40 -0700
Subject: [PATCH 2/7] More front-end changes

added rounded avatar, avatar dimensions from 50 to 46
---
 Habitica/res/layout/view_invitation.xml | 22 +++++++++++++++-------
 Habitica/res/values/dimens.xml          |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/layout/view_invitation.xml b/Habitica/res/layout/view_invitation.xml
index 5eb207171..1c5a58274 100644
--- a/Habitica/res/layout/view_invitation.xml
+++ b/Habitica/res/layout/view_invitation.xml
@@ -16,13 +16,21 @@
             android:layout_height="match_parent"
             style="@style/CardContent">
 
-            <com.habitrpg.android.habitica.ui.AvatarView
-                android:id="@+id/groupleader_avatar_view"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                app:showMount="false"
-                app:showPet="false" />
+            <com.habitrpg.android.habitica.ui.RoundedFrameLayout
+                android:layout_width="@dimen/party_invite_avatar"
+                android:layout_height="@dimen/party_invite_avatar"
+                android:clipChildren="true"
+                android:layout_marginEnd="@dimen/spacing_medium"
+                android:background="@drawable/rounded_avatar_bg">
+                <com.habitrpg.android.habitica.ui.AvatarView
+                    android:id="@+id/groupleader_avatar_view"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_gravity="center"
+                    app:showBackground="true"
+                    app:showMount="false"
+                    app:showPet="false" />
+            </com.habitrpg.android.habitica.ui.RoundedFrameLayout>
 
             <TextView
                 android:id="@+id/groupleader_text_view"
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 71d16f093..2278b87ac 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -15,7 +15,7 @@
 
     <dimen name="party_invite_button">31dp</dimen>
     <dimen name="party_accept_button_start_margin">5dp</dimen>
-    <dimen name="party_invite_avatar">46dp</dimen>
+    <dimen name="party_invite_avatar">46dp</dimen>  <!--50?-->
     <dimen name="party_invite_separator">4dp</dimen>
     <dimen name="party_invite_text_width">140dp</dimen>
 

From aa40347e322ae453263450fafd23ff4520e142ab Mon Sep 17 00:00:00 2001
From: Zoe Abrams <zoej.abrams@gmail.com>
Date: Fri, 10 Apr 2020 20:50:25 -0700
Subject: [PATCH 3/7] Update party invitation to show more detail

Show avatar, buttons, group name and group leader name.
Avatar and leader name are slow to load, still needs work. WIP
---
 .../social/NoPartyFragmentFragment.kt         | 10 +++++
 .../social/party/PartyDetailFragment.kt       | 43 ++++++++++++++++++-
 .../ui/views/social/InvitationsView.kt        | 19 +++++++-
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
index d4bb074f8..914616ca6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
@@ -67,6 +67,16 @@ class NoPartyFragmentFragment : BaseMainFragment() {
             socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
         }
 
+        invitations_view.setLeader = { leader ->
+            compositeSubscription.add(
+                    socialRepository.getMember(leader)
+                            .subscribe(Consumer {
+                                invitations_view.avatarView.setAvatar(it)
+                                invitations_view.textView.text = getString(R.string.invitation_title,it.displayName,invitations_view.groupName)
+                            }, RxErrorHandler.handleEmptyError())
+            )
+        }
+
         username_textview.setOnClickListener {
             val clipboard = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
             val clip = ClipData.newPlainText(context?.getString(R.string.username), user?.username)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 4eaee013d..df8cef4bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -23,6 +23,7 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
+import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
@@ -43,7 +44,7 @@ import kotlinx.coroutines.launch
 import net.pherth.android.emoji_library.EmojiEditText
 import javax.inject.Inject
 import javax.inject.Named
-
+import kotlinx.android.synthetic.main.fragment_party_detail.invitations_view
 
 class PartyDetailFragment : BaseFragment() {
 
@@ -61,6 +62,8 @@ class PartyDetailFragment : BaseFragment() {
     private val refreshLayout: androidx.swiperefreshlayout.widget.SwipeRefreshLayout? by bindView(R.id.refreshLayout)
     private val partyInvitationWrapper: ViewGroup? by bindView(R.id.party_invitation_wrapper)
     private val invitationsView: InvitationsView? by bindView(R.id.invitations_view)
+    private val inviteLeaderAvatarView: AvatarView? by bindView(R.id.groupleader_avatar_view)
+    private val inviteLeaderTextView: TextView? by bindView(R.id.groupleader_text_view)
     private val titleView: TextView? by bindView(R.id.title_view)
     private val descriptionView: TextView? by bindView(R.id.description_view)
     private val newQuestButton: Button? by bindView(R.id.new_quest_button)
@@ -104,6 +107,19 @@ class PartyDetailFragment : BaseFragment() {
         questDetailButton?.setOnClickListener { questDetailButtonClicked() }
         leaveButton?.setOnClickListener { leaveParty() }
 
+        invitationsView?.setLeader = null
+
+//        this attempt flickers to show populated views, then goes back to placeholders
+//        invitations_view.setLeader = {
+//                    compositeSubscription.add(
+//                        socialRepository.getMember(it)
+//                                .subscribe(Consumer {
+//                                    inviteLeaderAvatarView?.setAvatar(it)
+//                                    inviteLeaderTextView?.text = getString(R.string.invitation_title,it.displayName, invitationsView?.groupName)
+//                                }, RxErrorHandler.handleEmptyError())
+//        )
+//                    }
+
         invitationsView?.acceptCall = {
             viewModel?.joinGroup(it) {
                 compositeSubscription.add(userRepository.retrieveUser(false)
@@ -187,7 +203,30 @@ class PartyDetailFragment : BaseFragment() {
 
         if ((user.invitations?.parties?.count() ?: 0) > 0) {
             partyInvitationWrapper?.visibility = View.VISIBLE
-            user.invitations?.parties?.let { invitationsView?.setInvitations(it) }
+            user.invitations?.parties?.let {
+                for (invitation in it){
+                    val leaderID = invitation.inviter
+                    val groupName = invitation.name
+
+                    leaderID.let {
+                        compositeSubscription.add(
+                            socialRepository.getMember(it)
+                                    .subscribe(Consumer {
+                                        inviteLeaderAvatarView?.setAvatar(it)
+                                        inviteLeaderTextView?.text = getString(R.string.invitation_title,it.displayName,groupName)
+                                    }, RxErrorHandler.handleEmptyError())
+                                )
+                    }
+
+                    view?.findViewById<Button>(R.id.accept_button)?.setOnClickListener {
+                        invitation.id?.let { it1 -> invitations_view.acceptCall?.invoke(it1) }
+                    }
+
+                    view?.findViewById<Button>(R.id.reject_button)?.setOnClickListener {
+                        invitation.id?.let { it1 -> invitations_view.rejectCall?.invoke(it1) }
+                    }
+                }
+            }
         } else {
             partyInvitationWrapper?.visibility = View.GONE
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
index 1c1cbb0bc..9fa48cb00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
@@ -8,6 +8,8 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.invitations.GenericInvitation
+import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class InvitationsView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
@@ -15,6 +17,13 @@ class InvitationsView @JvmOverloads constructor(
 
     var acceptCall: ((String) -> Unit)? = null
     var rejectCall: ((String) -> Unit)? = null
+    var setLeader: ((String) -> Unit)? = null
+    val avatarView: AvatarView by bindView(R.id.groupleader_avatar_view)
+    val textView: TextView by bindView(R.id.groupleader_text_view)
+    var leaderID: String? = null
+    var groupName: String? = null
+    var leaderName: String? = null
+    val view = inflate(R.layout.view_invitation, true)
 
     init {
         orientation = VERTICAL
@@ -23,9 +32,15 @@ class InvitationsView @JvmOverloads constructor(
     fun setInvitations(invitations: List<GenericInvitation>) {
         removeAllViews()
         for (invitation in invitations) {
+            leaderID = invitation.inviter
+            groupName = invitation.name
             val view = inflate(R.layout.view_invitation, true)
-            val textView = view.findViewById<TextView>(R.id.text_view)
-            textView.text = context.getString(R.string.invitation_title, context.getString(R.string.someone), invitation.name)
+
+            leaderID?.let {
+                setLeader?.invoke(it)
+                invalidate()
+            }
+
             view.findViewById<Button>(R.id.accept_button).setOnClickListener {
                 invitation.id?.let { it1 -> acceptCall?.invoke(it1) }
             }

From 7ced8b71d3406faf25cdf4ade0f481fde608c8ef Mon Sep 17 00:00:00 2001
From: Zoe Abrams <zoej.abrams@gmail.com>
Date: Fri, 10 Apr 2020 20:51:32 -0700
Subject: [PATCH 4/7] Fix spelling error

---
 Habitica/res/layout/fragment_no_party.xml                       | 2 +-
 .../habitica/ui/fragments/social/NoPartyFragmentFragment.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Habitica/res/layout/fragment_no_party.xml b/Habitica/res/layout/fragment_no_party.xml
index 56cd7c5e2..241f4bf7c 100644
--- a/Habitica/res/layout/fragment_no_party.xml
+++ b/Habitica/res/layout/fragment_no_party.xml
@@ -78,7 +78,7 @@
                         android:layout_marginLeft="@dimen/spacing_large"
                         android:layout_marginRight="@dimen/spacing_large"/>
                     <Button
-                        android:id="@+id/craetePartyButton"
+                        android:id="@+id/createPartyButton"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/HabiticaButton.Gray.600"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
index 914616ca6..0f0e36725 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
@@ -87,7 +87,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
             }
         }
 
-        craetePartyButton.setOnClickListener {
+        createPartyButton.setOnClickListener {
             val bundle = Bundle()
             bundle.putString("groupType", "party")
             bundle.putString("leader", user?.id)

From a7b473867d1a4f89373992028dd68cd54646ed7f Mon Sep 17 00:00:00 2001
From: Zoe Abrams <zoej.abrams@gmail.com>
Date: Fri, 10 Apr 2020 21:29:06 -0700
Subject: [PATCH 5/7] Remove rejected invitation

Changes visibility if user rejects party invite.
---
 .../habitica/ui/fragments/social/NoPartyFragmentFragment.kt      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
index 0f0e36725..72d4d190a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
@@ -65,6 +65,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
 
         invitations_view.rejectCall = {
             socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            invitationWrapper.visibility = View.GONE
         }
 
         invitations_view.setLeader = { leader ->

From 9d6d2db311f875edf04deebffa0ac935fb9910cd Mon Sep 17 00:00:00 2001
From: Zoe Abrams <zoej.abrams@gmail.com>
Date: Fri, 10 Apr 2020 23:18:47 -0700
Subject: [PATCH 6/7] Reset party to noParty after leaving group

Loads noParty when user leaves a group.
---
 .../habitica/ui/fragments/social/party/PartyDetailFragment.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index df8cef4bd..83554931a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -359,11 +359,13 @@ class PartyDetailFragment : BaseFragment() {
             alert.addButton(R.string.keep_challenges, true) { _, _ ->
                 viewModel?.leaveGroup(true) {
                     fragmentManager?.popBackStack()
+                    MainNavigationController.navigate(R.id.noPartyFragment)
                 }
             }
             alert.addButton(R.string.leave_challenges, true) { _, _ ->
                 viewModel?.leaveGroup(false) {
                     fragmentManager?.popBackStack()
+                    MainNavigationController.navigate(R.id.noPartyFragment)
                 }
             }
             alert.addButton(R.string.no, false)

From fae59c3ddf1672991571cfcab12c69ed6cbe4082 Mon Sep 17 00:00:00 2001
From: Zoe Abrams <zoej.abrams@gmail.com>
Date: Wed, 15 Apr 2020 16:39:05 -0700
Subject: [PATCH 7/7] Update PartyDetailFragment.kt

Remote unused code following successful testing.
---
 .../ui/fragments/social/party/PartyDetailFragment.kt  | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 5b45c88a2..9b3f6a211 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -109,17 +109,6 @@ class PartyDetailFragment : BaseFragment() {
 
         invitationsView?.setLeader = null
 
-//        this attempt flickers to show populated views, then goes back to placeholders
-//        invitations_view.setLeader = {
-//                    compositeSubscription.add(
-//                        socialRepository.getMember(it)
-//                                .subscribe(Consumer {
-//                                    inviteLeaderAvatarView?.setAvatar(it)
-//                                    inviteLeaderTextView?.text = getString(R.string.invitation_title,it.displayName, invitationsView?.groupName)
-//                                }, RxErrorHandler.handleEmptyError())
-//        )
-//                    }
-
         invitationsView?.acceptCall = {
             viewModel?.joinGroup(it) {
                 compositeSubscription.add(userRepository.retrieveUser(false)