From aba2068a849882a8e38cff5972ea6953f4bdf2d9 Mon Sep 17 00:00:00 2001 From: killerkeemstar <40898410+killerk3emstar@users.noreply.github.com> Date: Mon, 23 Aug 2021 18:02:21 +0200 Subject: [PATCH] New timetable widget design (#1384) --- app/build.gradle | 2 +- .../background_widget_header_timetable.xml | 7 +++++++ ...ackground_widget_header_timetable_dark.xml | 7 +++++++ .../background_widget_item_timetable.xml | 5 +++++ .../background_widget_item_timetable_dark.xml | 5 +++++ .../drawable/background_widget_timetable.xml | 5 +++++ .../background_widget_timetable_dark.xml | 5 +++++ .../drawable/img_timetable_widget_preview.png | Bin 5284 -> 25538 bytes .../main/res/layout/item_widget_timetable.xml | 7 +------ .../res/layout/item_widget_timetable_dark.xml | 7 +------ .../layout/item_widget_timetable_small.xml | 2 +- .../item_widget_timetable_small_dark.xml | 2 +- app/src/main/res/layout/widget_timetable.xml | 13 ++++++++++--- .../main/res/layout/widget_timetable_dark.xml | 13 ++++++++++--- 14 files changed, 59 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable/background_widget_header_timetable.xml create mode 100644 app/src/main/res/drawable/background_widget_header_timetable_dark.xml create mode 100644 app/src/main/res/drawable/background_widget_item_timetable.xml create mode 100644 app/src/main/res/drawable/background_widget_item_timetable_dark.xml create mode 100644 app/src/main/res/drawable/background_widget_timetable.xml create mode 100644 app/src/main/res/drawable/background_widget_timetable_dark.xml mode change 100644 => 100755 app/src/main/res/drawable/img_timetable_widget_preview.png diff --git a/app/build.gradle b/app/build.gradle index 1338bd8df..409e6c4d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -164,7 +164,7 @@ ext { } dependencies { - implementation "io.github.wulkanowy:sdk:496dc01d15" + implementation "io.github.wulkanowy:sdk:b991d0c" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/app/src/main/res/drawable/background_widget_header_timetable.xml b/app/src/main/res/drawable/background_widget_header_timetable.xml new file mode 100644 index 000000000..98eec700d --- /dev/null +++ b/app/src/main/res/drawable/background_widget_header_timetable.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_header_timetable_dark.xml b/app/src/main/res/drawable/background_widget_header_timetable_dark.xml new file mode 100644 index 000000000..616a91279 --- /dev/null +++ b/app/src/main/res/drawable/background_widget_header_timetable_dark.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_item_timetable.xml b/app/src/main/res/drawable/background_widget_item_timetable.xml new file mode 100644 index 000000000..08854fba2 --- /dev/null +++ b/app/src/main/res/drawable/background_widget_item_timetable.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_item_timetable_dark.xml b/app/src/main/res/drawable/background_widget_item_timetable_dark.xml new file mode 100644 index 000000000..e432a648c --- /dev/null +++ b/app/src/main/res/drawable/background_widget_item_timetable_dark.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_timetable.xml b/app/src/main/res/drawable/background_widget_timetable.xml new file mode 100644 index 000000000..2267587d9 --- /dev/null +++ b/app/src/main/res/drawable/background_widget_timetable.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_timetable_dark.xml b/app/src/main/res/drawable/background_widget_timetable_dark.xml new file mode 100644 index 000000000..6fe7d0ab2 --- /dev/null +++ b/app/src/main/res/drawable/background_widget_timetable_dark.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.png b/app/src/main/res/drawable/img_timetable_widget_preview.png old mode 100644 new mode 100755 index 550260258a82ae1fcb8c54530efff52985580153..8494301878a1bdcb838aee6ee82be8b42c3904cd GIT binary patch literal 25538 zcmafaRa9G1m@e)VFYfN{?n!Vj8j4E`#f!Ta3+^t(i@OxJ0>KI`ZUu_FPdaza!>l`V z??YDB&N!v+ErwBg|3C1D>DG!)n`To1G)aBwtmKm}Rd z&pCf{Q9l#zE)6+*>d?|&aZ#3_75(%j_U$*T4+-ghKd?5je(}}3AH`Eq;qSZp5Xw?a zz^Pzj*p=V(sm;2_J8dDWWRAa*Qb|@`o_o2#y~%dTlc<)DyNN;{848_DmorisC1Ybz znVeSKm3;H-Oii4ew6si2zL8*|3 z+BCOH+ukh>4UPSf0@q2A3->Ixx3!fM5{<1C(XqxPq>DVNkz+-CL<@Iuf#f999}Ep0 z`!6pmGmeaazg3uZyS>K8K9cvuuHzCjpL=_+zAIb07!h;~$l+=jQA#51G0hfE5T_INGSRZJIeZ91ijL*4l-2A+lX$-S&Bu|Y%bL; z#qjWOZL45dAV8?y=1rBC*!M6)nyS8ACb*zYcu>HW)^Mt z{$-V==^`6Ec>k*+qGe1LV6wzA>Yi|1SM02rQ@Eax5uVW6zNr!(Dd@iPzh@IJ`v|{qzkEK0Xp@k zt`>@lia1-t&LH@V?BdEcTt*zE*iKiS}&IwMBKt4%GxiK+UcP`P<`0E9-2m5b3>Pi@Zb}PEl z^e4_?ZetV4-#w1pU(u(s&QV|1A0wg)09y<_ZGf!3T|n(L_ngkrL{pP{W~M%Pk%57A z^W#N&qFFAiKPI>nxeQ66mfJoDJucl%KgN>uqQ@Yi)}-)9qtb2Om+Xoq@7t(@BwkFL zR9}o*-o1)EZRwzJ*Pg$E?1Wk?WYRuNCNi9>Bu8AA6qrwt^Uz9}U0`DDv>v!wS*w>Z z0LGGw_m)g3L~2Jnx;_|o+7t^o>Voz7ZG75TR+@nL#;s}dk~cI5+UT0jHmvPQm`io( zgOr|$P2D#TIo;z3Y{p6s1eV|RviL?#iJk+I?BATSBn*Mg<7f9*T^9z`iB|(S>1Bv0 z0PV*c2)|_n1b;_AC7azFllbs{Vbz)#Xa`leFsRjqtYhW*FP#1|xE&gxeN2$PdU(`a z4(KK10M~|Pv`kAuI+n~Jz3yKLFX1lq^6iNn3mB?pW%C3^r&CYK1=II`c_w)ow)oR&R{SA8B%6^dQt4*D)syJ@2IriAroS?P!{vnxsQU)$}tU-0!b$B*| zDI_$%rbh76SrV9rtti@HckjTsJ5CcgO9zzRLbHE`szCpav!|kkj7}Rs>>dXR9s+Xn zBpCzmFE)Nv2+YS-l9qGD#;VL~Z>)2!-TJkB+EzMW`buyAcwAmGIIZq~F5041Uh2!K z5MEfJ+Z@jJD+Gb{UAK|v=RdRucMnGp&$Ir9flwUK{x?g;9($cJ<8N}pj(%(2(CezY zl8F&&m6gKC!{(m|dHxBCXKt^jddOog8}8YYsq^Crs2hU zz-e4kna@+MZu6?o;1Md2kT3zwv(@v$@}Z&B?!8t@_ETY$D!VF~QZNVZ2{ zd}86&+gabCLjr2g++K6U)xg232{Ce}8U7$Q z@=!P=Ii2}Mds1QYmsYG?@L9*lv5E^@v-LNwfp|*RNdy~j&e_iUK?wR`AK6UZ@uD|FTQ7|`dCg+g_ zB#APP>$WB)U}Pv-nzKg1`rZ%P78p2Y+@U+ghZdDhdDbn>sF;eQu;9KSbMP{!@vz`M zNg{|Ntd`F;mMgB(xu2JuCLalEb?!-`>V2XUmpFqHRnu;ADP|jEA~s`@40u%Yf!!5Hy_!$$-!q_C7Ps-L4tiPJnOuJ-2y;C?W9eM@uS=6I{uQI1)5R(vPZd z*L|wySN**NDHlrExzZj+D2hwk4tLX2X|k{=Dt0nO9n%E;F9!u$VyA9 z9(Ol`+Yd1nh*7J)T-~qkPKMLA;%eVh$#Z5#R`?<)MBG!i^qu}El#2xCpPImY)WTj_ zM7@ani8P>}Psf^qhtI7(-$=?yV?Z~)r)#--st25n1PYl;eF@Uw)|Q|Xl|n+paLA&)1?-iWA` zY?WT4v=5Ohhd;y@ta3emyEI%yGw-Zl{?Pe;u~5Yvt(G+k?L19mHSHK(nJujldNg{9M2);kQMnRXIa@Xb@r+Mp$Dd);p!GS-&f{-!^l%8un0)I%iO zl*zXJTwI@_iwoP22S-MZ1XVuFDPb(uB;Tilxq!zj!1CGRA%pUGrEY9v96wj*CI{|y zVF#vepjypkqTHhGn>Pfj3qycf6)$*T+wn$VJ-yeV->EU~!n2Q%&3V8q(!` zsr$9`xYJp4d1FVz9;&dFEugiYk8fj=1KEzK>wOEhD4MrlQuiAh>ySL;^E$UM6u0@( zL@A`|!)?T{+WV-kqk4g$(D9IJpzFT~`~M-OUwu{ui!R!SO9D3i>vt*nb&jVJK1~cB zC)F=PQ`j{+<*vjm^XtTSnMV=S_~7@j!JGK&_9H2^SZPdpgtGh)*J7AZ_`}dTgFVf? zcjbwc-I`L?-rk4nTsipu7(GX;O{jI{qA7?N3B+S5xBd3QV|&l%%Q(b=6GEk+%@Pjb z4!~AquvgM>FVd9EM0a5n_AT6*2gR@3pxq6$MH@(6e#xp5$092Us3p>ny3eP(K$4^( zipxQv7<=HyTMDAn=3{5m#@D^%J?n7FPSM5B*|2@`hR>%R{N*-ID7h9g!JY1%ZbBFC zxL5%kqvk5(a~zUj!iepCbE$(!@prm3@+=Z_b1H}RI6u(rklMHU$?fU9!TwMe=rC8d zWzyFsf?eI#Y@f&|Q|b*xP$YL{1Rr{>YQ6DyOmUaIl{0-GAb<y!aPw-XF5-L{|Z`~8zq4O$JjSDj`PX&dbRzFQWsR08t3JJqsDAut|Ezr34r3ZXmF z%!W;P*T^@O6hrsBTU!iXvvl@??iICe!!M5$F)rIFAKYxFxxT`&vNto!{Ox}d%hwQ6 zQg$7QfwdknQY$EbIH+wzIphVx!+;Wn-(Nf5S9oA~WPmaCskaaFGga*75beTRchu8q^sx z2doDM=(|3g?H95{?=9Bt$XC7vOv`^BySBHwOaduC=WiZ zu)5BS5?haKKcG+Nb{Wx0&102iAgNB~>`qt@q=OHq9nAtwpKV`c4i)7FB8*D;PQPO^ zmil@fT<_;Y?e9KKsr|Y;Zf$UwuPC@zf!6MwZ*qTF0QKG>8h)MAVfBLAr*eKMo5QAITz!QdrS0rvS2={kJ zv$Tp+K6yP|=^R|l>yUk*O-0uGg5LXQn0z7URMaxUom9$1tm~oj!`&XaKUx6*J5||8 zHuy=WHLn_=n$!`VO@L=_2#k(~76eGzFSaEK*w1UaIi%OVV>N8kI%|CJZ}_mwHU^^y z{0Y)VJ-JueSUuNNH6|W7L z%Bu^sgU`cX8y=>|F1B|K#>xcQ7v^jJ2AH0h#tvgMit@^0$a5iByRk3Xj6SFtLNxEk z#m`lethm8U$Vb9}qaI~IOrQ-Qhwx8UE6Tk#%K@uLGh4B?8iA%ncsQAT z$+%2@(L|a(2rWPygiK35**cjY0BL*j8_VNUYzVkltP(lAI%IS-^HqDh_9?Wi$?ic# zDZ=XIsd2CGoJ^`aPWpuj#Cu^R@xlJ{+(rF>3bA{oCWF;r;wIvQ#C~6OxfgV_@>Bg~PB%n@J;^_TU-{x==?PWd^}W zdS@ND1`D^$+4b+J%55PeE&lZ z7YV&h>nrcBU{T`TH4Pem0Pm4zcp{RuJ}xdpe=m!mwn$WqoEdK1UJns5`}=REbZm)M zdos~!m;L9GF;PDHYjfIdGV$aNcoq?8!fM$}$6!A#vRwa`r-hzwh{-K5Ii;)Yv@wC9 z<%1z#7#nRN!&v51x3by1_KAQm-jAB)d3@hw32Iu-Ec&6=d>7}aR?};eyOrY9 ziCaY$2heZbCIM@i7x%5w<3sXJ>1L+l6C-s}?EL#blEq(co7P5zO+AzTE_bHq1g_Rx z++G<%+cpDdA1CiVV_W@xnFec1OKYTpNiuXSSLI{%ws(O8LX=jg%2fKzO*>WSe49_0 zR#RK|kP_DE*-YxvRaypM45Psd$xR92&hA*iKwe6yQa1y7=-f_z>w02HQCE$=U#c0- z-p6942V~vc($a(UM^f-R*L1G_#IsWL)Akni(hdk3oCfsG9%Q&BqUt!b`;T`n?@J7ml^|(pZ2manfDR8Q zZs}(s!)Nd0^3*oQlkQEnWv^D#CL{ZgN)b5%XKbX;W1p7`hxT9#p(&u()9KtG{KhH!Z8wQB%*m2`+Kq)oV5lzBwvMn&)KUxIFK* zxF%z4OfVy5y1z$mke}Eio9cdQ@h!FAR^mHazjqz*PZ)m|Hsb_$Ul*z7OB$?E-G1$o z+Oq^|sHESrCrDIN=p!Ec)#J8)S zXjj zlQ>FdwL6G5LrXJ4Fwv+yerI=gqGFbM+?YCm?bY{%=y=8baUoQIFZR@b$JcT<;}T_T zn_kJ`wy?9d+axdW4_DlYT%y^|$UQ@8z2@OYU9Ez6Jy{+aA@dl7MO3lwB zNW)7@a@$`HaVd)_(VR+Uw7?;hq;I@kJ<%A)S9}vRQKGc3Ok!Z~5yy~-jb}DhMTsTg^D3tWu!_oSo ze&6bRe|vY`dBpMO5Zbi)9nNGYi~VU{jj86Lx9j!j0DWLnfRAMR@u5oU9Y9-Y%>Q|g zJFDbr@2AF2Nl)Z>d2wFqd-`>4x0@~<^_l73hqZTK!Q7l}(vyZZ_E(ed*u7IJ=yX*O zonupf)AXp3>yHg)M^=nXQmT_p5Rs^A1fQX^`7y9x8;86xYT&R=r|AAFqD9> zYOxz+KKJxxIcA^X`(7npStek=sE+CFwYlK^3LKCPwK_iAeDEKCd30=+S1QP=a@+P--8e4FlVn@jZVQdpPjH=f}OlBmxv{(XlF<`@8= z+dOhq(ZQSV&+6=VmXy_ecL{tyHa4~pwksVs+OGK@qAMzrZw zm%9t|1WSF6w3H$_L*jG>>sFjK{N@iTX;+HZjt;ICDfoFv=wfC|nYctp946gH(ed1e zCbZ!I1pFj8SwU(603Tv=caqFnlRd~hGw_)x=~?y%gEYAVF(AzYJsQgDSe(=2-czjx zz!zr6do=-p8U!lxxvmdOf!$5I_K9X1M$L9*1H&{zPkwQS{J~yOKnFxbdJ@G zi5BG&_ngKx!^M&>{E_jvfnTL;CY5(?Fm_9(Jawn!HHOG!jTe11R{Ic?K8e+C)z3jm z4lMa;TVfzq)EpoIov>girpJgvr3(q85g)~bZeCv{YrM&-vo2idzD=87e7Q_;Dzy1J z^5w(pFu9KedLrHwR!TjIHlfTgOjl|^%pHzTy;yN;SRAyO3VFOmHF_ud2}`#;t*Pc+ zA-JkcZEjjn^l~!FOnG3DmTTje3hTvK^Q(F~HhMJQ*8qZLT4oiXqvOjOrJ5W}ixnE9 zYf`WRz z<>4`bt;Tg*ztr`g|gi%}7Kdk85dI9>vgcXEoO7xf}lWChhYXWQ4b|I)|V#X|o^i_%x{UUOHQ1BG3Hvcvjg;uRaOE+=TUx%%^s{U{A`g z$5}c)P$IxLce@2ubZ?y>X`ESqey()bTN?KGbXQMKq=*H7>03d_a!V!zZHIM0JC^sZ z!!{8Fk^6~Iq6Y69g`OYl1bPq3qVh=b^!M@vijw2m#{siqbG+d4~KcfgEG2^^tpUL}abG$Qx6`iqB6t)8;&bgkP>;mHb!X`(e4kN6<%+EHu zFh!rC;Darc(0<$+v{p>-_7c?D-TnQEAL6GR*WWXenTjJ3|0@^3frkXEIUJi@XcQdy z%!rPTzKd@j4#Jsh33z_cZVi#0g4Lp#-PeRYLS#?~k7c>HYgn2EdyrF~&Spm2+ipP; zEM8=KN!X)wc%U$s{C_M&i9#o8%3gvE4Gk9>z_5D_2eA$$Z-2WrJf3t;$f8m*w5|tq z_6RwzNr+y}$nVwFnvI**z5^L(Ao zy4h>nSO$xCM!U}vu&NtAEH^~e zoevR%Q@qywTS1Q`;-1wnQXm!GTrrPIiHASMkmO{YQcIE+(=a{X&YJDUX{lrt?rz=J zkH6c#LG)waa_&4`PN!!(bpWU1ONMuLtQf;Fx!TNQ`6JL+o!>vkkqd*2jIw$HE~kVi z_@^c4lbJOZ$qy%C=9klIhyB6Y;zr9ar{vR~NA(0e`wuWXHsEd()$p5zV(Ja7PhRe} zUGFv{k37CGn0fCK*{^mq=lC3cHSS(oZnT|P0tcEN`p&_2oMs#n9+|-Ph@bMREZul8 zg+E68VwApABVWq(`Fd&MY;%B-kx|jvq({@YO20Yj7FXn*U{cB@62z>T^Kg+5SS6LDfT8 zwYd8qnquXI#U(BN&c6+@Jw32K9*0dBc1hox6jFYh(P-v87U$k)&rj4DU%Dd1cKu97 zC~g+M>M%0~YhqDJymRV0S7Q83h2(qEUe00Kq1&1T^8l}oe;Mrk$R&T8S0pwq!9mwO z>Aqbf_j^t=c1ptJ?$Ug?J*_*v{WB~7^78214x5wnt26cQ<^AnMOgxvZU0Fx~9ePCcIXQv2bAxP6TH$$Yfi75H$#{M>D1Z~d2!4S+Lu z23xHu;h4nw6EF9O`@qva>Oi|VssI{QkP~j7n){Ne7cvnd+i7K0EkyjJP2O3;&sQ6i z#Q%t0UTz@5!oi_SC!gsLTRRR$`L5%v4n@rl3m~=4Lixx_@8@66yUi)KuG(g1Q?6`HE zP1faj)zSB~yY*$_6r&*&uzXq|8|q$@V=xj=8H&SxBmLngPq(LpDve20ilbwc+I*G< zPVx?{zvr^Uq@DV(-%$n$;7b&9(UxgK>Dz+ISTQT8P|*qu8*LiQ`w_0~!yzUmJ~;7Y zf}pYfujFWP9y0E@vt!Kp)pg?1lsGtm-JZu2o!$M#@B5VY8{EFv3kG^>vM7m)_CYi> z>XWkQEG?+ieww}evVGT<;Kb=Rmu+|K)lRRaTSMYs+sfABqfk61hQSpYhajVHhLHs7 zy74;ei8N@Jx0`(P&&8~2PKHl%=?}ihbX(mr#z64cGe4E6UDOrS9JUGUQ0)4mI9_GZJE7w?x zqGQuQ2%`zkrvCo8pC1^KA7b7j6h%v$3pOMO^Y4R4WobX7k`kYEJ3Z$Kr1suP+Hgq_ z-6L5|>%)#gZG0>DeSLVpuKUJlwU*;MVj?s6O~vv|Ud-K)&5xX~>+-`D0KnTKr}ZBH zPts-^Z_TC6noY~qDWel!Pc>%!r;TVu<|!ZdoWmTay`NqlPmS*gwaS7b4|-o;st(@> z{((`=#1$IJ5EL#xZ&+MaS*kT%NFS#D?BQWM>?fy)Yi$49D++6!qFYYT}pYBeOUQ}8kNnS)K_ZbHYme}4ScqStIhc4zwe+3YDm zZUL{Zy}6+Bop^q*IVJC9<5J2F#ohPS4OPv6n+M+2b@8Vv*GNL9I<`xM{lDYgLt}#XLr}n#k;eG^7%RJI$FKA$fT3kSw5@ zPbOvsCpm|g2y@X_=%_i{`F@~QeF8)ZylASgd8j|t|atnGt5Sw>uS_$V(M z_C=nEOA#BX>xyP}$*;s0T6lhfR8&$~6cz?$RTeg<&r%u!UeFRCs7ygdtIo_^sMDPi zy`;FUq6rftsSfoX->)y>b~{0uZL@xuIp0rvX*xhN`wa_kPuF1R*pV*z{vRkXFYv`1 z`-jYo!la?_2>m$;{&v42ZiEcRKD0uMei;_D=4}t+`QF*5RX_@1k5&}L7Yb2VerV`# zVCs3+pTsiEkos;n{*7OcFyOKSi;wzl6kvwEO2qwXVyg-HemvoE%HBLgw!FxkD7qa+98sHFocqpnzvCv(5{&&?f4Brv?dfJT9Q7V|fLJ*;fRIqb`CT^pgq>wcGU zYa1CY>IbA)zxeBwMhA9+_2V-#ZA|rB;LpwqvyhULzz&LigW+dR-Pii`5}~w6yjn0Q z6I%ZEMVyVfYk}H2*p5?5+;*4@E8^9>q!l}u#Z{z_@;wg;C^ED4|AS!pXN@5qrv98B z+4FGXnq>+^@aR7^B+eDSHaE_vX;aFw5?gDmjl;3wjb4;*g`ptNKSW?^YxUf1VSeQ5 z+y81+5NM(n%7oigT?7qvE1@`nsBod*U^6Hu^6^xXRg@J}$BNRABH$VbFn_6%k_i(C3xXFEs|A`%HhveHc6#>H`8pV~8kHyJdup*r5)yMJu{`ZFDGjx= z+I>)VgIfY-BKR)dpvk;jTgD@zZSs&bRb-ecNEXr-pbe79VCx9Cq>Jb<#thDK)_$-$3mmH zXdh-9r9T*^fg_#LO3S3MT^8{^@4`yPP!^3v+{tg0-Tj3vPJtFM3Qu5wpaYfL=hU@P zLMa)NI#AnJ61af-^t^EvTR6#3fMEY_Tms$bn~w3(jKZ%pGJ>v6(57Ub@O;CyqqMrO9T?eSe?lS21z>IU~v@4;2${BVnUX)DL3)v1|Qo-XRuxB(YWFKs8Wd-9?d`G$w z;uIt)!sFeXD>mlFvncv@*GWUL^d)&V6c^o|gN4(k36dSLV(}Au5TQ^;Ad%VBpHy95 z#T71C4oxA7m(u>4O02X>;u8nO>zjc{9D`meq^TUtn=uJI06HCA`kS`)w;9bDU3WL{ zsA)7ev41DlZl`eW@qcABLFE?VF1lJ^UBfp0}w8z~=cL6L7N zUewWdz|Z)U;k{E3j({9_$X@3!fi#G%A*R9txc*cIW(c}JL_-TC3y`O4E0k$=nVdQQ zvVi`(nb3KI&N5b`e46w|^nbo5ya=rpRUb#eZQ1t^J; zf(SwbI;-eLWxAb>n#K;)tq4oaZ>ES>^O+m~;mqub;B3p~)bn-=-^ zS0?in=-V0)Xj<@B2|IWA;eTok1zdTx@`+&Y(j+1_NkGCfW)fS8FbP(~A>3Qmk3ZQk zY;-dk5G;L|)Be4a074!{`F%Je^FMJTBng(4AH_-n+tdDE1-Z#YD*2{=+fA;{gr5;N ziRtH^B;~^jMX~V|6q|`WcPP*mrV$)!I&zb|4Old^J;)f;Q5RK|y5C8zF=Hmk&8XI= zG#?dhbg`Yv(&K#eA`x^*i65>;Gbx90sN(sWG;VOMTLg9l;NK$T;)T(*^eY&*v+d(U zz5T~}Zfo1NFmg$KzoRq%`E88yQT~k?4~t*xs%P@aYNrYeLht?)2bl9d%e4lT{Nt0k zDiaC`;rnnk!%okS3O7U;4GXNZUyWOxn*XjB!pMuU zga`-`CkkqV7D_80F`8;%_VqFV)_yvsmm-p#xN)~Xi#6GA#!xa!sRN(B;ZObiW?5=G zo%f(fNxhSnpU<5R4)C5avFrpUGmRk=n-oYFzX^P~w{72nsLcE2@w}HyT?AQ1&P3D* zuevAWAI-wDYcBVu=9cb=Jz~bs>sr<-5S{nLRk#?0sbM-vDDXcCQ! z2H#)qPrxXgNoBjZ-`yu~n7DD><#T(&+4|dc;_WXJj|IJs+J90JlSZD&p6K~nVI)=M zueDDD*!@ddE^F~50}$8fB&vTruwbT$d?rRVC(UGL+x1S~`F7@vkz zcL~PaiWr6-xVo>P8?)uAnRMWQ`_h2*HW$lGN#B;7fQJLnh2`)UR*zH@?)}r0ATcSJ z=rsQ&a=u+3xBSR1_+n78Zvad2;0y+r4?XYj;bT&cw)+OcpH1Co6+7N8A{{Q()j0~1 z(8ZA%_$0=5CZVAfXs!i3eq^K$0v#;XffW+awPvK(gL{k<5lKW{ODZRSlWf_x?VHh(!(H>%mvP~ zTRPh~R1NaoL9je#aKO{~NE9VZ7@baq$&&_C+5l{VqYRk$aohH-otHQ8+@BM6M9NtX zfUn(mdUd@7R)MK?DZlyn`FCN|d}*`@i7xSq+@#qd^@Mz#*nx+lzWZ`kR0fn$fRE;| z5h^c;Kf4N(z;!W9Ifa& zXaR>Y1ml|>bxX62!EGJ!;>Wn04xJ4;&2eL-oU1uTq zxclGlMN^NFD`&_RJxgM!6ORVGw~0NkHDnH)IbL zoX-s{eiX^vbM#C=e~kT$2`N{1p?eW~O5B*@$4$wQyxZYuBml3hRzVSu4&~X{^YiU` z7FujzbT&>w*gq{$V3UTVC>J+U7=IF5O`Vj9xpJoSGzN~4m5Pw( zMQzf6;@O0tDF1H%9Xk`_(U9^UeirX6Egu@vg?YCh4h^d=2|Vg3X+wV`=rC%j2`QsE zk^XU?4EK}k9zTdgj_I>}U+58Rt*?I_!)kMKuScHB7Bm^9kNu}#7hH)CM9IWl5)*8yvVQY5VXf&A+vWlST7 zu*}<+NqO`B5ad#&sb%hxSh7dhEEN2Hf-SX~ZK-y5i-xh;@o6dXSzC)XcmwA}`v*K@ z+}G!wWQ{{#7Nxp%Txy2Ov_Arszwwi?7lPZ)w?{OHlBi0L$@PL*!`*shLs1r9FlBZ( zXwqd!A(%oW3Oah4?sv=s@Rf;hZ=4W9NK%n;m_pP`clSxLX3?n9-tkI=O`wOV#a8ZE zdC9xEk#9buQb|?FsLI&NrJ?#I-l6e2wnm)6!J|Mmup*AJwR9qs$k3SZ$66GWv0sDB z-^$`3;O}Psc~jx4s-+68LAG%e8Q~*o5mZ1v*xYtGV5`Lodhdn{hao(KByFUJ7ro;U zN=v47w8y!tWp$uJ<8S4Nfbb9ea5qs0SOS!O3o+{1b=hV7zU*(oaRLiwD4qwq(uc4hzAbpVW<7DlH}r)oX1X> z*#PBlTt{gnL2+H(CloC5MG`RxPk^8En{Oyhinl9S1|FQv*zkh}*M!w?daDOCH; zw;+6$t@7ahyYublU)=2xwd`&pG~Gzeu@^(rK;D3lJFMDtO34~gahHr534o5HO4UZV z!yrRuYx{XXClk^K6?_3V1v`$7sfhA#aH1K1BOh!I-D@&~3WcOIEAQ=q`r9p z2Lsb1W*J{kvUoARIu6Zu0!Jn1%y+Oop_vrUDk@8Xa<)HA%)I3?#A8M(X3c9&eM~@U zBNzeCEzVS4>w@;6T2&`Rv!1d&XnQyg(^I|hDG`pqA*HM+v2lV(0l7iR!77th?$(Zs zSH{7NCjrTt_=medXdx49y(+_tg9Wh(3581$)i`O9eD<`u;WptrfpCG zeq1&cw)Ht}*T2Lk!B=R-1rWNHtom7xlJTA6OP8<*J5B#h*h6&ZRHB?c2p`89O?3NC zF+x~|OvsjnFNl^XK;!c|JB0kbD4hnIf=5!+S&VNkUXqYv?iXglbXz8M1}q62-eFO3 z-PDnd3Zrmm+SZOvwhsf@nR5fXIW8k3A|mD-pQuOpDVBx212SWQE*Q3~; zwm}?L(6wrC<~+-a6!=!5Z(maw*G^=k5tp=Q2{zr)E7 z=ArdAvJV%+ADYMcIH7^bL4{QvEfvaQSk=Kh&twsDMe|jYpA0I$EQ8flGcq!&hJ!bQ z$YoMM)4iI2ZoV;4)N3LV^nnK*ov@(iOp=eo7@@3?e~fV^F_{L-NX?SQhw$!2nkjcSmUU3He)eqR7KUza{NO2hDUz2 z8aD(Dx56tgQn+F2wss^ZmN31A^0eLmOtNz7dfDw#ylcRBa4w6AQ3=zpHdZ)sa9=By z1u$u&YN%V_gMpD!bi+}oPd%$aG`tEyF9=_Hv z!*JLogfTx-psNlKt-r*B#!fpkg#c>)+x&ynh^Fg4yF50Yh|7j=2xf(T2r~-^m9T(( z4Kdgoi2L0YPX~~gui`j^t|bNunK|2U-;_1ML3kVF?;@d_?InUca^>0OnOj1t#u_ZE zTwws1Gq2zr4D(j$K;L7R;z1xrVnvex1dRej`_q+AXu{Am>F=fhvMzgER-vMY-Ltf! z^HlwK=&HwFl$PJ&A1@#Jc?{3LZi07wZzhNpFlXC?Fb?QSrg<2#!Sp4^WnT*QyFovE zu~hwij>A2}J?q2^9!T7P8^QV)8KVkG=a;gTiGqlMU5}d?6u*2;o=O#*dF`Via~Et) zD$V_x$x)R*#ul(I#xyywFfQ`wk(8}w$vr%h2kdH2&=7Y+4r0KQnIms9!n#gZy+q6d zalhO?SX{`t{+LwyD9hz^mq?sQo$ocb%22O?_T{%cxUIMW}5zhib{0kor!Dg>*%e(Fb?z+Tm@c|O2kc1^?25QM)@!9mNC!sfA0F~ z|8AV4#a_uBv0}qC*%e$ajqqlo=!(UwS#ur*{*AAnG`S9vj^yyU7BF^qy8n^%n$WJT znWA8*W+626uldZ3kleqWNiC?Vf~hj9>N}q^tJcNaW%7S?J~-=c=0w(5(WgZ3vGBig z0p=Z`UUASj|Mv#A=oNWpx6 z^C%lwDgcrRr|9zkm6-6~vK0PX!6M>{rMUC?=GSfnxl^K`z6-q_l-OT&I#SSKk#Dh7P0TUpV91NXABI4)X(F3|lP&PGC3I zobpaI!x*vH-dVDS)NJtTuG(`Q8jK7@UL7sf8Py^(isjJrdsGofnEZg{EMO$`ec6OL z6+QE}8O)O`W6%f)IV?j?)g5&g#Uh@w1nFkg3)~KSPwV*#E!PRo);~vB4={_GRQ1VGi^~c=GAeTb5Y@wP@IFq~9B0lyaCvDqT?=3i|u#%KusQ_ci%rRz z?=qv8h!)Wqj4nC}(TOP0dyQU05CqYC)bJ%jMDIbgAbKadkSGy3&;0(c&$-Sk`%-3) zvA5@5Ykk%;{2%B6Y*CvK6aFYg_vDcOx?j|7>Y><=55QV*Kk+6QT{!#=BGbuVSkZOG zwTb88H>ycxX%})S17qTsYUBSZ55*-UB;ID_+}E3XZxxYByIm<_2;2yM5xbG`+4)8X zHsCGji-t=al>HX4Xg6i?Tg4Vlz$O%KeDR2V!Oe>IHwg2GEG_kVfWXL+}SzyCNd~(22VhRL;`yo9xabsK#47pZNnK!!S2`{ouc^Gs=|7cgP4> z7>;tfs2`akfz?w~yAR~lWDFK(`=@r&WY4d8GF$s~9W&0r!+C60jyoUtY2^#>a!P%V zmmA#H6#ibNsIcgkJ`+SUG+8ezcwt$x@*N1-{X%=vii9T5W|RKTJau(=|0-23VG zbX2aaG9&qYVrFG?k$)m#U(sf5DY#FjP3tAm+kkN`~%ZXa}Nl^+WPm z=^JxifV51$_}s1*PKb%;KR`9Kw2T@$F4q&j4a5|Y$UtFU)uFq~!53zK>Ge1Wynwe- z<)Mt-AbayR)X4`}TotdTs(zjV!Z{|UHI(6TAIF=E^Rk9 zl&K)H-y0;9)^1X)L)_zRucU=l{U`)eoDu1Tk{HG03hN+6y#wBioG=DLFh0HGZW9jh z9eoHi1qXe7y_5BsAOkULf)l9 zY|;rq6}t;)0B%p`WM?}&yOU=#T~3*|$xn-w6CW(JTlGYD9e-AL-O2Tx*^hk(&QZ7L z1HXs*+`v+c+;+C-P3h8MuF#$I)Y@xoY#g0Vh3IO#1O&NVhO**$?2=0EBECB}FB#}s zF1KtbN{jCa)#>DM>%um(PqT4ji94vpL^zq)PE!n ziCV)-60;P(+_QJQ(R&Js^JExNo)h$Q$fK8BCGA?aq+36qn?-j}6~}_YfdkH)6e6JG zkG5wXYH70W#~u-PG1Zh(9lW{{>@fN8{9Qctx5(?R93tA!0l)N0A>=l#MKcJto2OV? zaoS|Uea+EX@&CyGF%c3*5egNRESd;;BVA+ra?AC{lQfYt;PQR^l~JEIJu$G0DCjNx zZWrD({Wi})Zw}X>ygKO*88X?+0$v@K$68%hMz6_u!fly#*E47<{n7nFEGx>C-#DH$4N=v81g8=~FI~*gExL_NjCgSg-6?zv z>#SI~2IBX4_)PWNx!^b_L;?D7A8EK9Zh|f;HU5CH!cb`uh_&)~)mM|hBP1duQM#*; zN|)7@jp&_zL<60Mr-a}y!9QPca3krHzVn8yJXDf+4qp$xSSm*wvnV_?hFvb4Ft01# zb#+d5tZ*=+Inj+i^NnQS8h$QlfPWLb*1A?`I`&zpX6EO4EW5SQ+E)zkw>k5~)v(*9 z9+$}48LsOe$rXlxbG8yaPE+x_ycPVaTR=^om!?}Nud@agqFOiSHNejEigt&Q=M_ro zI!Rz(2D_ODc9BGW9oT;&k``(zg~RZ)G}BMM6HAVXy``!1O)R~$;B(gs(KDJe>T>BY zY=b)?EJ-o{;u*)TN{PX^#T4nZJd-`iCb;@g18EWnUP?zby1K9Vaw~R+AU2O>b7UZe z53$oG2@4F@#@=NBGgS$>x0#XYI)BtTX6kYPR7Fat2J1cNq~Y){dlxhR{qK8pie+Wg zKXL!)4&tx!=(@VP8xG`tCFJ(@@1H5Znvn<1X|faE>=e0*CkrV)^55`kk_Q(r!X0rK ztkerk3M46thJKe5$9wQXhd)*na>T#XuD_f7pqqBfrjQxM-BVNy%YDoXQLm}+LySgF z@;kaa6}xk$cwWOMQR%$!N<~w{DBRX6xYbTVjM2geXN@JY1>J>%G3>svXMW@qx7WSx!pLYdy>^uo~BW!CY#lXNxJH^k=lPdlDyQLM1Ojx8WxX3xcp9g zE70Y+izdvAfYUp=RfpompNr!TCAAD(_1(FQB0u%_1g)r$>MRp$4^pIzq`;@LlC@A} zyy;&@t^2j=_wV0(T63SYM(v{nB8O5U1kU(xk}3?!vd_j5x> zOENlKBP|7daaF^~A8Mu(R8motEN9r|PS<|WJ(&bP)vA$q3X~+X#we*LkY5WU*=e3;P4l9 zeNX{M3f97U`{xl}^ZN3km$q3X-LeiStkc3(mcRp{D=_sn;lD|J;QA?O&wZ$`dL*LL za*hG*oyT(c=Ca5>FGzZj`oG#%ic}u+m_{7|10F;KQpUw(L|{*Yqd@vc7E}V|f=<^Z zk9n;nsrGM6x*`vS#F^%uO)n#8g1t)#YR^3xJ z)@@PH;FFEvEoKv*r6`TvQy8@}Q3#n{EBd&b8onM*B{cgv5q0YBK^#jg^2QVOx7B5o ziP1Z0Pl<#gZN1emtZrtXFC8VtH-_DeGq8ib#_VP*IDOyRZmu~^uY}A$eWsd%HFD52 zLVMcM{*!;qq^w023fC+ti(cV^N;RPXU!Bs@Xq_*DSl0>@Xk7P*%l0b2kFmpsBbN-6 zU(yxkZ#-ilDHszB{4RioUQM;aa1^@&x`Yti1h9rau^l_>k522`G2;ly&<&T(G zvoUOCqU@CKYZ>Icm3L+IQ5`sZD;n^(I=TD_G~c)8NJ1>cr)K3xUiY=)?BJgR%Jtsz zfn-isN^Mycc)ZaqmK^u3Yyee;=$G)AsAiG-?HUHv389R{O<|dO0Te|e2$E?Ma`n(V ziI(^^Tb~QED$Xp_3PwLw5k;y zTf?n7{-t=f#L?LbnmjVB3Aik6VlwiO`N}iNF&~_}=#;ql$;Q`4kGO?mlXp3fCw!Jk z2&|8wo9$61Bqgv@P%2KS9fs3hd1f|+CiQ#i`#@e^daw_+ zz!%**)4U@x=2-A{av=xiJ0eG(CEIW%E`mq~C4LI5H3o9y=tbiQu@%x4)&LnQ{X z)p@u<<^$(!PEJa*8qIZn^l$-kmL(qxHw;=-QNf<1AqjI#Mnp1d5BZ>DkqRT`>VHf( zsb4Vd{IJ`i_`W4Aen;~$XIFhc<}#GE};4GP5Ffw#!@Ek-g-x<_NpT;qLI{kZ=7 zu3AK)bT94?UBjOM58EH?#-tk0+9Xl7xl+CvYdtahK}KRY!c>5%|2)?5^oEU%JP! zAJV<{2g7puHA_eHe`AtWGh?&x;Mh22f4Q5Jh_;`@e3L-H@=q^fqTHuGBWX{An0lJ% zFPCb~q>S7A>Kh%Vl-0uhYtDAQ&ieoNvUgM2=H$WVK=M9lWf)%Mr>7g1-bP^5Hzp$k z`S>_N&egWt(v z3?e?>-UsD_sY8SazK>1OPuct@?LjS?nS$~|@NNiv5~%*V6#+oLLoGcwtn7rO+juQ4 z9}G_s8Ibq1eeyYEU=kj4%A8&tPo{600LF!6TJD9U&jH;cBx?_&yo;=oo8RDu{QK+6 ze1EypuuAXIUrZh?>n|?uHbzYMOs=l|x{?%fJXQYHE`LK_&~Ah-_%qP&mBRE)?JFUF ze!QWD3n@u+Z3Cy?^ShsOBUsfmeodL-;b-6<&>Fbte~fLf@O zQzTq&m2LO!Z3c362)I3LAdz?t5_zQ%44QG!@P)O(e45<$7bvAvc*t9=1qK1=qEx?J zs|)N$5ikj_2{EA+Op zf2_uGB!mNhKmW1(IWT!nf-5$Cqd3}KX3=Zv;Wf)_)CN5<>4bcMgp*Q#9-FXh{9tv5 zQiBucH4GN%W1<8*&8FpMoBt+0{v`SEBXWQG9UGL{D>>ULvjwBbQZ3mreU?4*k14uA zm;%m*f@-LZr)kbFIQubV5UVIGM{wneMU?v{%0(n)0eYk&9Qz%tVCHl&ZX+&dC14ry1j4KDe_($bV za0%ybZyaR=c3Q5_yxI`tA1&^3tGAOV4^mzarK3^MHcfrwj&TzyT!3Ta#gDGxuuY^u z$g94bMatavb?k<|s&8B+E&0-e>q&hF(V6dmKB2OIaWKUk6Z?SkH|T2I!vIK?ZewJ9 zvD&G}94HTbMgNN6$+u!Aw%yNInJ1NQPFcS@RUYarZgS()sRe?Q4PoFR39HPC7?yyF z15gjh9`=|}qUGsY`xO2dAvaB;o?tIv`DY_ZN~=R9D+u^NKS6XH)5P+DO)1KY0jepR zM!y=}|Hv@Iqt|O=u9~E26Yo~mfL#5gn@C{VcTQmQCs2l!aRi0(s@%)t`{;l%N^R*v z&T8DC*rdB01$#_PLiI)jZ(bNPqWQ4%E6-Z|!w5ISx&qW89bB{ZZ&#r4sRDx(*6fcJ zBboF0A_tpPQhtt~Uel4_3pmcU@h`If40%D$GNzIQS99QQ*!oN^vIe-X#wl;0bNIrm_*?kf+r+c(r0=ZaWllOF*Zu|+ zoQFK+IYq~mOksC*Oi2MO)l!S+R_wW90mw4RHW>BJG-HVHjr;R`+2hm(UFCzfs-m+c zcMFchxyIgsuVyBV5Fz-WjBGSA3#*gIZ(?Gq5P_b8}TQA=c ziAO&XvEvJ4Nb2jzks{-T!G#H5&B8ht{daQZS-r^vBDxBF(wD_(<21k0w4D2-XqCqX z1x2fhmKmhjtv&qghTt83L%Y}}zWX^eM;+3;;oTlXG-59c<&h7$tVHPVOgVmUC{<22 z7P*zwGZ2U7oa5r_NWf`1k=Qt}%&@McM}8Lcq23+n|lVV|N-lE^x}yu)CqG1f{t&rAeNee&v?;IrKBo^#HCgci~`d3#*8 z#~o5h8pd6V+t@v_#v)`qIE)m64!IpE!Sya_yzlrf1)I|esT4;ME;pB_`bs4#4l15Q z)i>Bu`W)7euM-E^VqzPs1U$Y;rW6IGa8W7|G@6~4s=igU+13u7rVsMqem@>0hDDBY z+5A*!%MO?KmM45h3c2yUqQuJBfV zk>ntvk;!$B{6*DK8@AeRvgnJBq6YSxd-7~_0O7AbiPbs`4rs_6@Hgyo0AVCBr{VyRq|%``kVt47 zJ3BVskELVKiKyA;v(;!F!4&%(;)zj9QOX0@J2df=I0~0Kie0~m@NU&%rc$(C!gM7w zK>>26$e(}IQ`!e&8)ZIhitPAN7fUG6qJ=uYzqH`YLe!29y)XH+~aAFE1*x%O%U<4N-5W4@w7Z=I8OGK6+HL zam1?9=GXx)eYnsx(~p{59)o&Yh-LZmN}cX8nyh>RxU~;*ZS~|`WLGz zwd9kL0QE1yY&@A~>?CDvXGEVL+>BhEX75|uEWIRYirP)lW9RzB`a5S(jJe=~>B@TA zL2qSmFfl;)x?i_nY4EMb-A8{+7zTrjWzQ1?+6jF0IO~1Zx}!`S`$ivT%}MO!P|md0 zwqHBeIG4&$*lM!!!#+Rt7OuUg^KPQq)q>)(cs?P%ioD_4NfWwmxtWTzH0x$iGEcquZdLfIX-I9)fKO8PyeuUAFrV1DlhPe{(wuR zg<4E{q1Xe#HL~m0Wnvmb1tVte#zi~mX+<}5qivVq@^m*T#z6e9bpIlFZ`m9CdJpdeeZ@}KKif@g^tRYd$^ zg~qH)-h~2;WU^Qr$!zxc3lLs)`$8Dl;MZW^!Ov{-TB!N%gT+gD;oFaRJo0p2mz}V$ ze;V)Nz!5bC_R_;XH=2rAcFK{EAm7Y>FUc?}!6y1@2uwcoV8NTkDj&{VqN0c`8$+0e z%9mkyrVzlCFTvb4Kzmr0IrQa%TX)27+x(-;1ckkH=e2GOoXNTR4*ee|bnv?vlG*sf(%#f|e*QEy=0j9|5qYNZNX@eJM&7ufN% zeUkQ8L<+X(Hdcrm)j^VuUr6DHDx6UK>Kv1$y%0d~x|66(^!Uw#$3sL0%r4l|h*{Dz zI=O-_ohPvllf~tX@-V6l2%2Wz5hff#94lGmrGpNN{_4S2+{%QA88@!k!v6LVz`YfO zJv*ueeOUu=rZO-)`Z}iD6iYLoEVSggXLi>{NtFzIP0Cr^FXUl!!C~6Id#jeD@yMY( z@+xQ6>*+P!vHwDU436j^m56JH919)!@uIg2l=hVK6SDhzGtf|ei zwO;X<;OyxD`NuBJ{(P0RtTQg}0gXs_yKfTyrZ$^yEAyE#>&NqT&zj#P(et4lFaF(X zzH%{{sb8Aw9Ikj{k5_^l27m6xdAG%WvtKAF*;E3DCiBH&=j99nuri7?K{TEeec^G< zAaCcJkhdh0IoBz5am3+5Ynn}Iv@$EoqEmi69=S!{4{}S+bNVoJili)RsL(HJb`gjF z=^fa`A+Dz77`l?5Ytx<UjLRETd7jND3G)f@nVbC(0@X z@izgWoN-+-@t)!d05<4~s9kWKlqv+D;`I|dzjFbr+XTKJFOyi#{}nS79uEy=6oXAF zikMFf&_&Ig?c?T)i3;~Ieh+TX`_(Gml)SgZ{cW*sOp%zU`@~WjJIK(=qhaOvLddJ^ zE)*g4J`MyTR!>m=k+iGA7D2$D5Q?xwv^QAB4PibHy$S@|LiDv$^BHM!oz4x90PpBG z;U!64#BmVV=^&7vgI4l%8M844ZKvxAQ_#-a`wo*_M6~yA%0MDYQw^T+0`scq|NX%G z6`-{Px37Qg(+Vv-Sk%J9L@}eG1FM*KZiv{q{QfoV1`ye{Pi<}6z5zpqd1`X96+X8L z*;4Yx_*4vQ^J^(jUV<(2N3&mHm<7u1vA_S8g0U%{d3k%|X{f8Ig+01|_VXt`HxCaU z__+7;^tAr(-#@g|2aL|wiQ&3}gwZ&bwjjN|0s0pc7+JJ~+{>l14~Uw3tg*V8UFtO9XcxS literal 5284 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 q4yw-=) - - diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml index 34535c694..06233244b 100644 --- a/app/src/main/res/layout/item_widget_timetable_dark.xml +++ b/app/src/main/res/layout/item_widget_timetable_dark.xml @@ -6,12 +6,12 @@ android:layout_height="wrap_content" android:minHeight="45dp" android:orientation="vertical" + android:background="@drawable/background_widget_item_timetable_dark" tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory"> - - diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml index 36a6bbddf..1bf4072dc 100644 --- a/app/src/main/res/layout/item_widget_timetable_small.xml +++ b/app/src/main/res/layout/item_widget_timetable_small.xml @@ -91,7 +91,7 @@ tools:text="@tools:sample/lorem/random" /> - diff --git a/app/src/main/res/layout/item_widget_timetable_small_dark.xml b/app/src/main/res/layout/item_widget_timetable_small_dark.xml index a02d85850..50bbbd031 100644 --- a/app/src/main/res/layout/item_widget_timetable_small_dark.xml +++ b/app/src/main/res/layout/item_widget_timetable_small_dark.xml @@ -90,7 +90,7 @@ tools:text="@tools:sample/lorem/random" /> - diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml index 8a08b5d24..059bb741f 100644 --- a/app/src/main/res/layout/widget_timetable.xml +++ b/app/src/main/res/layout/widget_timetable.xml @@ -3,13 +3,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/white" + android:background="@drawable/background_widget_timetable" tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider"> + android:background="@drawable/background_widget_header_timetable"> @@ -77,7 +78,12 @@ android:id="@+id/timetableWidgetList" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="56dp" + android:layout_marginLeft="10dp" + android:layout_marginTop="66dp" + android:layout_marginRight="10dp" + android:layout_marginBottom="10dp" + android:divider="#00ffffff" + android:dividerHeight="4dp" tools:listitem="@layout/item_widget_timetable" /> diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml index 5533eaeee..9c8b8c561 100644 --- a/app/src/main/res/layout/widget_timetable_dark.xml +++ b/app/src/main/res/layout/widget_timetable_dark.xml @@ -3,13 +3,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorWidgetBackground" + android:background="@drawable/background_widget_timetable_dark" tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider"> + android:background="@drawable/background_widget_header_timetable_dark"> @@ -77,7 +78,12 @@ android:id="@+id/timetableWidgetList" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="56dp" + android:layout_marginTop="66dp" + android:layout_marginBottom="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:divider="#00ffffff" + android:dividerHeight="4dp" tools:listitem="@layout/item_widget_timetable_dark" />