From 75a4e48872085e93318e8625835a0eb1534e44df Mon Sep 17 00:00:00 2001 From: Luan Nico Date: Sun, 11 Oct 2026 14:05:26 -0400 Subject: [PATCH] chore: Use BasicPalette to provide test colours instead of material_ui --- ..._component_fixed_resolution_order_test.png | Bin 677 -> 603 bytes ...onent_fixed_resolution_order_zoom_test.png | Bin 773 -> 680 bytes .../_goldens/camera_component_order_test.png | Bin 372 -> 312 bytes .../test/_goldens/clip_component_circle.png | Bin 27888 -> 25463 bytes .../test/_goldens/clip_component_polygon.png | Bin 21985 -> 21971 bytes .../test/_goldens/clip_component_rect.png | Bin 20978 -> 20967 bytes .../test/_goldens/sprite_batch_test_1.png | Bin 173 -> 163 bytes .../test/camera/camera_component_test.dart | 28 ++++++++-------- .../test/components/clip_component_test.dart | 4 +-- .../flame/test/effects/color_effect_test.dart | 31 +++++++++--------- .../test/extensions/image_extension_test.dart | 4 +-- packages/flame/test/sprite_batch_test.dart | 17 +++++----- packages/flame_network_assets/pubspec.yaml | 1 - .../test/flame_network_image_test.dart | 4 +-- packages/flame_test/pubspec.yaml | 1 - packages/flame_test/test/golden_test.dart | 8 ++--- 16 files changed, 49 insertions(+), 49 deletions(-) diff --git a/packages/flame/test/_goldens/camera_component_fixed_resolution_order_test.png b/packages/flame/test/_goldens/camera_component_fixed_resolution_order_test.png index ec49b454067237d69e3a093663b898ef3b9eec35..b20245b2badbca5effaba7f58653d78016b60e80 100644 GIT binary patch delta 549 zcmV+=0^0qh1=|FWL4O5FL_t(&f$f-0OXENofFGscVx=rdMX*Al2TOwBB|XRg5beRs zp8XTOd+Q;;p|r3U1uq`9_kyMLtMm|YP(TfA`!=NFijKEKyxye-OR#1*v~db^@gnnpY`W1(Bjwq7WU5vI5^<& z>PnKri14eeUVpELb8&nehVWraQg>EcN%CDQm&=if*+L6;fphm9x8?Htq{_zoJG*ah zxSbBQVv(BTz~vbDzbdr>v$wIc@ z0B8X1bo$$Bi0xX8y><-9@AQwoZLn=TR<~We@u)`t4UWw1{eG5!F~4kwpJTRAgyp nM2o0~79LRzEutD)L^b{a%2Ua;EWPIn00000NkvXXu0mjfsT=|9 delta 623 zcmV-#0+9XN1f>O#L4Qw4L_t(&f$f;jYm#9cz&}ozifOvGH9huw_X3PUiin035e+FK8d5|wq<@HLNDczer^A)PFoX0(Md?W9sC0kfJEW zWWs0eV`0F? zbN4Bp&0YZICFzxSMy!92j*eC?munf@eIOQ!1y(+00DqWp*x~#n*;0wLx&vRncDmk{ zbmjWptnTpQM}bc!!HQjjcewV%uCqNB0N_`@8?MX(@C~>LFg{uvG#!Of`Dppm&1-Bw z`b9=g?=2YMx2JY%{qzPj{TgPXN6+6ikma#JZP~J~*%eHVO17A3nywMmSgnwJ9*RZS+>{=AwL*$Ts8%7D zlO8(Ru2qWIktW}Fru-tPZu?Zv-t%TW<~CWLOR@a!;3B3ESA@HkaA(G*kGBnk0I|Qj zD}C3>d>vVa{eLfk&36L({Qe$*Zy;@Ek_o9tEUhMB0oTA@*mne6{dQ@${ygQZ-v{6W z@H$o6vm_I8717rV?e{6a2gx@=Ynvu^ugANsEjq&??ZoNMCss(MQdu}|n!yyAJ0=xE z->G8vLR+}IgNqA39UkJGpQp`vE(?oDDvgE^AVj+@y?@w^xEFLn{GIoAhG9sJ7rV4< z+g>={Y&Nkhi_7av>U;H|^Jq>zSys?aPg5s6k60nCR%_vSZ!icfKWI%V+_1oixR>wu z;pPTLBZ&Efe&KmbI7xUOVPhk(+d1$H!RHq*;pwya=akFK$6uL{;V`gYJMd}{c7BZZ zEtlco0BcT8pxe#-(+|lmWIPV+Xat?kV&8BX((T6kCPY7vsD>7z8d`{IWZr&{kB{*@ z58wCYWR#N3LLA4DlSxL_W@*LV#{Vy@&5URvs-cCbh8Ch4T8L`=1P~)>gcOz?!vFvP M07*qoM6N<$f;WjWVE_OC delta 720 zcmV;>0x$ij1%(EXL4U7FL_t(&f$f-2PZL2Hho41?Xmwj-6-Xph!VO9Y7_|p%qh1X0 z6PQ>M`~V*O0$z*<4;+n3q#6^Wi6>1wcz{DC!2<_c<3XjUfJ#efp+)*{Jrpbr?Y7+= zac%ZVHqCb4o&7!O?96l}K%ow3_}2kMVTu?HQ^aVPB1Xd$F@G9$Bho0UBiU)Ad&C7m zXl#~vI3}v=s?aUs^Z9T(okY@6=6k*YV6j?6WUC3?BE!SOc)eZ%?*iOjxFaT&2I}S+ zF-0`db{zU$(7a!G*Ly3{-wW5Sz!979u4{VOWv6Y|jI@2eues2be6n=VAvw#X>9^dl zG_s&AZ&_**>3<$^akR%#^xbx7Ynv5573xZHetM0|)8Dz-AZZR<4q*$T8YfmV0LU9T z06Lo*!FqtTOqPYsl#qMWBoZ2%-8Ho04`bkf#8RTDEn3i>`Ur-U96{y!f%g z)!;|%>32|*NU3c{I*|q-`zuqZn~M<*MgE-MO6F&&!GEp}26Gwit;C6}uJJyxp(lG0 z6-7KAk7~Q!ZU?}2*hY_|8vyB4j<};B9oYKpXgvmtUzq9W;_=K&eaTCps2w6n`R^<1 z7fvhL@MqO~YB{7zFX$BI@4Ua0B(XDB#i8Z(dR5y;M@Q-F>m&Ff$dkxZ074JSY~#-k zfO`NQJ%85`xil3;CMPFV+gFoG0Af;(U?c>@TD)tjoy z^sggL`M`=S6HUngq|fw1`e6BMJnriI-!qY9ehSUZEi!fewR-J2cV6PIAC{xKZ@m-! zBDwr(O)3RTKh-Y8Fom{r7wfKQBvLtoA;QDzt zj@@@wyy&6K^6mV+;>^0qCVc@OCJ^UET(+16<7T$3NjsyRdO>y_0|@8Oon+02}#M&$45(x0bn73PSYKrLPfZtBHU0BZm0-1RD>HU z!VPi}{}jMK1=M9rArrCI!dizN!FClN#E5ydy8pgmbT|S4Jb&W4ViFM}Qu);?o0+oh z`_1#KJsS4YbMN-3+Km)3i5RNCD9O}2K8FB+OL)$`E=htSg)Hq##OXul$ZIqJBqY+i z-r-Fr3+TiRNy6)jMw*%H~rECAHqw~epYTFQ|u137o ziOHh;w4qxs@7g^m4d2z=J2Fx-NCCarJJa^g6?%k6=_A3nUM0RtrR@k8Mt`>mum{8691Xvxg99xLpC zFp4u{W76EXk^YttviGa~x?G>#(vkBisg4YA0B~5h|nBJy)8e`26ufPDY zu8Ad1W$JRK2mY=Qru3oJFl0)tWNyXjp)Lp z?3YHSq)M>f1$e1NQHCzZRaobGTL-)Da%d+L-xBbC=OKxFs;w!gkm zG?=J=+xcC7?lB@BpF3`)V;VB=v`sPogj8hZl&~dtac=A`!Dc3NGPz7J0LDE^7<)mm zm)}>ng`4ZjD&IUDLfop`LU!R!ql=S^qlnwsG@N1&iS()cd&8#ycXXllm2wrP+#He5lS*wZ>O;@sS?abCTF? zPon8Ie=PF&q>EL5)RL52r)$Vont2Yp^J_Y0hg`DpZ1x$x-!YpMr(GJZqgg*N!uqm* zKk>%!dqvd_W7!hVphSI5Wf#;Lp>??ph+Yau>OCvsw_m@csKd+c*6S$c$Uy^S*RRX! zuiw%J`mqO3cUnF-UaL)F-7>+}ao>g_k)K=Xrgz7e?)y6tCu-*u&7$_V${j69^bqB+ zUgnjBdVi|bg>dY11yRJK&U|tWG;NvVKD{Z@*efNq9kbnhx%Q8}Rw~zrjq+(Cp&e_9 z$S)`Q&WUHWlq3~M202n;?+T`lNhKX?%?={>{UV^!h8M#jrngyGqr*A1_-Q9f2YmxGyLsiBc{%5nTPGi z+9@l@1wLG~WIy49&0VW~@Sva1a6Rrp=@nA2$j))!4LrKdqT`eLsOOO%iJrjx_S~?& zNp+6AwM`uRs|u9jkI#-f0$I+IUzB=%!Uza(9jVP&?C@(KrphwA3w{;XQiXq%nmS#HZD>5Fz(Ux4}L_#*7#-Mdg?Yd!WDqf=(7 zu4OgpB2v$WuZm$}QoWWXZ=}~DCWzF-Hh@R#x`{itHkonJ)7dW< zll@u1go@^YSj;EQ>d?vlP7t#0Q0q*#0jxVIJZs^9>u!k`@f&`3yzBx@h<9jCN3PdM zVgn;c=YpThqT^q6i8zv%J+R^649sG!iW4&fPtwIV*tDtP6xv9l+$9>*JI~L0B zdxK6M4&@i&Z>Xpw3piqo#IAg&8(9;Y{c?qJ6uOIBrzOr8+OTpg-)9|6z3~?%EQ&6U zDUr_qScw3-Qi)!{qpv5Cx)nbC!F6g=wj#gNNFEyJ)0kHh9WhlYgp6c=JVV6HE)>-$E_B*x zMFP$nw0u6{xgR0J=RByI5R&d7EQ_Yr%JQku5<6M=(`;JO@NuC2xN9O^oU>%EHbTTk zN08frv+VAV`t$}N`iIUe$%;vm5q0(n)09nF;7^c19)*!@v46^vf(TzDlLQTZv9{mIE2ALiTo{x z)y$v*$x3}Ml(`#Q2B*K6OmZJd)!!5UDiU+bF4skLIi69HkwA)H)AkZ2o?nx3n)wV`UoB+rb9GQftQ9$bV*wV$7 z5-V-=7o(NR&b)Aw9GKtB42L#Uo2lBsji6ze=)|(>cBbH3OuW&W8k%T>CVA3rta;0HY?lAFko6pYO| ze?XLQQlB(**yaW>Ny;QEvSW%3-I8~=`g3wz6Y!tf_pkeLcXOSCM%PP9dcHoVltC}r zFY9rqu*)<81ItSqC>vEqc+$EgbHgE%+c9g&NC??xXX7yp88&-gV^kz=_%akN$$w+W@F+?PG$5xO+CUc% zo~WUPnbb@rf$6&h(?cLD^5&G1lM8RZF_{qrEHw5(mp}fvhdBU2Gi8%X+=DIB$FJgN z>b#)D=R$mby%i~n?ryL@BZX7#vP#-11RAdR7tKniwM^}0GL=0cl;7R3(J2VBosh56 zWENOwRSJuoY^b}TGt&w(iT9!_o2rvErXzEz7b<_{#Tp>6-WIkBu}q-%v2%%}D?nkU zgX{FrKn8h&!|yhs8rFwHV^mAnI_iYz{A&%q;L(gL#3XVroM@BeQ*BI5mBXPH=0Ngi z@I&6m8t6P#C_BLK9?w#BhIk%54cq^+q1xD($OtWX)n8Q{x8-Sv(WC!|7$+IC z3`)Fxg6#Lg8JGha*F~3$YB4gEv%ve^fvsU9m9F)Ee779W^Id(lQ23ksct0+r&Tq+9 zaCu-6Wq{F=%E4qQImhEC?-LxDuj$owcQVPW9x^$tG5sUQ1nX9hb7NB$y7$GTl(}^B za?2|V0imfTM5TDwWeu5=uqdfoBW%%b>0&BxZAlrBzH9AT+XfYz1(HcHV>ejfM5?n= zDfDI!OZ)w+)>O<%`t*SY_r@W7vbm1ZVzAc@c0K+Bo}PIXGHEld;*f*7eQSjl=H>7* z#{U*Di(g1<#47~Djh1kM?d6)Vc=Du4DecNgAZNmT`bI#lt;m z8ZwK9R83yMfU*rbw^hot9f%XS@{>NCb^e}F4g*{g=9JXd5R`d2Hay)6PJbIrVX=0Z z3r&R2>#CyhUXW86w}V4A&bu_m7jzyN0Lk4PQsi<^&j1l-lqZ^?HCDkYeeyY`Chw)u zTZreKQVns1A!aH{0yjCOJZz;tI0|^_I@^*d*$p2RiHvn ztxB6MX67lnI*oX#E0(4+haXX~-MsshF|t@1djJEv^&3+gxy#%}voNoK4ZrkJsl~rH z?J&zmxPpPozIp&~BqI+&9Jnz7jH)NDR>Ohvn#!7{ggdUvKiSmgY zc2w?)<&>XRe2^ay&d6Ih3Gwi|L~Z8gv}Z7Ojox*!^Sp-T?-xp6Sc} zeRwL!w_dkW{%H9y-drbXsNRMXw8(B6QZVu@a|?N+(ajqIH{v=4 z7Rc_6k)Mtmy870vr}@0drK~LTb_aBg<4C=m9?*PRSoI;KnsS%*Ovin{q>CmA>wkRv z1A0`kjo*wPqVAF6>Q8NWte6XeyL$BqCX`)q$K%KMS5d8ZyQrO*i!Z<|;t5U{?cc$B;l}{C8|9?(SPM`^`z2K9 za4zFuW7z$O*!~}=9m)dM7$d@wLd6xVbU9;{!)28+-DeDU0cElT9()=KS!+^ z!Nz<=MXVg@`@DmvBfuryWeN$O`2B|^U5)x=;CAHtjwCVftIJ@;A8`7I3PZS%LuITC z<3lb}&GzKu53%9OHIRO11%3-NqzF)b7uDmk&P&W}>^1v{PW+rIbVHKuVE}=6`~bM^ zCw3hGmvxd>CZSq%v9O&}Yh{pvwMxLqA=BIvq2J@Hp9?p`>84RY*tM{ddz@1M} zxaEJH33iwZifKupO4Kog*I~)y)R9%|a#=YnX>N@fs3FPEiKLRn;|hziKrY}xz9JLv z9j!nK;`lE7aaG{_A_pc)+}Os98Tc8L+bW~KRrG?pol0B8Z?4h({ zdS3vhA&P@_b9n1PwH>F92kYOCjvf!b!~Gpok?kW}i9RZpg^2YQf{<0JxH39!C;_je zY6J3bKUDb4d+%dQHoiVME!-_8h!9a&h1}Fz1jd#LV)>_mzK5bEf&gM%v81p<3utV% zX}A{e2Xf6JUxL88#uel~GxkG;0v_=b4(g=niI|XumVUryO0-Zm$W2@RD9u+0@faZA zP+G3gRk0j4l*j9Fou2J_a+pBD>}#96V|uQs@<@35(@}BsH364+0>tzE{OvbWd_7VK z2+Q{(mSXEc8TXc-pM8mJA1n|9t9-x31^PR0){)Nz;JMQZw#wAioxjKhoqM6T`nn&2P7TJs?6)I(C*_4r&47 zdy_=kR0N-lXaaUW5bfUk!>L7mkMZy7TTfFDD&3b%K?nD~tp=!uV~&hSjiCsh6% z82M_#^MYm0_nws^%=Hv*qeLpXsTjaFVMj7=qkmL%TD|+Fb7(dRO?W2E*K6lY5oUPD z1Vqe?l$i^2HlDxJN4?Xu*nTK{zUUml!i8}l)wXNfj+N)G_)2AWC;=2d51DxlZ|0ZR zIm&m=U^fT1l9>Q{6x1%XmaV_HaG4EB6y!e0qUO|mdeu@Jld@c+c9A(D@6ZC?qF=mL zy4*d2ofg?pQ4V$98y_~Oo#VebCYVU9+ajO&Qk=nviKJpr;Xys_`q%vW1=kZ2!DG?z z7NQ!Dqmn1|2QV|XD(7#qhS9gAp-5sHc8;nB@zxk1?B5T97oa_w229Ia#qMz1rUDMZjg-E8b9ejq}iB9V2Z02fOaEi8Pvvp$Q%Xdss?9>44^OJA$~Wa_Nt!Z6~e z&L9#(F37jp#SPbty6znnKTXvCdfKdvDz-HJI45oeljH#8vz8Xz)y;ZqFFeKH#lPF( z7QA-{p~x)U?8_L}$pv)kVMV1BZu1@7Q-nXNqq+W?jQM-Myq;0%KWIyOHp15B+Vwob zzfas$Q_|Z1dggQ9LJ!jg?9#WF9p1n5tRUfnUmGB{M~zuI{LgdtySdxIc)NDvz( zZubB3&o~Ei3(pv;I~WAhdy-W7HiYDY;t~0o4k{w#&&cfYLqJ7_6j=UU75yNdqpDZ} zL6g8elkCJjr7@lS8IAvcUcy`Ww*vCJ0Aq{%TbKLKUEgn-oEp!Nnx9SW2rP35071Z9K_J;okZ@3a%`Jn)MXeh58xnVo{Gw)NXx;lSc-BjH?<`Qa5 z#&A&cL>VI0gisSg9W|BC0I9t}?G0*gPkZq$pLi^K?0#p7RHcJhevgIREI}0DyY3d?G0*g zP(pKc{TCih3sMcvaCah literal 27888 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 LX=ER>`|JMzPxAKc diff --git a/packages/flame/test/_goldens/clip_component_polygon.png b/packages/flame/test/_goldens/clip_component_polygon.png index a4ecec309af493da5815a05e9939a3f604b7625f..a5c8b744c8dd772cbee265ead5d95128638e6968 100644 GIT binary patch literal 21971 zcmeI4dvH|s6~}+~=5E|2A?5*V1`#)J34uZ}B!t$N_#fDd(XLl)jv9n z)Bg4!_H)ngd%yRd-}#;2C7W!+yz0u~!$u8bj18}vQMQ0Fo5t8}R%<*QY45(Kz(2}* zSJeYncx|;V-vunKUr^~{2Rlc9%9w*yl{p`%d*$*+v!1_LkzD57bH|I1PZ(d^v~%)5 zot1H(Kjm+HtG7eydv?u*n;)|GuU}sVCm4EdxH0-CEO6}9(KXjs|J@cn$bY1$rE7!Z zqUfF=+2=J6hOaLC^336u5jiL22(e3Pnq+A>6eT_eq?1s3J4kmK(oi`_GYsjq6p-#R zqz4pL*HHQ$$v$xpO2IWT6Q$r9htjE5AAcGzViRBj;<0cP2VV_G5vSUGd@l~(1ek_+ zEF8tbSHn@nLO9h99J~QA4zVp9#lc^PqlkrYsv;b`A&eMp1H`*8RR5t|pyeSx2zVRfc)1{8L;OCVgqQ`Ggg6;69&rp{0^$K8^!I(eoUdjG8+InEFKQropy^*Xr$Dwp4NOu}i_b8B}t7itce2lJdq-xHU zD1Bd1=b@{+M6x%bYY1FFM%UxuIu@nXASJGMf)rgt;CdQekEd$y&O>RZqE7rdUhp)@ zo`_j%-p&#x;Pf;<1&H&}+yICZ(EJP_(LTo#s)=?VAkn@ANVKm4qE-dpB-EbC=IFI41VJky zc7k>tLC|87Stn>0kSJ(fhzCLYU4o#^BnaA6f}oWV&n9ahykZnDU#qD1;>>FWl6?*) zJ$)`OpN`U1AjP`pB_PE@aN9wOGvcY_<#9xss?8^^#}#!1y1J)G_HuOffGbJz=45R? zalH?u#Ptr4qH73TNsc$CYLjr2=O-045!-_s_88pBSZFSPkKqLmIP@TykAVz5NG4z) zQxB4i4`k^1XzP}xnrSHYxOjIXO7l~+HrxsLDv+Y9 zJ5#E`M;zvv$rlpW{4{MJalNFdB+2eLsb(s=hFp9haV<&F_7T^|K}uY+B>xjcI+GVR z;RTnZX~VI%^UoD^I!d*8*?SIeU9-#HSp;(-N(N7XD8UNZd!7ugk-hg5`~gJC;2%Sj zphfnQ2L^4V?43@uIS?g-3n5CdT=pI%gBJpl=nC13J&e`l>5UjWA&2>amlc=D@W72KfFI)C22jelS)0W zJw&CK9vwlY5ARoq)O{e{Bz?WkB+WOue$+@^-6!j*H1wKErPuB;xh`omxwe>c99sE= zNjfT>UT|N$g0COrQ~6ZSNi@IsXd`%TrTo_?1`)sF2Z zJm)lFm+6|-^DmpCJ$IUL5xsj>&t~C1=ldO91MJBy8G0%%m#s%8o3Jg5;>9nsP570A z;`i3&nQ*;Hd-+NZjb8qGEX5N+)8G@AeuJ&W@zt^mN48b8#QyirLZMGWaRx26`Hc7Q zcpZDs_ppT6dq=h&`)Lcais2$Nq6ozD5S@U1ON)SS`><_U_{S^UdDFkXckyV6?d7qb zr?81OHP+X~;b+E1rTZb#%U9& z5~+d=h)1tT8Hh)(=yDJRAqqn54bjCQ+G8{kqCI|_+vDNY9Ydd#?6~pfC%$)z>#OjC zlV$}!TM>sNlPGc$$paS!Aqs+t)gV>_6RjXp1Y$Kr^B@XB6a*8iL97P&JYPH}M#?}u zDMj)i3PS7+VsD7nfM}1gMEu{h$J(CVL%-J+e|1sUBOBL-|4e=8HCwjF-s;&}>@N+O zI2_5!Ey&5TrlpG*8@VFzTESlq-Zk{?0Eu57J#hN-pfy_Lxsvgn0a_}4t$;Wj j$&bj1s1wHi>#Jc{?WmF~+t+muhO=8$UR`$3rPco%nnO4{ literal 21985 zcmeHPZE#fO6@G6vdlRxZBZ}GVCPY(EVay^MR^%gfToIe5AG(FmTp)}~ngk|PNhBdD zBHTvX)Cmd>4M`w;$duZdEb!Xk7)D3m7*K=&VW0>^S_%%17D}oK1_kZ8+1-22o$2&f z?eyc_KkReQeeQGL^PY2_8|Eg@g&xUIP02`MjHMQQcjhd{MuZtlN={bcNar8ENQ8e9 zm(3_BOoq?OnZc^JR^PaA_5H11XKq&Dg65~ctNED1 zc3=N$aBbh}H@~W_HgCZEh;gcK+r6KqMG*_NDz5Q|Ryt#_aFIy(-lWIkSIP2lUjsLp!!Rs2K-^AIbdC>!-RNG zfn0#O7&Rf`P6{h86RrsfHvo`uO^Dna5Nbefy9tq-140eRZ8ss|g3#-&yJML$=D_L~ zSgRKYH9gp4EjMz+aL%-XO!Z}l-%N-xhu$%qZ|t{D?SDpbokC{+ivagw6w+Ato&_tn z0z7EJ{uY1-5Vk3pU)J zn#1kGJLYQ@m%Geb-l?O8(}g)5-EBAS3m(2L*D7qGtG>m!1^z9HD+6UughhQh zQfq*EvqcR~0P5RT%0rO23{*W)D(Xp+YrK4$AE}S4zVWCUf;vb+)d5f~LDi>0btFR zXE?_ZF6_rR!aWR-aAAAKAvXfLNyv?WZW3}Mpqqr;2LiFGY|LiN>cy=IPm^JA>`@^h&eT~#jXpT`SbKWI2JTjH~Vb;3P41}8qgayR2}Z)xIdL{hkG`GcR`d0 z-3L(uoe(8LX%HpwPKXkr$q+^8uU8tc;&RuNi0zZDQf6bld@;^Ou~_xZL)p;JmB!^r zEnFzJry;e;!xy6q1}6g*RYNZ-jU>s1Wnw#eFKhC0;=REd)knOy7gW)ESv9Dl_p;3% zPP{ib1*oXn3##b7th!8;p!c%PUQWC>SgZPo_xc?UH}PJ-3m|5~KMEjb+@A>$W&L9v zZsNWE9Dsxy07$rb0FlcR9B$&hJOv_p;qyPP~`( zc{uT2)(27aUUnrnTt$|bT_SK^vu`<05?fdo2v5MZvM)WHc&~9o(~0+rTumq5E2)-YfP(6gN*?gD8QMAxea5AWGn?5G6u`5GBx~Mu_+N zUr^f7d)b;YQ9-ugf|nET4W_CQ;=Q2;r5(MOohT6%B&&lSPP{kxLp4H@9BNkD(R7c0GQOhbDY+Yf48<*SQCYx?ii%qwv)uvmt z(WYCp$)-DY4_&Spzca~)2I`;HM_0e*q)j$$PbSS&+D?^FLj{{CweYx2HLZ!N2IuUc zs-d~3ZPX&0YSyo9s_8qZYHvX+rB=_jsb;0xREr*>s=cSVjXI^2W<1cjlERM8Y6=5; ze@bD;UORXC)3)gJ8VUn>k5kx@S4LsZRGV)5RGV(jG@EYwG@EYDnft@|$ZX8HoI$or z96V2#8@Y!DSr@JHp^H1|sr}s-ZSdG{ZSeFV3M>C~oWlN7-8T5aSsOg_GKKtbgAJbj zoWlMs6Q^LM20v`H9;R9LXMLBKfB96k`CmH2pJ4uD-${xC^PwyLGd)Z8a_jgE)ffM6 ztW#X^@7bmDbeS1h1hPHkBw+uMMPPj0vE<$1k^ao}ogeYnr^5G^L>%S?IKbuMsI3_? zC(%U6f{+ElWH-bfc4arnZjjv&YleUH3{iS#!vpbm0nF26!^nn_4f9VLMmCB3L1ef* z>oY{j`!5W?psHS*e{^AORU-RAf;+w>aYs1*wyHcF zONz`%ED^F!qKS|NAq#@Z@hHb5{QigZ%V-%$Z;;*~yCF6br8h`#klrAFkTknM8e?=8 z$S0-POq2!j|5OnBc4ZB}m8^aG+LrFWo=?6DUs4X=g6}cQ!_lJnrgO5a_Jl$xgF=7fKdetR3X&m7`aVUg-_e8>BawT_BAy zHVdRNMiU_m;(w|jezzcR_`NpIhfD8oIJ^Jm*y5OfgdYFO)*JD^)hG|glOl5x&4jFz fSVjCx3S#z%If;7<*AKpAUbNuhM`rGt5w8C`wjasX diff --git a/packages/flame/test/_goldens/clip_component_rect.png b/packages/flame/test/_goldens/clip_component_rect.png index 6e6f73e776e5fb676c3ebbbd58f80aa9fc41ea6f..60974017fd98a7a3fec6e46ff0c99173e9695f84 100644 GIT binary patch delta 276 zcmeygnDO~y#tB{~8+jQN1(**${{3F^k-xd4hq366hN;)j+++UGQd-Rb1qaTT!`Tc6 zR&V?$&pWw*DU(0ScyoR~Oc6uHW(B^dtbzqMwk9(I1sfdyT`Rs3E5o>%QNx;t=g7QG z1q=)d44y8IA)6L*{cR}7CM`xCRq&!{yT-G@yGywo0k6#u5 delta 287 zcmaF9nDNtM#tB~bhJq~)3@is97rP|zJLdBXax}~+nY4QKtFR4B%gU_(eK%$hE13KH z4JQK>$nU?&3}Z8dscv4#l*+wXfmw-3=%U%NinM;XT*O57%?nu`vkK_%F4F;t8l1Ra z#kad#d2^v(BJ*Yi|4mE?VzPq&E}ms`@}(FU6c{{R978rY`US!jX)+2Zl)a4r8Imwz z|5uqZarez1MMAkZ2Z(ZT2spgCwGkwBK%xG%^hz@w-3T9;X@)>Go(H00000 LNkvXXu0mjfES4ys delta 115 zcmV-(0F3{m0j&X$L2Oq^L_t(2kcKU(5k VAhULVYnuQ7002ovPDHLkV1oTQH1Gfb diff --git a/packages/flame/test/camera/camera_component_test.dart b/packages/flame/test/camera/camera_component_test.dart index e2b0f2b4fbb..b99b220414d 100644 --- a/packages/flame/test/camera/camera_component_test.dart +++ b/packages/flame/test/camera/camera_component_test.dart @@ -1,14 +1,14 @@ import 'dart:math'; -import 'dart:ui' show PictureRecorder; +import 'dart:ui'; import 'package:flame/camera.dart'; import 'package:flame/components.dart'; import 'package:flame/experimental.dart'; import 'package:flame/extensions.dart'; +import 'package:flame/palette.dart'; import 'package:flame/post_process.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; import 'camera_test_helpers.dart'; @@ -401,24 +401,24 @@ void main() { CrossHair( size: Vector2.all(28), position: camera.viewport.size / 2 + Vector2.all(4), - color: Colors.teal, + color: BasicPalette.teal.color, ), ); camera.viewfinder.add( CrossHair( size: Vector2.all(20), position: Vector2(-2, 4), - color: Colors.white, + color: BasicPalette.white.color, ), ); world.add( - CrossHair(size: Vector2.all(14), color: Colors.green), + CrossHair(size: Vector2.all(14), color: BasicPalette.green.color), ); camera.viewport.add( CrossHair( size: Vector2.all(8), position: camera.viewport.size / 2 + Vector2(4, -4), - color: Colors.red, + color: BasicPalette.red.color, ), ); }, @@ -443,24 +443,24 @@ void main() { CrossHair( size: Vector2.all(28), position: resolution / 2 + Vector2.all(4), - color: Colors.teal, + color: BasicPalette.teal.color, ), ); camera.viewfinder.add( CrossHair( size: Vector2.all(20), position: Vector2(0, 2), - color: Colors.white, + color: BasicPalette.white.color, ), ); world.add( - CrossHair(size: Vector2.all(14), color: Colors.green), + CrossHair(size: Vector2.all(14), color: BasicPalette.green.color), ); camera.viewport.add( CrossHair( size: Vector2.all(8), position: resolution / 2 + Vector2(2, -2), - color: Colors.red, + color: BasicPalette.red.color, ), ); }, @@ -485,24 +485,24 @@ void main() { CrossHair( size: Vector2.all(28), position: resolution / 2 + Vector2.all(4), - color: Colors.teal, + color: BasicPalette.teal.color, ), ); camera.viewfinder.add( CrossHair( size: Vector2.all(20), position: Vector2(-2, 4), - color: Colors.white, + color: BasicPalette.white.color, ), ); world.add( - CrossHair(size: Vector2.all(14), color: Colors.green), + CrossHair(size: Vector2.all(14), color: BasicPalette.green.color), ); camera.viewport.add( CrossHair( size: Vector2.all(8), position: resolution / 2 + Vector2(4, -4), - color: Colors.red, + color: BasicPalette.red.color, ), ); }, diff --git a/packages/flame/test/components/clip_component_test.dart b/packages/flame/test/components/clip_component_test.dart index a414e2e7881..3f3f5931d7f 100644 --- a/packages/flame/test/components/clip_component_test.dart +++ b/packages/flame/test/components/clip_component_test.dart @@ -1,14 +1,14 @@ import 'package:flame/components.dart'; +import 'package:flame/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; class _Rectangle() extends RectangleComponent { this : super( size: Vector2(200, 200), anchor: Anchor.center, - paint: Paint()..color = Colors.blue, + paint: BasicPalette.blue.paint(), ); } diff --git a/packages/flame/test/effects/color_effect_test.dart b/packages/flame/test/effects/color_effect_test.dart index 951144f4ef7..e9684f21c24 100644 --- a/packages/flame/test/effects/color_effect_test.dart +++ b/packages/flame/test/effects/color_effect_test.dart @@ -1,8 +1,8 @@ import 'package:flame/components.dart'; import 'package:flame/effects.dart'; +import 'package:flame/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; class _PaintComponent() extends Component with HasPaint; @@ -11,7 +11,8 @@ void main() { testWithFlameGame('applies the correct color filter', (game) async { final component = _PaintComponent(); await game.ensureAdd(component); - const color = Colors.red; + // has distinct components, so a swap fails + final color = BasicPalette.pink.color; component.add( ColorEffect(color, EffectController(duration: 1)), ); @@ -19,8 +20,8 @@ void main() { expect( component.paint.colorFilter.toString(), equals( - 'ColorFilter.mode(Color(alpha: 0.0000, red: 0.9569, green: ' - '0.2627, blue: 0.2118, colorSpace: ColorSpace.sRGB),' + 'ColorFilter.mode(Color(alpha: 0.0000, red: 1.0000, green: ' + '0.4118, blue: 0.7059, colorSpace: ColorSpace.sRGB),' ' BlendMode.srcATop)', ), ); @@ -29,8 +30,8 @@ void main() { expect( component.paint.colorFilter.toString(), equals( - 'ColorFilter.mode(Color(alpha: 0.5000, red: 0.9569, green: ' - '0.2627, blue: 0.2118, colorSpace: ColorSpace.sRGB), ' + 'ColorFilter.mode(Color(alpha: 0.5000, red: 1.0000, green: ' + '0.4118, blue: 0.7059, colorSpace: ColorSpace.sRGB), ' 'BlendMode.srcATop)', ), ); @@ -43,7 +44,7 @@ void main() { await game.ensureAdd(component); final originalColorFilter = component.paint.colorFilter; - const color = Colors.red; + final color = BasicPalette.red.color; final effect = ColorEffect( color, @@ -73,7 +74,7 @@ void main() { await game.ensureAdd(component); final originalColorFilter = component.paint.colorFilter; - const color = Colors.red; + final color = BasicPalette.red.color; final effect = ColorEffect( color, @@ -103,7 +104,7 @@ void main() { await game.ensureAdd(component); final effect = ColorEffect( - Colors.red, + BasicPalette.red.color, EffectController(duration: 1), ); await component.ensureAdd(effect); @@ -127,7 +128,7 @@ void main() { final effect = ColorEffect( opacityFrom: 1, opacityTo: 0, - Colors.black, + BasicPalette.black.color, ZigzagEffectController( period: 1, ), @@ -143,7 +144,7 @@ void main() { test('Validates opacity values', () { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityTo: 1.1, ), @@ -152,7 +153,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityFrom: 255, ), @@ -161,7 +162,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityTo: -254, ), @@ -170,7 +171,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityFrom: -0.5, ), @@ -179,7 +180,7 @@ void main() { expect( () => ColorEffect( - Colors.blue, + BasicPalette.blue.color, EffectController(duration: 1), opacityFrom: 0.1, opacityTo: 0.9, diff --git a/packages/flame/test/extensions/image_extension_test.dart b/packages/flame/test/extensions/image_extension_test.dart index 678204237da..afc1e9355bc 100644 --- a/packages/flame/test/extensions/image_extension_test.dart +++ b/packages/flame/test/extensions/image_extension_test.dart @@ -3,9 +3,9 @@ import 'dart:typed_data'; import 'dart:ui'; import 'package:flame/extensions.dart'; +import 'package:flame/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; final _output = List.filled(8 * 8 * 4, 255); @@ -120,7 +120,7 @@ void main() { final recorder = PictureRecorder(); Canvas(recorder).drawRect( const Rect.fromLTWH(0, 0, 100, 100), - Paint()..color = Colors.white, + BasicPalette.white.paint(), ); final pic = recorder.endRecording(); final image = await pic.toImage(100, 100); diff --git a/packages/flame/test/sprite_batch_test.dart b/packages/flame/test/sprite_batch_test.dart index 156d9e185b9..8ccf23a4551 100644 --- a/packages/flame/test/sprite_batch_test.dart +++ b/packages/flame/test/sprite_batch_test.dart @@ -1,10 +1,10 @@ import 'dart:ui'; import 'package:flame/components.dart'; +import 'package:flame/palette.dart'; import 'package:flame/sprite.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart' hide Image; import 'package:mocktail/mocktail.dart'; import '_resources/load_image.dart'; @@ -24,17 +24,18 @@ void main() { test('can replace the color of a batch', () { final image = _MockImage(); final spriteBatch = SpriteBatch(image); - spriteBatch.add(source: Rect.zero, color: Colors.blue); + spriteBatch.add(source: Rect.zero, color: BasicPalette.blue.color); - spriteBatch.replace(0, color: Colors.red); + final red = BasicPalette.red.color; + spriteBatch.replace(0, color: red); final batchItem = spriteBatch.getBatchItem(0); /// Use .closeTo() to avoid floating point rounding errors. - expect(batchItem.paint.color.a, closeTo(Colors.red.a, 0.001)); - expect(batchItem.paint.color.r, closeTo(Colors.red.r, 0.001)); - expect(batchItem.paint.color.g, closeTo(Colors.red.g, 0.001)); - expect(batchItem.paint.color.b, closeTo(Colors.red.b, 0.001)); + expect(batchItem.paint.color.a, closeTo(red.a, 0.001)); + expect(batchItem.paint.color.r, closeTo(red.r, 0.001)); + expect(batchItem.paint.color.g, closeTo(red.g, 0.001)); + expect(batchItem.paint.color.b, closeTo(red.b, 0.001)); }); test('can replace the source of a batch', () { @@ -312,7 +313,7 @@ void main() { spriteBatch.add( source: source, - color: Colors.redAccent, + color: BasicPalette.red.color, offset: Vector2.all(margin), ); diff --git a/packages/flame_network_assets/pubspec.yaml b/packages/flame_network_assets/pubspec.yaml index 504ffecd0d0..256569ea37f 100644 --- a/packages/flame_network_assets/pubspec.yaml +++ b/packages/flame_network_assets/pubspec.yaml @@ -30,5 +30,4 @@ dev_dependencies: flame_lint: ^1.5.0-dev.1 flutter_test: sdk: flutter - material_ui: ^1.0.0 mocktail: ^1.0.4 diff --git a/packages/flame_network_assets/test/flame_network_image_test.dart b/packages/flame_network_assets/test/flame_network_image_test.dart index 221b2ec798b..6af18eabbb5 100644 --- a/packages/flame_network_assets/test/flame_network_image_test.dart +++ b/packages/flame_network_assets/test/flame_network_image_test.dart @@ -1,9 +1,9 @@ import 'dart:io'; import 'dart:ui'; +import 'package:flame/palette.dart'; import 'package:flame_network_assets/flame_network_assets.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart' hide Image; import 'package:mocktail/mocktail.dart'; import 'package:path/path.dart' as path; @@ -60,7 +60,7 @@ void main() { final canvas = Canvas(recorder); canvas.drawRect( const Rect.fromLTWH(0, 0, 50, 50), - Paint()..color = Colors.pink, + BasicPalette.pink.paint(), ); final picture = recorder.endRecording(); image = await picture.toImage(50, 50); diff --git a/packages/flame_test/pubspec.yaml b/packages/flame_test/pubspec.yaml index d1bdd04335e..aed8020c18d 100644 --- a/packages/flame_test/pubspec.yaml +++ b/packages/flame_test/pubspec.yaml @@ -30,4 +30,3 @@ dependencies: dev_dependencies: dartdoc: ^9.0.0 flame_lint: ^1.5.0-dev.1 - material_ui: ^1.0.0 diff --git a/packages/flame_test/test/golden_test.dart b/packages/flame_test/test/golden_test.dart index 5c8eed6479e..b4f6df898f5 100644 --- a/packages/flame_test/test/golden_test.dart +++ b/packages/flame_test/test/golden_test.dart @@ -1,8 +1,8 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; +import 'package:flame/palette.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:material_ui/material_ui.dart'; void main() { group('Golden tests', () { @@ -15,7 +15,7 @@ void main() { CircleComponent( radius: 10, position: Vector2.all(100), - paint: Paint()..color = Colors.white, + paint: BasicPalette.white.paint(), ), ); }, @@ -30,7 +30,7 @@ void main() { testGolden( 'Same test but with testGolden', (game, tester) async { - final paint = Paint()..color = Colors.white; + final paint = BasicPalette.white.paint(); game.add( CircleComponent(radius: 10, position: Vector2.all(100), paint: paint), ); @@ -41,7 +41,7 @@ void main() { testGolden( 'Same test, but with smaller size', (game, tester) async { - final paint = Paint()..color = Colors.white; + final paint = BasicPalette.white.paint(); game.add( CircleComponent(radius: 10, position: Vector2.all(100), paint: paint), );