From 8a5307000b59981a1a6cbf5b2bbec276935cc60c Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 9 Jan 2020 11:35:43 +1100 Subject: [PATCH] Update app icon & implement recovery phrase screen --- AndroidManifest.xml | 2 + ic_launcher-web.png | Bin 12943 -> 18075 bytes res/drawable/default_session_progress.xml | 7 ++ res/drawable/ic_launcher_foreground.xml | 16 ++-- res/layout/activity_home.xml | 5 ++ res/layout/activity_seed_v2.xml | 78 ++++++++++++++++ res/layout/create_passphrase_activity.xml | 2 +- res/layout/fragment_enter_chat_url.xml | 5 +- res/layout/fragment_enter_public_key.xml | 5 +- res/layout/fragment_enter_session_id.xml | 5 +- res/layout/fragment_view_my_qr_code.xml | 5 +- res/layout/prompt_passphrase_activity.xml | 33 +++---- res/layout/view_seed_reminder.xml | 73 +++++++++++++++ res/mipmap-hdpi/ic_launcher.png | Bin 1307 -> 1803 bytes res/mipmap-hdpi/ic_launcher_round.png | Bin 2687 -> 3548 bytes res/mipmap-mdpi/ic_launcher.png | Bin 988 -> 1300 bytes res/mipmap-mdpi/ic_launcher_round.png | Bin 1758 -> 2252 bytes res/mipmap-xhdpi/ic_launcher.png | Bin 1913 -> 2561 bytes res/mipmap-xhdpi/ic_launcher_round.png | Bin 3754 -> 5038 bytes res/mipmap-xxhdpi/ic_launcher.png | Bin 2679 -> 3881 bytes res/mipmap-xxhdpi/ic_launcher_round.png | Bin 5619 -> 7817 bytes res/mipmap-xxxhdpi/ic_launcher.png | Bin 3662 -> 5447 bytes res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 7866 -> 11129 bytes res/values/colors.xml | 2 + res/values/ic_launcher_background.xml | 2 +- res/values/themes.xml | 2 + .../securesms/BaseActionBarActivity.java | 2 +- .../thoughtcrime/securesms/BaseActivity.java | 2 +- .../securesms/PassphrasePromptActivity.java | 7 +- .../loki/redesign/activities/HomeActivity.kt | 35 +++++++- .../loki/redesign/activities/SeedActivity.kt | 85 ++++++++++++++++++ .../redesign/activities/SettingsActivity.kt | 7 ++ .../loki/redesign/views/SeedReminderView.kt | 60 +++++++++++++ .../securesms/util/TextSecurePreferences.java | 8 ++ 34 files changed, 400 insertions(+), 48 deletions(-) create mode 100644 res/drawable/default_session_progress.xml create mode 100644 res/layout/activity_seed_v2.xml create mode 100644 res/layout/view_seed_reminder.xml create mode 100644 src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt create mode 100644 src/org/thoughtcrime/securesms/loki/redesign/views/SeedReminderView.kt diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ad4497c9ea..8deb3f89aa 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -152,6 +152,8 @@ + l-@zP++}=phJV($u)F z4?%G7Cmf=q0lzlAd-fsd#zW2PDtEkxmXf{PO%1-4(kH+XPPp5thO32C%>UiilGI=mH z@GLA~y9PQ|uUnyh6egXRtZ%&|DsJM@93e^^}eC*($ZTG3rqUR3Y zg;`1vLfU=6+YoLnR3xy5Tz;>jQ>J6Zy$OT9YtwvouJHfCU9W+sC01o!YLB=o#SS6k zoVaHzcv%H%Z=z7B{H^q7F<~sHlX!;EC-dih z^J6=^v)MlUkR@^zzu#&*c{(s*ex7qf6@nOfPt4C}e)#l+y9`Fasv+atg3rrHc-$TpgoB3ZbMkVdKYjX?u7QJ& z9}aHNLJ&S5Gc_#BCjy{r8@Hyi5@88Dw3xN|dsx+kf`ufXZ z`!EO@ZUT$GOS00$xd;h7r$L8&d%Ly8KOKA&f<}*E3gA6=47Hva4cfZ5AmOL1R}1s= z^Jmn-O+ypv9Pz?;5fKrZ8pvG+3=tN5v1^zgf_wxaV}@Ji#zaFtg?E_MlZUi&J(pUh z8<@Z|i;S~_H0MR&=gwu8=D25i@v1=IUFPr)?M@r+!y%-UFs_>Zma+cR+YK!DVBg(V z`SmT#lvDUGfn!&8yy#<%>6?1?RvR$^#vMZIBDP?{+`k8cI=Eox)!}02GBb*HS=-M+ zY%G!o#QlbIqN1A9v|v=iD9u?h(deY4ByE0J+DU<)SYq$Mi6{24Yk@Qn#^0GLDq8D- zKT#KqXg7yH^=1kUL9>O>>|@A)_SUW4oG?)(4d_VmAo`A{r>D5GH3SuPAH(&)*txW9 zY;2O$;REz^YlEbsPai+3`u_y;afapOM<;xGVnF*YHQ6lPiXjgYG~J!KP&zyGX^8sp z6%4}NJ_?qP zRUX6s;KHEULfI*HAH}-i{mh(KV!L zTJjVaU}dK*Z>vm@W(WRoTYW_B!*4MjS8XOeu{*uD28S?K@LTuKUMcskKVA+~)rLMQ zY03PMVB00%G61(M5dz<2>b*l?tQZy+jF&jcB=k=M1L*fQEJq*KD0K^VytnldlnpZ- zBVkPmD@GqRCxgNLFgm1KrXj?pWEDz!49!ETk4X537nMyR$mKqC!+@5hs)6*nONKr}10>8lyp8 zpaW=*FoGT)o`Acu;WCdwu?&!e{{M90^FkG=3lI8!1OjIddM*w*P*sXUM^etUUi7a7 z5K{zY>?I+Pkm@X*0NFfzV~3n*7|TvVly2`sFHckc5&)m%+jNkt7S#1WorggJ;M)1~ z)B@ZvIzHH|?PC~g$}mEZDP0h_1;H_tCM>z|^Ykzz`3m?{MM5_Kyg~o&{nzvV;UDrP z@-+UR!9jQ6=f6%d5DR%Q7U((UB9aCCLPB)^rl~@{1{0uz5J4}e&*a9-tDL)6db6qT zlBnWEi*-H8h>;!f$i7(`Ezb9H7<9* z687a(ks~`R?`M^h&ihs}sj$oln@ry&FkQ^&b=_jBBn?QJW6x6lCU@6NvC zFG?bwHrR-o$eEo;$YG`EfuWk%o{Vzcy+3IG9Q*oqOZWrR^T&67KG3o@On82G%$YoH z$B)n0@m0UqzKcbS{%;AWSG=WoTqA#}*5FHSUcT#Ob*j5d5bke_c+b2fJ5#`YUO>My z1unm0(%E~Tjxx^qce!0t#PEXm571YCK`^RoaN;xb8)!F$G8kD3G){W{$y@dtC&MsQ8uzek2PzGEa=Lid{=cMq#p8?QT(m%-AR z@4J;HYeuw&pjCFdx{(J?X+72AySf5E60aKRNfApW)|1RT7Zzw&V==K;gb3X{;z#Tz zd;`b_2Z?yldbstnZoq;+QpH(jm&#oXR_LyYJUt912Q>Nm?-u2i5jO7qKZ7iyb^CbV z@!-SsA0zWI-Yb%t)sB(Yqcz4)$EwMP;rIj5G1+0$D~R`MohkCuD+<#s51WWMdQDOb zjX~(A=bx|!j#CP=OkT#i3nZ^T^?Po)ER>@<@pk#Kjo-t3ZU-}-ReYW0^3!nCeom-g z;3yI3 z^2$&PdbXKQ`pmDPeyGx%MbjozVgjqIi}?xF zj9HKQ%S{T{I}cOjPrmybctMXp^2=5a6;K!O&_kKDHyrsk@>kQE3GJy7rR|RI<_C{G zj)H$M;_v7=8y%9>*vMb5U_oW2`C|K=$eJCSZw%f}xb)pL znSMf_$Fdw@zU*QOf9ia{P38s}%LLeClp3^tFC|jlJCg64D(dAF{b?`q*%*r_+dJ2V zE8O!gX2_P6u*ARlidK|eGgUg8Dd9$ScQ<1Tab@^H)3NW{cUq!2yN`4?EkT5e(nR55 zONy8)UvdgjTjNPx)UQcjo7qImOWbf+DZuP?g}KFV(!J?%1g#lSkJ?6RT-SSSW(cu9{(DxG8%oUTrEU)8Je zitW)G&${}`@1|V4`=T|n$D*y{)NyjZmw##RHE{m!;A*?#UvCks{;dA|tq!qIw6#+$ z_mECA`YEDhJC(*js&885U-Bv)vT$DQ7Q1J(9SrMLv?p3~PjpmYJnSTx2E71Bi{<`i z3pP?N<=0izotqUc7u8-US{%2_du*jE5g{lwxWayUbH!FWRy#$E+$*jsVQ$bWn}+m3 zDkb`R;D&ekc^AW;(v)eFVMnd9loZW_MH(L)vN|EMe2i8Uy*`buq{&HjG%?~n=Aa5r zx0c?xTB`TNCUhpAEY{047V^&e{r;KPqDkp>6(*mC&#XHHz-+(Y*YtJ?Cy0GXm6sIm z|H6a;6CIyj#CDFjF8Acy6l3RycCtH}kzCZl(}OYgqcn}rR_Ny+lZ_?sqWLA?k3xz? z4e^Nt^SO7x(vRP?fUwVz$=`-i*oZpU{2tw@KjJ{>Q1CV}WV^+6x*V(3AHPAA6(>;D zR7>IV7nb;G51Uj9TFE-=VrL^=uBq>gpKM&TV4w@}`l5cMgHL$arfIx?iDU2vVJS4K zFr|LuI=SumEI#xI+t!XuSPL-{TOOT>#-x-FO>0L?C||WaP!dzTn7V(0JT&bIQj*CZ zZS4Atp60JNxrzoDu_T&~l0#2?*`{88HVX^bY25TWc8gWh+p_TVlD`4ARCE4}YbP@< zdfsvUO6*YGL*E|Ks4!D2Mg1{M=eR0<7tQDnVoMGOBlT;1FEvL%hW7NOUSW&}CAD6X z#F^mAlVk*C>a&qlAw%@M8}e1@5{VTfugsfNo*<8#mdb8i;+a2EaUl4+@{vUQv9$gdn71~~Elwtul(U|OchoFV zF1<-p>qvT|Uljq{EIvJMdnwL~7CcP`kJ;G>6ae_e3SrbH1fCDK9;wo$F(XU9NX<7f)XqRN<%eEJ=rvwF@sDeC^QK%ol-n5F}448Ojci z4Wiu{$io&Rl5{aZh7gJiQ>??bG5ojuDzX!+EGRr|yQT=+9|~}LoX1F-QyE^W_{u=G zVreUI%U0f(H4j(dX~1Vpj6^8vVd_5o;Uxqg+aAM;9Hrntgvxe$8e;0!WDe^BUS+1w zvQUZ$lAqhnrdH3cK0SQNa^L&hEdi?9T_CQq3DpIU`Xr&IkT_~zqr?tX_VXb45> zx?1s#ePdml6`ZU6>w{Hu+gFjX1v0Vm7cZ@f!}jk$12&{{mMGGCxWqW&8j#v-!^z3= zOT!$Eq84M{OAxbpeueR8u95uf`wrwbGfQs#d6q(1ZI<_pgD-rwk6M%P=S+$)lD`S~ zL4>18;rtQ5)eO8TjRV}Fz*tBF6HU~+an#Z-Ewc=N*^|COO2l(M6BP+0 z$2MZHl2@1M!KM%L#9AU@T(g~Y*vJMvAeqG~P zwPXP0dO1uR!8dJ+9zVV$D-$T?Ib=@M176ctop&>D09tim2OGcKJ1~Udb@(AnURQ_5 zV&CgQQU_Q2O%PZ7gJ@E2ic+V)@Vb&hYgrc9#+1(TVPFx<%noOkNEX9a!YDmi{%uhH zFqkw|(HnAj;G1bvk4O>0-Su%|M1B3SJzi+-?=DM`0?tNlec%lD_KZRK)f;Qd3TMeC zEd?^PJK!O-98sr1FP*$Eb8LbFX-Mb~zk2~VHlhx⪚bTv3NTB|$*shT_v(|(#BZY&{*K_BX-Es!KhewC z3;dMc0}{VlqwS&xZA*KZ$K@L0GI5x6pEjYU-N`H5>)}UjX-Un7#5P$Gdhb38nj(U} zU)vC#FU($Yq^j}wW-9q}BM2tg)|X~lV-+)(eqp!QEsU8MNP1@8rCjpuv*c8Fo0c1ewJ>~Raew$%Gcsdwqq=i*ATog|Vo_$UMC4}MTQQ-vVFlsk*FUD=@ekUQ;Zo=;!q+S=^Yp}{oXcBFSq&Y<0{=x7 zlBqPu*JferSD(nsiOa*unh(cj)>f$ntxlh01d?0n#*V}IoSDc(Y>&Qpch zE7A&Y{I`V;;=iSRu%9}!J(nIfs=ypzOSUlEU*GD>I4WWvkj>hMZuYa={pw5YPGfbJ zC#YmEcGq8g*V7UwkWO4Fz@%u=+IBj=0!fg`QbstE1;a8-6E|{7)XTwj@=EtWcDUxC zu`UAfblbwkI)IUIz)jP4UT~jTL}*8;nZ=6Szu=Xe*-@xH)ia|?9vt1Qa*QnxCcHnW zID$CHBu)sXin-N5T1;bKO0fz%xqhHVj%cg$16D@o8qeX#KuCQ3V%qyed*8$qDgKys zkC&HB<;(pDl9p}j1!aR{-MAG_m;fE}m4UZQij`qfJ?Ze>9f|S#X@47tz@cJgu8?Vb z`6QaelgvgMcmRSL1ndTRh#OM%KZ}8tpiSCisY9uBISv1;oep5ZsIy>hNo;nXLo0pw zuybV9molGwll&%j1!p{-aF>ps=b{#bSg$TrSQ{Q(h;nd@tkUeMBZt~_{l?G&mCbe> z-#O`!y`>A?5z*1W8~I~%D3u~hg(j}O;9a>!9-2EglfA56w*T;otilNo(#d%k3#M^g zzkjRtToZ^5Kdf<(1>N}3bN;gC{(f1QYy$UT`$oiJnPXNxX2#wCnmz?NeQ2e#BZ()rgbf1)37yORk)j~#8qOc{^T0E{uhzj# z5P&@VJhB2_-@KZ7(%qYTE9!B`C%z@`dOD0k$pOPOjhbVp!l4N5qaH6$&ELr;!V6h< z^=s_IzCMhPK1ab?8bxE49Isr3J=jTLej@r+(xYB+K=v5Ey&s;MU#&_OKqzI@rCe(+ zeYN=B7d*DB(UzF2rVm`xD5nHbV5eIB>vI3t>hV)fm$$838aXysarV4&MPs%%=h;l` zO)90X(@&|9VpHA9W#;E%OA}CTW^1l*U0e0>T@DEw$LFk>|2;j+SH+yLiaW`@8B@~V z{zL~zt1r%gR&j=I1YVg@aqXmRiIdsAY%T<4XB!M)3N~6TG7VHNk8cKN_`62RVJ@Ez9w_&BX6}|MOos7gd z#Edfo_CeB<>=th>z<&4XtjsgJh`RXJpGFt8_wdbrqG}&CB6}`W`sEK^PL5Qn{>jIt zN4BQyyBP)%~hu0x~%Y)r1Erd|1seTrJMAW zlxd)*-Pd=Gg%-W8Lw+xG6DMZt{CX^OX&rpC4GB9^o;N`pakDArlAEk->oamM0EC1= zN~(KM>i91!W8YgY-gP~?Jj#}|G^Ziur}rSq5Tsiq`DA9Gv3;*FiDK|;7K&tV<)JQP z5fcI|1Q#yHZjrUt8sYn6eVp-lO1d=&sjJyn5|jjZni2X?O^*(@$cx}4jNN_;%@&Q4t<*HLrSOk;rc1Ffnx#p*7y&DiOC*)k5%{etk zueVqjp73p;)ntG3JJ{g+tOX~}9J5JXQ^HfrDE98O(3sC_7P zG`{&o%j*ETx<%nx`1nRe@5a8*g(%79>Z((#`_D8Fw{=Ao&$pXi{8>#)p8SW^r)3v4 zfse*^F!?@B3*)3Bq*$q5pJXh~#5(k#O%}FFM2UpTzIfi`p^mCyB#DQG>j+VdT&-#*2k)_f4W%Z2XLY!^lZ55YIXg=G5JT9$mApb;g( zG}~=}!DaTjyAcX6toBLyA~bKj+GAe2wmy)%#`p-f>UcEs#j|u$`_U4nze8I;VkI?t z@NIEzFFC}rkG`_{NRdMo_47XQ;_+FyTVh(`FRQ9k=jW@dC0OIEo^Y^WknDk%ZZ?%U zPRrBox4jzsOlSA^tlQT4{1+6*45~<=k=2-rD3F=*5vfU}3cSSDrRB2eGvadm_;*c6 zk}FX6gxFWEnBTAX%d3Zt2TpCrs%w9+?ENlE&RkPu=*tTBS&n|5(RKCLMgeEoud5zC zn@NQUa`G7!)ZcGIEl-dJ>2rN?ZhzMcZrpYSY!q}l#Orkdb)}`=<_Nu{{Z|IacBvZEONZm(Sa_-ZEGo zd1CX~$(iAL0^}W{>XE5tXzD(tW@u@eM+=<2KmN~te!f2UhJED}#e*O3!ln6^RH-Zc znLwGHa%rkf*|?3Ccib+}$uo-8WxSpN?K&{nExqWo{8{O@Rn+&Xgi29wGpTvm-&Isgmlo3P(32jb86Ro{R-K3IbWqw9DI;t2k9oK-ne0|>mvZ%$y zc^22R^R{3^-}DuXE|uOAdPSzzOqDLADUC%EQPp#M1-1CmD+UEhD`h*i+c@UQ+g}3C zLSv4w+G>>*msdOHN{fF`Y(A}}V~(9jM+lAtyTxihonKKmx8z(y_S7Gt9$94LidhKXuD@VX?Du2XBlv^$nWx^j^qQncWUWa;Dj`n^p2G;-P$lqY$ zh0}SNKHJw30?7OqVlm|jw!DOf$b$SsMu5!LD7)yM^02=^=gA9ZX7th4W1tRJLjT@M z*{Cu#bMX$aYM^0-NZo<}()_E8BIFF2t9#C$n_C$EK7UV>q8|bu4H2JgbuK24ZfbwE zSDI1!Wp%}F;c4+`{3&?H#u3&ffq3tgwgSgA%l<&qsx(Ch$t_ngtwQjQZu(nVC86?V_t{R4oW4fvWOYB%A^H5p zl3VL<#0o!IUUVu{|aPGB|QDKuc^gvgE{+@Wh%+y;t%-=j^vtcCgf)b3L z6$vAG)TUBRukRoczz1i!nQv2u^_}>($F`AZRj{4ZKfg6=8R3q^EmMCC~_x$+UMStVJ}VNj!#ePYB;g?p|sFAYOQ+-4Ic5jEad4 zDbOKvFm(B5-gcm{zcFvz#@H0^F^Z%=+&_E&Yew&8Qvai8{U?q*GiDG`tTd!&ZpA*7 zm4{mvp3Ly>ci<-Q4_!WYSqy#~a0y8Z?22s6OudKM8gHvU&?rZyx~bq_nHvR28pe zgYquBBk3e72B$+p%Z70>nq60`zr8{to!R}iGX|g2ZF6*y5gbDC9k?d*F4oPe~2Wzqzo*p2uP$sFOs>c{wyt!=ed`G2)D83a$C%37edU%Wh`0-we3usnMqXdgK$iH##M{N8` zGj_jUU_SUQRGf8ID-UrWx z{LqED3ghzsa*nl%C57s_oA;BJTl>T9FD3Vls7jsa3VUv>Xj4uN!X7ai$H&sK40F%? z)rH4fbu|H;U!f+anBWkRs+QBbw$b)Jjzdvcvb=v>u*Y!l5`recV(@J#(w#O_k^ z^vkPCZY%Q=C^~5KB1W6n-ak*b4`H|Qp(Q+jYTuHA9;Z+^=ZmNvF)p3=BW;<0m?YTP zIDeXpA3Y5{_`>&YZ%sDr<`WQKWKIqlX^^d<0Q6qIyYO-1SwLNA{pK^V9!S-_AOKp| zvZXPhk|H1_j(6@mWz#*db}q8OjZhcEmn8+u#hw{UYYly)f zS2#X(5VQOlzMXi2Dn){_tOqi?3*2+N7Q7KETngL{*X}}qBlQ{CNc5;XDFDa^-m3kt z*XYB<$N%egzn9=6ulq@s>S@*8bC=t5R+io;#9vH4^0O1Uq%Xhut0c^UDs;b1@(GOW zi@@k6VskS!Z+f!4hVA#sn$`_w?vkbjM!XN}ZB zVBY<8=F{#-?yb>LaT4tZ&Kpv>Pamp@Z}&H7-C z+~!INNuc&L@L5Zx9G%VH0n|v`hf`QHOm%ddn+Un;fp_q4(0JO8cqs4$?tHd9!>#Q; z-Ul05#_KKE&!4$fLM9f**FW2UDiDSB+iupH!}}{8-*gU`W^3U;QmCXl(Tbw3SjAJX zcb21)cJgPh?6kK4&p;9V<)_lKpW7>bz}M3+u8FoKr=Z96JvJtbBeq|>HIv)^dNHK8 z;CVXss~H88IL?kJ>j9VcJ%F$b_h#+x2o6Pu1W~|}Bq&T9UG-cD(k`(^S(k0K4RB3= zPV8T$Z~!C64^4y!_`YUP!9wj}!@se4TXXL>r&}z>Nokfo=wwM(dhlD*82E(CDNBO; zYt(PzIV7;*nf|6SloYkVE2-un8&GFc#{G`!YI6nRG)R+09QNh|aFdiVeD$hZnw)y} z9o7zaj&VqCqNL^NPKJ40s_qIUJra7mG#h7r`1;zGne`gk>}~aTZ_h*K%2Gyh z`G1~~H5L&J5+S^`)1}pJb0CEoJ+ct1H5G9$W=l}IqQkf${@}vm$-mk)w%I-5GZ)E< zg2Z&%Tu5KWAA6VQ=P}N||D78oe3N^0`P=oCuPY86Z}jBD9ShcZAVT5A1d7zqse_g= ze953P5bLAMCSKg}n?Pf8cpll2FCj7yl?uenkc$>r;x1)@tgW|Y%5^35(B3I5+Fhew zq~Dc8g0XSurox3GCBDe551^WboPj|&Vf9x+ynI%}_lLQ;-8_qXbRIGvqd5bBubgmF z82|O|e3pwmxvB!weZPd=(e$I&dxd9N7VYO_ogA&E;ZzBrl%ZUT?gVib*8SieWdh@8 z!G6XoH1Z|xnebPG%(wHE?#`E-G>5qf!uirI)6^f za5VSvpl36pq0y_mo zHxx&l3~*8|T$BT>jIeZwT!Q03rP(`B6y==)p)&k>FTVC289R`hjCPwo;Y`^bBp#8L zIk>%r9a1TJswqaMkaI4BQlFruD@p9i!{7AO>7U4ES~s+)KhH^_hg@zAr4|Djf2a&PaGu$`iFse?Gco1VVQa7JrHDtzGT zbCXi9qyPB$6_Cbqw19|?N`T}nq{fiRN*u>lY`1=0!qFtM8%0PfLIK9K@)amI4*r~Y zPvI%du=lWua&9sHpP|LLMK#-foks-0ec|NQ3vKz-LV*#9ImPxJevsvEGk~ws7 zU)j@ziULD#`O#XDjHtEGwegMZ%$mQR+MI$6IhHl8T4M%5`Q$)dfDCZY6b;Bwh`qv}cNE&4N+>+Xz)W6KjM*^i&`dliEcFbGaY2hUu409LYDP-#>?hf~1uLx#P zlo{n<4{8tG`(52;9LTAEP$gopG9b<*p`&O>UJz|nghZV9nsOOhGCl?etz>06ehl@q zD?D975|m0_I#-!FMnlG{Tyv<&V)V(uUv@(E->#0IEeM>~oHEE-S~rUEfliMt<4^aN zh^#x1fg&l7s`0CTeC~9`FlXgzhhmBdW~TPssIO53#pzW(c8BQDaZFE2Pca4K!#owMGT? zzx+UENC>{S_QdI_H4pN_LG%V7Faz#v_Me@y&uV(5zOB%;+`nViB^LCo{$IaQp!(O% zrf>aTb_Uu;shyohm#;NRbGimQnn?8H-tRJMQm%W~dy&%da|6bl)*DIt-qB7eO>Qq5 z`LCY|jsEHDC4XhtehQnL{oucaSvpeLsbf`~6*dGz0BH;keWnlhDbGQRimDsYVIFz(*Fc@LU_rI zhtF)N2QBvZuYK#(HAO2rb@zKIzCWIl%L>An566ay>unOUplHpRA|caj2Vn{x@0+F~ zVW1u?RIea1VeZbQYrD0~ppHQ{b{+9>wcis9e3-0|GvH(aPBOq#pnBTTHda2kW<;>b z%Q3x7G)O0L5r8(Y@?TOxv;WCKsc44BDdf^LIwYOMv#=_3_#RT;cHKqu8hjq-M!TjP?|vI?_1Ua^Ft#VG zuMqvlmM*!3AS-i*Y?9bO$qbBVvzD=B@}nKUoE_QT(EZ}F_A9Z*qBG|fxpKaXjIy1z zP>SYesjT~R7X($Ib+*BvvfC6#i>~$43ZY+Ukli@^7fW?A|Ls|e*j(wSabUhfGFv*4 z)2ert1tBL?v5Hd!HC*BHFS#10h|PcOkK6#1)XhH&e5GYVWKnQkMsee^-kCb*)D&D>LyVndbZc90YLE zpzu&-Pa}aNV5i``;b&_4fL_wlYD6=kuU{HK;i` zJxhh%dD*h5SD4)@1uQ(~JnF$`<|o^;#H_LD_MMep>X1n(y>+O~9psOw-0r>%#q0@+)SNMskIhwB|u{ z^u?b+y_M|%#3}JU5h~7Aa^nZ>hh@2(d4?2fH0zr2r>zO5JN9=lF6xH7?hIn2UDfXU zuU2TtD|&TBE}2}6y8qqi>MrE3ZsKw90fg@@V5b2YJDai)#o0vcILE!tCI*AdBkGFH zz&ipThA2x2a;Ck{FE3H`W`8(7Ejg2h?w1h>n4_CVM+szJkntjbyV%{-lNZ%|80pTx z>-hNNHh!?TY*LR(41p1VsEW@Q0mr5L(m?bvI3$@?L2cvj@b*r7@=q_a>xjcSm3;D| zwX-0paJ`3KjSG|H6oe-ZeDjUaJdP;x^l%CVY-5TBGk@@c`MUEN>&`l`)MT4w2+BL`iE4uCaf93IsLzpif-NI9C`B`Eo z0*?goT)@iPl$VvZ7LC3B=KGeMmD}%0ZRJbmM4FKJPQB`B+|St z#>U`m+}`Ul=|2;m<+QlWK_azVlyeWET6kkxc3MvJ^grYm(2#`#PbrbxaER;DO~9EM zoTm%GX0E)Dk)HSU6%Lyy&n%hVH3x;tnd6P{?n-s3(udCffRe5^J*c}Ov6{v` zPhc)_7$g9Pg+a|Y+eYBaW!7CywjE7p(s&_qM^C)aFk=VM~u?{|i6+?t`_)sS4# z*QohdwtK+ zIalt%FZVZcK|ufOqhxE4!rU{l1voWXXB!XF%Nq1YTjjE~&&51V#XS{$C%*fSdnyP2Rr${U2~i09^aOKK}nY zIwdhmd3)&JJjt;b1Y8yJ=YRM9=bu*&FuR<*8S*=GwWte% zwgGAYKy$~Xid`5Lgh__u66T+Xg4gnDYHHM3G3Qw^pMHPhq1@wxk>6E}`17!-sp)I0 zI(VNC!@`OA^5;ug5_!@l)R-8EorCk{y&HXkfW1dp#-&0+bNr$rO10c%frADd99gtT zWBsnplL*V>pfVrMa_m@SLpYf8e)S>xE9BC0ytqEfFB}pQgg!_>k2wdoWXqVpkl*+v z7!h}tN#RXRzWNR9?E|0|ArOj+jdECVDpCix$DcHlhM=6Bv|CTVe7OSP`xxfu&!11q zE(?L1`_c!6xu0UzyQG`=Bc+ZUIif=mN=+(cZ4_Eee5Kr@e1@!1wF!iN&sJhc$QxlP zkr`1wEk&z0h0xE_&<8>2f)X9l+~0{vZ}wXSv`v#MK}!(x&Wg!#L60&XE%p>=(86A+ zK&tA{4dc*qjV*eN+HD<=Ej2>mKJzYFLEYsJ`u|`@l18-pj_WU;hH_Ib*a*SL3n0e2 zH;}dQq%k}DG}m$mfp_I5hWH*e5zGwX#?jAK@G=MO+U<(DRsJSmSD_ z#OsveGi@^4*Z1gf0tkW1Vd!?sz0lDk$gmfeoX@s__fT^UuOvichK9Tti5g(mCFo?K z`CrOIyCTBEj}mS7l<_h#?jlfU%7s@`=vZo;FS|=r_Fb#0nSq!0oH=uwqS-k{GuhI% zAO~u2I##-{oJ5ZKucXDr6(1XtTFM2XgM<`k_;pCNlnWU%6KLe^>zq4&G;Hc&6_uea;#q1wwzrJ6*Lrsz^LOw$fTL@Zbv?h zt!B0~*ko-@*CT8YkhIj5lan)V--ni#@_2-?3I}KJ z-rin?y9liA6fOh~u?z;HbB_|O>NRX^rnx*ERzq1c4F^bAW0(MZ{QD*3CdWK9R?K91 z`_XNgGtMns?t|GMYew#%6RI#n#y~FxzV94*tQ-E}J}i+gS?;>C~?r`OfpHCAYalq(^rw#T`aO`*3**H$lE>Ny5fn^AZ0BlY#WUOopvqc3(b4;Dk` zT|qqy{4|ynDy;6LyMDG7u?lYyXCWXzC{H?}!$PKe4nBx;F#ZxZN)Y4)&z?_P>ck}XEK#!t%V_eeAC*vtF&+8(U|To0?ko9iKd%XC=Hm@N2K;IYh-0YiEeH(WJU$ zQdJ^>Oxe)Cn>1jV#d5gF9GvaP9F!0vPKBTC;`t zqk=Q7x(=!{fqkuw!g#&LuyJtoN?#FtaM$?e&|B`u-1wH?zkN=Lh|K&NNlGGpS=_LA zlGaDMG|PMpf|3Ldu;S)j&Q3RO)XRN#Uft@e@GkR@L}5GqsnDSE*c6*dT5coA956@T zg-Fkl_-W)E7-h)m9@U9Mf9ugsV1Qr~Pw@DcPBw(HTHeEMLJX0>K#C&-H=Vun-jDFEc0V$>u z;(MQI^$pTXx+4xesaM5W7yac2l-l7G@YP zS)3u_oX@*}6Uw5i+29KR_OI*V4e-tdq%?~OIr4+G2ZZ<(=Q`3C?8+{~$kjyb!)w z$~LaVH?DLlZnEUWy9onUSHFA5vMoGjXxf;8pq;B(Jic z&N!(}?#+hXmfhNB!km8z@wR^;TASGy@Kdbfu(8w6>rCLIuaODu`DZ7<+d^n33e7%mj|mWgT20bYJBvB#?E1pG$BZ!-?kcO z2qcH&UiXXHawE_jYNx8;t9w@Xc8?LZ_ffV4Mk194+)s~ov-HIHDCepf>uMjJ_alK` zJvzTkfoAg8F5s@#;rp~xR|>pvdRyF^wZ4bxen7oy$;vW%_dsTsxuX|zAIlN&K83&Q zY-%*jLU8qFfFYxwCN21`g9(z7&KCC~iuSP6Kai+_vUL?>SzQ0;R7-KwSBsv^1y^W}f{MRS;_~y^E|25n{x_R2K?#J3y zye&xuTS289NP=R4f~{I`tp3Ir(j5YEPXOnMj)*tJf4kZ@Q_VZt>VT~dNd1<&sfnmE z;a-h}qve52ZC6QcHx8JZ!U2UjUuW%*`qIWjf0VhW$o5{{$D3GAr$F5}*a&!m9Mv_^8~E(luR9Euo@dbW4F+z1S{cY| zc~soY*A2pJUslaZG1+xu_5F3}i}jT4AEvsz%-D1P(UI3ATJJrQg=@%doAu~4JQl<)PMdf`?+mo0QaML_-EH4<-D42i z7$2by@jvX{_5a^r>OT$#h$4<%nyy8}j%Feq8Iq-&4_q$Tl5jHh=U;$Qs7fn#9WXPC ziy1I8k4qUab9TO(^K1MCeY+uf`o`e4$$fGlcCT==$rVO``o7oyqzy*!&+f*9QGF>^ zw=V6+r<*#FKhhpP{C@J9i7NP3>Z45iwTtxkb>Z<>>&X5Qd?p}ycc{}Q)@3W)*pNq! znjB^=w+iw#U$_0M{(#d>`$7bzx{~w|I zd5E_M4p=#2#n#SB*Xu7PBOS%w$R!g1^wt9wmAoHY#g_sq*D2ZLJy?}B;%G6TD5^|r z>gC?OMD*V;i0Q`w{8h?#XAE8+yTnku#jj&j7MOopR})jbF&p-VB9P*XhJFv?S3E4{Auk|zU#skyR%_OUu>c_fz zxqbDBw|7J8o6h(pz!cVn&^Xb{~m# z&MW*uO;Qu~r%KohN7533xS$-#Sm6t5qSGCON2_m+!?>(Kc_mp>9KXfxAT@cQ(M8ggovmwGNO208A}_lubSUC9LG?!!(8eY>HU z4%&GdxKB3X<=LT){^ra zZy>cT%}vCLRV&;9$xM%+NtwG>RvOSW{OJ|=8zb=N6BUB15;Q=|ZcO3}@V-3Y@@5iM zzGnFQ*QSc>7u!l9yNhd_3zj=5N~ut`D^rw=kRjXY7PylUP~BRJ8JE%eAx5Z=5Z8Tw z_{I2Rz%dQV3)fALV$CR9C~+gm(7B$SklPY)u1AN2gdp1OqhGQI?n;Bx&Y*dNYztL{ z90K?Do+?Cn@WGguAMt*#J8+n^>@KEe_)GTCzcT~dZh9}lelnFKodqpgFx+YRVzgQ# z2du~5r(Q|{ED2Cvt6bXFH=1xrm_I@BSKrm>*;5fN*2SQowsM8uCy*#~+u5;p zzt%jvxlnm@+iwqt$hAw%)TD*}mWcOKrt$>kMC+ql3oMUL4-&uSAojl49I}}I=b9!Q zz)=8*wNV>2?=8}pU#sg9wkBcryYCVe-uXtoOj`Je!>dY@4Njq`P1 ztSe8p(&i={LTP62qLV-0-t=;fctXWA@VgOpCDbAT)UbYsMt6@l=S?R+-iT3MeSqV9 zL9#$0W0>FW(~0;8^;Nx6UN(UaLItkm2+KoyT?EXjb;lP*28Q{2kt%AQC@s_fcpc-! z`^(F=doO(A7Q_|Pi3i&9A@wz@W!@LRb$DbOeqLF!HR&U?pl^veNO80LQCeJV#B7_B zplOH1Mwvl~){VfEEE8!$gv`ZpUXNs$l7o!4t%}ZPgcS$27Y6-!cPRoVIUS`mM!aDe z?Rf3qUWckjLd6!5lT9Jjd|wL;Dtip6t0~K@h-HbK)b{K-t{f^(CQ3N4x*f$%OX5A! zL&(*wolXYT=XbBTJWHn@nO0H(r6J?fr#7w*# zzu_8EJcO695yiH9GDIFLC?Dm=OGH>td?a!h<|q6d{&zr%Y}S)*OD7{@QKx40v~>N# z!Uw(VG}S5Q&&o&m8C5dP$s_h<$7tS=5|p) zCF10Mb~j5F9tSXO7{h!smJQ>8B_h38V~rSK2*4@}wHA|Vo>w?GwzYizjc}&1ekHMN z9s^k>oPd$y>L|Z^R2H5aSR&e?P2Zn6UxTL7kgD4mT;BVLCxy-n_NC_>Q$r3%i^Crl zF_qwC%Fh__6P>Bb;O;W!R3Mco;grfvJ5RJE19ZvV9CFZX;Cv~0noUKjD%$KMOp?Af z2;OIrb!J*QIphzYb1Y+$nW6c3$!ddUuHC~S{KOUWpL_qETvrg6WfmH8j+JJHtP$_K zVN^VhZVox^7;WdciY}Nj&b|0w+R*F8+M9#c+^EkI57JHz9k3*$=Hb~_b=G=TIFOF7 z$D^+L(L@m1Rk}85AQlcSOj#o?h!yYm;3{z^x}ADP^A?WH&mmXw&ED`DNCSaIZ*KHP zj}_byp>d@DGchBFtTQ#{NJKYSBR(Fs7KmUeuTBjad|{guagLSx|6?X$9ScpdeEwkzn^7GbQx?VY zT3{EOzB&A1C`XtT_b{}R9a$z3KgKEt>RPj*?|tXoe#YqBOruHVS51lGdU|^1u1SV` z92;2-nIM6%_jnU-k`JN=HTup&K{&!k^{h@*7yyeM0n{a-hl9QVM%o~A{$+C>$ zR-g?136%W=c_$xEeJ^lL*%_w>Pb!D8x?Ry`V$3}e{jaVwjoa9=auj8#YiQLXN1Er{ zWN&>zTrxcCMW6>ghDi$_c<<$01^qp=iuHGnZnS8f0*oc&RJl#db!5_K_%t|3SC2zcM;c(Jh^Xx_z;8z2n6VD;ka8 za1PN;B|)ZzjklpAW!)k9ZCTKZonQF+(6>tBxX={c4bF@v}KQe)2e)+eh+$f7E%Nk}?@K&`>( zRK?%RDsrWh=Q$(0S;T*`G`%A!w6-J>06+r#t`1;<$Yxrb<2}~b&B6qlUMp;s}a$ZW~Ln9U1FHIL)3RAWVL4V z_vX>!Gh4ffyL<+lZgtMjjwJ*euZqxs#R4=nQtcdnuSwNNJ#mqr!shoG)n~@|4WqUu z(c%W?-GmjN9_`N>jKMsxaJRkTUytaj4(rm48O%6qybENbC@ z3`a3wcGCa#Xim5@ggf5ppoVM>o=u^zDf^Y-G@ts7<{_z6Rs(c%sl*o|hY@~gciH;N zUpHI>%IPq~p9!Rr%YCs5G8dq-9&ZTG_i!7(_9vZ~Oy&s3O2_e`;x}DGLkxiLG4z+>6}$<2%B=a=qhsz!QA?s|$^iL9_X;tTgohu{oy4uP1pqziY{%a$sbN z%!0eF*RiU@KhP)28Sa%n&^8*)jjJ|7UGy3P& zZs>SZ9!RE#il4ZRXj>xnDVpu0pNZmU&`OuFcE-K_sA{)uhh*c+r&)~W$9KY@KG9v? z9zrE6YYOTzs`tCxNus4J8275E4|Xuz#LFuAF4i=Dc8pH``oQ{9?k3j8b$-}qI7#3z zy}VGdxt0Z;5UwP$=DLf$_fDkFEh&6G`t-d=wVKy`T>v+ft1(@wDR}UW?NRcV^+caA zzUbU9!}^uG*OvNunYK)#F^B}Bg)D%P_w*d0uwKhh~eZDwjA%KWc0QceaRZ zX>oeket?+Yq3gL&WKveBHWq}Ra$BS+tl|%5?Otj*_UuIf-?^SD5DTX0aqKL{A7VCS zHydgNazRSd@BgwFzuq|LMD+2qLw6!e1e28}S*FMTTu;pBogxotGu9Xz1a?N-L2S!RXZ zZK9Yr01vSyCz25xdC+!jn`-)>7K8`ipjQG60azMLUQf&Vb?B(OqCBswz1mT5i{gRI zw_nMm_}i^_Eqhjh)Xb?tVo_l+b>E&iq(qPwZN#u-ba$6Ft0)^{HuQI#KCzfNxHJAd z46QZs-2=BM3HZ2*j;n2)dn%zV#VYng5u_$u)$Dgy>(bB_(ZhFxx=K$}=b?f4&2Q0# z;lH~s+O6N0>ur$R9Dkl695lOjQ$8`{$xV3zWDf@{^$z@%(&%?P&Nj@5+VK5#hnLgP z`U?zxb7V<5Bd(G)K}n|^l~0Vwm|6=DL{gHKa=0yDG1nIpXsHVMTl*QOrGSH!wEn(D zQ43jo*=$(rSw7pARJsvXAep-a?@^D$LgghCKXZAxF3CGSa-!=1Xi8CzxnygE?6GP))3sj1k>Ma=K1b{3S6h-%Ui;ZdQqWRc9|OXHl0PJN*s`;*dVZAo zJXei-r$IdLFX2Qi4DZ{~O3XJee3CRmjqyXbXZPHjZ;2{|{=w6n7QqBnS7cgXgIx zJ=RgU47Ji_X6X3rxdp&cKyJIr^zi*OgM){eOI|~JSc&=4EO+a~yq|jIktX8$X^8lN@4s%%JtMG zA@6KS>l$Pl>K$dI{#W@P1T~$lryn1ce+=)vL1%35#;VePm7ZulXD696tj=1cT`u>? z{;*eyXRjZYNvA?G&ur^$fjpEulvYArQjneH?BQ_Rz*avjn!BKi`5pcKes$7+?hlo{ zh})I5uItEunKm`Oacm&$h8oPgqKVMoVX)fP?$g8e|N2o`(r4_13!ftLu-N`Ws z$z1zpOSP`ED>Z4zT_;N!h9-^PXyk$;fxMNZTrBX`5MS8{4O_1$ll@UIXeP{hP#|e2|&A1+@L+j7D z3aC4{OPZ|IKp$7F3o}*4J`e#>sqfLIrjFQ%slHy`EecOiztZvFGgUzOVD{q`jQp@( z`ni)EF)J}^OG9s%c(`YK|A?`HHAikjg0v;K!y7WC^*CQ}e8+~4oB!q&iPX$D^E&;g z`@PO?(S!a!+M}3wi?TC8ag#gto~63s;gF?zsD1|C*6@n=|62Fsru<{JC-le%CxgO1 ztcBK%e)NvtiM<_n-hPW#RD*8hw>Sd`^VmQiX>bmN*XWgCc%_qD_-<}3UTm6lPsJ5C zwp~@3EQZE?4`m-Z8Y;XfgZ_`JsYa7PX+PFk9V@u%&p@lX zBky2s2%_JpD3`x{crqglrjIlFgrE8{QVtasx!X3I`#S!sOM9$iq1!Fp?dK|3D$gUQ z`nq5Yn7Aw@tM~`B$;u;4Wy1y;Rms`Hj|9SCU!3heltD?qdDs^V-Ok5!!3lp4@yXaxg5)W_5R z1ehPTB#wJlT#Ba^iSyO_dEsQGlvml^kqOGpgGoD|G5H+mMmRLil*_%>cFJzK0pm|^ zBn&HcwxmU_IBFDAUImsiFz*(@@N}6A<7L&31RR>o#KKUTC;}EpN99db7v`iTsdnZ- zob@j#Ia3uDF3K`6CI^8BkgO7CVw$;#__1Yz!hzwX#XZX-Wgk4R(oqS6>FfJ^T@6|i z#=zgpO)y__l6O9PWP6JV{SRW#hRnU2yD(4O^v}^P=e|iC`A^?N6*j2b>0_V}K)D1RnN`7Q%xFyDO|E28DZ z!W>@M>vtO7Lwz9@^sy|Y_qOhqlMh(b))bTKn-ERvp1TI6oZDVk{ERsNB`w+8CClaT zy|DMra%U`JVY@55bA5Tw)rpSc`w+kr$7O8}{uENhdLK02QCyuRVNM^j|Bk#|v2$fa zaKxA0nr)Mx$q;5l3#n@r>!%xt;_%I;ru_mdcvjOxFc`VWC%&8c=3wWu(YNVwo8MBY zlzo}TpUXlSIlE#EaKV#3uc{MJ!mD2GHtoXfKg&*Y81(&o`-suQ_L0wIc)5na)KJr{ z0l{8WdP)FqF~Aau@DwLDB5qu-YZjVw9$+)FQVK zs&||QDF!j?lHf(%vzv5rbNA>^4>Vyjs6|ydqdkR*L7x0^8X% z5x4tArhD|-q#OiZX4T19)F0+yE;8R-VcaNYIWDtAqOuBG9cf3o@B(+O+{-aWTs%G{ z*bV1lNK0g-@UfgP)!Q!>8i~KWe(XSeWhAbQmVLA-8qo*_ofrva&b`Vbs$gU;}T;OsWl?m^wErS_yD4HVoDs z64WXYx80kdoV4EZx7rv43M6TUo z=*JOCDjomFxH_8}tLzCBXy7<5Tb~T?r;aoTnn6@D;-Lu!6)lX{3hlNewdRUH3>5iK z9O%Sd`UiLr*E)nEzYut)&q>f=ikgg+cO=QA8*|Xy+nUczF)8e2RTqy_-?6HHMKo!B z;=DogOL~jO+ne&k@FIQiDASQ+TrWSzpDCpAGa;&V zY^3t^$k)FLIag?TW@I#JB;mDnWZ9?h57(3T_Kcdv&U0MU5#9@9w+hp42qg}rkehsh zI!ks#{m5Z}IO@E8snmhNbw8jWEq`hrJAH5hB7-03sNIi19OLp(4mxkUsp|A(m zkkvT9p~l0;l3YH&6eSZ*$DMYOUz0X>XM^`1ltkN9hLgMXy&+mi?^Zv7WUHhC+%{I7 zDn6Q>cK;%31yD1ieEO}84X12T@~e$8X_nlh#TL1c_$a9tp1W#_P8PG@Ya+^}OSCtu zwL&}-O{8I8E2UPPn||xng24Xz@n{e~PjF!{=$!*gF42} zTYW;bU?A|BuqOf0_D$l?#6(pwv{1_Psx#4$)+q2d&c^){n6jEZv~{p`?q0Ip8*O`J>gVj$vnZDB*``2d1Q z9H9g3XNhy*NdR;i(u}JJHfIKd1l)-$CgKe(T2f?5KtoSyhPZ~l*(9hpiTlTv&L~}o zURKpZG-%&Juqk29L2-P`g;Cw0PSQHx0y&fHASxF2k3Yl1%N)Grir_o+enrToeYEc_862n z+NT+ajhyW1+M-9bjtgwpf zM3G>_XbJk{DmurNj8+dJgIS>(ehf2F6yqj0&5Ue`Hll#un{j-CaJ=(H9xGI|p=H>{ z106-X4anEb>g#V{lkWU)EV&5;(x zZfDD)<6j%0Lqb5IjaM#C*Iw96(gJ~kxRit3SnpcW`NB^yE;*TTvG9%O+Y8Ke>fvTC z)hslJz5d;)ofZ8av}$e1dvHIG=wj* zBqs`p1^t&G%MumIQ+Ru6?SN5TwY1nLyJME46nJDAkHb2mhb`y?iZADCaLncmESmymds{`+mYW72IS~V@IBE4T87% z?a&Ni@GaIOlr_}bd#Xl@&3aE?qpPDa()6%_U5;CoWqY_jAzBP`Eq72t-F&H6rCX`g z=w?;rdJpJgaBA4qjhOHN_hXJ&rj~c;!hXh9B(-l4-{Z_~!La;Nh~6Aw@GJ`Og40P) z9P%`z%kbTpFYL5}IMfW_Fo&WYQgPSZK98YC7*yjx!N7QHnSfys=l@bV+Lnca`8x@|G*CAiyRyrIASUmj6BUhSoGFqo|3r}VW~|(`Y9Tzp z{bS#4YIk!`8+I>+r5()-TGdKG!WZJ|y3c0UGJ@qhN>5y4N+dN53-NRce7+DMyNk}K z!K3%QT$xI#!m621UMc+_6=dE+C|v$v&}=KTG$?{^7ttokYMC4>3z#GSYaKx4wtS+l zbm|-m%HhD{wc$Zw3RAjtjknPJGOEQQ$?XROY*!5%d6=o85>|SP0>2c*u?CAIP7CW% zW#8s(XNB1_0kUT5%KS4Rv_RitX-iRF0pVOS$leX+W2F1>XQMEnSDBJc(*vT_An&Do%@)?mE6X

jgdhyklR z5%SsqoBT3m%2qj2NC;y_89qjPz;nX&7s-=8;|NI0qqFI7UMqs%6!7gdwuON;E!z*a zXRu!hrQ8ON%Yf|uZlv+xK9@}o*8y*N5?QY1<_=u{3x2|!(m*`N9+K;yKyn`I$II2g zH)2Gr>Gq+4Ekl{u^i$U2^I}VR0Ca}B5#)2=hX?SSjHeq0{Q1sXuBJh*X4-}%yq^{jE9dt!`_`$5=CfOFl>;1|DJ})ci+W7Q0fY%4L-7;EjTa$~g0ipBQ^xxL} z1pW}~tqaP~SU>gP{XM;HE@Il_Bm1_(=V^{hN`%CBSo;v^?3S%hSr@*SUAfs;rDto5 z*k@*_^dFZ63Nu{V(^)RrI{)u;^Q+<+I4dyEF{0SL++LORMdrh+%?O2I;)F>AAh&== zqqZk6E4aNOJbgXI82j|?0m@?6)~qkJx3W*25dRRz^K#(>C=gsvydj>t?DFO5GR^XU z55+P-o`fIAnctuNaXMSdfBlFXeELA%jRho@N#G7O!~sI3jJ;R<+mheTBLjv~lnB82 zLFo591&SY>a&9i|;fhmnfWl-%vl0A3ZI?}6pAOC=4arXF1E zvg!DmMr0m|HJ3F#s@<jI4!5#lSk!KJ4TNeDYj@3?OY>Og@wEAs$3NJF@WO6EqRe!wh_Xu*BX{ z{rOgfj_O7B8I-`2GE9&dMS2D~6)h$w=p%k?#{8B7hA@Cd?CK^9STtO&9j@O$51Vtu zS^9A^_HZOl_(Z)Wno#%|pAM7kFSCcZ(kTrB7TD*TiPs1b!yz&6N~q|&Q>Hlo8q(HB zo}ECB<{?Wd+ui}3U0P})iS^*uYl&GODG&+IFsOB)X z^BH}DIWD82mNJnK+MFpT_ma*Ulkyx%l{nnSlYzoU;mWS1N)D9@r&X|C0K8exnUJO# z&1aa2slP5E)VQB%4fF0X*O?y2=1t~AnUJAt$ksO^Rm$yW*ldSoazUZeI{UDNi)Ru} z92a|vf|~=6EF0F729&;o>$&R8a(*bAF`CuLm{_TXa33Nkr>As6k=Z-a!>5f&FV&}S zt+c60*p*v9o0om^lM{3JgYdj-PWRwn<96rfYu#L1@{&6ABHe~-r_st&yNO|AET0r?{E%(lid5br*9^dDK zsXg35#uHxooM^qsELYvMEO^ax2MdD1j@3&_mfI(jRxi`Cg>k%h==P4}xR=xAv{}0V z(fddjZjqwsitf9wM9gDrLr+tAUQ`yY4mUiseWu|}Zd)5AVyTv`%vNg*$c-sQ`pPs# z+;<+aW3-A{ZNyJETAWPwQn3$~t@}B2DfkrTR{-e<&RBbwOkvQq3lW7fKu0rPl;cP~ z)tw^t3BE*||L(yRm;{Li%S{AMDYR;G{2=Dj-I}+s8j8KXS0*zbb7z;QjqI{Dm->@8 zZvfzQ=4j}|FWqGE^&N}I{O=wsSTU2~YUEgCc@b8jOvQduaZR~gj)U_O-d{eX=W6Fm zHnkW_JygDaD9kxa2Y>^qqoHFDGcGXPIgJm+CDWPlanxs3vsCs!2#rq5=HhKwtHF}1 zlnucurgwuk^y4KIIah`g@kf-UG9QW#* zhlcn?ceJRjJg%O&QvUIzqE^tR+@QsWop7I)oj)Yg9IATZsoJ@xzsUm1wY>T6=;Oa4 z%Z+$LPRVhd162F9!ZvquUb*-{E7aD#d`w<>f!yU#ODolNh7wkD)#BG_LSZFx8Le!? z`f8VHVxJ?Yq5KVtI$7W$bB%I0k#y!r?lC!=wQK4~Rg@y3Gw$2t>cr7pwtXF|oa0^#;@P0?Kqc!Y3yf6epUBam~O zmHwF*)(rq~?5=3;rOUWok9LX^j>Oybz*h?O%uDC9r+-qt8MBC*tm}zT; zUl&6=mP<8|0hGy&9aGa^;wpE)UMID4sT3eZE*qUH`S83E0MEaaSIUCi4=IWNPyVc? bW)Pr6^UnO5W_BNzS-^Vtfn9}vdS3V+A_|mC diff --git a/res/drawable/default_session_progress.xml b/res/drawable/default_session_progress.xml new file mode 100644 index 0000000000..bfef55831b --- /dev/null +++ b/res/drawable/default_session_progress.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index 6f3372527e..a3203d25e9 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,11 +1,15 @@ - - - + android:viewportWidth="1018.39685" + android:viewportHeight="1019.1061"> + + + + + diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml index b6239f1348..b7e57498f7 100644 --- a/res/layout/activity_home.xml +++ b/res/layout/activity_home.xml @@ -52,6 +52,11 @@ + + diff --git a/res/layout/activity_seed_v2.xml b/res/layout/activity_seed_v2.xml new file mode 100644 index 0000000000..17a406b1f7 --- /dev/null +++ b/res/layout/activity_seed_v2.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + +