From 1c93ffdc4fdb3799ee965a7b06a786d46315c99a Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 16 Jun 2020 11:46:44 +0200 Subject: [PATCH] Adventure guide improvements --- .../res/drawable-hdpi/onboarding_done_art.png | Bin 0 -> 19325 bytes .../res/drawable-mdpi/onboarding_done_art.png | Bin 0 -> 7906 bytes .../drawable-xhdpi/onboarding_done_art.png | Bin 0 -> 8336 bytes .../drawable-xxhdpi/onboarding_done_art.png | Bin 0 -> 25904 bytes Habitica/res/layout/achievement_list_item.xml | 4 +-- .../res/layout/activity_adventure_guide.xml | 3 +- Habitica/res/layout/adventure_guide_item.xml | 8 ++--- .../layout/adventure_guide_menu_banner.xml | 2 +- .../res/layout/dialog_achievement_detail.xml | 6 ++++ Habitica/res/layout/dialog_first_drop.xml | 28 +++++++++++------- Habitica/res/values/strings.xml | 4 +-- .../data/implementation/UserRepositoryImpl.kt | 1 + .../ui/activities/AdventureGuideActivity.kt | 10 +++++++ .../habitica/ui/activities/MainActivity.kt | 8 ++--- .../AdventureGuideMenuBanner.kt | 9 ++++++ .../ui/views/dialogs/AchievementDialog.kt | 27 ++++++++--------- 16 files changed, 70 insertions(+), 40 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/onboarding_done_art.png create mode 100644 Habitica/res/drawable-mdpi/onboarding_done_art.png create mode 100644 Habitica/res/drawable-xhdpi/onboarding_done_art.png create mode 100644 Habitica/res/drawable-xxhdpi/onboarding_done_art.png diff --git a/Habitica/res/drawable-hdpi/onboarding_done_art.png b/Habitica/res/drawable-hdpi/onboarding_done_art.png new file mode 100644 index 0000000000000000000000000000000000000000..548d9f5261d85fcb22397921a0412c7c2d390af3 GIT binary patch literal 19325 zcmV*DKy1H>P)q{knY(?=_tx~p9DcwN{p8f~F4MAPJB-h?}^9 zx$m>T-}4RzHzXc7W-$GdgP!T>>3*N5yMO)Mk3`B)IIx8rc;bmCTGeXxE0QGrzAVfC z7q9l;{N^{ETX;xi*9r#&2PB0L3I{fu1J6A3OpZ>cYYYa1B}GL=wPh8RXAMT`&nUb3mi8LE*q=b3m)r)~Qsgf3H!ipEISW z)90Rjo(>;7M%S-gZvDak`k$>`&nUb3l>YlCG>JwEaULS)oy$((MWG=q_Pd%Ar;dFw|ry*)ku zzxe!f&;OIBp80%+R;!mB052N=&F>EY(83hN%i{Es2ViG1=qNYKM0%~7R4O&;jYi7J zG*MQXfkL5>{F`^*asB#NfB$!0zyGg3_~3*72cD4f1BC<2IG{*w%b20O{d5jM1Tl;u%aq)@fgNL51+t*l?lV2>a?`9zlcP_zi)zS+4khqlwVRogQNEd;6%|#7y#!ZtKCB$fSaTO z=D}~J!cs_ajxa?5aA`&@sU(@^@ZMr~;d>SBYd%EzdAWyYXQmIk>~=!9$j|k9{r`(8 zaaREENV`{#h7mfkhujj~Ke0e%{-ma;N3C@(7=;Af!jTQ~i0 z{qX-x4fOT>=Sx?vd@tosfWm+W;((%-J`lT7b7NLT_w3noVt;eX*~aGPBjuH~20f&< z02~Ak0GY$(f;W^^&=7e8K?;V#%U~_WGsLx#8u4xXMI7`5;Nj~CM7cmHL{aFbdYy)J zdIKarHTgq9jYh38W@MOxdAYfk($Z49qN1keHTW=8E8zApTuY(fus3vUY;2#=X#BS) zPJQOZ&prEl8ZXq(u?hBsdSFlULUQwx#o-~hFCc7bap`Q4O_0*k3e(%>DWIyGMt6r;9Fn*@|R~jIy#m_!o`Cq zZxjx!(TEzi)L;p=_Y5DhF`tnzr_O`UD$EIe;1&2X2g3t~~X>)dV9>CrY zU_vMd{s_?wA0;vx^^}=mf|t}l04A|bFc_h}u4^I1$I7!;cU=q zR0zP75klf8r`tz+8un6ERaN!a=Ow`|I?!_(x^A!~q5`maZ7XSfyl#!L-#S;@4ObW2r4Z z^pMap)6?)W0o-)rI|S&$J{P3f=_wlO>!OD03OfCnQ{nJ|B5&L%i(nsX8P0?R` z`_HLi|6%e+HS{n4<)2eyO)1^Dc%J+|H?g;r0gl5*)OazV`r(n~;|}BaJP$suGS+fH zfEr)JQEFfNZECJjt`t7+3!ugTr$}$>-3T(&N{(TJ6t&KPOH%~nYSer=Es1gA2vk^j zQm5_>Qvp=b>Z&U0@9U?5!MpIPBB9@sIIb<4(xBDj`JP#@x_Z|vpHyRY?3PL8tByVqhy^LgFS9!*^XKIi+$vMDPv;} zEJ|(hP2xZo|D2-Bln1xC)D}PgxQ`U+EzXQpO9u@7(^e=%V2;)ielgqn|@f|Eg}fB3&|)5zEu{p}lX(qH}8|4Jc9 zW)&6Xlxa$XN*cQ?eX!F_SzP4Aah35299Ruziu5L!mD1q0Mrw;+KZ^7g=fsL7gBA-> z?A2UUMG>~Ko+>&yHbi;mOgeJpFsXD#LMSeoGR!nSHiB5UD4DXdp{@>*-8xI=>^v$i ztD-D(jtKPCqwX7fU2&M0O1fee%7^6~SR=K?zg!J?@%1UROi6IF{jJ$-`)_IOFj)U= zy>l(3x9=J|6#LtH+`&4bit1vjsA@?SWi*PZqH}a_u$OAei|LuqKSx1XL)!ElDlV;{ zzB^sQBbr}WN~3ps$m6t8Rs9~S-Me4Jy=h^;Gof0DP8V}7Y%qhAUoCh3)GS~6K|6}$ zt$PjQRGh~59jR=8<0~^|27?+ogD=aj;LErXvsg0NXfVJ*Wj$y6uJJrc>h|nEcXw>G zZ7Qv2Z>0%UJoEsc*odj3QK*$3lsUR_Iou!<@GP-=D2jLtD^#CH~7L`!j z3uo!}Fpsv4pKzQs-}kzAJ!siz8N{D|6%W;V_!IM?6a_kp=t+mNV(u7_eQu0RW#_Dr!T$q zC7MDO!i5h$q?Y5KrLyuWkssBSKf9hLsx|u z`0wDZa(vqD!JvlHJ7==L?Q2U_n;QcO>}jY-1Rp0?^H>c=5Y3{nsj zuDpt=GPtoBPZ6uY3*b3@g`d@cZ4oI;Fu)oLC03 zW%f4)I|jYoe9|A9HWhgx)!Jcy3sMwy)=;la14&G!R*Rrp4N4rj5#}*^_YMvB-==U7 zUeV$*sHv6rt%`CZ869kQP=Vngg-$9F9zZJJL(e%Ce#k(!>>6gUi-BG$5Wg{vDXo^q z*&?zPNPdMc5Oz2y;1=i1%4IuBj=%fvyDjjX{>S}CPW(YLR8X~ANB4&BLSpL^1t|f3 z;zu0DQC?j~71eu0KZN_Su?Z0nzh?>X=B3|J&-F_`1(5#b#~*)u6FXhMB+1GtrtBw? ztss-QhS}kufEz+BQ}$|DPB=?%$XZaOw&hG&`ySvHMF*@1vJ_;l9m(CROlf*5D=SC2 zaFZxY6#o@NTv|rveFGbV9~ZY&BP+oTsf`a1K?^N*W?)weu*Dg>(UPS%&RS5UwnYvp z;09K(q=q!BcFNShLF8Rzj`C(*4um0<*$`Ok4h8)tjg&6sF8U|?ehgkFc19NW?P$?nPiT!?>D#}g>{70cn z4P~UolI8FAbkn(aei0lW8~V%6&YS-UJNk5V6h~A3C>&VH0Y!3K$&ZBl^vpBQ6hk#@ zg9Nh&V9*bhumg6lsU4gsJ25d8`KJg43E#YO=_SA4*ILuih{iBlymTT_p23bY7}f_k z8S1B+jA%HcLO(zF5GWK3P+#{A>brg8n&0n#3jp~G9B0RYEdlwzgQq^Z4y}M&0-mq4 zXU`fv9!~*mPU&W|xiLLG;~Vfuw!!?=;dZ&gxZ&>TbUN4k{QMk@?K|R0?Ck8kbL2>K z#5y-uqfax|YtdeD0sYIH`U^I`f7S7O~A| z6=_DLh{it)X{|NOY|cJ)`pn*v(o&k57;m_6{`{XholYwxpX&g=A7N^P+dRF+!(F|4 zs}D|wZ~pw}KOdjEH~PvG&;Gu;W^bdA#4=4rlG4?v3KAB*M>%ocAY$X7ernYKJO(}X z6%gGU8KQH)`bA`NY~-)5b$0$GR`N~yEk|6L4yGwXbyZbWV?jYt zvD59yG8&AwiHV8Ht(woL?H9qlR8mqhYtZY)9ZqL%fA`JeiLp^KrlI^ex?x374vFK| z@I9*QB0B*W7TelpCdcW@2gq!=auK}~#;)0Iw!ik+tUsHco16QzV{Ya5$;SV!igaYJq*`wVz zJ9|I6aG?*0>mlspN5A;RFMfjg?WkIJ;>3w#n9D0rJDLIxls>K1XjSEq)(WA5+U!o$O7n}Tf3AlX42FrjxtoyB z$$_qEkc4v0Sy1UlX>4Q=QT?Il)WqbkZ**RJ4c^rc-+%vo%R^7>5q}79%fTEPB`I2x zY0j^O3Vl{*&>w>1;QIXZ|HWhOErY%$l5>oUb)BG`1an z>@k&Aqa(Y^Lo@Rhln?SFw=xWad=v(GKZ-tv$f!r|IP9Q0*semMFuams$}1|S+PZq! zw!+etOCO$r?J8`yTh;KW4nY-k*zNXd*u}QBHy%8=R`BNo<`LA@R_pxqV+hhc1Z{L2 z=~Vv!PiW`E^6yc9mkRuUR30VG??Zt%(8OuO{w4z4pmL6Yptkj;H$`gO#FH&K9F8J@ z&PxcDIBw21n@>L8wzs^xUhhEnb%_Gxgq#xqjVcvEp28v5w$8rDBP8@rk zW2PMc*WtmgSS8wWMkA*Ybkq)l+SVg#Q7v8mrF`xWI~LVbNqq+3*RlM2<^98P;MlQa zM{4ToUOafP^@WU#j3z@`8dcZtB@Oy|&RJ~;jfkS*aX^Glc>O^EYOz>77dPDMw_fhu^w%>C&}_oAvJb zmBRnsb1soC*@4?Yn9xLF*>$?pZQw0cwWBWJIXDx}E5P>X7X+(9FrF8sr)Pe#yrTT; z`&$lW*8$YLs7^a?chTJ3JRAl{TLN%7y$EQ+~3?|i(bNL znjQx>-aGdnMrEH@xenvJ_a_#f-QG=0_3=Mno+L@h%F%=OL`t`Z*{uK zV)r1o(?=eUmn;q!P0!oNkddW1{p6Eocwe9A<3n03=J`A@5lQ?5h5t!>@|I1Vod-f% zi$=~Z2R5+@?AN$oUg4_R*yiQ<&o+?U_-oZy7i@9yZI$IiaNy~upFUMoRPy5f=9Z@# zn_HT43X91GFmgMfhN5BygP9X5s2{~<8PGUINrE?&5eVK>(U_QVP6OK-drA3w&f5%f zr#p-w91cOw;l%qWi*y)%*yhy8*)&0A%_%I^G#!xlt0mP}Zgt%(!hGJwCc@Y+Hs0lb zK9T>(kYJCr1Cp{o1pY7ZPlBY&&k%&>hyY|}ksjrkB&_6ffNnXke+okt z#r!r3|2O}lVy`GW57@@G2Hf~?T#J#bYKzJ~v5dqG!A$|SO*%o*=xNx;{-kk#leVm~ zhQ_C7Mcf)UD-J>xoweA=1<6g^9m@{MAjVPsX-3%8OlbhR*s0=JH`ZU}Anq#s7imlj z`Q<)VZ9PI!B`tC{(J%@jB4HGbtiiUCeLZ)&>+k~(@=Y0V1HJ3>f58*&fTZh$hnfpy z#=wnX3WNEN#C}3C0Je38VM5@++xQT3=!f@u#lZF<-X7m`7KXzA72MgB4+|aW+JrNK zV{sSy5aay3Ng2AAV=C!V$+8W>ZBu5W?1VX>!R2mHt2JnPqCw|%bZ3XO;D@y4^}1*T z9oVh&b5J)|S_oJM;{@|;b1v2HZK9mKLY&JeBnnAL5nNS+B|nzp0;0tL-;Ywvqw0=5 zxlFLTaUwgH0Z0D=q}riTXzCRxU6=nppP!!%ka{Czx6YGgYD_qEkk5;?JlKv2X?fLo z;cw965U+)TC9!9WIDh#??vc%A2VjN-aGG-q$()lq?ki7Uo!KMJe8v)a92Nf5W5b6|&bHY+@D8ivQvB94i(DdLvKPTAU$$`}_rxht> z7W9h2a#wvmechYoNwJ^@05iUDbt3#8}5gY;BM#hI(%ZRVO#UNPrsy9Kt+kp!YWU zy&i;;Xd%G`@Cy~0v-7b{Y!bW=22&fhwc^+eq$}ma*mk@5??(I=65298r5R1sfQlw% zmDM5#mP2vEB7iWait+=A&yNvi0Tt|SKExxsoGuD@^T;}NkH*LEQ2-$6_c%$bH^Mfj z7LsAA^M9+Zt^28-t$^EBaevi***3;kyO7ZE9jlmV5Fl=pvZ6dH%ry(?&I5HRrW(oQ z_5}&q1_I<*1?3%ZZ-J-;5QJ)kcZ8}TXoPI0JKbGqNEH^Us<>xY9BbvVS4}M?KCb3} zoanf$%sfZD6hC)Fd?7z!geJeRp#c)$k~AD9)YXH;Hb)KB+M$oxAnNPMeF>m#sIuRkN{v#6LuOsq%MAGaPzQ)$7xnv z?~EI-;PzS!&}EyP2RGCVqy(QAMsT~0ydF21bMq*_pn!UB-=;Z8f(&{ZmD88sgbF^n+8ZSPkOv16DcF@tp?y?g&-Xgqtc0_Mz;oERjTS&dwo= zWuE3|#$j^{2xGW8Cl4Lr17u2HvK?(Bxe0fu<^1P(L5>|XfY)4aE{<-&fL}Z`*a4)6 z_mdwg=)r{-Y;#<)2@jZ%&rSK}3@Sqb(Xo4D)P)BNm!`_p8HCi$=Zi}{g`n0d{NK6D zKmoUHnzn(lu=%O4&CYLp&4YCpf(kLjRz3U9T((GgU3_`IQsn&h5tKv z%_-ov&CKUOP`yekqy+{p5iknrAQpfND;k3vUTg#6r$2um6Dwk6xdZ+H0Bnw?#>dG3 zbu%j~19jev!tr23eyVkTo_rpU@C35tfjV#7OkrXlF3x`=0Eksh;e5d#me|HeN2#W| zimJ*=XmVzbW~X7-EG!ZgSY~IZ;TeJ|T2n#ks4zS^HAQ1M2c*$MGB(3g3RRUKO4yfH z2ahT$yu^C1D*WH6D?$OcZR31Q24e%Z2+l=du3DuLlGgl8E@eW+)T75hri>l~P?K1a zo1dSB9c@xL9#GX*Y>#@DG&?gx7OO?5RepG1GqbYk_RSjrwpnqr@-`;4%G2W}^9NWW zTrU4@8^H;7pq2dR!UM6vG8;FvLAHq3EzAK0xw)bn*R0J&_wJ1gNm`9?oBZrdD#*{H zkLx-CIM|lc zu?%RWGB!L&-8Zhnrej0QnvVRayxVvC77Y*fLv_+nacKo*BS6=bo=KH8_0-VZN+lIl zLWLa}=!K{BCStDal#`!Nd-gR`UBiCL!v5Kw#H!agjyu?Yrx)p7-{<-47&CU@z#H*@ z#Z(|^sbDKZ3q?xH$U@&$6-`V{3un%eLoL)$U(XK*8imBhz{cg@IiMOgui7 zA3orLwk!D`D{Q-(+Qj^vG?JU#`BO8ZD?6|}C>{C&R|HOqaq85m3%~izZ|pNuQzea& zXk#9F3NYYkAz77H)Zhlt(m-D~4G;8*8v-S`MVQA>Uyryss!$rKq^t@}R|G0S|e(V_3 z;V%GHob;`N zEyzlDZ{G;m=jYzT=O3dd1H1H6ZfwN=MV>;?1xpc^#sR#@$;E?0t%WyL4?Cv`cFZh< zg_M+2VM!TfW@qC;q7?zb0Z45TsH>dW5VNF$wF{`X+xQ=o+9-Ap%ET={6aF4d4#|zB zHkqK8@x_B?H8Cl!U3^Z0KNl`sn8!4KemEGcaXTHK$<8a#=b^3}8~WKx#}YwVWi7%9 zbX4fDqQsGjii#0(0Q=9P2W}aiypE+gZkxAyu$@hfn~iTS2GP4+ox$0Od%r~|_n%?g zl#<%wyxExl$RZH6@FWT$j%|E=jJR4z5FThBBsC30V9p+4RI%V-&U#SqGX5|0G8Rn5J(vX2Tf&2zkkWzyJTdr@7#~78C?I0+R&*v@7^a4Lkh!;dKE-&kVfctfG0LK0?a zSiJDy(I9@1A0Xm|?b30+au6HGl|{JL8wXn7gM(=I@PE0~7QaFkrMLKsgj+6}3KDK+ zn9zdMHX>Bf)f40*bvk`j5=n1Nfpqlf(H6a4{~sF*mD{>b~;PPf=p&JC`qCzJ>jKiX3>qM@s7LHsHUEa_{J4F+W3Iw@dKx zVW@;O4if`%ec=hebL}E^UHLHS`M)5wjo|WGDPRZ&aobN-Rib)M6ILya0h|9-+>+}s z6`YMpZ?9szmy-zKWT>LhN~0(P8x2Im5xpUUE9&9}8;(e*e~7z^fsJ)11EdIk@AG+N z*z!V9t9&>X2kt7s7US!>{AcEbBRa}OB^53<@Sua)&jGtelqA`oy)PZu>gMB@d zx2|05nw%K;DO|JFcy^ikm~4at|gIr3NI!D&@W+w)BD{Xq%dlm=VqsiwJ29zfB@YLRM};q zlMtd7h9{1J%z)rfUbR?}09b#86LnRB~I+uSNAVHEeFnNvA`H4&|H8=935`_E&<>AAJ^U#9icrX;L z&nYOVsIG7Lyk2kE$0=A1O$Vs3xD?G{CQ%CMrf3v{dj5BY2YTPN&QFc0RQdsp*Zc8h zMHO9-wfD77;r|kw9vtKn3)JG2BpkTKC$<1`9Ow2&@pWsK61|BKkYtK;TSLNnD^8p^ zQ3uuYMX0N-d4)we2U?Cc0`Q70^RrXk*RR~R%uU-+6Rr~g_oHjqt_`lY4`toMb3oyL zjCTtlhkKC2JvJDU^d`Kc2^r^>u;9k5i~(F=WZlq^nYb+pIa%S#Lw?O1UEY>eum1u7h9^3@O zkT;6(e56-l2&oO9m7#Dz;lMU>K!tm5;T{xA{+!q&DZp)|^rlE{iG4{av)hdvSRuV7 zfz-z5ASu92Tr4cT5sh;75Aj*~qi{gsz&3M0NNb~<7{AR2UUN9u0o(Ys=8I%qk&Jyy zla<%XycG_t#{mFJ)q3lfQlEj! z+_4@Pl1D9FZ}!SMg#!u)Qji1D_9dd1zh7F*?-a>xB|lQ)(=*RJQ;hQCZ3qtDgP`Dk zWI}Yj`|i6*9~iuxE}Y0dpU-z5ZT*s-u9Uba?~}+CQd|5t8%S>oxWyT?%a>=*o;7+r zo&uB|Pe%ok#`N@zKSK+_HndpiaJyW8W4GJypn0)tetv%Lp~l^8M@NT}s+Jt5bQTT)s|QxoG27tWvmQ>W8uMY8^N0N;-=iKI!! zce~vsXu9(fS|hfabIjSFJ^f@uNog5Pj^Ate@OK@5;&D1`py!&=XnZS~=-RRiA<1^U z1ZtmDC3yV`z@I3&*pzMuLk-DeuzSjS6A&O;Xb00?vdL1`j?syv^$#a}8tm;RkK0XdkEf^m=FMLY4&Hq$8R$wlM(@ys0BltcStWRsxB~D- z^S1r1*-Wm$4a(3T%>J6)zR`Bd`h?_w^z5_G=0Q>`2!$kdR<`LYRaG@#KmFuWS=BXl z8V~pAbhydm3!ss(o^rD?$YeCo$k0&e+;87=jSh~y?(@0+H>AA?RJ_@D-g##(L8x4$ z3+lBh(`^1qWmVPJA3yU{R&8CK+T-<;#o-cknbHiDmzhpR&^0`CH{9|5`>uNK@N18@@1bI(0@8cu_= zXgQ}nc<6A$frE##^`=bKtkprmaELtUKodY`dZGxa(UZaL3zE*1p?$pV33GRL=L;WQ zxKIyp3<2C&P5lX8xEywNFkR0-|NP^i>m|%h)6&w~(0r)XtWVEW&sd#uC=`y-6#!k> z78Qy~=MR$Jl&$$}+mq(*o7Z3X_=5`#P-BBo&sj}P2)cHbtBHN|h5XfafE)scp_;B+ z3VkK0#VJ}>a$~7Yb_GX79W~@~N*TH;MS6>~EU}kuZEbmQ44h~_bm&_pC8bYmHCk19 zO&t}MmXpoy#Le$VZ_Wt7%tt}=N!4q$#8QqL-L%q-M#?p3(e(Hzjg1UaI24LbO-%m! zM(4HH04N{6|Ni?s)^z5{C!frPP4Hy%!InQOE-8Bobg7xHqS6YoI-Rmt&;@Yw1OVD0 z(&;pmo|Xo>Buc|F*PKbyVGqS)A3}RTv=5YI(xI_1OFluo^3Z{+wyvIgHb_@4eR#%h zvxV(;s~VveLom!c;8~sC4$tFiy0Wu#zP4v?Q`^zUPB2|E(=`pcd_Dj++93u*5psBZ z9d`+nM8`0uD+IvHD=v|1>-PvAT)oJ2StB4uv)yzh-7$I03PxHdHsH&t~p#j@&~vVYLo(K9muDc!OZUR0|?NF27tiB1)xJG zL00Xg+J+{*UZ+3&yN-@DpU>+6fL?}V_(Oa<%-e3^SVmX)ct(~v>(t|?1zk3GKvqcs z@_;TcfXxAr^Fs=SCMp1$-vj~THkTJgWF#^$U0COUG#88_GcpRg_BQFXI(_R09q*^1 zf9!VBwS_E8m0hdaVNN+0qn6*VKNi(e1~rI#?YIU`ufHi*8=~{@LbNL&w-JZ7e?5B) zYwGG=Jb1A61q6CE8K8ny*Y72b&Pa1s8$q2UA8b%gHzXR^pBU8QX(=)!HVOZ5&c)5I zMccr1qmDAL52Hax2(O^L+#HGqd^FhKO98)+Tu$fh8`rP?a(H<7txK0KUE3;(j~_pN zxTdD&#RG?0U&vy*j3%ny(?A-1nmlI#U6{1r9}tq72lhgi&fk3*dvkYx}NI0l7F+c4)Z}yjql=p83V{it?}TZ#k4*2T=3+y)cwvs*74UV|16R^n{ zXz*@-gT-Pkgrk893JR=Hho?4EMg8hmziO~pEXC>R>0d0btor%^&{bc*PZo5+6FNU* zL6hnLKwF005OhHeg)k-nD^3@KGCzr9ba7*AsNqn_`7_B;P$$te*5$xUeCX&&ndutn z?{Bc$EQK1-Ra{(Q*)G*PK4)e5pd8p(VvFx-janN2LRls*2XK>0uoJN=`Xw0Hf3Nw_ z5wjs9OFd<^QUvOm$LmFGmsbE9OE@9um=WC6Jov_r4Vhq+7mfr!Y*Z}a0T0BILqu3z zDu3w&kl;9)(@#EW?z(aP`HLTZV28B$L(FFc>K~Bf(Z&K@#jIir zjI=Q6w4e(>=!E2E$jVYbe&%V=b?t>qAARURF!SGGKBJpK*Q0So`Sp4n*vQVdd|S~GHGUVocumF>`{6McM@!Ie$t@ReNI6sAvlbJa5gXuGC1<^ z1MJxIXoAX`Q&_5LIw0>y2+3D&b=@q&eBQ<;ABYVf;m^}&&YUVNFaP3!{Rf|HY;JDK zDJX$G&?S53nXa$^H3!sdwj0JEYXPh=QKlml4$$P}Jp}GLrJTGx%Fip7)u1T|kmC`8 z!+}AY36sGmrY``%6Lh7gQGQX08gw-Q(7tl#=B+}^=f~LOk?G=ND`WdPfJawsEC)F_ z6n+L7J}dqm9(4{$QvHEqYg^>V&c2C8Ps2X;Cyo1?v}KhwG(J5`ZntOA6Y7A3;}1ol zj)lo-pQqW0G2GZ8HbMcd01N=b@u6M--!vJFu&+TagI-7G+yctQcdVL)W%ei#`B=5} zFdjhC13)rBgaHuc)iu~(WM9vn?m8e32l+lS2*_&nBDlqm%>ZWmZ)vaM48Iaz2ZiI+ z>~AZc(l|d7V5xz$Wl*a%q=w4K>X`$o8iz#iO&nrRDAX{m&OjyQH3E#L#s(p!_-SnD zF3rtOk!^04qWE0|>L`bZlvY*25zz>#&J0zK?Qbz~Ru%mG80&O|7Dp3+Wx87GnE508pkdtAddH75tcEn2fq5~H!f>wGX<}kjDl4s& zO^{M$*(an}wm|~d$rk~@fiB)>0NztOj_m+lutCb3L)B(*M%l;1aA4i@$Jq!ht?>?p z)TZQ?J`8WS>^FSUShBL=CbYt?CR9%05CE_-w&4{-*oNC~CAZT~0pyZ$RswrCHIPiS z00ss(#Ev0gw~Pw$lA(sqPK=XfZki&YAVNX(P}ejIY9DsVyT(gMh5%C=K$VZpAiM5G z^f1(8eqlI2>;P>WJiZ)o%tIVoNNZ3<0YW@4gI*_q&1Rb?m&2l}Dl4NSt%u=YP$LA! zN(Rios-lY0^?J!NKSfsSoD>ES^6xn0h3${AeY1Lt_W(Fnx9v{mDT6kUZ<9b<97y@I z?HpKNa^q=0dXrp%uPRd8wx5&xJ|KrfFxs#wEk1;y9V@JJQ#3O^!Vf3JaM^IdL1|U7fNBmeU#jQSe ze49sIved}ZlsLw+ov|`1fDQ9vjd*1AuH>@KORX*YsivX^py)-I2pl0mL$Ak8Bg4Z; z!Ad7Xnn@ZP9YDaZhbk-TWCLQ|pyb9vWtQ!qj~4}~#n`!wsmr!e-X;$RHhk!cTvDyR zP01-u?32j`b{A}IA>5RFQwI^XKR!G_Lp@zIF*-=I@E+<6X;e|W7bT90VWTp_)4l*iH&WGEpqa?Bj7!CN^3 zkfPj(xnlVLsj)B4r)9cgYCOVaz(1xdzzz##>^>4=}5u%#1A9&|;EFc3vT+!SK!!jvrtaf>e`b&Zef8 zgQUf8Mu+=_1A-0qoUOnT6RU&_9&Q0{TMGgVo=ygBsMBoci>aclDr<$h>T)@R>REz3 zSeCdrTY=Sa4!1)(6$O!%ffziY=DJ}=Gnq26jZYefW5sT_!1)_pQcH`Aam8(`naguv2LjW@HZ*AH>|b~fRj{YwMh*M4xY>0G z=}0F%0&bm9-5hpQDgub9pvo1)@Lq~n7QCb!1~M@<2}i;`nw^`WV#Lh(0A9sql?XA> z(&W8SVPr2TDiP`(g9ia@*bBMUgMp0={TjUr5*ABrYN48{RFF>L#F(3#l4{EGX-{1p zO-#=t$J7N0k5jIYZU!fc2hNt7nmVYYCK0+~OgGcKb&gyBc%xQN!6HAvQiT_=jt!F- z+d^G(_R5(gA;TjE6$z7vKp;YVaIAP1{*+#82?Xtm{JL^<&=I|NX>jR&i!EX}kY zJx2LCIl?2@)7uL`Ko~?sjSvX8NJ*-zM}j)G{rJQ4P+MIh&^Ij&AOTw!8~gnM$Zq(} z){WS{Sq(<%4xy6ru{dC>^$4lTe>!VS!W0H?tZb@pJOBVQz{iWm#rMVJ zu|&pW48giK%e3^wXFrP&6p1chyGCVY6=X(y9_Pn0I2E8bgq&XhRhCsw20Rs{Rtdqp zRY~L@X5|+_DpL!v;v2T4v;qOVX`(;N~u;WIK! zR8*KRyo(Ha97-W#yaZqH8HRd44D?)Cg8_zBIkv&EM|N&vxEEf@4xZ0uuu&C_{tnp? z-y7=dJ(K4NG-c)%BXx=sAeM&5jUEYjsD}n6;3_<`CXP1~Zll<1gkphhT7hG!7NHaphv~%=F~< zc|MzQK2ARV_y@DolmDah^2dGmuz$|^WH60OZF~#~AkN_%?C9X+_zKtw8P&$eM`@4& z7q-Ls**UUU<`6~_6m#d_F~o8D7Ke!N4q2KLFa8pP9}cY6kBsm4F&Mpmwimwx9#oiQDh~ApjP^$i2Y#oF(#$NrW^w!yoW@>5=$6rCP&?m zPRSDCiN=q@k8Xru_#m;dnip5s;>_TjRaEG}p`#%L z21C#bg?K*k?;m9urwhmRBV+|Bv(O4-g4g11h4zR^arOdBlLn~LRh6|OR?mp{6%|!t z+k2xULh57=u=>sW@x$B8Rf$>WWc#CtaT5gcHXs3r3Gz0buEoi3;Tx{%BP#oB;W3hJ z*9y2ToH1E6o{(P=%Op69P7$|e000XpNklJB(f#cU=`Kf-ocW;Cy@G_#HKq+!f^9oDw`-Rf# zOjp;9pksbU&;`s+ly-*q$5vF)=1SW4w{dE0rP$mS&vSI)!Vt^0#nlP==E8*wsOv*N zKO79!xSfvAWaky=xf!tx&ml`RkU>a?5Q@_BYVvvAG<|OfLJS-UmU-b(ota1{6TFA{ z`MCnzxJ);fAvXg&Scu_BeUVTOd=p+v4dUjYx-y8~?dl97eB`&+Iy--cIc$p57H9J^ zx~koF$7izg3JrOzN=IXjZSr&TWiJAF`vwOjmPYp@&MgPd1f4#O(lfKM8vq=_V06ZG zyj7!Ur=R967Mh-&K{{3+f|cEJSxGt4%jzgEzew2hBs>HhcAM0H8+472Z3$g*`nF=p z5*r*mr+MG}UMWo$tQ_iQNR&F7LS>K<{~ZxRkqzmlq^gdBsBbiHjU~Wy+#B~@z)xd_ zb{v3nIME^$Arr9Au?LlPQj-0$6y-WZn+j|TTorU7_6&4I{YU{b!NjLxy10^V7J#gB z!DBmxf}58ve?3~U4a-4sE|r*c$6sX+W&ra4#G z^jJ#e><)kf%APFdUT2BYL-wtjJV|0_|I;Fu)NNfZki}yf` zUw%S*`@;^vLwll2a96Hexq9^I(U8aGtk)TgC^=p#lH;L4iW{2^i&8|LVaiZ5HC+%BpIpx~_q83yMS<*C+~I_TRd87xt+CbLGa3TdRM! znV*?1boL5*JdQnRE!dO`)s%~5N>IB|A(xOFEAPQu*yyB*$#H2C-csQpSTzY&turz+ z<#GUg1tis+`~rr306)T7@W%&Uj1AtE`n#|7GhLTEJGYdsRnvRukK8z&`w8RxzPx%T zSobq7ILnoNQn~O&N`l)Gs4b|XtFI3JEC4TZPBef`Y><l*! zL$L1q@I42&0wlI{2)ZDN`EZ~>BplJ{p_;N}1}Z@pK?2L8Y6dC#g~jscd+JpK5Gr(d0s6<3n<}a7of48zWn0 z8(M*PEiJLB$&mQcM5>hvnFt7F6X{l*uWChA;=Wrqqt?0U-{LrLZ?@-mvsq(%&0IyU zKnECrr__DyeF5aSE+c;1mTFagR$kfn!LQx0$&%zIpZ-*OB*kZP*1*%uvAPDu~L~^KV92>_0t$JAUIq80|uV?bs zm5W`I6C>Y;*2W#7wsXYk`WMZu$3a(PaRzK|AvD0@a!5=V*J2ZKYU|93>19WVn!OUB zi!(NK$jm_XUK;4RGkxporLL*T(eGWqe)A{m{5;`SElO?@#o7RT(hRw=6IawuQS~(C zBsabm7VKzkp9pfv18VWh8(Nio0kzB`-Pf=FF+877Hyu2JEG(0#TgHLAXwNACj#V>O z@30Um8t*_x#{kYgFhZhXVB-oIUawp3zug_|>AH3uM)}tP6CcG7wvEdeT|Qs9yYtE) z!&wW-^oY)YI5q<+p@bRW5W*4+an`{CU1D;v=eA0Pz7L>>JIym)T!7PuaFG7)uF##X z>rB`8B}uarbUhRc7i?(l0J&F%&22r9i-Q_^pTxFL&Hg7TDY>n_s-UWN;O;)XxE{a; z6|`;fa}vFQ5k41aaI&(t?$4@f_k3>OfrG02qGFMH6qDe%1N%Y_Db!U?+v0+hTwVxo zk;=tOHBy+SsprJLjC6SE!MobEg{IjU6bHQxj4M<)7@9xv8F8H@YTA zhW|$*(DkSs6|FeGYdjBJKh66Bke^q8EymT9R7+Q1P^_j3uP94zLTY=XWA!#k_L+g` zyvO4Tbzi;ubp-J~o|9LgK6Lz~0hK_|j}u09cu%>yZ3KY84PjVCot+vFUH#}nz;3lh z;CQ(1b9-M``TZYaU%bCW7(9>Pfv#}(wJQsB<*QmB`;5LAaL0}i9l}M7cyT8yczBsC znwl67cV7GebXm}5J|XFPG~P<;cBEdN6FcGe%80Q-;X{lA!v4k=h@?J~=&^10d(I9Y zKAeZTwa0^@XnjsW0iq!qKCjms_NAkjLPOI5Dl9HVFz+Pwp}rYcu0=`mJHrFL?^@@l z##Ac(fX3_n`0@^_q8rhIB}v5 zs^^PPS6lN6i*gRM9Bl;P6>pvKApD zXJd2~<{UV9WM6K6Q4u;{O?P)*zGIo2v7vy#bp-3al}vO!C?DDO#=lWi(k0F*4uvIN z?CN&_HzOpNd;kHOLS-}}_Ul{lBA!MBYlq9}c?}-K+j_m;H9kH*J2EojPZnk@rz?Row%#>ms3cWM7{d_4s1T-vKmc1t1wm+A1r$Yl_NgGW z-K*E?_1=2R`2Tg=fY|-|t+#y3woxHWf=n_5o0$+1n?WWa37O}il1i%TzHgsfH>s+G z5JRf!UaHQ5)E)QT=iKw%ea=4Td|OB1q`DGVzI=H^O-)THD;6IgKVa+Dtu3lkGOQ5k z!eyYU63{*I#1q*uG3J49to`jY*6c4E{&cpn(N=Qk(4l46l~ko|h$|BYkBTb5(@!tm zxq9uoXDkT`tR;>Fo- zu6_I2{sRW+8(SqRuc{`8!$HNBwL-I`K2|asjnpqOfnrQLDl08@eX!xZ9eelg61ti08(w)UDw|}*mwybyS#7Tz88a(g^+)27(9Wm0=lQ3dTR5Ub-!CSXy_1Qjje?$ z*xIx@sHC!vY%Q(AEueG18Hrs4*fvL)XkZ@;8BIp&3o8_Fj-aA~LdW~-|Cqgh|NfV7 zRoIyj;CE>V@bg0Yad1H!l9Q7^UcK(^<<VQG*PF8fTt>b2H~?dWH6g+1K%b@veVhD} zDr&N~x-AV+0xV6U0F8lk=;sudl+gE=&(kknd4;a#og^o$5L+d_hwo(>EQ@8b>|Rqe z2!fq<8rDfpQ(hn{V7HB+MQlC#*=TQ*LE3Agr)9>{ZhP zG<>wAw3KdKJVQT!^%b(YjP%Q&zDifWJ^>4aJ`ob%%Q9FN%hYm`&V4cmnSMw7YA7R` z0uM>fEK#<~uZ9X*QMJ|SBnSR;(xJw1GtC;uO*FatDS%T_O4l!(rd2P#NdMUU2^AI> zQ?<=OudaNNzCDv8-^-mNB$mZ8HJx0PCG=N*HIf<4fJayziDq-T!UHv1tJX&k$dpvo zlO0|)wleW?F+RX4qw8#OU}>_qZ>J$69-)JKcF_3?7ir_B_o;8c{^%3M3WoyAU|B3v ztI2J3#CyfJWVV*9k0!t)1IM+=vx2|_wMnZ0a=~-Pofj*B!%a0#!s4K*cJ0DR`nO;G zipuKjG&U`ha!>!0Mvk3CXL1hEpyUxWamq}JFqy=?EJMihEEo-K3!u1kUhkE#uN45P z8axb+>J8C3lFNA%=4PB%y}&*n=kr>Gtj002EPvK_Q(yw1-BH8B1xI01ldJo{1sEGFTSNWZ9nQ)w-?A zT$x1%nu~5)m+w`a$91~Q7gYORRSO<|`3Y||WyaFiwAaW{xd@_Mg?eYJx|DPc{3hn1B9B%69}s%a58oR9P8&$nWxz-?Q7 zt=$}D6d;IADjE9HKmHBNcXN* zt&UPJKD&P9MMc;uNqq%?hAF6qOdf}JvVk@n!e7~Eas{?uq=ULqr4bp+lZ!`0TzeB zcID#NuH9Qc-hS%Tsqk{_AiX<&thSnM0V=3KQ9p6zcez~I$kwwAAnwal*EWb*1Iqk2 z6OQSzekZ{iOYB`^;OzSJqaA0?obelQ0+s&&y-vS9M)|cWoKl^z5>C>nE#a|GV z{A;y}d4Wed`m;Ii4*6W&-2cnbYNmRscQC1+GBPs2pko@k`1zMIE!KD%k}^_cqww}k zs;jM`z1udQvD;e0W(^Vw#btt2-u?|FY!6gB1FUwQP0Tmc?#s=>YUPKO8Rblik{x5M#= z=ztojpHfp(Bch|D1>J5_Q`3M;moE8@ZdZ-@S7Y_!xt2U-%u~0JwLGCt{S@l?_XNTH zw#AYdOj4HTP_|D6YXc7p2$4Qds8c_Mdj9W+6|eIGI9NM|mf1L-U+Fn5%nLj+fF53N z8&f~k*Vq4DrhXb?YzC1Aa{w?K4YSuM?qM;~kHUzHx%80!i5$Iv zq9RRHTUzMYwEn%VadC04sC~flhvwgc{MUNr-+=rx0i!na?}dtP?1*JC;LPy7RHxTv z@htuh;PJiiVcJK>_~z=hZzm@X8fGjiDffKLitaczZFnyqGn-`>nMw=IH~&uLpNSS5o6x1= z84ain{NdpI^VpJS{*}D*MX}KlG(dy-@5yWF%JPKNASo&aQ$Gp1CZ=s_Zno3;lSeSY zvQAJvap7_$iHeM(Ig6g5=xDP55p$?HK>Jiv2N0ohDb!Dqm@3o1Z(q$&Kl$dLIS`y! zJaqZ|KdGg;NiG9mNG#L?khm;();9)n@o8bU9tTC4V`)OhaTaQ_$$cH>No#JxR~evM^z@H$ zkBwSeTf|fumcg>LME&GVeI+;3xTzKs6GxKHMCO=SiiwRwf6qcmNdvGS2R?;n6jlSR zTDej*>s(HdFLLIQ9t!F!IV)ZM^>tJ8#UW>TWa_6nP(L|D^CTW$*1KipbhDrspm5TN zp##C(3050}QGAgP?%pbZ5)%_c2??-J0L$4UdngK(Y|4)o24{212L}xR-}rin#_%Wh8mi5CFSMRR8>ri7Cb?pZb4bVLbG}1K9NFw#Y_4^F@+p> z_$4dUPrR*kidzw-fWvxlJD)>(aB{h@53nqKb{QqWyEbZg3N3tQ1yz=pQr_8L(@tOnoJjElL77H*Z{{n8YL+GjbT!H#AWxfMcsHqQwBtj?Z@!)jR>h0@X>f819of5!u7Pl4 zXi`5Kl{|=wic9E=ZJ$s-tniG$^5{n=Os3=!qsZ3SNHvHJ${wdNmrQsjxp}88>MKwE zA9Oq5;1Ps(Oza(mgv!%S{e;z;<0eldtfQerU+kdk*RD}P;avb{GYw8jp~;|o!u&F^ z!ZRI295ppnnA!XZzOs7Cob?2yrcI+r$j}n?lUM$k`pVr5V~fi)R>Mc9(%yq#($Ymw zQO49v+Olm2nE;$I0FJ_Js=PM7S54GcJUfQ}EBXcEH}K6iCi9kb{JwGmkwMRAFg?@M zj0}bPDFUm{Xu^~k+&ZHJpTiZ6e$ON0CkSTFNR0Jx1>vtNyQ@3JklGudKFO1Bj{5F1E@47SX8Rs)K5mS@N7c*3>u#{l~O0CgHK==8o+*4w5eRRnMd~N-{L6ka9^)!1LL`RjN-C?Upux!_X#~c1GgN1P#8i?o28cg3yUL3v(ae{sPze~``h#FZD4R*7-wh)@z-^d3nLClPRlNUrRenVC%elsbHPih(;T z&D{hLQ$NLk`stR2sh>K_KTlHxehY_C{BSClyDgytFdbGk}8-7ySPsY_&Ah0(v=E7_*}O^<10A`Ac6(T ze&)qj?@9f{mF6DQPyS-C@hug7tr>+AYFn+a^|883#KUo~*{rD9;%0t>52EL&YIp&VaLP`XK`bjA#HT-HR{{lpC4xrq; zLv99$IxQgJ;YuL@q!L&4{VHi7sh{qrOEAuBDgSN&9rY@w0J*9I1|H6w2;!=E-Z&Nu zM+Xb1a0xtM34nJnr_J+*rW&{g=RBauZr$EKY~HQQAMhg2_$!{<4=6T#d#IOyKC8V1 zJh$7AJ``IbL^y{L52tVm^kNCH^$`}R7iHd0RN!6JVT*IWcM?9|qZ06+#gV;x7&!OS zU~7-E8@?%A0$M16ds(%>_Ib2WQehp#CE!s4vNw;HJ4mw?3#6P5sJBgd=)?Mp*~$^1 z?-kJvK*u`(6EItXnOCtIfkgo?3)po32yY3kaQ~By6#iM`!AMebp17QeOrSACRi`_p7q&`cQEZO$@>b1`@ zwXn++%|vVT`+xt>nYGXdybRm+?Ah~NAoY1zpVh(gRBwpR;mjtiZJNWs;dJj3P+LT` zg$oyM0a3^BH{SY9dR)IGodcX&l@(PY1AY1?k`dFx>&uI!zij+-p2Okz{=k6)EAE}U z@R=XfY!i&|2;#%V<{QW-T$J7=ptgu=&}R!k^L)Sl{q;5nNfp(#5>o{iSJn!}lloY} zfMcS*309riNV@W}G8aI!ZSUT_VE}o*TCY7ffaK{vKGS~MERR6<_idV{XEyvX_2 z_t#&+D$#!dL@$N#Ywa@Y%HXT-v>%=5<4DddkUY%pOafNr9z$?n1oLSRC)e3^A#kko zh-&T_H#P*y;%>OIiW!?CnXzn{WBC|CoY6Nif#S^(R8&ytcz^vLv-j`c&lOg=)O|;{ ze{_o$E&TY6w|=`~@Q@+K+U8cNq6*dqp-?#Hj*XXN43c(m7-%hHfzX!;Gu#p7mRSZ2GFH^v+ak)f zfG{3?3!w%qfLOjA2O8SC206+?6Dn~5VgU(GXjEW_GoDxmqSNt$I;kfSA~%-`Iqq3WH77 zgz2zQ3#>re%=!3a$z##xsNRVv2Ys%;`POfe69*476_-^=PV{YrwP}`FfY|!!@h1w; z`|8+!Z0hOpSqogvIM3vU_$N}kJ|;@)-&a?4_fG2v8~@A^?nZY}9N|;$5@?%Yz|As_ ze5I6(Zxk%$cqsnDqHshxBU>1bD3@PSMNO!P%wLuY!bF$TL8XNSba+oTmEO%KJL37& zfIu+wvAL8OZ$(9xn{!G;IhMh)SSHKvL79%iy(R!bDndL}p%0pkGHBo_wOGKb7D4CF zeWhRb>tEB;3m4PrQ#tw=ghS+W9rdYVP)RHkx{T_9J|THa8+bVPGJvqo2K}6HAIG~s za6~l@{_8}Oh$E_TVv_g1efkIHoG__8OM_5K~(sAN@ zSq95unLSC6<+_=FSE@!+%~KzKM7$*yKyc96bI0_*diiB)bs4E&-~KfB@!53p)DgXe zbDinKvREd|?ukyJcu&VZ51a#`SP=KivsXklR8np#okv(kds8Dd)YT#+p@l5gcu>$* zQQ@u2H2cY?$$)xz?8shvZ2ls$qEgo)o{bKGFZan(5#uW=*ZE1`g!vfyBK5~U&m7)Mc)0&B79yh0WZtLhuGqT ztxm`4;T2I0pZF7B?xwr9Zz7_$lcvvKBI5UOUm_h56iSQkk|idZ;;e}@d)||DbpPjM zLKu2E%Cx>Mq8iKWY2rIe(C^~tY}|Z|N3f{~MCWc1UN#rPBF2eGcPyVha4iT0*<^Q8 zV`DvCJbwxhlYI0+P~)B|6QcKZ08faPL$|W+8BxuN${1}nQ+-_x-M;dTh~LANxa8JV z#P^J$vpM@|{ODoWjzxGvCqgu~kO}T;j;O|+lirA^=Bba#9jGcNXP-5u+0!Q|J!2ZceuHMsT1dC@Z_%Z%&+0jBNN?)XtwMZ=E((LE8!walD@vb*D;q~e zi?doNdH5(1@Tnfr>XtpyeRLu5>a_n|SMIDknT*UE-iZ)XmJZg~5NX!Lk@644wn~ck18x>CfoE zmxrkg&I<+;$Iy9v&OD(TTN(z>?AZ(H+Rg9i(uFhP{d?#GnUYviq2xXMd+!nmgXi95 z({=_Gsy(6{M^wX^)U-@Q3b0^HN7K>IdHZ+2lR<*PQU3Z*8UKhFQ@N3U*WIz#!80ZY z4DN-9Y9qIN__w^K+8RB}V&HJ%Cw?Ll;uym?ZhA`_&L^&ZfH)ZN{0O_0z6zIT!DK0A$lSDZZ94Da#Cyy`6Ze_#t0gNQF4*s=Lrj)unl1cm{B#YZE!@A=~g={p1kzIFQ! zeRU>}ssN(VDMR4hYNbbpCsQ3FF!0De1E{wmszKh$FL!MIrmCV;FZ6*fBhd%@uMHdM z=B*p(*BIf@K>rLOA;(Rcik^&~%Hc$~4$keoGdVPI+$2Q8o95zsSq95unSm`;_tP-9 zlK8*IQpa%~6=y(L9LYJGRpjk^%{lT%7JMVB)uTf$;j2F(eL9qp=p4Lj94UK1(hwSr z%6jAb+wiiv=<2l_!aZz4C*2G$TyI5GV|}Jgn|8agzILK{c#4S~1mh=Xx+IsR-?sfT znmhk#8i??ScZ=mNOl5TymBQlWojFFSh%<_2r;8`6@)RA&up{2;ZIc!|B%lLtago{-sDL^+;aaOuKXYQ})+)o;HMAX1uW z+|OXg!K7(3XmZA5n1#@L5#?B)!otGb=YGCsa^HbTE{<@=fW4S^T7L=d^Hwy`+Vp_c zGr<~7fW?`RHr>TxB6&VuMM<%K`-kse7&2r?MxZBz3gAetP5Ai8?^I*UU{r5;1ZYGc zBl+v(0g`d}^dH4qi(_b$WCg+sapmePq8#^sI4H0a6G9`S%ovnxX>$<^@Sy3GK6NI= z#vr2HwaQ+LsK)wCpFW)<+)WrUB1MnRlf)73U=3XcEZ%9cBTOQibDUU@2sj4DO`0Zv zBS*N4)ZGk1ggeo{;bkyxi_`W_0U`&47n%vAf@MRMcplAs`Wt?};9qK!wd-`ogL%Bgz%!-%%pU@fY5&5#>0> z=+nzzdfpnJs2iL-OoGP^AVOmfDZv_p83hjA-TXVc+L|iqi>;ftojP@@*DRoTNDux9 z0J)svoobCYLsQ`4cXO}xg4%BC1WDI(17#gfV&X^Dj?}vsiUQhmRD^w}S6) z>g(%jrM=t!aTcpz^Us|-7c`6GTku+CY|>z#$A5(0zAv>q`?#NlI5!e>EWKOALlkV+lq5@^ZaW4 zdXx{1E`!mW<>}GO3D8Yyi>Su>n9XKEw`;T6k}h4k)Dobg2#Lr1Kk@kSp7!u9`~Uy| M07*qoM6N<$f;Spo@Bjb+ literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/onboarding_done_art.png b/Habitica/res/drawable-xhdpi/onboarding_done_art.png new file mode 100644 index 0000000000000000000000000000000000000000..3451bd631607977740cdb87a837eb37e25bd9bfe GIT binary patch literal 8336 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/onboarding_done_art.png b/Habitica/res/drawable-xxhdpi/onboarding_done_art.png new file mode 100644 index 0000000000000000000000000000000000000000..3d8dc9e0c36b3eb7dc1d8060e769f9541a764637 GIT binary patch literal 25904 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%0D5&Aa{kFY?ia)R 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 DZ_<@M literal 0 HcmV?d00001 diff --git a/Habitica/res/layout/achievement_list_item.xml b/Habitica/res/layout/achievement_list_item.xml index 3ed5e96ea..b9e9a0fe5 100644 --- a/Habitica/res/layout/achievement_list_item.xml +++ b/Habitica/res/layout/achievement_list_item.xml @@ -5,9 +5,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_vertical" - android:paddingTop="8dp" - android:paddingBottom="8dp"> + android:gravity="center_vertical"> diff --git a/Habitica/res/layout/activity_adventure_guide.xml b/Habitica/res/layout/activity_adventure_guide.xml index 75db74e85..7674b7f6c 100644 --- a/Habitica/res/layout/activity_adventure_guide.xml +++ b/Habitica/res/layout/activity_adventure_guide.xml @@ -47,6 +47,7 @@ android:layout_marginEnd="30dp" android:layout_marginBottom="@dimen/spacing_medium"/> diff --git a/Habitica/res/layout/dialog_achievement_detail.xml b/Habitica/res/layout/dialog_achievement_detail.xml index c7ebc2223..e72e6a9e9 100644 --- a/Habitica/res/layout/dialog_achievement_detail.xml +++ b/Habitica/res/layout/dialog_achievement_detail.xml @@ -6,6 +6,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal"> + - - - + + + + android:background="@drawable/layout_rounded_bg_gray_700"> + + %1$d/%2$d Task list display Onboarding Tasks - Complete to earn 100 Gold! + 100 Gold!]]> Delete… Getting Started - Complete these onboarding tasks and you’ll earn 5 Achievements and 100 Gold once you’re done! + 5 Achievements and 100 Gold once you’re done!]]> Your Progress Let\'s get started %d%% Complete diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt index 165e52073..c0c320941 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt @@ -48,6 +48,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli @Suppress("ReturnCount") override fun retrieveUser(withTasks: Boolean, forced: Boolean): Flowable { + // Only retrieve again after 3 minutes or it's forced. if (forced || this.lastSync == null || Date().time - (this.lastSync?.time ?: 0) > 180000) { lastSync = Date() return apiClient.retrieveUser(withTasks) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt index 8d1aeda1e..df1bef019 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt @@ -1,9 +1,12 @@ package com.habitrpg.android.habitica.ui.activities import android.graphics.Paint +import android.os.Build import android.os.Bundle +import android.text.Html import android.view.MenuItem import android.view.View +import android.widget.TextView import androidx.core.app.NavUtils import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R @@ -60,6 +63,13 @@ class AdventureGuideActivity : BaseActivity() { Pair("fedPet", getString(R.string.feedPet_description)), Pair("purchasedEquipment", getString(R.string.purchase_equipment_description)) ) + + val descriptionText = getString(R.string.adventure_guide_description) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + binding.descriptionView.setText(Html.fromHtml(descriptionText, Html.FROM_HTML_MODE_LEGACY), TextView.BufferType.SPANNABLE) + } else { + binding.descriptionView.setText(Html.fromHtml(descriptionText), TextView.BufferType.SPANNABLE) + } } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index 8c333ab4f..be6cc0e4c 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -509,9 +509,9 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { return super.onKeyUp(keyCode, event) } - protected fun retrieveUser() { + protected fun retrieveUser(forced: Boolean = false) { if (hostConfig.hasAuthentication()) { - compositeSubscription.add(this.userRepository.retrieveUser(true) + compositeSubscription.add(this.userRepository.retrieveUser(true, forced) .doOnNext { user1 -> FirebaseAnalytics.getInstance(this).setUserProperty("has_party", if (user1.party?.id?.isNotEmpty() == true) "true" else "false") FirebaseAnalytics.getInstance(this).setUserProperty("is_subscribed", if (user1.isSubscribed) "true" else "false") @@ -693,7 +693,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { compositeSubscription.add(Completable.complete() .observeOn(AndroidSchedulers.mainThread()) .subscribe(Action { - retrieveUser() + retrieveUser(true) val dialog = AchievementDialog(this) dialog.setType(event.type) dialog.enqueue() @@ -707,7 +707,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { compositeSubscription.add(Completable.complete() .observeOn(AndroidSchedulers.mainThread()) .subscribe(Action { - retrieveUser() + retrieveUser(true) val dialog = FirstDropDialog(this) dialog.configure(event.egg, event.hatchingPotion) dialog.enqueue() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt index 9c2808305..60e79aeb4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt @@ -1,8 +1,11 @@ package com.habitrpg.android.habitica.ui.views.adventureGuide import android.content.Context +import android.os.Build +import android.text.Html import android.util.AttributeSet import android.widget.FrameLayout +import android.widget.TextView import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.AdventureGuideMenuBannerBinding @@ -18,6 +21,12 @@ class AdventureGuideMenuBanner @JvmOverloads constructor( init { background = ContextCompat.getDrawable(context, R.drawable.adventure_guide_menu_bg) + val descriptionText = context.getString(R.string.complete_for_gold) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + binding.descriptionView.setText(Html.fromHtml(descriptionText, Html.FROM_HTML_MODE_LEGACY), TextView.BufferType.SPANNABLE) + } else { + binding.descriptionView.setText(Html.fromHtml(descriptionText), TextView.BufferType.SPANNABLE) + } } fun updateData(user: User) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt index bac0a789c..0ede053c0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt @@ -7,24 +7,19 @@ import android.view.View import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView import com.habitrpg.android.habitica.R +import com.habitrpg.android.habitica.databinding.DialogAchievementDetailBinding +import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.models.Notification import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils class AchievementDialog(context: Context) : HabiticaAlertDialog(context) { - private var iconView: SimpleDraweeView? - private var titleView: TextView? - private var descriptionView: TextView? + private val binding: DialogAchievementDetailBinding = DialogAchievementDetailBinding.inflate(context.layoutInflater) init { - val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater - val view = inflater?.inflate(R.layout.dialog_achievement_detail, null) - iconView = view?.findViewById(R.id.icon_view) - titleView = view?.findViewById(R.id.title_view) - titleView?.visibility = View.VISIBLE - descriptionView = view?.findViewById(R.id.description_view) - setAdditionalContentView(view) + binding.titleView.visibility = View.VISIBLE + setAdditionalContentView(binding.root) } fun setType(type: String) { @@ -47,14 +42,18 @@ class AchievementDialog(context: Context) : HabiticaAlertDialog(context) { } private fun configure(titleID: Int, descriptionID: Int, iconName: String) { - titleView?.text = context.getString(titleID) - descriptionView?.text = context.getString(descriptionID) - DataBindingUtils.loadImage(iconView, "achievement-${iconName}2x") + binding.titleView.text = context.getString(titleID) + binding.descriptionView.text = context.getString(descriptionID) + DataBindingUtils.loadImage(binding.iconView, "achievement-${iconName}2x") if (iconName == "onboardingComplete") { setTitle(R.string.onboardingComplete_achievement_title) - titleView?.setTextSize(TypedValue.COMPLEX_UNIT_SP,14f) + binding.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP,14f) + binding.achievementWrapper.visibility = View.GONE + binding.onboardingDoneIcon.visibility = View.VISIBLE } else { setTitle(R.string.achievement_title) + binding.achievementWrapper.visibility = View.VISIBLE + binding.onboardingDoneIcon.visibility = View.GONE } addButton(R.string.view_achievements, isPrimary = true, isDestructive = false) { _, _ -> MainNavigationController.navigate(R.id.achievementsFragment)