From 12334f5a31c687ec852a239ea86849ac79c979ff Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Thu, 20 Aug 2015 00:59:21 -0700 Subject: [PATCH] WIP --- AndroidManifest.xml | 142 ++++--- res/drawable-hdpi/drawer_shadow.9.png | Bin 0 -> 161 bytes .../ic_action_content_add_circle_outline.png | Bin 0 -> 1185 bytes res/drawable-hdpi/ic_action_image_edit.png | Bin 0 -> 532 bytes res/drawable-hdpi/ic_drawer.png | Bin 0 -> 231 bytes res/drawable-mdpi/drawer_shadow.9.png | Bin 0 -> 142 bytes .../ic_action_content_add_circle_outline.png | Bin 0 -> 645 bytes res/drawable-mdpi/ic_action_image_edit.png | Bin 0 -> 462 bytes res/drawable-mdpi/ic_drawer.png | Bin 0 -> 163 bytes res/drawable-xhdpi/drawer_shadow.9.png | Bin 0 -> 174 bytes .../ic_action_content_add_circle_outline.png | Bin 0 -> 1539 bytes res/drawable-xhdpi/ic_action_image_edit.png | Bin 0 -> 994 bytes res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 304 bytes res/drawable-xxhdpi/drawer_shadow.9.png | Bin 0 -> 208 bytes .../ic_action_content_add_circle_outline.png | Bin 0 -> 3269 bytes res/drawable-xxhdpi/ic_action_image_edit.png | Bin 0 -> 1376 bytes res/drawable-xxhdpi/ic_drawer.png | Bin 0 -> 537 bytes res/drawable/button_round.xml | 9 + res/drawable/drawer_header.jpeg | Bin 0 -> 37371 bytes res/drawable/drawer_header_noscale.xml | 6 + res/layout/activity_device.xml | 8 +- res/layout/activity_main.xml | 5 +- res/layout/activity_material.xml | 36 ++ res/layout/fragment_material.xml | 12 + res/layout/fragment_navigation_drawer.xml | 77 ++++ res/layout/list_item_with_button_entry.xml | 70 +++ res/layout/list_item_with_icon_entry.xml | 48 +++ res/layout/nav_header.xml | 49 +++ res/menu/global.xml | 5 + res/menu/new_pairing.xml | 36 ++ res/menu/refresh.xml | 20 + res/values-w820dp/dimens.xml | 6 + res/values/colors.xml | 14 + res/values/dimens.xml | 9 + res/values/strings.xml | 5 + res/values/strings_nou.xml | 6 + res/values/styles.xml | 17 +- res/values/styles_nou.xml | 16 + .../NewUserInterface/DeviceFragment.java | 271 ++++++++++++ .../List/MaterialDeviceItem.java | 117 ++++++ .../List/PairingDeviceItem.java | 93 ++++ .../NewUserInterface/List/PluginItem.java | 58 +++ .../NewUserInterface/MaterialActivity.java | 193 +++++++++ .../NavigationDrawerFragment.java | 397 ++++++++++++++++++ .../NewUserInterface/PairingFragment.java | 171 ++++++++ .../Plugins/SharePlugin/SharePlugin.java | 15 + 46 files changed, 1839 insertions(+), 72 deletions(-) create mode 100644 res/drawable-hdpi/drawer_shadow.9.png create mode 100644 res/drawable-hdpi/ic_action_content_add_circle_outline.png create mode 100644 res/drawable-hdpi/ic_action_image_edit.png create mode 100644 res/drawable-hdpi/ic_drawer.png create mode 100644 res/drawable-mdpi/drawer_shadow.9.png create mode 100644 res/drawable-mdpi/ic_action_content_add_circle_outline.png create mode 100644 res/drawable-mdpi/ic_action_image_edit.png create mode 100644 res/drawable-mdpi/ic_drawer.png create mode 100644 res/drawable-xhdpi/drawer_shadow.9.png create mode 100644 res/drawable-xhdpi/ic_action_content_add_circle_outline.png create mode 100644 res/drawable-xhdpi/ic_action_image_edit.png create mode 100644 res/drawable-xhdpi/ic_drawer.png create mode 100644 res/drawable-xxhdpi/drawer_shadow.9.png create mode 100644 res/drawable-xxhdpi/ic_action_content_add_circle_outline.png create mode 100644 res/drawable-xxhdpi/ic_action_image_edit.png create mode 100644 res/drawable-xxhdpi/ic_drawer.png create mode 100644 res/drawable/button_round.xml create mode 100644 res/drawable/drawer_header.jpeg create mode 100644 res/drawable/drawer_header_noscale.xml create mode 100644 res/layout/activity_material.xml create mode 100644 res/layout/fragment_material.xml create mode 100644 res/layout/fragment_navigation_drawer.xml create mode 100644 res/layout/list_item_with_button_entry.xml create mode 100644 res/layout/list_item_with_icon_entry.xml create mode 100644 res/layout/nav_header.xml create mode 100644 res/menu/global.xml create mode 100644 res/menu/new_pairing.xml create mode 100644 res/menu/refresh.xml create mode 100644 res/values-w820dp/dimens.xml create mode 100644 res/values/colors.xml create mode 100644 res/values/strings_nou.xml create mode 100644 res/values/styles_nou.xml create mode 100644 src/org/kde/kdeconnect/NewUserInterface/DeviceFragment.java create mode 100644 src/org/kde/kdeconnect/NewUserInterface/List/MaterialDeviceItem.java create mode 100644 src/org/kde/kdeconnect/NewUserInterface/List/PairingDeviceItem.java create mode 100644 src/org/kde/kdeconnect/NewUserInterface/List/PluginItem.java create mode 100644 src/org/kde/kdeconnect/NewUserInterface/MaterialActivity.java create mode 100644 src/org/kde/kdeconnect/NewUserInterface/NavigationDrawerFragment.java create mode 100644 src/org/kde/kdeconnect/NewUserInterface/PairingFragment.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0da70ba4..d59839e4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,25 +8,30 @@ android:targetSdkVersion="22" /> + android:largeScreens="true" + android:normalScreens="true" + android:smallScreens="true" + android:xlargeScreens="true" /> - + - + - + - + + android:name="org.kde.kdeconnect.BackgroundService" + android:enabled="true" > - + android:name="org.kde.kdeconnect.NewUserInterface.MaterialActivity" + android:label="KDE Connect" + android:theme="@style/KdeConnectTheme.NoActionBar"> @@ -51,65 +56,74 @@ - + + + + + + + + - + - - + - - + - - - + android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity" + android:label="@string/custom_devices_settings" + android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity" > + - - - + - + - + + @@ -120,7 +134,8 @@ - + + --> @@ -138,40 +154,44 @@ android:label="@string/remote_control" android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity" > - - - - - + + + - + + + + - + diff --git a/res/drawable-hdpi/drawer_shadow.9.png b/res/drawable-hdpi/drawer_shadow.9.png new file mode 100644 index 0000000000000000000000000000000000000000..236bff558af07faa3921ba35e2515edf62d04bb9 GIT binary patch literal 161 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 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_action_image_edit.png b/res/drawable-mdpi/ic_action_image_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..5c1da971307bb6ea12adb9d3f78781d385dce7ee GIT binary patch literal 462 zcmV;<0WtoGP)G{f12t9gyzQN8(jfl5{f=;0Q{PVCO75}XaK-4 z8$hJy{`_KdGf8U(jY!&6o+mFK}G8A<8IhN&o-=07*qoM6N<$ Ef|wb};Q#;t literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..632dd87bd6ec07d01f9fa945380c98bb7e122a76 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJEKe85kO=qW6p4fb76-l=_gE#E zu(&xhD6{9s(?08bak5Rc<;uP@|nU=UzFz%6x@#ly{E6Z5RU$2Hhw*i>Gs`(~~C zr~2_>(e4Ka`gpa)&de}Ks*u{@U5E@m-v9X3<$3NT3r3p*`<7|@n1Ecw;OXk;vd$@? F2>^8yH@N@+ literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_action_content_add_circle_outline.png b/res/drawable-xhdpi/ic_action_content_add_circle_outline.png new file mode 100644 index 0000000000000000000000000000000000000000..f2a6b4cf611679117f1bc1caec7636ed883ffa7d GIT binary patch literal 1539 zcmV+e2K@PnP)@{otd(F(6HLEe8 z=A}{d{txI7(6NA;Gte0VH8+6HBv|cPvLnZ+{{{F291tOp@n@urmeorqfX-h@t5d-B zM#7mbwP;@9v{}P`es@5^!GiMs^Ll9n(DAd7{2;g!oCk__-0!D|_zk=Xwm`&RWe`!A z06H!iSAfUCSa3#$V*hYoN((Y&b*R_sN`?s2&=HYBGdZ8}`~~n0L?kkD@ll8XIxnSf z0bSs-3=K|k|66bb90uRp|6?fsx86a{Kz=kwTna{-Ed3u1G=ZiS$?68Xks~s5mD~ha z=cm!?EHEUc^*^}xC3p{f4SGTqHQ8D%t_G9AwP0{c8^3e!b+9#5wl5$R^CYxvk;nlOXGxAG1Wp5-^trW&(GKlG(os-l)3s z2^U7fbgm!phJ%*c&FCS0f=Vy}=HYEb>II(U54m0#!#c9$DL&)LS%!=qL0VJEtWo2B zqW8`(T+a<13PA*zZ?CU^4{$v^&GxfnC%iHUP^WETe1*U6>L8zB8`v1KcL*gwo0{d| za))g>F-vGNcOm5|@9S%qwkXd!UzP=! z706Fm1+?o-imYG_y1i4F0Nc+mLC_>em?l0o5IkmGMam?=NRUP81G)ae9$7}KctT4H zuyM8(VeWqZD>E_q_tB*S0<>>f4z6*Oks~&()%+AffZWi{j$kb{JHfMg{qG70(8RnL z+y>kw`eAfb93iuW5HOFoyFBxM8NpkkKfS$BHUTyaoeE{Qb=JECm0QCfL4iD{d4coa$A2n`^}Yo0hDJ zmv)EoqPE6E9RY`^uYE&i2^j+V(n<7Ig4FS;S#B?ieBP=PMV`~{m<;0O2Z%%wk(86v zmt_R5R+5|oAnSVLkVRJCj0wN#tY;nI2h!_EBAu%0&t$+YA9aYM-0Awj7rgI7%s3xWK zkeE(w>l+kxtU!BfKP>(M_nz#du=rZqzR5E`g~jKE1Vr^-%e{ar9CMRTFay-@V8pCI z<7_>UZ{U`8IT};=>#-PXjIsbDp}vQsMu13bc09h9=kgJ%I3CwpKOXem@wkzoD6E2z z$_~j&kl4hteR=!@Z{E?thjIes=Vv8IC={k+`DoWXdI%)Sng1;kxwKby5+l0vc3whq6W~}vXp)o?7?LC@B~7IzNhv96BvA5& z(7s7hjwK{%a!+ti0n7g*O-^CD=Rx15$t5J1HONFC0(XEa6D1X)QZhz+Bucs@7!ew` z+MQLAD!Vh(!}ImZx-K*aWC^u|icvhTU$S(HMbs}{KGgi$pP^S88 py^aO+*Do8|uZ{(TGSy$}{RB)wk;2ZaCbetB3P{b%w6Wh6en|23-G83!sgF0VmL=z<>upTLhC! zfljBh08zUYwjZ_#b_;eb%d+3yL~~LAAbu%C9))d(%~yi|;CB)>3J727LP!Px#4lH~ zz7xNUg8cCV|2&3G0K&&Q5Rw3(X8s_AjldR`2>gcgPnZ&b@WB>B^Z-=OpN61q1v78z zWC}ckUAK*d6acJ+p!2z$mnN5y@Dw&?Qxj4Eumobxz;;W@bK|TDgm6*n4$%XkC{+WP z2D@rNV0Rb?fYGXZq5}Z2bKvkWYzEH%($3@j3Ka>P@yly$j#)foT`~Y5avq%B0ox0^ z3!8#~pE(Gt@%Jg%M%Y{n0`G7?zZpu8Xd*yW`z`SF5Nsukvwsyf2@%Zce+RBxgP)VI z4FZHu7{82rr=tg;W}a=1y?#~BVL}*(-Gh+t280v%e-o@I9rzu-s zP~r(duj(XU34tAfBJUW5aWT%ZIKGi`-h4^p094NJgCoZ+X1)lD?hX%Za$KU?D1cm_ zKLW?fa$fS8Ft)^*x;Hmo1TFe}9SvGMKZ&<2yB5KgGw2r2N| z^(DAJ*m~a8w=VJxnZQtHipmcwT8sK%`UJ~Fs?i)bk>-m@f zMA_#hK)xa%+CJ|LKzcyx<6;D)E>QBn1t1aX_whCY`hA8aeQg9tg!+B_FK3l~P#)nk Q*Z=?k07*qoM6N<$f<#u!F8}}l literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..51ca58e896d5d2bcaa4f52f3ba6cd845812eeaba GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=-#uL%Ln`9l&N#^1YQW=s(ue26 z^dz2XNe%YFFIkod*(LleT)L^}v5M)|R(sKZf2EloG!(FAG!`%$uw*huDZ~Kr9flmn zs0OhN5sBnKb6r=h`rBE5n~9@=IivB1abOFMrU- zETUzV{Gef7l`;36yEFCo&rf_&QOd8tBiP2_{4r6Znxn4rkoJy3{(u!PdK#G#TDI`b zh*bE!TqCi=z(t~q-}xq!#rhqh@7_wqFc#W1Gn~5`TyUI`OLVSbK|}FZkvoMAPOj-Z sG7n;GS<7V>1YDG4X156UKlqm|$il->({Vx$FbEhtUHx3vIVCg!00TjCkpKVy literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/drawer_shadow.9.png b/res/drawable-xxhdpi/drawer_shadow.9.png new file mode 100644 index 0000000000000000000000000000000000000000..b91e9d7f285e8110ba3ba4e72cc6f0416eb3a30a GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^VnCe4!3HEl*p=S^DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MMa)2jv*QM-d<4Ta$*#5x!8O#VbcvCx78OjjCM19-`|n` zlcQ;yJWqK-!X?h+v^9}Es?F+hJ07=b>sdT*QRcgm+^%b8|A7C`|A*gYPjm3$2miRv cpZdzQt0C%<%j~>EK-(ESUHx3vIVCg!0CP)0sQ>@~ literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_content_add_circle_outline.png b/res/drawable-xxhdpi/ic_action_content_add_circle_outline.png new file mode 100644 index 0000000000000000000000000000000000000000..ad0ac8308a14e650a27fa478323d3a1332bd311e GIT binary patch literal 3269 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_image_edit.png b/res/drawable-xxhdpi/ic_action_image_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..d3674e7b04c21cf68c3900c33151d1574b05587a GIT binary patch literal 1376 zcmV-m1)utfP)PyoUg zfdWtf!VU;`uOmPK2slLvod0iucn`3|0)$s+ zqZ56dRRDnlLD8LqmqRdSBy0@!HRAPbXa{rzVr@vX4dago(9gj*jTCkS1TnK2W~_o9 zLftTDpb7-ufHgs^3%nsqx^a181bwir$Xg)+gff0VoLCM$g1D;r1mb8YSAeil6TYC$ zcWC=WWcTrlg#rNMc|Ox2E-7WvY?wf5AUyA01-0Z zyD)UWd@~tPF=U;?U&GStiISU|%%&+DRuk^1Fmlt@K+mq$h z?`#pyG4sO^xJL9DdI0e~pqZQR900-0=av5n;!W0h=tI_5{wR5;A}GUozA1`nej9W- zPxGA`0ls8@<(1&X2=FQModV!v=DP+!YMw8a`OX0FHS?VS;B)4S0?^DKKO4?<7UbhR z-*f|#8vxDx>L_vnpqW4MILH)$X1*zaGJa#0X1*W*&3v=@nJva?=0`K%Isnc5=*DOA zJU}yF5P)WWeDkeEkY;`|^HT%R%ujB-l^UR#F9<+0KfU>hBSc$@jI0Pr^Rr2%-K`H}!M^Q$a0<+&8`9sTpGzRp1Wg44{t zeUPpie5OzSgdmRA^K-dA{ i?sWtx0AUA&yZ;aNSipbH^6uOK0000V0_@|;uum9_x9FB-y;ShtbvzU zYXjJ?2C>&(I68?dN%G}e2a6i}pK8WCS08y+@o~D4#if#m`YcEI85voQuso{ZRZvh9 zIG)YGXxL~G$IQ{edE}#%gM*Jk-*pD2B&NbWYytwp9gj^L8fG}itVhvuAYS-Gg^k_g z?0;839xvSUHs(PYGsli&-UrS-HaGA-z;I=*D(8)brpV0SJdEYP+ z`}u#>yNn+$Wk^5tbbZ(7hDrZs`l19|K{?~czjyWOetZ8YV|gU4geA;S)DsoV^~?*p W3KFZc11 + + + + \ No newline at end of file diff --git a/res/drawable/drawer_header.jpeg b/res/drawable/drawer_header.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..58ff6468fd018ad200070188d5c517de4a14e681 GIT binary patch literal 37371 zcmbUIcQ~8x8$S*wR#2r{T52~`(P5Ov3{|t0*tFCxrKmk(gj%JM7}cs0YBWYsEk*58 zFF60Cz%?Bea?>*pU3h>D1eijH|18<&*)I_1sV)OTswIk|Zs3Hb$uU%r-Ce5rPQ z|BrRC1M8wW-2=$!y1+F4z?+txj$TNL;k=pw#Mbk|73pwBj=PB;%9@yA z7lm)nh-{oL?Z1`%f48s~|9`FQ|5@1oyRK0X3oRJfJX&@T95j2SIpi-yzEy`z*`fyI z(UC>GP)X=aj^AJ0#EDA2+iQrk)hQkfNN(984IkDM`7m;GJ-@tJ%c zu6|*PzwXHBLZ>E_TUlz~@Utj$E_fM#0-7^)+{k_QaDTb=yWhp`pO@N-##XLtE$KO1 z1lw$kOGFO}R&kTN%j0qVLTYQvmOTgHM)&lUj|B&z_6ckgeDx_!FFU@}T5l}e4J~^` z>HYn(Z8P2L1oX7|2YNQr`tQ5(v0$H}Y=I5w_1#RELHC<(?h{ZCZnKyNiB%A3wl`ca z{^e9%Sz|_2iP9=94y=|c@ldhk&uCCEM1a&12xSZCW8azK=}?Xqin(^_`Xv1DzE)K1 zdiM*dhL*-AboBZOsPB=o%Pd!%^PrKSW4s7Yz>dWahyt&JO-&1|u_J)&ghExEG$ zLPTJHUp91@gu`S%xnHCwM;67&wF$xZ{*}tk4XszgUet;Aye*YJ7Wf-nFSD@R(ldPK zRUUl9`zMw8{)RGqPGdfB!2?C*$YK}rVS!lUK9tb(llq`51Hs(1{Fw`tIBrU+vacTWpA{|?xx@>gj_UpOm!0&@RWzvB}eeW$rZv2$(Z%jnSR2eDiAV%cMI zjSnzf*A_Fk(w_dp1plNXS03yYNjduu=l44gMgJACdepxc7NScQIChB(xOs#6&@F=* zkBzjU%Koj=O-~p8G_<(3Cm<5nNcxNzi8G9#Zd;;nM?VLJS2;}MC1n=1A0|fHuxdTn zJpsXT=7JdnZYq!|&iB&aJWmFNAQ3y+FfKPbvZER|xte%DSv)rrFdE233n!^M8tg^u zvEpO-NvWw1hkW8!l0#M zH+RIgwXCfR(mtwERt)u7X?C=yWuB~CzIR`WV(a+TLS)va)|GY|oPY*&rK`GvC08@c zOX0$Azb&=1Em!Ig%^+i>e*uRD?zDJ==QavX}tg6+QzsY=dm4PU>eIvNjGKYnPAa8vn zi%XSHW9(jk&2QB_g|Qe%vky1kXsx>#`|%^KZHXxKWe(}aF=TkM;q2>qv4`$xztIe4 z_uPr>3fJ*{sr6QCzGnjN10?8!3iOmz+tzz(AZ{r{VrtO7QjNot-dG>-6j>gU5SP-K z6A+tufQ3ekT3;3u9U~2XjwBMh8gjh!a7siUBt5a*_d&xj{`(I6&TntAzX5o+ta{G* zslmjgxZD)-2Xe8-HKBL?9*}hGv5WdQX)VJ5V!gQ7d%9a7Klv`U(nSm9F2-#6GcXl`?k^%7r2T(n{NuXTDh zMKuJFQKu3+K9E%If&h(jtSg54^4y`d;ewQ{8GX5V%^^uVL7GVk4{G1uF6@)J2?YgD z#I8_1jkHZZ7iSQrDCm@Xo6}pHHsDqC5FYf{eH>_ac*958Y#RK25<<<8DX95 z8GqW93nA~ys%}}M=TAUGxo+$c!ZTQZCpvQG7N9<`k~6!Qb@q+5W{EbpmAxr*^v6eX z^4H&u=kOOL9+(B(ixD3upQ7VcD`XJyr)Fs6fyo1Yan70AN9f^#u@@}^O?DrwGJjso z+*t}{{?dAh&I<-pcF}M&yIB*qoVdSN@}5*0uGO3wJBp2`Q*;wWmz!hk_nwcf%Ul1b zhRbjngeiOX91gGD7VrP5AMb)@NqY7dtv<8d-)akt+bo=R@FpC_qY6e z)A`Xt2C=#YM~(J3Dk5@d!mvg~Cc zsjt%6-acDO9j?4JjPldUxNG?W{{~A)9`7`f@EI; zX6=ReD|i1ie_kHPH-vpq=N|_XKYv^?1xt-fB7^S z*bwFUNpHAlS7(3`8Di%e#kJ+f1E7a#p&(ID;TN9ahCZ695odaJn9*?Zy&%6ic!%~h zKGQ05Mm?cHx`b8r2Ckoy1_f(!2PntbFY4}U_U7`ucAB>xN#5c35GM3R2E)Q)NcY4G zDaxn4_nUQ-J&ZU})_(#jRqMTMZ;s(*%TmYquc?DfUbCD>v1TW%7*(?(P$Ygz=<8~c znBO}_lqi|(+Y$2uP01LKT2^OT2*2YLfj2}<2gJdY1o@@l(D$-4Oxi<>b~LfvIl{(v z#A!+y4MtW}RMlpe5j4btTB0KRp8QQXRk;6g??VH1md{!mIuzuOZ2y~UGW36X60$IsR7 zk9j#f++RNy{*>M4GKt;WTJ?dn_^+IR1WbpLqm&MY4EUz75-cOez=!$^#nKJY z3Zzw2O?24b+(o7PLZ>Ek$B*x1J|MwL^L_-B61glyUm96YMheU(p<@r+pKt4~Uy`kP zX!a#}8BzT7xHE%z0us4?Cu$}UIYQAPv;~RzzXTlQW&536G{dt=i!3F}f$3!84 zFjs2I#k-WHiLL%q!I+(SXW|iJ4Cuz8t0-1U1F5@@GP1JlMIRc!oes5qe@sWY_4Dzx z=SbnLF5@MwRiD`t(54+v>Dm40U+&*~Zb2JccgsB#4rdD;u8l9L{bOuZt}cG{_%8KV zN=0p&9PN$y4ztW3rCPIYA;S*eUndLkiv0MLBcR1l|DK7|%Dx!e*p7~Nrm{*=x_`-_ zv#v_td1H~O`8Y+F6@GBr z$U4WeR^R7*smg;pT*%8+3Uw(ahMAu(SRY)^I}k{9oKjok zk`${IalPStJo@$35di@ludm8y8}mvoNlIylchZ1F-MP?FKDTlL#244!Dx_3H6mf5F z!nbLjs<8H^Cpym#w29Izwf9#ZDK0Nbh6=B%+#F9GDculL2XNG;5akYU1+2V&JkaiR z`+I+ecxI%iSSUovLtf%Xrd9p%GTYCKYJ9R>-5vX8yUMYPW9zduvB8jnq(?;K{;NV^ z9afQWr$UQUA?ef!Vk+!+8{8S{g~e1STc?y6FOm) zzxfP%kMja3-Gp`iP{9C^*-2X2-(P;|vE0xJy1eS+qN&nRq|;u>^C-RA<@v5s7ew!K z?O+9C`Gmr#j%Y@UXKRi~Y9bZQd^QmPru_z1laYr~4N^u60|OC!kxIIH`OL;he1bhV1g}hjmFDK+Z&`+zQPuuknKq zmt5(x$7BwEUK_Wl7(4+bQLO5sb(^3w?OUf+VYiS>|0 z18#Y+w(#*h^Z<D=Hh}WA8we;3G;G;$AkO@$aTiVa(E!(J+>-Mr6CJXMH&!`cHkJbeZnxq%+@bn1C#bpo z;pRgki**#IlZqm$oEh)#7!E?(_UBbHh@jiV5Tu7z-(()D=D%C zlS`+?X_Nlbm1*Oo?<6G~o9VsfpX$-P@4(#;{P~r$?^}gNP-nTn&F+4 z6Oi~r{yWKUj4J;#vHeV-Bpu-kxV)=R6L}-W1a6(_9zGbjrpD9kaq71^a;t*RH)$(| zU5CFtkYyAvisAKb{1+mwms8E#M-N$J{X@~X+m&-RF{6r$i=h39mz<>OrPWX;HPLoN zT*k~M_wr~wy}ix^a_U7$P1UJ;baXU&=yWN@1(#e%arYjvulJ-BUJCxqs0N!yZs*Iz zk{Z4Vgf&#wUSPxgbNlL@(;oZID48~0p#5`5xa`*DUp4-fGvUO(`i-ITnj6n`zW3~0 zyO;3TqTGxfe}}N zGu`v>q6{Z*VPDk%7=od%pn}2RGT>2}x4{;Lu% zh)N*}IO`M8V|hPud#L=Xr=HGhxrHv7vA(x1fm+;iPS-uRsm2GNo?q4uyjAIZ)VNI> zXCiV*1cy$=gz~|1MeP~8_0rw=w=s?1<{voqf7Da_`24cNJHJkM7A<|Y=W6>sOrz!* zS=%7vz=X}lnOJx~h03wR^|%R{)$~)R@MF`&UEj7Yq!R8&nn(Lq0<8O&g3pS!rY1+m zMD;QiT`bR$!qO}l|~v1<@UhMj=)Om-xQD4{{%kx9EH34{+d41ssg zXmdY|o+Kwuao*H=;QZ>m13sent4@W9s%x1cYIpHBi&EAIFK>LyIvc7kXR*^)FwNko zqSYVIU8j;VPv)+NKs#OR%aY~^^!|q;6P4MIA1+Kw|I@UMi{_7fE~a>EEA)PWlX}0L zlYSK~Vf8h3Jb18(+khWThPQa?ndu)TW3U-9Gxy6(r6oPI3_be^o2AoTcV^SkTuw$r zyW19bm4!IJScOkraGOP!G%}g^enpIQ|e6Y1cGbO?^#&(iTYwwzon#a1O$Y9mT(o9OsUeT5%@eHrkWuLr3baSX^ z?_E4MS)KlG6g4aL>-Mg6Djc{PGiFM=erw-op(ChXVx}AHL18 zxyKCUx!dh=wwbi{p@0Mi%8TArvhyOByt48M=#ky32h#!)E~b)6UMDcnHyTYPD9q;n zPEvhmhmcl~b2b()Vf`x}MCI)VNx74-nzI4js6?q&HiNEBDIi;t!=w`NVp>MV24$Z= zn`ig|wwyT&yFKuvYo4TB!&;aB#DKpyo!@KRXOU8vB$IgUW~ixvq-Yq7KrdcBt_4Yw z+V`1FtA0r5u<20non?mV?ohh0AoSs)yT)6w1>KW^rAlbJ1^*!$osB8jP=gy| zKi-N%m9UMK^C^%@W(5Pfsj%h)lPVSH!q>22tBWc3F#=y*xM-(XiYd!j-1RVg#KDfPsTK=ZI5TzpV|fBu)0tCXWK`H%fr22#7#DaK1i&7 z@Ap~UlzxyFY?-|JLGRJwr}{CgB48}7uPs{t2*7bK%*5ZRlZJ^)n6?#u48-0Y=9I!f z5OW{DP|s@g^IE9;o%7yqp4Xjr9BDVV39IYM9WREyXOtRrR|&RjDq--UcL3@R@Zmm`sh27+siYqZc|ADn-Ze>>)o-p|DJ#l zJDahUGQ2_{J1Bou-cGH0$E@CkKrG2o-CS7DgUG9wex6Jz$WD9!g#*nQ+be!I|V@A z2U|5CEz`a#F2?+Fy#>HmOP%Oqs()i5p^c z7ad($P`-SN3riQcxx2mNLI!Jx?j(&`YW8+=V3Jy=8XFVTAPX)RHOz6A{9Z%>Z~V;WyH-}EzK~nbZvNYlc`%B7 zEJ9bEduZ+8(AxAllGO{Q+|a#KU@Hp#v+14Oty@?^5)dQ$5+MMH2`^Orgzd3xR_Vis zw%(MIcQ%MyXJkd5)WHf?|qgE~(($w2tZzQj=ZEffMa=Yvh=P##JLV)5B0}kQu zWD;aBr-!1UGy$f08;6am1P?JV;~zgOdG6D^cLCq+Maxi4bwMtoFZpVE4vQv(mi5Qb z`t4R0qIeE1=7kKB#s0vYCZL;(SbTNWr!^sri4pg78>WQLq}B<$v<0^&dv+nticKXZ zs4f|^I04`UywG`Pcw0CLM3kTNrUn@!JR&V~|GoL!lRfwEP3{|0T%gAl1o)_h#m%~z zvSlHjnEgrol1phv?!d+M8=v?e1PC5)W(EJI@*1~UM>8_*kw+U6YV}Eh8wmJPl{5NF zU+CK2{MYxJivlCnU}v%=C`_Zx)Iw=Rnn^v+CnV&1at*I^FE!Il~pAtE!S>WfSbN< zEQ=NpQdU}fPoq{36?wohKh?y@bOL(zVdcTkRlNkwzA1mM|3Fk_ z;koG@tsF?)M;SU`LFA88{j?{bVMP2e*EkdH_-@fXZIm`DEF@%OC(r+X06G}nYYe%+ zy+bNpJnW-LfUvPkVtu z63%QUxc(E##{`s%;3-l%WI;D5FSs4R@8#a{bXewY&2EvVYih!j#GQ#&R&;6Tc8SR@1v@kt9{ah z6fh?2*hTH@Z@Yi2q3ea;KB~8#vF$Ht1BWOYMqk%TRRDS7GmoEdrBYw(j z$G6VbI&4Ky(U;2|+l@Ir78l38lZ}W7rzuzbT;LiyWpYc)MWLN-Lj~Q*R!5IY0CGEYe$dD^y+ch zC!iO4ZX0W}Eb5(^Ek@(CgYG1qb@)nlvKe%LBk<-Wlb+iac#WKgC zJAL;q?YVVKv!c7iOV=0}RS}9?E9Rg21ui-3H9SVkEZ_}N2IG=GrW{FxY89z(1U0=S zT*ke~(XZry&X!uRwC} ze%ciV?L7(IeYM4uG&gz!dFcF&f!=!FX^?n# zbiE_61bHk&M#v@WW35#kS%6P}}GmcrOIXzj$gNS$}EDekGKZ=*SQ2JnO>vIt5^ZuevaOr_1nJ-!! zBD_uH;-srVzbt6%Vp=95w-z6(2Us^%RzHT%(nk+1Tzv=y65Wl-e045&_U#MCar-GQ z-+ll56B-cm3i3Id*_ZuL&fyyYeIMSIhilfFbyq1U{k1=~TeL2@PHa&x86|!jGqaXA z_qb>qF4!HsJ{2EW7o8bWX#JD$@NVDl+cj6z+JP?+KZ5VRK28tzoL!3^zW;oteR8$& z_+!s2Kl0Oqx3JZk2HnkDk!V`q6A;8a9^G=w?Iz5Z|n?+44;~q9Jo46A8F^6USJV$X`7Ep(*RK zOT#TgDK1@`Z^%)GwPl=qIvp#kUQ6Huqxd=x`R?t4D^C>lv!MC5!~;%a%S(#>*jgvv zf!<%?%q2)5d?Fm|mF~;{0iDVW&45djJW1Fov3uX>ccW>$vNsW)VWQ(O{q=>^uyUc> z^tEd`%kiCk1wf@o@r@a8Mixk309Q~zSC+&m?1?#Kr+gpa7UMtTgbfSjm>#qEErFG4 zMWJ;|yr1?zefQ9O*1IFx>#v3CY3%N_pc;q)n0K@MA__AeF zeCE>|_Vly#<4zu=rzap~mx`n@HAC?Bgf#) z{qVQPAxQw62_cit zidJ|PM8lmf@U~<%JJ*hbCUP5gy-wnwqZZjW-TwBe<%&Ug55_ao$Pn7v!YQJuh-RW@ zxUl@wd%x+~!b%^XQVyS>&W8>m-P!7d~E3(NAJ@_2>11?UgJyK6*QL`}voeC)0|aHH88- z!wb)%n9b3G-re=j%zj*M>XXgSwF@r5y}brhW%qeQeK)KBo>>kM)3{+;G>FC%_2eJo z!@|FOvJma(-(C;?EG0%%6^r|T(B{pYU0Fk#8EnBU$+XZ_5+#oElc$at30g5|TMq9+ z=P8JEfmGGF={#}$c|vbJ#}We9u+F_zBTe3mxL|wA(O~L*FYQ?|0Vp@rgU*}Ep(Dqm zSeAZB^_lp0P6j4#RlOu;j%B_uMgKMrw(77atijAi3-W1&b=T>}^CYN=gMcig4-o%V zaJM*@e?!QFo&7mg92;S+YD&08Q+590BsEu1fEBf2#!!=)mkxqU#SgNmUhC4-Y4z@> zY#4!bt~2oP+CIDIu*X}Lq{+iay)b( z^|-Xn2j9}AXA($A(M~I2SnGfC$H3ukBM<*MHi<8xS@oz^0-;LaZH2MP<6c+7D>Nko z8_BZ5Ho=AGY%nii)C{rg$Ib3)jYjN9I&0oZMx-0!h~p*R#^H0eok=S-@Z2pD0zh!T#zC&vT6zM=Ffr=)2i1!hY1{{ z%w}QbJW8$VmU=C^Q_a-g zU8-Z1XhvQlp~|D{mzQT~8y|%Z(((7u3l4B??rA@~WT^;tV$WKA6k@gM6 zHy5Uy=}I7TXu>0bJwTuW=D>XkNrc}L;nU-N%c_OA{xH_Twy}YH@(HNeAeO9}eaDqwU91&;IB@Xyx^6TCAHzFv>q?|zh{FFM zS}^)Pvhd=8^-758M5qPPN>lS6nIgv1dN>F1{NCl=1lcMy(k7Cf!K4yYT(Orbt*tzn zCq{RBVX%lV_ctfA%zkz~=|kE6*VzogwXZb+-*5*{WQ1Bn)HsXTRzzpl3*SD<`<2hY zSaszI7vw8>sFu1Ai75!)=(%+O#9)OFi}Pb+~t9CB*Zqk#pPnw z!QE)Go=iah4d{iVZ)Dy&$H(NO_^q^nnV>-x;3YDeY1<(`+lFRm7=2l;^ zGHa^QRSlM!ukpl8#P*z94xd)#^R2j89!5rPu7mGKTS))$JTorZdDs$aaC|Xd+Ck;{ zui8CV>DO*uL^S6vac1fn4oV5q&M2Z!Mv@Hi1R~uvxr2m!&2NMwkk<+(CkTXN| zY}kNek6qf49&|%~-PCHy7xd9{|G9VDfvkGRA6}C48~phwQ_r_HcdnOrgnEo=sX}-{ z3f2Xrx@P`K%L6A0Ye)hk53=|{442zJsf@IK3~w);|AbWfJ1^?D<9hrk)U+oMmUta1O%@(rHuz(FY7>`~FOF2Y=wS>v9eCtOws76@CI&4TsDRK zTQ(larR12WWyV{G!Rm05%z&qr?@pJIL_h3x-!9v%S{Z}nY4UhMcuDfDLFDxQ_t0xR zm|y~*Uckk-BJV0b^304|39Xc+5 z=W)?<6FU~8QrC(WUwNHGdge11v5&?}Y>rPc?L6?w{)Q^eq+G~8Jpb+-P17zm0w0}u zZp(a)Z~Z^$*bTYDR7cUxKmi`n#wa=O-PS~+Y?t0{Usa+ZLe^b(^6niB*kjgZMpNaU zgSFfv0mL@Bcx{p~+aQx1Ii)WVsc)C0hKqS(MMW|E1j4~=0;K`UJH4^RY<_qU#KgS- zoN%rdTy@;Lic`ER?K6!z+}$I%9hF6KD}j%lv+vo_uoB8hx95Bl!^Ga#Zbe{WmI@oR}wlv(_T zBuOJ*nOT!MP9~W#^@uyBHrOmK{#6Kk3(2dhm6N z|13OUtqAY}Xr~C^nY3K|^(;9(0b<>eSv41ikVNeshQ1y!{6xDIaXf?2_YXW37}kcl zp_lDRAA|#4t6IU_$3WTT*vD{ec!`JyC&xQ3G6?mzN`Q0!#beZVq1=tx zws7rM^yuwEV`EY%0de8XbrXw_lxhpZffC>MdjmJkzgD+%&4iR47=s_d_8iWkShj{D z%JXqgxt6gpbu9ic<_T7Fr$x&v3kE?Y{ z%81UDAw!F42G2-$2B|hUc_>yZ?V@;;^%E0q(&Or1&-TH?#lqP8oZVc?NT5)fi12-? zgGJWnVjMhA1HR!kK&I%nAyDAPGM0aZcujQ9VcO=7a-H%bb428b3}(vnd_r+qHeCr(;2bPb{Cv%8z~B0NUPdw47NEleUYOvMOG zD5hh1JvZ-#G;Lb|k^#A6iT54szp*L1{BFM4^WGDO0BqZ#iOxv!W~KTY&VC)9d(qDN zG)RCL+1+rAQ>jeGZ4qCQQ*PPH*TVqXq5 z=*&UpwejIzG3qc11yN*%>&&Vg0gy$x7sDS9^!7g}@*>H{qFH>GP4ZmJET?UDl;Pc+ zN;v`&n`$IF6UUdxgtC!t6x(8o3JGuWGt# zDjsg6z2vmvN>WLg(0l3wP5t(|k_AQP26)4XrnaeT$2N-2z#{Dxx$+^yy#A%P6uLbAT%|Ej z`(Bsb@NV0h{D&V4p;vPAMZoX;x%fK&fZdydK-YRw8d@_sYCxk}24ONLLW!^4gdNgf zAYC$qg}}6>4V5lbhc2m+PyO6Vrb3g3==Ju%8;OUZtnt@nx%xhSO7xr9^!vv8k0iWB z4HO`A-gZ^%WJ#Y--Iy9J)N~jzz>;uvi<2K8s!J0a+exCu!Gi(#NNxoMdtvXMt>N{8 z**32Z9zO5PQdGgkk@0-~M&lo9;V&TdL4XDT3Em8kCm*WV%UNz2^=}Y_I&68*u_fVb8-u&^oQ$)$Kf^MrO1Ls3j8jevh!B0Qk#eh6O zt#E|^?{W^%^x-y~`hBD5r{!`)wRjc8UF}9Yi5uRLp7%NuWCKut4N8W@c@#aDsj}A+ zZW&&p({xQl4mFa#(QttKQo z491)c(#gWRCH*rWKR;sfiDi@6`k6e22|x7NDSb7oBwEoNWKxS3t^Tf1E(#ImCI25v zY_6eB=T(aW(d8BGNn1mVH_>|NEhgK>mvpsWh-p=~{tef}pmoa~lo;qZ^+8GiRa#zkEHVMWY!ARp^*`pS@Ga6kw&UucXfDRX%erysQL8n;dh*s_BBkuCDC$D-^(Fy@J=h!iG z_S^uwFaBYSp~|io(#0e3YeF5$n~K)WD@YcObN~qbJxPH;hTsH*7h6J{Qu?o>4+mPz z1dF^v0!ejnOyRWebh2rs(5je&@#ra~zgQc5{*r2=Z`QInT zb>d53y5tc+_;wZx4YX)6y!Mr3^H8}BSif7tS06He5bj<03CNUfN16VP2&W&%LRXyz zHO7jl3`%Drp{RS zDVKca^@PsjOr$18a{D#VWTwM3;Is@Bf)?)5+4JbMwaTpMv5d60>U8O>>=261F+dEK zS4Pu#Q}@-VS6IDY0F6wWV)yw*p0qFhdMZAnD|N~xN1PF#2E?TRDkf!oGK+eSPg;P+ z5cOe>D$_;}KT-+0HK84o?_YZl}_quh9 zC1@ILyaL)w@1`kal?x@b7JA9^^712ROdQ)BJ-Aq_A#!k53W3GhCQF* zZk4_?`RS)Z%G5C2pHJc{)5dFP`jcqS?h4Bnb{$el#baZKriqEYjF(>+g>_HWqXs_L z_%=531~KRGc1**RSUk{|ztW~}3EH9TtClTVwT$hOZfS`7*bdm(pEgY7+^Y3~-{f-4 z|I}MU@>=(&sdi4(}X&yfq$ zknh$H3Xy0nz3}b)P0i`d>Mlt}Yt(D)Tz65G)Wz+>{1L-QFUaq)OqVoi^YC^^)@~_( zt*fub8^ zO#o+6Sohz+TtRnFd`6WS(kE$AaHNNV+yYb%n1mvF&kV}4ir$?vL%ZnCf&Pi-iO!>`S?-i)v zs66YC4?^-VrY@-;M}4hJY6-Xp=qO2E8UVFlGT4wp?cspNF2?B~(`WWlE6Fi7@=M-; z=gN17O@pzuD5Enp;6@TJ|8YP8)Tqi))q8Oqjo;DkP^TI+vyO1BAmS}01!??dVoLjR zCU_dIv-SfF&lAuEBnwy>!9=_H5tCO{)XHT2Jp|SNVN_E+I2X&bxU)#*=o<^QsZ#uG zj=r_&+-s}JWrJcR_T{&)!cheaT6XALTl+?d1Lyv5w=yt@%f?4WVVQ`A%1atfi&Z zXa$rQuBI`kOoX>8P?e0_SBtlo&FX5>=?s#zJQp8ybRpUzS|07xhZ7DquSr*p(S;HQ zhBG^52UmKl@p_vo4O^a*#S)e3@wkWS(iEf4b z#CHLWh##M1l|w}v4w!QwA}WjBLoeG}P4?T`LI1Wf&41dgZEl#KL1ll%2HqTdpmq& z7+|_u75DOl{3I8UuvIYvv%iG@Ke)g;A-WUb(S>eiQY#)N%(OKkJh7K1@!WnuAB#Yq z6huUK6KLe{HgubWor;UTWK`K6 z(?g{dNgi!v&r=&_XyT=F+Tk)dw_kA;WF;XO<>7Xp?6OXQpziXiO} zbysrZN!4@&X3ydO$igO7PnaiS$$Z3OJ&z;AygSkg&JWiuxZT;nIDsmlnoQ}6KG4p! zQTySI@lakW?<;tG0(t}Qmc5>2tD8dR2IR@ao%?-wI{)P01VZ#4H)m(rK{|#X=rQOh zXrltXK33w+8QSAPHZu*pgQgQT0Bf4y`FK0q=f^Mj;K+0)*N%kfhqLJe=*ff{U-usnO*dh%IJ8xdFw(tE= z3Srl71yTJ4kSA-NOOhZ-^5dE^kJ%IZFS@8p8UFeuwTR6bDpiw?JkS)=-M3>$BS}q5sEro-HSh+x`Sz7 znNQ7+-r?YDTHF@s-Xb(hvQ?jB*-G$|MvGI(aWb*?qB}0gaV+&YGo{OAAg!NxBepp52gyYZAlyRhcS1>P8>j^g^z;(R(x^Gh-#yNS_Cz)w7aO~ zP}l4Bl~j6Af|@)`3AZ)+DYvjEN|+XtaLTyzaXrT{uBI%%JViNn8LY+T%1KLg^Bq5H zE57jU{Viw|iEgJ0ez>Fb#5~5(ysGJxr6OOLQ0+_S51$a_131D)#A||d%1A+!8SZ8H z7{c_X#Y}s96CV$}BUk^TB+qqYeBF26LF23EA8K-J08}tjJ1CUSOJ*w(u#e0ep6m*X zU!Ev3`MXQ?^Jx_$>EbjY!gw-}RGze3?cfbU`K}!F=d^gvxi|ZsvZqaeblxz7HOsu5 z%dCtK(aVZS9nz(|XqV>k^7*$G)7B zsF7W{@%4r+DQ7V@#;P@##JyN3Zj0)Pq$^w<4V(t}sb!^?YY}bIMpsgp&DrrG8Zgey zMmumL4EljoVP-&_Qp6!pKTve(lqV% z8n&@^$LIa|q_h;~sKz;R^-o#ud+%QZq{CuGyH8prj9nJn#Cc;(uJWI6uJ8cO-(qM$Pt<15xMc%CVwxFrF!b}DdDi4Qi#FN6+VtuX8>ruC>*jY><`^szOtlZ zKQdJdx^^Cg&fJPKA+c~AvIsoy83f!A=Uc8DiRpMCtgcY@oS%6K;cnsuDv`q0Z`aNd z3Cci}l3A?BItw0aTuz)CDu!NFerd&=B)&-Zrw z{a?3RUFUjT<9Xd5_h;;D;oymk&3|w%>A4o(t!_3K9ZO7GmJ1IA6_uh3xd-Od(Z=wH zU?y`4sA|Xd1toT|R%WiWl>j?AUMYo(^oB}I&-E<}zgfNoC>2~@1ZZ{WCR4@y)5r)1p14eBnzo(d?cJ=GM6+iSQ7c1%1 z)J~ql(QC_m#{jCAVySMQl30>UzS>+zYT!=VoScP6~8W}MtnKK<* zLB0H3lbq*D8Dj6CfNNSubUJWj=;TL^#jTckcAeM(Vu>wJp0ONz=b70Op}FM7CLf(S zqE1a5yoqWRkOzT5+lsW5iZF{V5QA2b9%NA!lJqf3ox1;u4NJ&F(gHM`BGG_^Niud| z%aCS@F`oP#eRQ7YV*UdcvQm@=O_kMsW{tPTFy1DVB zo^&6EMfEH}oIGKkt-TPPJ;4Ow;q11WVX#Q3F!jg_X_` z6#wu$U^{W52rosSb3M;WWa;y`_}SWt0|q9dVY-1U$sZz1{}Bfl`Z6u4>< zbvsSaCsJN%T81m@W&X4{IZ1?h_5qu?n|j^*UK$D+9+n8K)LM3Y8H7EH$A$IUW*&tD z^M$mQJI{9Z*Z8t4K4mUhOD>JZPeZ0+uu_e1s!aE_So-+j0rgdU(NGTQCy^n8U!G54 zxWL~O#6Ze>4-Wyzr#W0e!CsJ^RB{}5F?Kk zP_-E0tP^J2RjLhNO83=|Nc-jAo0_R~I*7PQaN3nZSJM`%OsZRbE^%;G>>ez@7w&5> zU5G-nXXT0*TyZSrBar$hbf~Y=Q#v3o6?kzOqwxqf%{6>po*3%;b$Q3|6F3Paiz$ zL5dPNI4V9i`pN=mL8NY<=g-|3x~GSo-VYXEkN8|INtV7CI3U})K>#zW!gi(Ja)l=y zt;_Utw15*^hlQ++6{r2A3&yZ=_*a1~Yl^}|Zh~F?MHh5IE9pX1rxE}tP56pkmsqhj zO#k@F;}jYB%a>62Q~fBDYiaI3-RHkj?+OKj+=f^8V6t1N7^ngdXVN^Hr+p)|x`iWn z@QDXV+oRw3fQ|Ym4V<35=HfVW8p|Q~YcmcU zoMl|n3mp1j`%og>a=n{re~owby2}UX3}ik%(U_b3>D?ejfKgsPPL`kkveP{PA6zkc z;Kimh6D!shdm|slhT(Z|-!hB~iTdc$<==E*WK~Z?f}-qKW#$vqVE}phXd-N~9()rC z#ZjSZ<^dB)M`-kb(|EkB95sEKVpP&H{lSqmFk{quw^SeO7FgDNCf1YD!*LOVLAE9C zu#i?QDOuL>kmz;{{Ue<@(^Zxd-DsmbP{{5K1WPJCDhMTsOcx0TS*Aq2k*#>0@<;-! zw{{n03!6*#nUJ1_*nbcz`mk&uhxw73fV*2`PZ#soq-Dj{L0msCkN3Twt^Y9Q|tF7{gTMWj<$sm&9_r_+qNrS#(Q``(&B`nE60lPcWOk}CF z*qUC<&d0Y?mF7NmO&bi2F1RT#C83qcb7uBiSl*`4OUPp*J{W`R=Zj^=eemibveIkF z51b@w2h40=U_AvE1B;Z*>}Z#avc@MtE*MgjkXGleUyiHSpuNwJ)LA=od05;23 zlUF%o35>nI#hTZtYXn@?BqFtDz7xmmREw9URl#^BjN1b6yCbOf>$3ncr>d+JjyX8R zxO?}2dAFga<#O6ObWYv}aZr%&uT3lU#n~A?@QUUl{##R)SmE;z%8FVaMdw8@E`twl zuzqG*Vwb@p&)%%vaCH?55Nf@AJk>X!&jaeT>{Xt^_OXweF6Xas1yAAOC;Lwt)pl{< zYYZz9tk{0WN?S-l(hqCpV_HGc(ygmB0aUo(Avmly_{YfbRP)-=!66fqaocPMkl3K5V^9wE#CH4u$6XNujx#sozovaqDy> z^xJt-)LGG!OT5BtuH&cLDoLZao&|OLE?Kjlj+1j2)Baea<0)SmZlvXv6Fit1qH`it zx%l6&P=y=D$ws~B5MvA6BD`4_-`}i_mb=?wsFr#l?;aN))9Vd`(5d~u z;F5!gVwiqG1M88rD)%Cu#odf3r-;Ne*d^gnPsBtfkUu)ppJ>-Y9kI2AUj|;YVo~iV z5#nXoSZxN<8| zO3fv6bR0_+dA`}tqkX}tP}#nkLBiXG zUxf8S;Rh*kg!rnY&^8D5YE;SC)|2hKzpJ~Bi@>}f`O4x2`F5Bj*oW*7#{ZHOt+N;ue49n44^nrsu29%nH43$N-$ z)eBf;wjGV^uhuw3R~utWR6ORJf3mkN{3*4UwDRV*wwsQ6G<*H}!OvyUxm;EMtoUPz zMOr77Nv&38{?iS)?RfQVxWu9V^Z=;~dn(aYOFU&}YiR}&L;PNx)rwoEQdl*jI z#2hDHJ%){qDamM4Timtbgr%h;>mQo7LP{)G_GqG0nIr`errRYf`h3%zj$q-S>im*G zI(kk`Bpv;_gvI83&u`3-dztW;+TX(;${gYZIUq>n0juwiZjL1~;D>OS<`}5B?r9O= zyG<#1w64z?--ip}necHN*)J0=R+mRt-gh|S;=LQcUo@n&Ty`=GX<-BqomIIv^p}*> z+F3&(#mZE=O!sLG0Ph4jDaj2G7T>4av|=Didds$*!bGe93rn) zr)mxk!L^dMTS{rcjGOfJcQEhM6JH2N5sKMiJRb{VUnn}Xb7Ntv1g|2JcUED&Gv(sM zja|p&Z4tXmXv;==L$psK6JPKdA^0_PFJI9u7V}khrO8cQZ+F~Fd;H`6uZEPJ+8@wN zaSA;nG^o*HwTiq|I`WuWmn!&Ym`+>+Ua6 zAaTTm<9SK!2w+l--Bhcple%QF83PSj?UTSvQAY8}vRm%-8%IM}iBCb?!zjxj)z*YW za|w^drmN!ZzIXI1pR4TM%68z7e(E|U5BV)G)~~`MKYvjfMVR2oGkh05;`nE$H)K`o zp2C*s&Pc(Mb*P1ZlooNTp3ju!B@ygNZ*;jP#>U(fs@$WJoM7yz0@?`LhcH~R=3o3CTj`DtM$RS5zo(q%`&np&4#WI0Y~Sve|T7=*lS3A?Mvd# zFK>jlv;{Wb-;hHESmRS7WS}l=h{mbeY=%PQ*Xj5GI$bb>089d?WKAM44c23g;dY1f z=?+EL3e3+0q1uYpTAq&3bYX=DyE!q#0EOEUZ0=yQddJGPR&_)zf|gZ zy>zHhl$dMhtB8xV&u&9#Wtq0N)b2$EWuwH2({3#5DZA#*ADB&aa;F z#of~4CU*<9xA=r=s$6n-yC^vAsxGUMsS6`Jhhg(^QL|p_6`Uz=TwUJ?X)#MCF3KUz zsLC2h8v=U<`=@5p4ns6lLI!0h|9y}}?=#VD=1# zlri(hO072A8i(0P2|}B}x@UNMx>xJYy+`$L@oHjD_=q`1wh#7Sgl8gsl%tppXG1*-h(G0a&J=Jhyp!SJ>|qv z^m!;PwW#`Vq0ua50%3pN8H)Q==hZ~(H4*5t$Yu4ZV?v_pU1!v&4^B=PfvvLTAj9AO z-gV~NIeyZS70snmbx~eus{j4nRXpQ~Dc!LF#!t@1Y?~2gIvKYVO(2)nA?Qomn_jVe z#>S_wdKldRaxhaX76G-jn!CKM(6oQQP1OPj)OumN;;0c+$I1k}g|t;k5u>SViy2)( znQZmW>$jDnKj*hX>z>lm>aA;Q`wB@nH}=w*T-Na!?{K>26-w$*a2&U$DAV?wJLHDR z1Z9nebb$T_j_&(=$r77iH8onsAJNN4O*&2b(iT@2r5@xm1pB*s;u(Pu!eWvzV0e&i zZpwB%A~&QH+jO<@stEQc=S(nRhmBvJj@%Ej{gck)tbS3c%PV%QYx;EIbuCBan1#e= zI_?iQz0H4iXZt~@gnm04_~`%n$r0d3l3=J?&_{oBEV~lKK`eTkPBZwUu+rDNjD1a> zOj6CgYiPbyP;s1iHFOBGecF;j8&D|tWpZ^A-V#crZ+I$LN=%`e&`%%UgV$3 z#oU!@2L}Un#^mED(ak~Dd^TQMIqy`jE-{|i^^LJ+{XSQtES{V{+hSf?(XTocb``$; zDAK3bPA^91%zT}jJ)qB4{E;^Gmi+S^$}a5{HW3*YWPnnlva`@nkTst$yQWVGTb(=6 z6LH{9dU|Ps;KelZ`>eG(Sx^gJvJ=pWkfKotX?ZY_sC#0eRxwMe~#k3E=H=AqKWk^ zi_?_K&wj@6j5q4m$85Jl;z!NQ z^!JSoWT5cAM(0t5GUb=c#cvmg2xo@LEHO9J?1;bP>-`&gz>#AyWt7FrNf0nO$Z`i&9>ndc)%U5M;)z_W#-d}m(|C3;x9n=)Cze-??xBUy@#1MJ1qTefy-%!wA zm(lT51NJmtqtWU&->8iQV8X~kjT$6Ee?`<7~Hyk$jX59Y1vnp22W)wW_|^=>TTUI2EJ7SRLB81CZp2Y0y;eWE7ff`esF zK1ui9G0CPU6FwD2#AYn9smu8ONcCorLke(O-)OMi5zoBQcALLBSDmX0Myv0nyBau! zU(CF)>uBOdq=r-cm9zp-8N3*6Py=|jp4)?!7*LR!;>rZ&xB@N#R_}RKyW}=PPNTp$ z^ASoMo4Ez*FE>8FggmTeKGBaiNX>`jYy=1BI9$W{g^leE55uz9;=tXV7!&X#iTjr=^992q`|==9&;0 z;TZd{Qq)B6Q(flsI+=Ao|F=l2PP~vsi+0j#eD}tHO*g>$rd>9`xP2n?_SQsutZxn2 z45p znVFa~&WtQqM&keQ{rFV+4a=;Pf_!Z$Ex03W&@t(d&}r!sX6CXSJSCm2f4kVyDdRWb zf=ixAbyO(t_T78#xnk~?0pM|3XWHGyE?Vfqi9YvK0e|}0HO=;s<>v>tNO?E{%zcJG z1+*%Fv~hkuY2Jqx9#m@GQJ!QDtc4s!vKqLq`XrH;p-1rUY0eQRZNt#Zo8i+g!K3^6 zlKp64w&W1RmfYxzU*6!pgeFCg6;f!$-Q~C3u$rf#&ls7FsgcljRF{#GPBhrMxWnOj zu%&XC=tyaT{#Au!fi2&ECVWoVt7qww;+F+MMb1NL9o)H>BXR&W=Tt8x7!@YLnEItw;9nz6_QF2TFLOSFb;uy5Ir%Qx5h8laVf5( zX)A27?)pciS6wo;3Sc9yTXIe>3QY=9M$}`o*sKtVQr;GUxRlUeZ>ZI{*JgRE6b5KK zWv0bAbaCJ^eXgvayG9^V45egMBc9lRrNHjJZ)9vgnc`5?kJos2F;JfQvY`bm%d$ChuCZ~M;C|CVff=+F8Cw$*Sx*IY`wv*a}=wtLutCK!G&tQsku z^`LcT?dr9+zZTaP4YECZyshpi9r2`?dAJ1?b+6oLe%0NCoMwJM=^bU89N}4)M_2do zJweUykP9jDR6b!iXjdQMJF+eQ=6NUKe7Z;7FoEOAok+oowIc^1OlikNMj&*j@HL#? z?}dx)*p-vAi4t{+an%S1ET#r|TS{V#okX=)Byi6{8viS{wN=K4E&*Fm_S01wxq$jf$5`cA=_EiPY zqbA}3t4D;`aNrZUe!q-O4K-655LU+l4;JGNW~0@1(rM#n(X8-aNVjrV*OAMn$rvXl z`tV0>S=n;jqhh36?DzDG)qw{2QK;l6Oud|kFu~V=AK!ffw|EoH zq}Sez^OiUDv$~2i0$xD8X8WF{dtq6Hra=6=Gc8Gx4Iu!a{q|lz*3s&1{qWwI6dj$p zrAywHmC*+sOMTGI&6fy4)dEUS|Bz)AuZApsHL2LElh5kmm=R@bsM0+#U+Rr(R_>@s z2;uq#K|KQBWzMTf_3&06NpJzDYO^komp`aHRpT~mq5Z(IbXdXylkB?jpZP50S4xRL9Sbs}1RSq5((*)i-J9uR0Ij^B`h!Hr*25xe zrj?AH5*CAF9O@g%ft18}sxEsX@3pVrassEotKldX4{9YdI~Ti#Wr-4J1J7MS=4luV z#7z$>SAw7#5~uo!hCEryhSx+llE_hRv2p4!P<}qsb^JM@6jy7}!-Lz=xlXGYTPwDn zp0+maNNGee9__QU{&+LDpE5g22kADKuKMh4qU&l6ZSBFj!H}R59s9%?-yc_jUJ}x; zMEtYtMuXaK;k8RKx-z6hLvDV@cHB9r3CO~hYO2q&x>e)P_!KR1vM9EVN2INloqX)(Ymx%&bU_~&=*%PUhr(kRZm4=gbOfjlPxc6yJ zxgs}kT%X_HUssoZHPDIS%9O<77mMzVSwS~XR)`2UjbFzt$Vo<5L*%yjYNOJK4UE#q z8cH->uPIJZGMS-~7I3U?l6;q|2zo`T@YPER7nFK408iFIy#lIZV9wwcq#$*k2Yo=O z%wIO;wyKCzAD_(nma1Gk;Cu2q>l?FXU=Q|IL*(b$@61;$yxPuY6`;^~ts-$nD|s{M zH%ckomJZeosq;qYSSMGr@|MgX^B}@-m%nB9&OtM^o!s;9oK0HwZGV#Yabcizlwmjw zb#ANS1b*%7CcfMCMs_N=N^iCxqkH?*KU-jU%x>u>xFznPIqLWqJ|A1lF%17)Lm3t& z>D~E2X7+)Iv=d?4SNaS>!uOQ+K_(j*iSi;;7&&g61S9?3nF*Q|tPd?_YjxCY6hE(! zAj^ATzbVx7a=28=DZ5~7bVdlYE<%Wsq@tQN4uQdGDfzPU4J&a*>H3?ii(yLan7&%@ z3LVvjG-Ws*RWna~{7R=MHcz)VTN9XyW8zZ6eo zI-^A9i&(*%Pqtl*XDN`1-wGcQx01Lj{rws*v`lW$v@LnBI(Z;9U>$?i>2J%rD4m=u zHCzA@gzUoxrK>7=Mb7Iy`IQ_b3V{&rSnTxQpSFBqNoJjqnvtXR@GUPe3G+B%Pjqga zl5(%4XDmGLis%>5eK%u2a7c5RC>g(%JZ>(3J%Ia!4nb(tylP@`IYMR0IUj~ER0+R# zcj&>NaznoKYVEgNzw>^<1InJ?=@EH4TbC7>DPFNbSqrb@t?2K3$z;R|TOUPU^&H0c zOrE_qEAMGtMZJ;YyVYcQLkLMflj9%K%EzSuLBuqaq!4;wz+=`Te+0#q9$`TA!i$y=Y>Gts-M7X3>NZs2R zg|i*;sk2qeL?G!4q6BW&-KmD5e&3~?)eUWaQ zv1d*C_Rf_e=zB!*)75%ujd*)65GOYCPn3UXWdi-rBV9HHED%kak46TBM)FU(5_GN- z$nSZM_ue_iJ4J}~jz2Tx<8R0iIZb^3%VXH9tS!khTgb$g)-BZhE*5@5FP&DH&`j^~ z*6BFW=1`9ZCj7*ajZi=5!l4Br z7}O1w)&G-u%QleBUdD39_sr8|s4L4T$6gEU2Clo6945W%&xzrN`%N!r)q4V@^YVOX zlOd4L*TuU0iQ4!~MM@#$k{QjZ26Mm?G9Dd28MQ1gv%a+<`<x+u>5TTJE3YuU2r7gCFKJg+{rjHEIGq@_kEq5|y0M%dDlapkZo|Q`yq~tQ))I3! z6{^7!T#EM2jomYPk^C28wLNyL&eN}yf6Qd%8 zN>4xw4^@At6wOsZ8Y6>lv`d1dzlTqMhHLtH>QJyz@U1!AQer*Vva#anjOZ9kxH2Zf zRxydWC32Jnja)~07W!%65%U~M!6%Quha~X}_)3MM*OhPfUZP19hjGBkW9J9* zNjDe^PTGWlAUPFJqhc^Bz=`UJ-Q+uHh@>==cL6}=Nc6(e^N28Qzt|X)J4bjvFZ}tU z+h=2$mrw!aFQSLb(_pHvqQCaxZMOTa4WlfWnzy=~@m80c8FK1Dy02UtXvy_7-&=5s z!3IF?LYsrqZu`Qj{TH9)X`jOZsr+lA6(r|Wg@IadIZk4~)7xYFAgNSf6TmNbu=g(Y z-ziT%dBE}NM=-)Q5!3OLl}8LiJ(5zvQeY}bAfww$DU9vADAZ5QPm-j^;$1|)JVeeN zJY-$vl{o+X@NypW6D5gHYbrGq@lCXVnJ&8M=-3W%84uL?WW~qoiGl7c7EcN3wZ>dT zXpVskz69@=$-2NjT9+<3;2t};?@&Sj?z+BTxTv@U)VRSh9rMvU1>X}v3kc*mI8r!> zs)ZppP8&fKGfjo`LjC{bxF7e|-<^qIYD5h$*{ONt@hrD(p%F(>?`pA=8?Oh8$D#qD9n|#h&bFmfG zG@Xk5@+`Q_@0^aB2#*@7##J)GlSYs_Sd9Jma3Qq^W4Qj9Vvx*M4I2M!`s7z z+OhRrk&gQd{S%uZ!$ER8u>rC<2G5#W`<(?f(FDWv9p9tKqM5w7>@& zT~%HO?x7mrMCV*my{F@0wwibP)9>A{)vG*-M{rG0G=I?`Bj?CW9rzz?U3^q)Wzo&U z+{2E`iQ2Me4tnS;UZWjy65q0+P8VDfo?kHXE+M^#zxsFVPyI`339PxpDn%3ZhoBb# zhB$+BRlFjRP%`wq2V;ht?~7Njjn;+=2uljzoIXxr^0fGhXK#ZP@YkD3ejZvRo!KHsre~`^xJZ7f zaH~`3;oAAt?A$FKDONk_J@$g>DC%}C98c?4fS9K_ronVksqM5Zr0%6w6I58hI;6Pf z=pn^0w^BcLMQ*et+o}hz_5&YL=z3h&d;Q%78fhql$No;#TSK3CBo8IICuIy|2^DdRbS3c;C+bQa{tO z>FaN8FOb;_El-j#5U#sqbX9ov?n2=rjMsO)?}uc03o6IuNz`%d+~2$^3E-6BX2Vvi zW16o)S#NW$IX{=D*EDri;t&x(*kOdN_4G8Ad?g%mwx#Qbz%%x;qnQRag~b4T53Xo> z_M*#1Y%Ny^8B4>rpfqAqppAmDu_~vS@LNgxDR?-Te<61qKW>6|SSF_I$5waK)n>DO zPlrn9vEKUwBGCiczeC$osfXMquCL;TzlxUsR(HgXr7ZE%mduTCykAvm{zanBv&Bnz z6r3wT<^3D*K?04GYl^PY$s9R6GCE~qxG*)F-ki_K`F-{u!V|0EqF$ctxC1HxwX{{C2#3!*~K8QMw=wq!?BL9FHv_oWlq z1TPDt6uG`4=)u>Zu_pMBuK$-j$foRF5hJ#d81ymTI>U~aibT?eQ^#CR7nu-X!mnZ+ zyGX(MGTQbC-#fjME_FgTjOK{By!02skg=@zJ0LGT;$Kk3N$X)OFtOkMO_jJrm+b!Q zz2i<7v3*3a>~l#8+6H1m!_szG@_h(|#axEM?SN2K+|Ohxw0#bVKDB-j+L@i0<1K6) zadK3OzW?UeU^o65W_SL#*(buSr8BNir&9>$HvMBPu<}pFFv*;I`VY5PHelN}@Pg5( zQ4%VnxcC`?*Ilu+eY;xmFk%^!{vS(;ZIYh2SG`T$<*A%A{i?|MV|pk{xFrt(cfnX& z@teq+cW*ojK$xorCo|#W`xh+QKU$wE$Td|_iN_rd^F^Qjj{FN@5_4iaP`loy`;#xG zIZwEG9#J^$@*ZL9tY`IBdDERQXT5vlc;fiVn6sKvm$<0yK|;XoX_bpa`>L7YK<{}{ z2yki3tFA8*xvD3_h#+DGYd}k*~9{yTg!tpP^Ok*JK;@|7wxS3 z>r;3FW6{eF$p1Ke`2@`s-N@P^huf2+tjN8=8%YQB+96Ct0m&n5b zvhLm7vO&*Di|8CPG9IjrIOjlN5;yB%%a^O~K_kVG@rCF&(|hq}cB9f)ysQ^iqWxH| zt^3oDtTa@(U1(3W(&Gv$R%~5*eZYv_RU1|wL<&6N-sb;$%(9pX-UFF1FC=S%HDzg1 zyIbN5IR?21(a28g8s zV4kM)7qYr_&>t@|`*b2UzDn>8s93D9WQ4#O?#POGnRtt)`-SQ=9kw16_ccOIM!HTn zu5C^us_n73$dea8=C){=;zvM3I(UdIUn2A58w$ErV@>S0=Y+dV&GO?bZn+{386wPN z78dCeEBW{fT-~{nLXde@`jI@_lN)~_Plg5Jucp{DfP0D5b?uCA2=v(9zmWDp^665X zbD=s4=cb(!5vEFm%KAE^|G|TI=F6< z@n$=|bvM(Ct0s&mEiN9FhC*}~^UuBY@%;1C&aDjYfxUoP)hCoM>o$#;6cFA&)Ya^I ze9Uu)0v^sTG0Yr*Jg36QQ?}6WH0O8kheI%nsv4AyRE$sLWXx(jNK(nBt(ElyTP~Y_ z7^|;N!%K?lcFi}3_&(kD+R_H2A|emjlh>qd=fWgq?yH)xEc=sgBwPaVzUZ-h<7c*4 zv~aIAaNLKnEu;r0KRkmb#UheclVjuP5!d7Q%L;oNq!tO>ktd-P*;s+9zP<~HW`2bo zX~cajJ9Do#N`R5Fsb>##EFp=SoA(v5eS&4;JYr&{KeJ6LD7lyR%35pl8)X#a6f=@{ zu7>P5u-M>dXRbl^tIuupR#vkZX!Hx5C*JO%#t!Z00;mrxofGqaJ5@2iOx&zu`JMF0 zbs@V4^HDQiXK8%DyHyCcOFClv2f71;=e)QuOaqc7QgFJxV=ZLab@h*vfZ1PraC%Q} z|JC+7udUY)ZN>-q-Q_6oW2-0P(b<0f7K=xW*!TB1;*f~CQUcC&Tk%Im$B~4PofDZH z-0R*E$I+O=s?KH=_0&X5V`H2gGLS2d2*prJ;u8HFNqP;!Rcu*}~)l;?yX_1>uH_k4kAlZfYv; z{usLkH!ZDnhtvSLP^Xyv`9LH{rtsB;O@}eFNzk?L zWn1coW5pzwi8}0HFVxM*jTd{QBdl6xpO%ES{>iX4{PpSMyS`n>nvDe+f(Yb^d(X$! zfRFX(roPDb{B!X$<5bRuW+0c}O6EI@aNlc8^!N5mbeef#5$VzzDH&zKRMPDSpGB3QH?UGk+C zR;`WOwKTr}Wpn}(5gx)!sqm!$Umv=z0DrBH4d};n zvBAxE=)Nhf9)l#0szS7_*%Bj_131GBgRk8lE^a29Riyie@WF^@6%UtN%;q zNKrdLogg$jb7R4uSRzmLVcK(?pk0P)F)7${T6@mCGL_6|#dtCjGSopX^>tJW?@A46 z6@QwbW$Z`p_&|`(aq2E4W$08#w5M2njuwNmJ-pQAJ6ynO78sk6j3gyoHhy1lC66<5 zK>rTKR)WhYd){tww9vWvi)y~;Yt1D_kR1#&ruP}D1&zf4An=1s__p`T9fZKLapl#! zQtB&e(p{1W1|1b$)!PC|W#Bik_wDTzjomxvg}JQ28sb_Z#vTxR#wWbMO`n8)b(%FB z^Uj7Y*&HUBmKVMJ+?a#$&xiHF8#O-z2Nc*rHhW#`mG-+gj=hU7drPLRa7d+-Jsn7x!dwnL%dwv0@ymc*ux+F-9*8sJD;&=bilo#KdZRnV$Zji8bm5(bjD%|ie z2wT`2znfS24n!xwSt$|WxnQe69~$y%gF9ok6cL4+r7-ZfHl@D1Isl40EtccI-93fR z$=vOYC58fiR>rKX*au*kH=bP)PBanU>5_tiu6|$bZyLYbv&5e0yWjBZ^kNwkK_f}W z;hN8{xCW6Z4A!h7PxP*&ao&{oH$Q{Apqg{+Cok{04xD#t;0K4ATa~I)Fkx4VHP`XvRs9J+ zC~!&2ThsH_WINmQax5v(vLs?Z+*BYL3e~QUQBdF8(53$nDkvI@BKjR;wYrAyQECuP z!KU;E=|-t)>u#%Mq{ndrSB_0a3~3)$+E$qD$2iZGst;Fj(=^m})3~J15@r*Znk&j8 zoBH2)EbxC2}Zz>&e7@}TIV=b(w-CJ+uJiSzT zATUHbv3{bX^>*)_$T=lkh#%H4qiDoZjTV33yJy~Ee?#||`81q~luHT@a8`SAq4`TA zJkaR9lpNmOiKG`8t~~HSbJy*YFu&R(wr&ccX;-Dfk=mD>Sg!Ja+mH2scx$z53TUxHE-?Ck@nuac0Tl&Q?_pW zQO4tG?Vl2r8Sx#kr5XfZy2ONXA!_YPo$0sDLt{hLk`23x{4tL-{-@F6NttBS-O`pH zT{hCIx@|MAH1JzzR2cPnwyYfS2cmtdyq|P-_P0kk=ETXbbta=%Ml)>X^|-j%X~nj- zOn>^p_w^Q7skHlDbcGmuNZF#*48i^VGf zS?W7$O_*@#VZm!M|WUFOb$z(b_z^}^XYdl;EJlHUOHF$-q4{b?0 zn&F>N`jgbcnvLj%&+TXp*B(cJH1)~ouL;YW6Ab>__sd?oclcQ*UC$a&CuL8_JVF$+ z=9B$r-cJr=eixiB>{>I2UG}$1_9=@P$=usy6nh>5Hd$>!EXo%DyiBtJYY-MsDpANxXmV3)4Yd)XblcKoZ@dZ?>22Q1>U-GBh{rt)RtgCWE&pebBUqT zdUK-jO-)o3Sn^#a-?nnT7U;$h2cx9CTcsQ%xa7n?-iF!Vf1?H-@oj|_DP)I8k^9*L zmpjKLE$8PE=4{V%bVi%x=)l7dK**fLXr zQMyRF5Ez6O*L;`H0V|x?T=?KYcDQi9>uGJzN)GQGp&C|_UTkoNX{QE_O>iQ1dxB=VR1ge< z@&oPxnY*XAK z(p>tPPtp=?Hi*l}-nP0WPnOYe0c`C`4OiN8U0o^W)JCsJxN-ibkO%J=57=e2uR{MD zjA2K5bcFyb&_EE}+30I_TQ07Fyv%^=ZO>`1C60E$RIQJkzZ+a><}&*7{Y`13bHs?z zu){6)$GRQKdZg)MQu&Yi_L61>{Ew978Z4Z}F#JgC`-K%gUDccrg1&<;%EA{g*+4AC!z%9 zWj1*WDQt$wTeHG9VL<&<`bX!N99jquXaBjXIP5@16F(R21l*Q9sk;`=-R$W^EHJt)|w_<<9}aWp3` z#ds$5s}D{)0=g>YrJ5B2$zng|b}!pNQFpv?3lY>stWN6>@Fx;(|ApMf8}~I=_$lS#^7@#7N|yA{+B&9^A6@> zZR1vA=}%szCMl~?HHnN!`S^}iWtowlZMN3H(<}@suxtJr3Yz03wuXvay7ugiL;}m_ zzL|Fwmz&`?;Y4%q4Gh-syvw0tAOku!gkyXhTrCYehsoG21L!vqd=-pcyC%l9JP?ir zQhelczZ+el)}hW^!(RwF!G3o~cquArxdYb1roi*>SEzpF7FcedZI>2 z`JcYo`-kxW?Ak2Ln4_db$&_7^8MHFdNZ=`Q7k0qR5%uO_o~@qYK$=s5fy(KJ1p}@Z zL+6C0)9jXC&GkjwiMql_eDtdbgC@MH=U9_v_DZhCTxU4vbIai=%Md^RHLIx|z||d?OA%ROni9Jw>=L#GbVKfSLV3 z&Exh5!tuQ0Ji)_NV*<7{!nt?+<9X&6skOW^+0{Yi(BgsQ?!j0CMOe>??ghD5$Rbgl z0&;cE=ym;H*Oj`V@YxL=$MDvBS8JF#UUMwz%C9Mv^s^=w53+zp>y7SV@kZNAWK)(^ zoprS4(nW;9-BNaVDy7avc{y5mcUh(f^g_bTXP3Tz4#ltcNpl`wxMOH+E%O$qaLdkv z!}%m|)pVMj@)&!TTL8)$^g3sUu{nn7*x#8C@n>8-JAckLtneF)9AO;VZvDc^{#)K7 zrq&Ign%~!*N|cB$ky+_DG7TEBH!rB!w7@KoE8}@3Pa3~4PqT}!?_FN?sfD?;O?jx2rxJ~4Zr>4M51e;$h`-e)wkj^3FTO(bIIAHNu(KDo=15U zx-jP^V1dWrF0)^V_FX!1lE~E3g>zfw%4>mC+^vMd%Kn#Pq8Vk;(sLEM)HW! z1=$gj$5z_EjI4qD0JQ(&>LqpLA$qvoLz3q!qU*twrVIF=hMP9oUhKApA_O9C0Wu3C zNAjnNH=W^J;7H7BuUh}brJEX)BasMnAy%Jytu#c9lpk{As)`e&d|54=~{q#qBv$;jM%tvuXO{A>D|RbP{OnIP4>6d;srZSYv;QYi>`yHA; z9{|ZhdbEJYh>}NUFGPcA6*(0E4{NW1W$o1Bf?PODGT>*uR;>j zfJiqGMt?CP*}H^X3CtKsHb7B}!3B&CE{k0FnB@Uw2~%&27dL}*@|t}lnLzzK$h1`8 z-2BhY9=$yFfp<5Hm}&Xwf7z8TMVr+k$eX=s#+Ei*Xe#tCq;cdE2m&2w6$w{U(y_)* zW*Ha${3m*Lk&{;96P)cE&Z+oBivQvR2QdxcW_Re2ZEg^!m?yYn_L#%j1|g`%lcAF3 z-0ky+;1mx531;k6AR2wmMp{uxl&4s zjmf@JqrIb$ZX;tkHb(Ombi`SqImZ31H@suxDGe&D40ocJkhsPn&{Z>7Wa%0-o27|! z1k0?`hi5NjZ|eUO*capou)byNX8IR58%w=TkE!#GbpLI8-S0`O&3Pe*^v*UwI*@>KF4kCQzq{b_6VE@UtgMR(~PdJ96||le!_i;H+Orw-fyE&yoq1zyeC$aH>4s z1~5S@xuCLn0roXfPl}E;a&jc~7v<#`b=ht(AI8@NBk;?{w(g=d&nbJoTDYVe8`n)R zF|iwDScvrjW5f&b3UXb-odfKH3X9u*7mB)vek^Y!9E%Vt)`QUJq#3d~cZlJv$WT={|e{emKDv2&I zUC<@6;`|;5jl{eokoQ(>?7m$H_J!;%7k{CYUOdJpM(!9#7^C~S% zkpfRYK-ue4+lJv!Aav)bs&NGYii%opA*SbEj11Di#2M3esOn;^Gt!`R*bhyo_#8;gZD*9%I5$B z(yfvEtbv}pv7df({(4nwq{t{3V;?EUQ(SEyPZ=5WF7^zdll)wF{{T3w`;=(YJQeIS z&j7P&1nn8?!$D!;;1N>-AZrBlsCpZT`U{g33ItYJY}*vAM=V|nk5av9fo<}{{T9TSSSb-an~IW z>rZCfS8H@XFem9j(GAI3L<(3rQP5!YG(>l~-Z;)M!<>5ll^)Uw0D-jn@&0<#v5Xz~ z`W`^(qcp2&`fT(;Z{4>|RNL!G21e|1GU{ZP=Fcp|&7}xLv ztvI%L&lot#>Hc`8WGaBiI6PpEDI;UM%Lv31oDP4ZX1Km?p*U|>|YbD}JgS%2q} zd*dBx3$f#I#?y?RpGrW%M%FnaIKdRua!-~Kh$P?xpYm!>n34?RV<$`kGwa*lkb#9w zqbH1K^%T~aJ7GcO@q@-`Lo1wYUPmN~o9J{!j>?~#9Zw^*3g>RpepA?Xrgc!jX9J$T z{L)L3yEhC0@|<-&X&n(`{LRNIGJ3X0LqRUFZrm~01J4Kf(;d@jOk*8!-~9e`G=+c) zdUC*;M?^^ks1UGn2SLw6LgH8X`0O_he!rzcNd$nvZ9MbG`Rhx#E)L>7FnG_m=}Em! z;!1!seBD32o}#j3W|CteA9;xbcVky>r&NW=9PPja^(XwA&XJf9M+BT?Z~(37yIr&M zPCLZ=Y+WomdPQCOzxWIB2^eQFuiyt-9!^Nf#t&1|G>XMOSLX+e5ltB1n=KKFswn#HT#v zuzwN<^`wvH3hl{aNk5GgSNNIG{{T}?W8;ODz3;$(7{fZ{Tf_4)`l}?0dH(=uMSLq@ z3Qh8{8DT{g{Y&7JZ-uJg{(npV07!xS3G}N;an=?80MtBx^yNcqO>Qy(7#+U>Tb5Z+ zs0sVn{&Z1aw8Z{TtZiw;vD(KWSB%!pk>B$$1f2f>KmNTGS8XH7tJK-EcJh^m0d`PG z9;=g9tfU|W0Ar!|;GgIyqP&dJw_e^z@o^@lv}@*odCw>7&-wgn-K@v%gaZU)trS;- zS98a#XxkIzE}3$R9pC46$vwEYcAs#4<$zTr%%v1ez$X$N0r1oN4^4^*_=-qUB1H@TQuRZAP_Jyp_|k?5^AOZHz2V-k&=R zoO+DaS=g(T1CF0w5BO0HHE0gBb(%6GIPPAitVIg_Bh`Z z+FRRP$2<{)G84Ej0G`yF6%;A>2?9K6e|q^%qNAzP07VTNw?faf{S7pNlVw?rxmGy}yk?LSE?N1`f1MOkH-JV<6$B5R#(4D^rYn_W7y}(YL;eDaDLsyu zk{H*_1N+>cuQbS{EDG%d1a!}}6j06LEN3f|&RZXu1Nzgt#z>% literal 0 HcmV?d00001 diff --git a/res/drawable/drawer_header_noscale.xml b/res/drawable/drawer_header_noscale.xml new file mode 100644 index 00000000..b9c87071 --- /dev/null +++ b/res/drawable/drawer_header_noscale.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/res/layout/activity_device.xml b/res/layout/activity_device.xml index 77e2899e..40c1c30e 100644 --- a/res/layout/activity_device.xml +++ b/res/layout/activity_device.xml @@ -3,11 +3,7 @@ android:id="@+id/buttons_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" + android:layout_margin="16dip" android:fillViewport="true" - android:divider="@null" - tools:context=".MainActivity" + tools:context=".DeviceActivity" /> \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 996dc57c..75a946aa 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -2,10 +2,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" + android:layout_margin="16dip" tools:context=".MainActivity" android:id="@+id/listView1" android:addStatesFromChildren="true" diff --git a/res/layout/activity_material.xml b/res/layout/activity_material.xml new file mode 100644 index 00000000..1bd34f30 --- /dev/null +++ b/res/layout/activity_material.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/res/layout/fragment_material.xml b/res/layout/fragment_material.xml new file mode 100644 index 00000000..27d16d3c --- /dev/null +++ b/res/layout/fragment_material.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/res/layout/fragment_navigation_drawer.xml b/res/layout/fragment_navigation_drawer.xml new file mode 100644 index 00000000..012abef5 --- /dev/null +++ b/res/layout/fragment_navigation_drawer.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/list_item_with_button_entry.xml b/res/layout/list_item_with_button_entry.xml new file mode 100644 index 00000000..a14808c7 --- /dev/null +++ b/res/layout/list_item_with_button_entry.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + +