From 99f471eb7e027ce9155d3345b6e308642bd6b0ec Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Fri, 15 Nov 2024 15:55:57 +0100 Subject: [PATCH] Added christmas ball --- .../resources/drawables/arm_second_xmas.svg | 11 +++++ KittieCats/resources/drawables/ball.png | Bin 0 -> 1675 bytes KittieCats/resources/drawables/drawables.xml | 3 ++ KittieCats/resources/drawables/icons.png | Bin 3789 -> 3720 bytes KittieCats/resources/drawables/ticks_xmas.svg | 44 ++++++++++++++++++ KittieCats/resources/source/Icons.png | Bin 8911 -> 7817 bytes KittieCats/resources/source/Layout.svg | 18 ++++--- KittieCats/resources/themes/default.json | 3 +- KittieCats/resources/themes/xmas.json | 5 +- KittieCats/source/KittieCatsView.mc | 13 +++++- KittieCats/source/ThemeManager.mc | 16 +++++-- 11 files changed, 99 insertions(+), 14 deletions(-) create mode 100644 KittieCats/resources/drawables/arm_second_xmas.svg create mode 100644 KittieCats/resources/drawables/ball.png create mode 100644 KittieCats/resources/drawables/ticks_xmas.svg diff --git a/KittieCats/resources/drawables/arm_second_xmas.svg b/KittieCats/resources/drawables/arm_second_xmas.svg new file mode 100644 index 0000000..f75b3c8 --- /dev/null +++ b/KittieCats/resources/drawables/arm_second_xmas.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/KittieCats/resources/drawables/ball.png b/KittieCats/resources/drawables/ball.png new file mode 100644 index 0000000000000000000000000000000000000000..bfafe82a406929e259073f3d406e61cbeef9fe10 GIT binary patch literal 1675 zcmV;626Xv}P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11{g_1 zK~!jg?U_w%6;%|+|L4w~zLFHENE&Iu1r$YTVqzL2iDH`Y5p~7J8ilxUfnrDuJF1C6 z3=5-ZqChkv^3es|2r+Ijkti#T!I*Rf2GW%GO0Xin0PTBk<{lR__j2a;eNs$Vypx=~ z&di&+zxzMu-gD-am>Ki6GiS~WD5cIBW1ii#Y18<8pQq+c1b~Ph2GE^;&fD$@)V;Pg zRI}EGYS!9N%~~6(S!+WzYi+1z?Y@MfR{N>p;o*H+>y<$eKx>UK4AIrqwWOz~XJfHg z{2_{>>p>783`2xr2&L4ek&%&+R>sgR5dmQ4&CL9yIL6G(3<`w;wALH7)*vExjfle@rp(kgFipZajknuQB0l^q~@ zn}CNH00S@p3^QT?F*70n5i=^xh?r3ZP+>-i`D(?OPi|K#2gj~myE$*D1O5Fk2f%(s zw9M{5NMRUoKyeCSp{$p)UWkERC-V7|cLjBDV4y1~l@0|&TLS=!2qdm^6_q4Z*@G&H zznSQ`ilR4#3=~8bYN&KZitXLn3Gar2v2kU{3N0Ne)RUsgP8sWDH8;TrxV1n;=*}Ix+E&WXP<( zF9!!hl*^|(h}L!x!FrAeokYkfeZVS(Nj`h3uXuPbE~5YjJ#ihkO$*$FG$X>d#$f;!yToV zcgmaX!|VVS&R0ka5GC#<3nM_JBfaLE0d@j_`l!FZM-gp?yuo_1Hcd=0zh6_ zG0g5ec8BM*Cfa97_{?XG@@ANy(@eD1B=yMc(uNr^QL^j-sPq9Qc@Y5HjsR&vPC?xy zkS#@af|<$Jkcx;N*9KT=K@8wvtQ!8_M4~&ebuO|Bib>gG?LuBf%^J2!8|KAEs1kTE zR_>VD?ZkHGe*YBvfS!7C@^zpV>lnycRRS9>Pa%Ul%if(!2lxA@NVp4aI;mIy*0D|< zGvA7UMJnBM+|o`ZwhvLblUqp7*}-HV75S=JM>hBB*i9V)(+XImm|e}0VY5Ax+>vd5 z#6qoz85JPob}{&H4V0SJkuevQQY-y>Pys{}A#&=uf3F=uvk zA1FW)I#(KG@=CRk?LMpJS_73p!0);OoF(SnzCsQvU3G+HJMi0KAIeXBU$sVNlsc;m z3m5*>TP#j9ur$+qBdI;I4XO6xAQQeGSf&2nWbN;AclS9pHa=dCm`}>Sx@1hYul5?X zS!T?NX3bvrUlz&&s8QI`iH?qqkC!z7%qX=#XUuj3=uGION@?h%QgU_5_dmHkRMK-z zSWHTNhIBj}o|w2)Hs%}I()ub$mx}o+`NvHH0nA?=pPc*?5G~7XV0VsrOU(RWK;#nK zsZ`}l`TE|1O)I6|u?Ly=zHQ5wzevpA1w>@uie-|^ZqXLiYEUiqS*(C9NAvm9 zRiOZ2Yj5vfB6=5?+v55r+mdDyxtbC1{;_=iz05fuiiqgdWy=l{(HnO;PAhikM4|8& zdk}MepJHYnotoMKqJ8*ZI$k%-2i1Up20sOD?d{z{M27)9aIa_xxX!@q$MgA9wZ2pL zm%I~&!nYL1YXBTY!{Xl1VgN@F$B)$m0$TWw!?wP@M?tg;%) + + + diff --git a/KittieCats/resources/drawables/icons.png b/KittieCats/resources/drawables/icons.png index 8e921c81ccb9cb2c45b6c583b3e44bbcf0595940..c67102191e2cecf4dc62b7541a3941d6850ea88b 100644 GIT binary patch delta 3698 zcmV-&4vq269f%!}Ie$7yL_t(&L%kXYSd-T_`ST|si$GWcqKE+;ty&dZcdg>UQ5Sx# zqeGus2X)l?9Mz}jvvpPLz)@PQf*TnkpcX|02SkPn64_gJ2!V`0HHR4Qkv+gnJ7y2bx+io8WJq~}1&JxwK#4ML^MWXg$#r2c zQiltehJXCck>%$j0Eb~AA0xD>jidc+D5RGxHZ$n8u#7kx8vE$Nr9X4qq>9g)sie#R z(byi{(baB%azw&d5avD5DOVE%Xwd$H6Q3Uery;q0bGk&;kjb;DRO(&j@Hl#R%u)Z> zM`Ne3c+OvT#BCGRA+um~Le0=4>Z+Q`j|YXF$A59kFa{ZaG-u7k-r4u_@(stlOv%rG zZ(LsoagH#S$+1}&w&zyZinoE`}775oZwZDn`!G>;!&z;>Y47YRhM0lOZ zmVdoULxNFu9B;~J!9puuJuXbRarn-F&$mtgeCFB-@kdvM1=p50_VM-e2PzCZ#}Qf%SwlD zt4srI0&;p8A>Um+S(#r~L!(n&CM_AcJ@C6J8>g=rzoY4G6R~yb&!>Hcc#2ME?*8SY zS%aU@=y)=nMk%~d_>+)Y?zq^(HGeYOq;gvwu6s`>>YLmP-(+W3$~J9SFv_#Hi{1x{ z#Zu(Qs3uPU*mD;PnOcnoQGqF+f@m>0JeOG=i56!)Dvdj_H3Zr#0j!QpU=wNy8IgSF ze9CP@+Kn}0(Y{5Ye+0*@o&14+|1WSV#knxMtmxM12T6@p%?)5SyumMA1b^pz)RKkf z7gV76X-ofpz53VJHG4l!Iy$!#2-5K(vaJU|jR&=u-bJv85Nc-YWeOel3lN5XAFfoygUO~}%b zhc9hi5S{<*Ua25HEF&>=&k;b20jSs%k$-~DVBDqB7>jW_V+*V@+JBrT8Ip%nK!_V# z3tO7nvS>8|yTgHe;Q;07Ncf2A)D;iXao&3+JDeJf{DVCwutmu zvaF?9_J1(^Xfm3{5dVdqHY{7O&f_$sR}UgkRMYLx|^16Q;f5|8$oTQWX7YLHxWZk_S3w;*fT8^3L=S7Avtg5iK zx}i#(QvRmq<@5V_D7)4cxl}a&1$r5WbNZ zIe#2xpe@5ay7nl~DDN@4Yat5)!b!v9Jivq?Ghl70Q>j!_s9CejIvpS?Db7kxJiTHZ z1?q@@DnJPU#lf9Frz6wG>QYh6p>I)MPym3k-EIrYJlBUT>4y+2^J`F)SM$S_6@yM~ zy#Bj;AD)LtKUXJ$P^kuw^PSp}SVm&5@PEqw_}`%&1qIp?7#K+5Ik3)AD3~=qsM9=c zZCO(Srn)Q@kQzgEot?7KH3bDfL6E!!5G+3lWb#``x+YOGW*A+5nUEBs`vxE!-~xaE z0L95Hl~QhGhoxeXJnF}l=UN+U?m)k#(GOyaGq?;NR4K}?(8l3SZzZzes5P^H`hViL zkcT(YbEr54DS*DTG`7m3P9#1%yzKm;_BrWI#e%s5CfeC?{7kIJs%BRg-g?6jx69kc zHTn7bLwtNhAStAIoi@pcqefE-n(vQUCVbsc6dC9>Y-?QQXi-&h|FbJ6{5pHf3Ht%# z=lDt*YuY0A{42aNF9U59+E~jK0)OHPaJ*iGT&YNn5{_tn}#6-5~s5q5U~P zm&sf=0)Y)+xm6a{BKxnKyRiK6Q0+ zvg;x;vusPy)2UjmHafjMTzN>Q+Qiqqc>#nqLSZ7@SWbhg{^ACxJ%0q@PXOUtW0yP4 z7-KRi;xo~0oDAZ=ri_>bM zFy*AT_ZZO9J7AL16@N0>!VTr+Qb;T;Q-iLt$d9fZuJY*b*J$VB&Z{ZTt&cyx`D%Gi zI(i_{3GJQee>7{*0F_chBu8W*JF82;qz@yWr!Lw3X^V3&$3b9{QY?6g!QnbVT~Ju{ zR3=lf&}1MIQa(t^$}TRc9t@XoX5|Npt5Fe3>65hAZ(ijVzkjF0XEJTXa=FrequmKI z%JhsDY3g4K2O)e0$rxPljLC# z3PFcY8#sz%%bNS(YT7ZNRjQ)}eQsmt4_^ll=SitinRm=-J{kk~$U>lK3i%D4A4Jg+ za?* z8g3@EBaQ6?(2U*E?6a+o8Sn`U7%qWWb4Dk^S8CvWA0K9qB@f#Jg QZU6uP07*qoM6N<$f@pjn*8l(j delta 3768 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 + + + + + + + + + + + + + + diff --git a/KittieCats/resources/source/Icons.png b/KittieCats/resources/source/Icons.png index 281c0747f1758636e02b90d8df9bc19e434e84fb..92c84b47617f94c58c91c2bda5221271c27f7557 100644 GIT binary patch literal 7817 zcmeHMX*iVa+aGzNEKw9CTZmGYgzQ8y){-S#lC242nPD)trzDYRlzoW?ktN19Gqy+) zW;7Tv1|efCV>g)0ywmgf{qh|D|A+U(`{6q7&bbU4I5gPvCnm_T*{kjl0l0fj&@}M~F87 z27@VqzY`=f~6ipp+VZp%AO(K?DsHl&%l6yKrrNwFy)|sc)b2$QI7Nu2~<{9Qc?ag z+qwq;h}Qv4jO@bmR>%=~4xwb$I-Ty?=g-H7HI(``&jm)3mE;n_{c=jD5#Hob)A=yp za?takxquuy7SQF#|#6431 z0CeLy0MpWZ0D!>1AQ8gT0fzeI7QB9sHtOgVk~<iu4HGM(q{we--id*(=~! zfU+PR9IZ*t&NNku^=_P1ftg&od%M?UOOCZT-@>75Z{o?;BhA6@1CC(D zAvD*f6<=S6(3sFrdt8^mzqh^vTKDcNHTT0dZ zky4_Y9z2*nra2*uhiTmd(UN zn$on1S{#)N_&h(rw}=qBUCzo{OEE1A{n2bFVkmlRaK1k)yml^z;X(37Wh8aGZge&F zd36p~QZfqdLN^V38u0Okqg`-5g}cg@2JdR-s{7nVhY_GC%1Ed)s%4VY7$96ny_Gx< z9{xQ#swkF_P264&Pty&8wv+N9C&jgO(@fW+1OU+2UanIb<@KQv(N;q_$z{5+Q!$sH zTbO&Qu7sLN=5ORjtJO-aF~x_~k$$Ufv<3;W(W@6v|79*YxH2ypy_&{*;<=PGkdyI- zrp|mXO#x!s(%nxCUbyza@Dq=B&o8AZ^=Rgu52G6XyG;^$P|F)nx!QBTi?PPTJ!u+a zgLMW61B!I8GYQFw4IL7J?+kw~!Gy4PvVtZ>hgr5OU!&|pzbpZ?#XJn9#m4uIwZ%(W zzxxs1-bQP#_+27rydi;Uij^!OjD=Q_23$S{)B0+voHQ|&mQRwBh9ixZ-p0sHis23z zueV;;2R>^*BqeZ!lP3{^lFSZY%sZVfk+0@CbBOX(nv`e$^ry6(+$N+jxL+0Tbz*(` z74g?tO;xrssQYd4xmf)C6?C7cDP4@w1S(^Ka4&$c_TOvN!j-g4&bgx=hDPDu^P?Di zw(7d7FE|0IYyn1wFk>=><-cLxoZoJkY!w^VA3Y2XUcy^AjEtD)kiv3RsyWbowOPq; zUVr8`+jpLRtQCu0t!IJpqnvX>9)?@?_J@fRSF8v?$@=HK!g(<>lkW=NS6v?e`DyJy z^F4gq?3Bg$$5{=UA~s7(;quFaxzu)T8ph3^(}c^zaBe_CZPldV`E^m}tlqoYFfx^; zA2l&?_gc%!<^c5vu`u--bULU3?HssvlACsU=rnrCw*2GR+|*z7^fa2mH72jIKC9RL z=%9KK`XbM#2sH2JDPn)?*0_jdO_fCnewVQ3!HOU<JJRL(sMoopwMvA07U>IPwI(#Z}59s71UaEIy?<+!v-mvGg$BS<6e zEyiaagC4P#lOC_AI0QU!5%Ft6YE+Sb44{) zw09T_!ZFF(GpXFYZQOKQyz0qE2U4vn^=mn~?$MQ6Z^mS)FrOVv_Q;E|CYBHye_1I> zaVae(LQV5^_|_@7bbdPm1(d$g1azVI~G5w{0f!iitc7Gu!f-~@y&J6%E|ek3bU`Fv%;{+)(W-0#uAJLM{h zplsweg7Abpl*Fj3IUBU}BlyYO1d%f-XMElY@u=VbHZA7Kpfz4^{%%8KOup=D0k_m6 z_A1JQmSaQ}GeXn(6&OL^SP`7n4&6i$LzVTy%p>~cxGe}@)Kf65FPiqKYGAqDt_={M zGgdm`cF(~7N0r)C`G`ony7>*c;O$C<^0aylSZ+K1njaEr5i+W$=KJe9P<@4U?r$7B z878(s$H@f)&XA>zxVDnQy}dW4xbQ{V(0)U8vbT@{VmJU2(3hiA6KmD5lp7ipf$sOe zNm4Mgjkr|G>{H8$CLJmn@_6($uCDcbzKTC|X%;1!6CUI+mR;qj2qeIl#2lGZ$%>8^ zkxjGrE)TBn>T?OlmzCv5hB|?YFT&hJoxf>m_5q{kpy3*Rxj5`hAbq)2t9jugjck8B zb?Na_UfBLYLDP$~drX5DC@$t`5jXw7N~2ySw}F!W{4F-5Ivyd*dy={Q#gP`Zv3HVJ z_TWo@`?EudCtix)5^M{{y&J704{lwjVWfh9lr1?eaV21E_(NtoZ{{#qAKBu1a-EJZ zZqo_#PwjqZDp?!8wIDMouG45riq0grF27V?67&6hNW|j&2S30UkWw#x`83Da8!6e^8f8yL^g1$E=5tvpbSq$>S&m0u?hOtpJ_QAzj7TUEv6PfNL$aYD z31b;ln@i5JAl!E{rbMp1Q)^p5f47DuVf0oa;N_X5q!TcT(x_&M*nB%Sq8!QSUp}tZ z*Enmzv5}zicKY|h-@pS;)zJ^35i1F$^fS3?r-6YD)gOM`5Y~T~JGWn;oC|^n?JV5E zJVS>1G``iF=fd!G#yw64Rs_;E<}Y7%so$QjUn$Ex0WK4fi9iH2YC$(vKoo!br4S&n z#ZF7IheP-egOJzt)mW%n_V{WkYIw)MR4J{#%ihv(IGCcw^OARFppsp0)umKE-17-e7{g~WQD)kQV8*q%!MGF)+F?%v^1Z>wG_S4 zHW#}g>~}54i$M66;%Vr_cjKKmNT%tIP4!fk?Rt!!omz$KSes5vQSS8%wZ*_2tP1;e zQm(y^l{MmGjs@!uVMk!prKt$CLah3`vojyBU3(D>LWHGgY<&2%|GYeDvQehyod zE^i7czU4AnMPg?QB*VgAHWjzn{Lh$#1esA<3KSj55Dvg?i`?9UXxZ7!0& z(>_hM;tgcZPKbyojkVk$$oTB|NVrQ3O0z470tom85^u36lsO|5xxL@p5$?);Qp6AM zWowK8zG*;bS1IL=Bo7Qkww42jh*enalL@tX&)A7$y#EwzrVpUa@6iG7(sB%Y2m;Y- z1kN@`PMKWqdQj^IZoigmAA0^BKR>^>fm^F~n%%kbPyJ_fyzfidG`pU}@~inZ`_;78 z@k{=!rnth-r~hme9ftLL8IE@5;{RPM^dA-DHo8-s)9Z*s}1mx%MJ&VS`g*z_7D^3#CK&9gET zS|}kdUpEf{?Mhf&{MOc$uo8eH%TZoVjK$=Q$&_2p8??21_0GS{Z}!8m|2|3V#PibQ z>&*$>53mzq!5SYHEpK{Lp}m@!mq0WmyKtYiv;Ax0>Z9TBIJA?b;9;P-Ii_ND?We#~ zqqX1MH;fSd=sQBsKi|&eyK}JHUOdR~iVD_I@@IXa7Hm;z=G77khc1lT zrvik}vA=Hv%WTrOvUetH(%W1@J2-lGCY9qBWcb|NL?uRy;Iz>XCEnrOD`JN6#}le? zXr_3>lGG9XZyA8d5E`Knpu~VY&#uC=J!~bu`M5l z0=HLM-PN#VA(Jh3@Kq7Rt>XzwU{cCMSmP$xxO-N!VN;(&_(-Q9$8-O%BxK1-g8_t= zz&jP;3x=-<7XB7pGOPC-?QqocbrN^vXr z<=H$Jp}#)uCW|On)0%q$>>MU&Bx2{t>I6=u3&$*c@#(9}?x(bC#xh;R4Nk{hHxxa$ z`1>hupeDsSbGR;fVE!55_Sp-7-D^jTdR&$dkvAJ>rud)N6Uj-zzQ;sHOPF#B-i|K<1#|%?Wjb}Hy zO>=N1z;_c-p3jFzMgm;~&k|wZi=Ss!-u?c1H3DEV`Ygsxws^L4Z_|+i=K_51IsUIf zg=L3~H*cOIuA>B4KEnYn@#T}PC~=*WgAIaQ%MKSQ0~WwY-)K?Vh6TzPxYT*;3LL)i zp{7&^r2E!FitoqDHB=!nhgxE19;%}i@?LGIul#jmd{H*UK0@^PSH;daGH!2VL_nKz zel)i{Lf+${#+}yexrsSm5v3>v0hvP)H$*?W)T!jri^QJ(B;~8{4F3AJP{?x%93WMA z&tmiWxSNsi5t}N#31l*CW3bLzk}L6AXI!V?=jyb% zu)Bdd-}kxz-*1WvMmXx(tKIdHUtNp4<8~<{c@_pw}&JsC)FqDh#rebipP-mw5Q67S7*3 z&5ViJ$VwWB5IvE|_fk|4WN*(C6XrT~RF!%^op!bCf`Ql+3@%(9^Qg;?(pl!cpV4d8 zTRKFiK<-KLoTI-d>*!FV5qJ( zlW|^A@nqOWv!Pee=eVznO(1eFVkdMS7hL2+bE##H6MIVgoi#sc(UbFa1Nd(P!ctVE z>K+e@&sGIFr=iw(SLWKd)ZoQWdJdgSRguCR8f`i79m+Y?Et!F=$W|xkL#M3^Jgh&h zh;#s#w9n=Jf%Gm`>d^-sHdzECltr+o1(XZ`k(&7g&Y&L^qVpI{kpto+yCp7 zogq|^OZdfy!h7_%S`beHEd~ z+GPxsX*I)nWH-h@1%2niQSrMGQBybe3Iq~QfP;+Z><22T1u4FcW{YhBZ?aL(+2*1L z=~E6BC&_S`+|!nLIn217=A~FiO7kRP_SJpFH_v?{1%66u@ekz7cE*1P_5Ku_5WJu!LbltY|5T@%+b2{l zRoI<;;p!ZT)=J47OWqb!tj>>Gn1j+bW7?+^HUd*HE!CUyT*c2+q--_hos~puE4K!9 zG$z&uh^*hHN{U+eyy|pWEqeFHWWxZWIxrg7+868O~%P{!!#+A28@ zLm=C5^__Wow_FSNs<`rovsU*8w}USpeP#Pf33H?LxOem;Ni2LtxlguN_{FwHh_)r7 z)Gu;*^4FcfH)C`0)MpW*O+)He`?VEL`An*yEv%fU^BA>eVN6q25EXI%9cX^3~?*GB>V; z$VW6bqpSAHfHZVDu+KnUf3x`J^-pE_oW)BwnK_P%qDWYf)EE4Gq^%1 z=KHSNxe@x}$@pMgw3CnKH|h&7jVJ}GdEx8jt6DHB?fBtxv{I;#pRjDJqb+m8ABYp4 zsHnP~h7_{hjwKry2%Wolg!3G=Qcw9H8A6K$GI~(iB62{ZwdT$s3++?7fwl$^4bXI2 z0;`oyE|)32To^e=?u$WZ%4Uv!(m{;ba#KEduw}>a#T(&5bS>Jnx^vyko)_qTLP*4Wnr{>@ec~( zSX086fMk%`hs+`2SVedPk`eEy4c9Q?^)N(Qjn`c9CTvt$fN$3!sV9452KSrQ4)*## zWnQ-aOHLlR_=@2Qp~>fK`91y}oXVLd7)uQcfm)yR4vYHn$lWZZ}ii@fq4uW3CV1%>4v49UtvgFfW z9vdfpvvJMpSrC2;d3U}UiE)VF;gob{fFbb)A;s}H>wFP7>(OiQp9tLLou&sIOjN4D7aVn+kS zWf3z~cD;=%P6WY6+mwlSf6cZ z)q;$XWJ4K)mtmifLph6uzs+?9;t&0CtRm7GF5af6Qeq#Jm4e&-z>VovVO6C4(?;m_ z<26@NtI?rfy{GzmT2@MeH~XK+!u;XOec4!~-p-TGKkU|L&X#Gs z6_kQC3s96_jwAA7+*)Xv&JOEWykCw@pn_{43HM@L3VN8skDD2`IyBn*42-;K!z@!U zn0;y`qM~K#ovIc6_0>Vv_+DtDtd+#AF$GWqFUmY;Dp0!8`FUMjSIZU-n5w|F2w8{zp|Up2fZXaWG&gR|~_wAqD_%SesN|zyJ7u08{0K Ap#T5? literal 8911 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 As{jB1 diff --git a/KittieCats/resources/source/Layout.svg b/KittieCats/resources/source/Layout.svg index 20f28e6..51d18b4 100644 --- a/KittieCats/resources/source/Layout.svg +++ b/KittieCats/resources/source/Layout.svg @@ -10,6 +10,9 @@ sodipodi:docname="Layout.svg" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" xml:space="preserve" + inkscape:export-filename="Icons.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -27,9 +30,9 @@ inkscape:document-units="px" showguides="true" showgrid="false" - inkscape:zoom="4" - inkscape:cx="206.75" - inkscape:cy="335.75" + inkscape:zoom="8" + inkscape:cx="176.75" + inkscape:cy="324.875" inkscape:window-width="2560" inkscape:window-height="1368" inkscape:window-x="0" @@ -49,7 +52,8 @@ inkscape:label="" inkscape:color="rgb(0,134,229)" /> tintColor, :filterMode => Graphics.FILTER_MODE_BILINEAR, diff --git a/KittieCats/source/ThemeManager.mc b/KittieCats/source/ThemeManager.mc index 38a5b4a..4c54a0a 100644 --- a/KittieCats/source/ThemeManager.mc +++ b/KittieCats/source/ThemeManager.mc @@ -10,13 +10,16 @@ class Theme public var ArmMinute; public var ArmSecond; + public var MinuteOrnamentLo; + public var MinuteOrnamentOffset; + public var ArmHourTintHi; public var ArmHourTintLo; public var ArmMinuteTintHi; public var ArmMinuteTintLo; - function initialize(backgroundHi, backgroundLo, armHour, armMinute, armSecond, variablesJsonResource) + function initialize(backgroundHi, backgroundLo, armHour, armMinute, armSecond, minuteOrnamentLo, variablesJsonResource) { self.BackgroundHi = backgroundHi; self.BackgroundLo = backgroundLo; @@ -25,11 +28,14 @@ class Theme self.ArmMinute = armMinute; self.ArmSecond = armSecond; + self.MinuteOrnamentLo = minuteOrnamentLo; + var variables = Application.loadResource(variablesJsonResource) as Dictionary; self.ArmHourTintHi = variables["ArmHourTintHi"]; self.ArmHourTintLo = variables["ArmHourTintLo"]; self.ArmMinuteTintHi = variables["ArmMinuteTintHi"]; self.ArmMinuteTintLo = variables["ArmMinuteTintLo"]; + self.MinuteOrnamentOffset = variables["MinuteOrnamentOffset"]; } } @@ -67,16 +73,20 @@ class ThemeManager Rez.Drawables.ArmMinute, Rez.Drawables.ArmSecond, + null, + Rez.JsonData.ThemeDefault ); self.themes["xmas"] = new Theme( Rez.Drawables.BackgroundXmas, - Rez.Drawables.Ticks, + Rez.Drawables.TicksXmas, Rez.Drawables.ArmHour, Rez.Drawables.ArmMinute, - Rez.Drawables.ArmSecond, + Rez.Drawables.ArmSecondXmas, + + Rez.Drawables.Ball, Rez.JsonData.ThemeXMas );