From c53f6e39be9f9567b7dd406cf96bf3f9d207e5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Wed, 17 Jul 2024 20:23:24 +0200
Subject: [PATCH] Clean / improve / update code
---
android/gradle.properties | 4 +-
assets/ui/button_back.png | Bin 3771 -> 2422 bytes
assets/ui/button_delete_saved_game.png | Bin 5813 -> 7834 bytes
assets/ui/button_resume_game.png | Bin 3659 -> 3434 bytes
assets/ui/button_start.png | Bin 3999 -> 3058 bytes
.../metadata/android/en-US/changelogs/20.txt | 1 +
.../metadata/android/fr-FR/changelogs/20.txt | 1 +
lib/config/default_game_settings.dart | 7 +-
lib/config/default_global_settings.dart | 7 +-
lib/models/game/cell.dart | 2 +-
lib/models/game/cell_location.dart | 2 +-
lib/models/settings/settings_game.dart | 2 +-
lib/models/settings/settings_global.dart | 2 +-
lib/ui/game/game_end.dart | 1 +
lib/ui/helpers/styled_button.dart | 210 ++++++++++++++++++
lib/ui/layouts/parameters_layout.dart | 73 +++---
lib/ui/parameters/parameter_image.dart | 38 ----
lib/ui/parameters/parameter_painter.dart | 36 +--
lib/ui/parameters/parameter_widget.dart | 106 +++++++++
.../actions/button_delete_saved_game.dart | 10 +-
lib/ui/widgets/actions/button_game_quit.dart | 10 +-
.../actions/button_game_start_new.dart | 12 +-
.../actions/button_resume_saved_game.dart | 10 +-
lib/ui/widgets/global_app_bar.dart | 12 +-
pubspec.lock | 116 +++++-----
pubspec.yaml | 10 +-
resources/app/build_application_resources.sh | 67 +++---
resources/build_resources.sh | 1 -
resources/ui/build_ui_resources.sh | 49 ++--
resources/ui/images/button_back.svg | 2 +-
.../ui/images/button_delete_saved_game.svg | 2 +-
resources/ui/images/button_resume_game.svg | 2 +-
resources/ui/images/button_start.svg | 2 +-
33 files changed, 529 insertions(+), 268 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/20.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/20.txt
create mode 100644 lib/ui/helpers/styled_button.dart
delete mode 100644 lib/ui/parameters/parameter_image.dart
create mode 100644 lib/ui/parameters/parameter_widget.dart
diff --git a/android/gradle.properties b/android/gradle.properties
index a392afe..fc8eb74 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
-app.versionName=0.1.0
-app.versionCode=19
+app.versionName=0.1.1
+app.versionCode=20
diff --git a/assets/ui/button_back.png b/assets/ui/button_back.png
index cc48ffb1dbb653d9a996f139dfbe02969724bfa5..51d7a01d171f7d7f047ecf9dee2d7ceee23b310d 100644
GIT binary patch
delta 2366
zcmdlj`%P$qBnLAC14Am)9Mg%4HuX$@1AIbU|NsC0pMjx)p<xw6Xaj@8Oop^o455=4
zJm)hw^f83al=AHscbh62I#<MRreJ8lK)^J9?>T&-Q+NYs^7>BV37x?0H<jCKCRfm8
zF2CuVK9hukrV9B_5eS+t5HN{9U@D*A3_hPJyn)kr{U-DJPUQ)l%<Vr-&~K7J;PiR{
zzbX8_)A$1>^ZQNZ^PSEYFon;58n6Ep9=~Zkfs+LSrV98?2PyEM${#R|FJLOK|1@5|
zDZIXu`2(i%`%mNdo67G$h0kvaU%*s8|7l>$rtk$!<Mo@$>pz9pZyLY<RDS=dAX&eu
zd;wE<{ipIn6;I{!pUPVgQUo#-q|R?Df4~%wabUCf{HOBygIoh*1We=e18D%U{icC*
zf?NqU+J7n^SOg>m(gM*1wi4vlsURys;!}_mfZPh=`qje>1=$2*!&HOVAQd3fVJ3o1
zL5PFA1rk9s7pj0iV46U{bfKW>!a>tTf@g|{&J+)uB@sSLGJKX)#BAxvIdai+<fG@-
zE5yuKOIV<uxIiOmp+?d|&EzEp8A}W^ml|g+Gs#|Nn!U=lXq8>jYWw2V4kfD{OV&7*
zu5~Hf;8nfBr*@-n?MA=4P5$*;!<u)*b?r&(-<vscf8NxCMKcbS%sN~)`&iw=lPyb6
zwJkr}x8_{`x{K2`U7E4w(#$Pa=kL6+Y~QWbhwiMeKXPZo(R*7?JlJ{W;jXg}_ndor
z<jS+7SDzib_U!nz=O=HxICbO2>6<Ul-g<rc{+lZg-d=t9_S(aD*B`yR@%Y2N=O6FC
z`1s((r-v^;J$m)|@vE=T-+g`Y?(56<-(G+G{^sNNx1WBz`~36c*Poxh{`&I$*VpgA
zzy0|A?dPBGKmYvr_4oIme}Deg|NHyz|G$6#|NsAzaP<`f1H;UcAirP+MkZz!RyKAH
zPA+a9UVZ^VAz=|waS2H&X&G601!WagHFXV5T|Iq6BV!X&Gjm%zdk04+7dKB|KmXv6
z(C~=ZxU~F&qLR|`irV^yj-K9$(`U?_HG9t7c?%XUTC#Ncs?A%rZribM|G`6t>yI2g
zcKpQ2v*#{cynN;Awd*%;-?@A5{)2~)9zS{Z{Kd;xuiw7^@bS~<Z{L6X{Pp|K-+yWa
zpSc(qSVKKs978H@y`B3#Tr@@E`2OiTPI+A1u*qp+o9f$1yAoG8%oJU=^u~roiPf4n
z&lL&v<wQK09Cm9#>bC7OZz^e?Tz2cyH#sxLO27T}H!K^=_wZNkIA47J_h0rObr$b;
zey_ftzNcY29E3AzY<<6Rv0BI!`Rn#~m;9aLtd+5Mnf$b*^Y!yLezEU8X_&VEdFGXv
zskXW|&)aP3ipq)+H~u!cds%>lZ2r;udlFph<J8_fpW`#p<W9riKKC;{FXn48-+HSq
z8WvD*QX2fOe*Hy}*u9~*&ucA?;L_YS-|WM#8UJ1~Z2iW}8ZIo!cEYy%gu#Jp&Z|!t
zIBfV4rF58Kp>_uk^P2*#iHQw<&UtEw8BV%Rb!lV#wtL121BWuniHQwgCP|+(a9B`a
zG%>N^?s;V+o(*R^B2y$3uBw`7vvI__rbsNfKGUU*v3{FOUH9(GmaiC^j$Xd|_I%u*
zKC=cJ&%BCn#{UAu4}4qB@#g&c?4($Rxol@kw%c!iCZ86{;Mv-Aq2_h>edE_mH@-U^
zd|8<!x>>K`tsBRi`}=cbUo&~=?>u<--`n;7&aL562r!8I@IL;F>1Mr#yXQo2)PG@4
zi)DyaUAS}Cwuz;T^-K8XD0bL-*Ck$K6_C=lusy#%@fz!f(~?ZTxu=25Px6?$`>%EO
zt4Q$%1C#$p)^IDlS33Bz@|SR0EJL8y73o(8cd1=touJ5dcKzRjYq%6vevtCa_}3RH
ze!%W&)8)@UywYMB7G0>hzsc<y>jX8<v)fI%&q^^cu|8H=_)|MAww_`4Jmn4lPy9Z!
zi(wa^Xw0^|!M6|WVz|Yrb;Tt8<oPqZ7@Wen{LUAzo>|KH#v&-;|H7wdb}?9aJAK~M
zvCuM(;oyhdxq?N9AIZ-wWpv4T&9i*DUD`F)3(i3c>lCUo`j`(qo5b~1cB51AY~~|b
zuX83!?@PVLy5aawrr-T*6Rxpts9*bJ)7yKuK#mJ5+N)x+J~fQ>!HsJ><GA-HTw{H3
z>zb#F3;+J(Yq%FAuT(Gz-+%MKDTb;THIB3T|4*&qQOJID?4HSSafO?IH`mw6ZnkS^
zj(vOotDCJhOUC<%rStw?;y)wB_-n_{`e(sua~TfL(Ymsh_iQdhL8Eg<-CzH-tqk=W
zg<amvezt?@NZzIBFTGg|)0IO$Uth)^A^0!<X*Z+S+<gb{<ppsUEVzCA#bo(RTc@|O
zx3@%>|Gq31nADIxWk+@9-ebxw4>Z0@Unn<aQplcEJ*VzraVx`#eK8-JpH030g>k`Q
z1JBQwqIq92G~C(j`+vps_|-Kl`5a<+<5u$>_)~vXiQ$dz%Z>}>J7+Uof6ZXT#>pj9
zd{xwfLE*W|WmUDp^f~*K<Qoz`nt0|f+GVu*uTweG7O4}~OTu3>JM2yh?BBJkOgi&$
z@YY>z%ULoky&IO<bEHrGvNd+wqK~C>tr#BenYZuSW0s76V%zUu|Ff3wz#j${g*msc
znKv>0c6KnZuWw_WA>Sg*{<byy3*!uVw$_67-hG8J2mUyiEUBLJrFY5UKS2x(FZ5oD
zT;D#8k)i5#To2>#)t(7;mOKh^=NI!I_|v3vBR-HdVfAA3I?o8ZM_P}wZ!vuC{`6qS
z{b=KcpQ#fYewNPNu-`!RS@<=kXVcl3*GAu-v!3(7pGP?ib92|%>#?8F?`J=={(bvj
zc9DdCoZJWgC@XFF-@`4VzRr}H;qIv(W{Vuz8^M+gX4+kG`sdrKQhD}iZu+muC=oE_
zuKLmq3;*i#zON5kC&<9U&vko7mC_rH&ntK@A3fp|ap~Oh?H}w*)g^*IA5Yca_-%(y
z!xZP`|I+JkJ!G5zopr*k_cOFFPF9~f|H6LeJqU2i;XhNpoc$Sh)w*pA3=9mOu6{1-
HoD!M<&5CYG
delta 3725
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
BxV!)W
diff --git a/assets/ui/button_delete_saved_game.png b/assets/ui/button_delete_saved_game.png
index 5e4f217689b11e444b7163557d7e5d68f3bbfe7d..4ca5b749c208c4b7eac2a4b141a1bd918d7cb98f 100644
GIT binary patch
delta 7808
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
delta 5772
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
X^x%nyFEB7LFnGH9vAV2tN@xNAHkhAu
diff --git a/assets/ui/button_resume_game.png b/assets/ui/button_resume_game.png
index b2ea0a02d05e42377eb551a4b51428b511a32f5d..2fe433b7d18a39880a14e3f0af18cb75c4ccbaed 100644
GIT binary patch
delta 3374
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
G&;$TE#MROO
delta 3601
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
diff --git a/assets/ui/button_start.png b/assets/ui/button_start.png
index 6845e2f5c21598ab61f1684d2075aeec0334bf23..23c7a4f670de19ffac455d6c510c3c53653a048b 100644
GIT binary patch
delta 2995
zcmbO)|4Dp8Y(00qr;B4q#jUq<YkNeV${t^TZMx8o+jE~XEZ)-*a7ja7)lje{>hcAS
ztfZj55f94B-s`mMF5P;iB|*As>9(y(s%C0l(eLuozV&T#S*g#;tIs}hRfCL+<AaLH
z)2khKT2I;C{P@AVb8k``Jg%0NmzB?}wY&dh_Jj}j&wk(h`OLfW`nvr#iY{`;R?V_!
zVq@rGWJqQ>Ai-dOo2k%y?t1UP#toL<-7`Ke$a}~4A}u(;T<T4I{`HdAuD|c|Kbxw%
zyRW;mn5*H!nFz;#?bB{J=5N>CcgL-HnY8`M-OIm4>1j=qWB4unpU?Wn@%nvMKf-VB
zbCw9+u^}Rgp=si(-ES4jRRsTO|2^N7l&vBz;mz9c_oV$DzV|Oh4!{33N6hShNW?Ci
z`P{ur84mEhRqH=gf3mavSx4xk@VGi&ahcy@48Ik>F|I%S-!lKYQt0FzFK$d{U@6J=
zoyA!2H_9NYl3QH<H(P^a;^y_TXFf~TGdZZpZ94qy&_UOab}bAHe?Fb<Khf0BR`OWz
z_xcZ}hZq=cTK{)n^D>g@z}IU5CT5Ke3=Y%I{Xh0bhxx&eqyY1O*UGETDl{=N%-qNP
z=LS2&j=b%T8s}&Ko-WP7!LWj(;WcyPhDa9=28U3FJB#jC=}JjEM=&@9G6=o9cIerr
zI@NknW)5Dk!f6Zg{?55&%CLf~;kN#*)h~~kFtIRrF%_h)RT5Y!<v0Okgv+8sf@brJ
z?<FV)Ff34FSSQUaxVi_d=fKmb);u4T7={H}41Lu?!8&On{K_dHMbopd?+WyLE5#7P
zdf@BFgd>+$#xggoVo+K0^4V_I#QM*EP3$0Rc9!MNy0VVZA(SCz{=za|1})|X+k9Vx
z)E;7p`DCS=)2B9t;lWC7Z=Ic4qJqVl22qkKa~K|U-oIBKbS7?_Ylh&;cWisNzFzd>
zI;SSXk|&4N?S=cwWb9P;?ax>{VNKcJM8_L@rY~S}IK^P`>ZM@P(P_>}SMG$?f4aKP
zdv(6*28Ibj4C}1Um3G_j+vCkswIxc8W7mpU<_2|!9Yz22fBi|jxz8+jK^ZT@Jcb8Z
zpXaF=z6@V~vP>uGmMKF8bHn29Z_G`fYYd9~Vs_oyx@@*Hr!m74mWI{azUc+-D{7aB
zkea-%Y_9m)KWq!x8m2H5gx>$LQX^`U<F@+bi-ya~d^a#Eq%y=@eU~Rvu2<ozCvYe&
zcf$=S_X8kdnYsH50{47)7H3%Ujq7FB^}mOnIW+Mx%v<sFjHTiITWY`Dm%b9;%36|b
zw>6vLgU{~1EghNr>z%hfZ~l8u$;pYIVP0nL-9p2%d#5j5UFSS;)oo6DhKfb!*5z&d
z^7U^0qi36>UM{<tnfj4|fuTV?E9dQmjb*i7UqSv_^PR6&Y1yB$-jw4?*~>St6lP#J
zAnX~tn{W1EMg|6(i%V~nt_<1w+RxW~o}NzZJbng-2c3MT!MoWQS{VzrX8KRw@%m(V
z>gv!OZqev+Mh1q8Men$67j4=Wcj{K@iX}-L3=9qR>RGw(*M@qSZCh%4J?lEdgw(6%
z^Thb=z28bPh_F656?OE7de~{ULvFt2$CwxxDwMXD*|vaE97n_IXWRTfRvfk7bah>{
zFeu``GB7aA%XmI9IO$bz(baXPcke83J^P!1fx%{V=$d=KCQ2B;SN)lF-8gwW$Sq;J
z%d$kx>;J8o1u~AkVRf5W)^&yj1`O-A$xqo>mU}Jp=(Tc?=84v4^RC?4QL^=Q!j?~B
z3=9nZSL(v<-TK<FsKOq^D+xGtYip&_Z0{qC3hYmPHqX{bej8=326AoGZaKsBr6F6h
zmxmcDL{%z-LbxdV`lPE`Mq#_z7+kmPuYb6uBI9G#&3XKMOR7697&O$Dm;HSk?`3{A
zuUV|Omyv<tgG>7PcmeOYzYg0n%kG}LzATRaCo4ni)hpLD<JT%Bz5DP<QIcUo&(^NL
zto{FNSr`}|%)FCXcK_E*nagk9v_IY&_osr5;l-+`ql-dIgLDM1mlU%xFgQe&ELwW^
z`+4^IbGOr1`mJMT__DMrJAd<xKiU8F1pQ01WEmE$ztY-myC~^!-TZ4>Yg`!^7$hfd
zcBygvT4uOF<=OJ}uHnoK3@IV!OsxN3(ORSXiCMr*-ut@z2}$3+Jy-V$FF(pZ?;|?{
z<J}r*1_p&>cZK`BU!HOt5!AR_bl>*hGylhRH51bm%j+55F=Sp&o3H=%MDKb>#slS6
zpFT<k{<))8e_gSpIDb_s2ZKX+sN$)|r9nP3HWYt$UL|0|T%lCX_VPvi9v8_z>xQUX
zWe<`+?!EuVdzRIf+Alv1;>~|`&spir>=1V4#x2FPy&tCK6uWH~pSEs?=aVbkh71z|
z=f2&gAh!S0z8#s<>O<DM%)4IldM2p+Z3<VaWb+6+=l${Vl4{L+5&88VeSYrW7#sxm
z)^BmW^S|9ZmAlS1Igmj?)zeDiwNH}4wBy1G3=WDrrPbSQzwy5`^ZPb8&R8S(CUb+#
z6l0n4Lrgo{9%t?PnWrH&d&0{%j1GJ+9WF0_G|@hPO75%Mg~t{%*E@Jw-My%KD*WAq
zTt_!{ZX*T-)t|eTo#|3x@L2xGZtcVFV^X)$|DLQnA;aLI<#~Nc-Jw|_3?82E7Uf8)
zZL6&dEXzn+b0Gg9JA<c6wC~ST#dQinria!aWM|+EDgQBL$M^F56W?n8+4-6;`)T`w
z;X$(L_R_B7+V=z(c7%Lwy>_JD^8dVB*{PiN3_pBg@9zEDs<=7)#MYgvIeM?dgA5&(
zJz#D)f8?DWLx2!NeXrz~^WWSUP82fSnYC&CvNb<5>h&3(XfWgyurs7G-q^C-)2AkA
z-K-*moILKA$Bx8s+cBgBu+O#^zWChyblExkiDzdSF+5>lI5%ahOReL&Sw+j`v+7SV
zC>S#2`Bq+u$vVZbK!QO?Z*EzPcu&aPwLu>k8)j{K99*|nles~K!NT<E()I7f%%@-V
z2oJt?>JejTGe3jeRq<nICa+tzN6*B#Z1$^z><uDYUVC)U_%)@)^l3+_{X+JJDcPqc
z`9@~*zPMKNdrrM=BYVS=Cw`HW*DRYeW79SL`W!x$7Yq|FS=Rp%UY%<FJpW2bvJNAA
z!xF}VtW*5<yB)VZkS~74%_7Y(iS5Aj(+fn`XfivrF&1Q>Qhx3c8vo*=Qd-RAvkO}!
zLGtfUFWA3f*_=m{GS*lyv@cnsDb3s15jqXjFkobBSi<naLOs=Y=joODBGdHFtM6c#
zAi_|8Zpzksvp#A4T(+k5>_ZkYhDmG>_BtC~o3eK9x8?uJIkgy6-qyd*p0;t>okdl?
zk-7|*c4$OzdjI+S?St_`Jz;E|>g5bq_vneN+%-3VsUhp$`j^L;TLc+Gxa*=9Et}Jr
zdO?C=g=R9t2glllW)V5P$`uR?q!^Be&e+7pz)*12D5D+}>Pifqvx*Abz8W~OF+~1V
z)ZxA-)pblwK#w8dE#CzXUrB}#mIbHZpI%_duw?zRn5bH9M<#})3>+_>-3z!f%d3IG
z!IU8?C5Ek+@xbKN3qLPsb8+%AXs|VGyvO%H;}8==7h}Se=ckM^co_copI3RsePs%x
zLNMQpV>$L$rqr9>{iAJ~%5dV3tb=*iW}Di?&3{+g&jYn``W!+huh2|RWh|Ixq^`v}
zbB$*E+1BRnN3|S`3_qS&9*COUIjhLQe6_Q2a`Vm~H^Lb*5<l<T(q^CZZi9T0dhx}L
z`iuqV9-iy>%UrE#oXY!Kvf+rKMv&>E?fH*AKb+6p_0i<=l#TT!3>IZ=2fzK3n0l!&
zeJiuDxP&*m!y`Wdv-caCYg9Tv)C*kb)r^VIF=gm%f3&IMfZZXTZO(Up+Ozyue!e#;
z>y$-0!;TX38G&nWmbXNHQ?Ks*%$fgt$=k)}`gE2r%CWbwpAo+8jg_9-IZv#uS{*En
f-N*mm{bx8JefA8`Rmlzp1_lOCS3j3^P6<r_+jvb5
delta 3943
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
diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt
new file mode 100644
index 0000000..5482b7f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/20.txt
@@ -0,0 +1 @@
+Clean / improve / update code and UI.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/20.txt b/fastlane/metadata/android/fr-FR/changelogs/20.txt
new file mode 100644
index 0000000..8e88019
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/20.txt
@@ -0,0 +1 @@
+Nettoyage / amélioration / mise à jour de code et de l'interface.
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_game_settings.dart
index 6548656..7e8bb0a 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_game_settings.dart
@@ -1,4 +1,4 @@
-import 'package:solitaire/utils/tools.dart';
+import 'package:solitaire/utils/tools.dart';
class DefaultGameSettings {
// available game parameters codes
@@ -31,9 +31,4 @@ class DefaultGameSettings {
printlog('Did not find any available value for game parameter "$parameterCode".');
return [];
}
-
- // parameters displayed with assets (instead of painter)
- static List<String> displayedWithAssets = [
- //
- ];
}
diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart
index 5e6ddc0..442eeb7 100644
--- a/lib/config/default_global_settings.dart
+++ b/lib/config/default_global_settings.dart
@@ -1,4 +1,4 @@
-import 'package:solitaire/utils/tools.dart';
+import 'package:solitaire/utils/tools.dart';
class DefaultGlobalSettings {
// available global parameters codes
@@ -25,9 +25,4 @@ class DefaultGlobalSettings {
printlog('Did not find any available value for global parameter "$parameterCode".');
return [];
}
-
- // parameters displayed with assets (instead of painter)
- static List<String> displayedWithAssets = [
- //
- ];
}
diff --git a/lib/models/game/cell.dart b/lib/models/game/cell.dart
index 91b6d5e..b17e20e 100644
--- a/lib/models/game/cell.dart
+++ b/lib/models/game/cell.dart
@@ -1,5 +1,5 @@
import 'package:solitaire/models/game/cell_location.dart';
-import 'package:solitaire/utils/tools.dart';
+import 'package:solitaire/utils/tools.dart';
class Cell {
Cell({
diff --git a/lib/models/game/cell_location.dart b/lib/models/game/cell_location.dart
index f0fc583..f9b9022 100644
--- a/lib/models/game/cell_location.dart
+++ b/lib/models/game/cell_location.dart
@@ -1,4 +1,4 @@
-import 'package:solitaire/utils/tools.dart';
+import 'package:solitaire/utils/tools.dart';
class CellLocation {
final int col;
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
index 006584e..7414591 100644
--- a/lib/models/settings/settings_game.dart
+++ b/lib/models/settings/settings_game.dart
@@ -1,5 +1,5 @@
import 'package:solitaire/config/default_game_settings.dart';
-import 'package:solitaire/utils/tools.dart';
+import 'package:solitaire/utils/tools.dart';
class GameSettings {
final String layout;
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
index e67b92d..a254bf5 100644
--- a/lib/models/settings/settings_global.dart
+++ b/lib/models/settings/settings_global.dart
@@ -1,5 +1,5 @@
import 'package:solitaire/config/default_global_settings.dart';
-import 'package:solitaire/utils/tools.dart';
+import 'package:solitaire/utils/tools.dart';
class GlobalSettings {
String skin;
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index 7f0d3f7..d31cc43 100644
--- a/lib/ui/game/game_end.dart
+++ b/lib/ui/game/game_end.dart
@@ -25,6 +25,7 @@ class GameEndWidget extends StatelessWidget {
padding: const EdgeInsets.all(2),
child: Table(
defaultColumnWidth: const IntrinsicColumnWidth(),
+ defaultVerticalAlignment: TableCellVerticalAlignment.bottom,
children: [
TableRow(
children: [
diff --git a/lib/ui/helpers/styled_button.dart b/lib/ui/helpers/styled_button.dart
new file mode 100644
index 0000000..04bdc7b
--- /dev/null
+++ b/lib/ui/helpers/styled_button.dart
@@ -0,0 +1,210 @@
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:flutter/material.dart';
+
+import 'package:solitaire/utils/color_extensions.dart';
+
+class StyledButton extends StatelessWidget {
+ const StyledButton({
+ super.key,
+ required this.color,
+ required this.onPressed,
+ this.onLongPress,
+ required this.child,
+ });
+
+ final Color color;
+ final VoidCallback? onPressed;
+ final VoidCallback? onLongPress;
+ final Widget child;
+
+ factory StyledButton.text({
+ Key? key,
+ required VoidCallback? onPressed,
+ VoidCallback? onLongPress,
+ required String caption,
+ required Color color,
+ }) {
+ final Widget captionWidget = AutoSizeText(
+ caption,
+ maxLines: 1,
+ style: TextStyle(
+ inherit: true,
+ fontWeight: FontWeight.w900,
+ color: color.darken(60),
+ shadows: [
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, -2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, -2),
+ ),
+ ],
+ ),
+ );
+
+ return StyledButton(
+ color: color,
+ onPressed: onPressed,
+ onLongPress: onLongPress,
+ child: captionWidget,
+ );
+ }
+
+ factory StyledButton.icon({
+ Key? key,
+ required VoidCallback? onPressed,
+ VoidCallback? onLongPress,
+ required Icon icon,
+ required Color color,
+ required double iconSize,
+ }) {
+ return StyledButton(
+ color: color,
+ onPressed: onPressed,
+ onLongPress: onLongPress,
+ child: Icon(
+ icon.icon,
+ color: icon.color ?? color.darken(60),
+ size: iconSize,
+ shadows: [
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, -2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, -2),
+ ),
+ ],
+ ),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ const double borderWidth = 4;
+ final Color borderColor = color.darken(40);
+ const double borderRadius = 10;
+
+ return Container(
+ margin: const EdgeInsets.all(2),
+ padding: const EdgeInsets.all(2),
+ decoration: BoxDecoration(
+ color: color,
+ border: Border.all(
+ color: borderColor,
+ width: borderWidth,
+ ),
+ borderRadius: BorderRadius.circular(borderRadius),
+ ),
+ child: CustomPaint(
+ painter: StyledButtonPainter(
+ baseColor: color,
+ ),
+ child: MaterialButton(
+ onPressed: onPressed,
+ onLongPress: onLongPress,
+ padding: const EdgeInsets.all(8),
+ materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+ minWidth: 40,
+ child: child,
+ ),
+ ),
+ );
+ }
+}
+
+class StyledButtonPainter extends CustomPainter {
+ StyledButtonPainter({
+ required this.baseColor,
+ });
+
+ final Color baseColor;
+
+ @override
+ void paint(Canvas canvas, Size size) {
+ final Color lightColor = baseColor.lighten(20);
+ final Color darkColor = baseColor.darken(20);
+
+ final Paint paint = Paint()..style = PaintingStyle.fill;
+
+ const double cornerRadius = 6;
+
+ Path topPath = Path()
+ ..moveTo(cornerRadius, 0)
+ ..lineTo(size.width - cornerRadius, 0)
+ ..arcToPoint(
+ Offset(size.width, cornerRadius),
+ radius: const Radius.circular(cornerRadius),
+ )
+ ..lineTo(size.width, size.height * .35)
+ ..quadraticBezierTo(
+ size.width * .4,
+ size.height * .1,
+ 0,
+ size.height * .3,
+ )
+ ..lineTo(0, cornerRadius)
+ ..arcToPoint(
+ const Offset(cornerRadius, 0),
+ radius: const Radius.circular(cornerRadius),
+ );
+
+ Path bottomPath = Path()
+ ..moveTo(cornerRadius, size.height)
+ ..lineTo(size.width - cornerRadius, size.height)
+ ..arcToPoint(
+ Offset(size.width, size.height - cornerRadius),
+ radius: const Radius.circular(cornerRadius),
+ clockwise: false,
+ )
+ ..lineTo(size.width, size.height * .7)
+ ..quadraticBezierTo(
+ size.width * .6,
+ size.height * .9,
+ 0,
+ size.height * .7,
+ )
+ ..lineTo(0, size.height - cornerRadius)
+ ..arcToPoint(
+ Offset(cornerRadius, size.height),
+ radius: const Radius.circular(cornerRadius),
+ clockwise: false,
+ );
+
+ paint.color = lightColor;
+ canvas.drawPath(topPath, paint);
+
+ paint.color = darkColor;
+ canvas.drawPath(bottomPath, paint);
+ }
+
+ @override
+ bool shouldRepaint(CustomPainter oldDelegate) => false;
+}
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
index d052020..534b7f1 100644
--- a/lib/ui/layouts/parameters_layout.dart
+++ b/lib/ui/layouts/parameters_layout.dart
@@ -5,8 +5,7 @@ import 'package:solitaire/config/default_game_settings.dart';
import 'package:solitaire/config/default_global_settings.dart';
import 'package:solitaire/cubit/settings_game_cubit.dart';
import 'package:solitaire/cubit/settings_global_cubit.dart';
-import 'package:solitaire/ui/parameters/parameter_image.dart';
-import 'package:solitaire/ui/parameters/parameter_painter.dart';
+import 'package:solitaire/ui/parameters/parameter_widget.dart';
import 'package:solitaire/ui/widgets/actions/button_delete_saved_game.dart';
import 'package:solitaire/ui/widgets/actions/button_game_start_new.dart';
import 'package:solitaire/ui/widgets/actions/button_resume_saved_game.dart';
@@ -35,21 +34,27 @@ class ParametersLayout extends StatelessWidget {
lines.add(SizedBox(height: separatorHeight));
}
- lines.add(SizedBox(height: separatorHeight));
+ lines.add(Expanded(
+ child: SizedBox(height: separatorHeight),
+ ));
if (canResume == false) {
// Start new game
- lines.add(const Expanded(
- child: StartNewGameButton(),
- ));
+ lines.add(
+ const AspectRatio(
+ aspectRatio: 3,
+ child: StartNewGameButton(),
+ ),
+ );
} else {
// Resume game
- lines.add(const Expanded(
+ lines.add(const AspectRatio(
+ aspectRatio: 3,
child: ResumeSavedGameButton(),
));
// Delete saved game
lines.add(SizedBox.square(
- dimension: MediaQuery.of(context).size.width / 4,
+ dimension: MediaQuery.of(context).size.width / 5,
child: const DeleteSavedGameButton(),
));
}
@@ -102,44 +107,26 @@ class ParametersLayout extends StatelessWidget {
? globalSettingsCubit.getParameterValue(code)
: gameSettingsCubit.getParameterValue(code);
- final bool isActive = (value == currentValue);
+ final bool isSelected = (value == currentValue);
final double displayWidth = MediaQuery.of(context).size.width;
- final double itemWidth = displayWidth / availableValues.length - 26;
-
- final bool displayedWithAssets =
- DefaultGlobalSettings.displayedWithAssets.contains(code) ||
- DefaultGameSettings.displayedWithAssets.contains(code);
-
- return TextButton(
- child: Container(
- child: displayedWithAssets
- ? SizedBox.square(
- dimension: itemWidth,
- child: ParameterImage(
- code: code,
- value: value,
- isSelected: isActive,
- ),
- )
- : CustomPaint(
- size: Size(itemWidth, itemWidth),
- willChange: false,
- painter: ParameterPainter(
- code: code,
- value: value,
- isSelected: isActive,
- gameSettings: gameSettingsState.settings,
- globalSettings: globalSettingsState.settings,
- ),
- isComplex: true,
- ),
+ final double itemWidth = displayWidth / availableValues.length - 4;
+
+ return SizedBox.square(
+ dimension: itemWidth,
+ child: ParameterWidget(
+ code: code,
+ value: value,
+ isSelected: isSelected,
+ size: itemWidth,
+ gameSettings: gameSettingsState.settings,
+ globalSettings: globalSettingsState.settings,
+ onPressed: () {
+ isGlobal
+ ? globalSettingsCubit.setParameterValue(code, value)
+ : gameSettingsCubit.setParameterValue(code, value);
+ },
),
- onPressed: () {
- isGlobal
- ? globalSettingsCubit.setParameterValue(code, value)
- : gameSettingsCubit.setParameterValue(code, value);
- },
);
},
);
diff --git a/lib/ui/parameters/parameter_image.dart b/lib/ui/parameters/parameter_image.dart
deleted file mode 100644
index fc4b576..0000000
--- a/lib/ui/parameters/parameter_image.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ParameterImage extends StatelessWidget {
- const ParameterImage({
- super.key,
- required this.code,
- required this.value,
- required this.isSelected,
- });
-
- final String code;
- final String value;
- final bool isSelected;
-
- static const Color buttonBackgroundColor = Colors.white;
- static const Color buttonBorderColorActive = Colors.blue;
- static const Color buttonBorderColorInactive = Colors.white;
- static const double buttonBorderWidth = 8.0;
- static const double buttonBorderRadius = 8.0;
-
- @override
- Widget build(BuildContext context) {
- return Container(
- decoration: BoxDecoration(
- color: buttonBackgroundColor,
- borderRadius: BorderRadius.circular(buttonBorderRadius),
- border: Border.all(
- color: isSelected ? buttonBorderColorActive : buttonBorderColorInactive,
- width: buttonBorderWidth,
- ),
- ),
- child: Image(
- image: AssetImage('assets/ui/${code}_$value.png'),
- fit: BoxFit.fill,
- ),
- );
- }
-}
diff --git a/lib/ui/parameters/parameter_painter.dart b/lib/ui/parameters/parameter_painter.dart
index 9b86f6f..7432914 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/ui/parameters/parameter_painter.dart
@@ -15,14 +15,12 @@ class ParameterPainter extends CustomPainter {
const ParameterPainter({
required this.code,
required this.value,
- required this.isSelected,
required this.gameSettings,
required this.globalSettings,
});
final String code;
final String value;
- final bool isSelected;
final GameSettings gameSettings;
final GlobalSettings globalSettings;
@@ -31,26 +29,14 @@ class ParameterPainter extends CustomPainter {
// force square
final double canvasSize = min(size.width, size.height);
- const Color borderColorEnabled = Colors.blue;
- const Color borderColorDisabled = Colors.white;
-
- // "enabled/disabled" border
- final paint = Paint();
- paint.style = PaintingStyle.stroke;
- paint.color = isSelected ? borderColorEnabled : borderColorDisabled;
- paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 10;
- canvas.drawRect(
- Rect.fromPoints(const Offset(0, 0), Offset(canvasSize, canvasSize)), paint);
-
// content
switch (code) {
case DefaultGameSettings.parameterCodeLayout:
- paintLayoutParameterItem(value, canvas, canvasSize);
+ paintLayoutParameterItem(canvas, canvasSize);
break;
default:
printlog('Unknown parameter: $code/$value');
- paintUnknownParameterItem(value, canvas, canvasSize);
+ paintUnknownParameterItem(canvas, canvasSize);
}
}
@@ -61,7 +47,6 @@ class ParameterPainter extends CustomPainter {
// "unknown" parameter -> simple block with text
void paintUnknownParameterItem(
- final String value,
final Canvas canvas,
final double size,
) {
@@ -69,12 +54,8 @@ class ParameterPainter extends CustomPainter {
paint.strokeJoin = StrokeJoin.round;
paint.strokeWidth = 3;
- paint.color = Colors.grey;
- paint.style = PaintingStyle.fill;
- canvas.drawRect(Rect.fromPoints(const Offset(0, 0), Offset(size, size)), paint);
-
final textSpan = TextSpan(
- text: '?\n$value',
+ text: '$code\n$value',
style: const TextStyle(
color: Colors.black,
fontSize: 18,
@@ -97,13 +78,10 @@ class ParameterPainter extends CustomPainter {
}
void paintLayoutParameterItem(
- final String value,
final Canvas canvas,
final double size,
) {
{
- const Color backgroundColor = Colors.white;
-
Color gridBackgroundColor = Colors.grey;
switch (value) {
@@ -127,11 +105,6 @@ class ParameterPainter extends CustomPainter {
paint.strokeJoin = StrokeJoin.round;
paint.strokeWidth = 3;
- // Colored background
- paint.color = backgroundColor;
- paint.style = PaintingStyle.fill;
- canvas.drawRect(Rect.fromPoints(const Offset(0, 0), Offset(size, size)), paint);
-
// Mini grid
final borderColor = Colors.grey.shade800;
@@ -175,9 +148,8 @@ class ParameterPainter extends CustomPainter {
if (grid[row][col].hasPeg) {
paint.color = gridBackgroundColor;
+ canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
}
- canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
-
if (grid[row][col].hasHole) {
paint.color = borderColor;
paint.style = PaintingStyle.stroke;
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/ui/parameters/parameter_widget.dart
new file mode 100644
index 0000000..32f37e8
--- /dev/null
+++ b/lib/ui/parameters/parameter_widget.dart
@@ -0,0 +1,106 @@
+import 'package:flutter/material.dart';
+
+import 'package:solitaire/config/default_game_settings.dart';
+import 'package:solitaire/config/default_global_settings.dart';
+import 'package:solitaire/models/settings/settings_game.dart';
+import 'package:solitaire/models/settings/settings_global.dart';
+import 'package:solitaire/ui/helpers/styled_button.dart';
+import 'package:solitaire/ui/parameters/parameter_painter.dart';
+import 'package:solitaire/utils/tools.dart';
+
+class ParameterWidget extends StatelessWidget {
+ const ParameterWidget({
+ super.key,
+ required this.code,
+ required this.value,
+ required this.isSelected,
+ required this.size,
+ required this.gameSettings,
+ required this.globalSettings,
+ required this.onPressed,
+ });
+
+ final String code;
+ final String value;
+ final bool isSelected;
+ final double size;
+ final GameSettings gameSettings;
+ final GlobalSettings globalSettings;
+ final VoidCallback onPressed;
+
+ static const Color buttonColorActive = Colors.blue;
+ static const Color buttonColorInactive = Colors.white;
+ static const double buttonBorderWidth = 4.0;
+ static const double buttonBorderRadius = 12.0;
+
+ @override
+ Widget build(BuildContext context) {
+ Widget content = const SizedBox.shrink();
+
+ switch (code) {
+ case DefaultGameSettings.parameterCodeLayout:
+ content = getLayoutParameterItem();
+ break;
+ case DefaultGlobalSettings.parameterCodeSkin:
+ content = getSkinParameterItem();
+ break;
+ default:
+ printlog('Unknown parameter: $code/$value');
+ content = getUnknownParameterItem();
+ }
+
+ final Color buttonColor = isSelected ? buttonColorActive : buttonColorInactive;
+
+ return Container(
+ decoration: BoxDecoration(
+ color: buttonColor,
+ borderRadius: BorderRadius.circular(buttonBorderRadius),
+ border: Border.all(
+ color: buttonColor,
+ width: buttonBorderWidth,
+ ),
+ ),
+ child: content,
+ );
+ }
+
+ // "unknown" parameter -> simple block with text
+ Widget getUnknownParameterItem() {
+ return StyledButton.text(
+ caption: '$code / $value',
+ color: Colors.grey,
+ onPressed: null,
+ );
+ }
+
+ Widget getLayoutParameterItem() {
+ Color backgroundColor = Colors.grey;
+
+ return StyledButton(
+ color: backgroundColor,
+ onPressed: onPressed,
+ child: CustomPaint(
+ size: Size(size, size),
+ willChange: false,
+ painter: ParameterPainter(
+ code: code,
+ value: value,
+ gameSettings: gameSettings,
+ globalSettings: globalSettings,
+ ),
+ isComplex: true,
+ ),
+ );
+ }
+
+ Widget getSkinParameterItem() {
+ return StyledButton(
+ color: Colors.green.shade800,
+ onPressed: onPressed,
+ child: Image(
+ image: AssetImage('assets/ui/${DefaultGlobalSettings.parameterCodeSkin}_$value.png'),
+ fit: BoxFit.fill,
+ ),
+ );
+ }
+}
diff --git a/lib/ui/widgets/actions/button_delete_saved_game.dart b/lib/ui/widgets/actions/button_delete_saved_game.dart
index df484d7..7ace6cb 100644
--- a/lib/ui/widgets/actions/button_delete_saved_game.dart
+++ b/lib/ui/widgets/actions/button_delete_saved_game.dart
@@ -2,20 +2,22 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:solitaire/cubit/game_cubit.dart';
+import 'package:solitaire/ui/helpers/styled_button.dart';
class DeleteSavedGameButton extends StatelessWidget {
const DeleteSavedGameButton({super.key});
@override
Widget build(BuildContext context) {
- return TextButton(
+ return StyledButton(
+ color: Colors.grey,
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).deleteSavedGame();
+ },
child: const Image(
image: AssetImage('assets/ui/button_delete_saved_game.png'),
fit: BoxFit.fill,
),
- onPressed: () {
- BlocProvider.of<GameCubit>(context).deleteSavedGame();
- },
);
}
}
diff --git a/lib/ui/widgets/actions/button_game_quit.dart b/lib/ui/widgets/actions/button_game_quit.dart
index a90e6cb..1fdcb94 100644
--- a/lib/ui/widgets/actions/button_game_quit.dart
+++ b/lib/ui/widgets/actions/button_game_quit.dart
@@ -2,20 +2,22 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:solitaire/cubit/game_cubit.dart';
+import 'package:solitaire/ui/helpers/styled_button.dart';
class QuitGameButton extends StatelessWidget {
const QuitGameButton({super.key});
@override
Widget build(BuildContext context) {
- return TextButton(
+ return StyledButton(
+ color: Colors.red,
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).quitGame();
+ },
child: const Image(
image: AssetImage('assets/ui/button_back.png'),
fit: BoxFit.fill,
),
- onPressed: () {
- BlocProvider.of<GameCubit>(context).quitGame();
- },
);
}
}
diff --git a/lib/ui/widgets/actions/button_game_start_new.dart b/lib/ui/widgets/actions/button_game_start_new.dart
index e4a4b59..9878e7c 100644
--- a/lib/ui/widgets/actions/button_game_start_new.dart
+++ b/lib/ui/widgets/actions/button_game_start_new.dart
@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:solitaire/cubit/game_cubit.dart';
import 'package:solitaire/cubit/settings_game_cubit.dart';
import 'package:solitaire/cubit/settings_global_cubit.dart';
+import 'package:solitaire/ui/helpers/styled_button.dart';
class StartNewGameButton extends StatelessWidget {
const StartNewGameButton({super.key});
@@ -14,17 +15,18 @@ class StartNewGameButton extends StatelessWidget {
builder: (BuildContext context, GameSettingsState gameSettingsState) {
return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
- return TextButton(
- child: const Image(
- image: AssetImage('assets/ui/button_start.png'),
- fit: BoxFit.fill,
- ),
+ return StyledButton(
+ color: Colors.blue,
onPressed: () {
BlocProvider.of<GameCubit>(context).startNewGame(
gameSettings: gameSettingsState.settings,
globalSettings: globalSettingsState.settings,
);
},
+ child: const Image(
+ image: AssetImage('assets/ui/button_start.png'),
+ fit: BoxFit.fill,
+ ),
);
},
);
diff --git a/lib/ui/widgets/actions/button_resume_saved_game.dart b/lib/ui/widgets/actions/button_resume_saved_game.dart
index d93fcd4..fabc77d 100644
--- a/lib/ui/widgets/actions/button_resume_saved_game.dart
+++ b/lib/ui/widgets/actions/button_resume_saved_game.dart
@@ -2,20 +2,22 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:solitaire/cubit/game_cubit.dart';
+import 'package:solitaire/ui/helpers/styled_button.dart';
class ResumeSavedGameButton extends StatelessWidget {
const ResumeSavedGameButton({super.key});
@override
Widget build(BuildContext context) {
- return TextButton(
+ return StyledButton(
+ color: Colors.blue,
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).resumeSavedGame();
+ },
child: const Image(
image: AssetImage('assets/ui/button_resume_game.png'),
fit: BoxFit.fill,
),
- onPressed: () {
- BlocProvider.of<GameCubit>(context).resumeSavedGame();
- },
);
}
}
diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/ui/widgets/global_app_bar.dart
index 3543942..1145cf5 100644
--- a/lib/ui/widgets/global_app_bar.dart
+++ b/lib/ui/widgets/global_app_bar.dart
@@ -6,6 +6,7 @@ import 'package:solitaire/cubit/game_cubit.dart';
import 'package:solitaire/cubit/nav_cubit.dart';
import 'package:solitaire/models/game/game.dart';
import 'package:solitaire/ui/helpers/app_titles.dart';
+import 'package:solitaire/ui/helpers/styled_button.dart';
class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
const GlobalAppBar({super.key});
@@ -21,15 +22,16 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
final List<Widget> menuActions = [];
if (currentGame.isRunning && !currentGame.isFinished) {
- menuActions.add(TextButton(
- child: const Image(
- image: AssetImage('assets/ui/button_back.png'),
- fit: BoxFit.fill,
- ),
+ menuActions.add(StyledButton(
+ color: Colors.red,
onPressed: () {},
onLongPress: () {
BlocProvider.of<GameCubit>(context).quitGame();
},
+ child: const Image(
+ image: AssetImage('assets/ui/button_back.png'),
+ fit: BoxFit.fill,
+ ),
));
} else {
if (pageIndex == Menu.indexGame) {
diff --git a/pubspec.lock b/pubspec.lock
index e0ab96e..229631c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -17,6 +17,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.11.0"
+ auto_size_text:
+ dependency: "direct main"
+ description:
+ name: auto_size_text
+ sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.0"
bloc:
dependency: transitive
description:
@@ -53,10 +61,10 @@ packages:
dependency: transitive
description:
name: crypto
- sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+ sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
url: "https://pub.dev"
source: hosted
- version: "3.0.3"
+ version: "3.0.5"
easy_localization:
dependency: "direct main"
description:
@@ -85,18 +93,18 @@ packages:
dependency: transitive
description:
name: ffi
- sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+ sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
url: "https://pub.dev"
source: hosted
- version: "2.1.2"
+ version: "2.1.3"
file:
dependency: transitive
description:
name: file
- sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+ sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
url: "https://pub.dev"
source: hosted
- version: "7.0.0"
+ version: "7.0.1"
flutter:
dependency: "direct main"
description: flutter
@@ -114,10 +122,10 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
- sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+ sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
url: "https://pub.dev"
source: hosted
- version: "4.0.0"
+ version: "5.0.0"
flutter_localizations:
dependency: transitive
description: flutter
@@ -140,10 +148,10 @@ packages:
dependency: transitive
description:
name: http
- sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+ sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
url: "https://pub.dev"
source: hosted
- version: "1.2.1"
+ version: "1.2.2"
http_parser:
dependency: transitive
description:
@@ -172,26 +180,26 @@ packages:
dependency: transitive
description:
name: lints
- sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+ sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
url: "https://pub.dev"
source: hosted
- version: "4.0.0"
+ version: "5.0.0"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+ sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
- version: "0.8.0"
+ version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
- sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+ sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
- version: "1.12.0"
+ version: "1.15.0"
nested:
dependency: transitive
description:
@@ -204,18 +212,18 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
- sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
+ sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
url: "https://pub.dev"
source: hosted
- version: "8.0.0"
+ version: "8.0.3"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
- sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e
+ sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
url: "https://pub.dev"
source: hosted
- version: "3.0.0"
+ version: "3.0.1"
path:
dependency: transitive
description:
@@ -228,18 +236,18 @@ packages:
dependency: "direct main"
description:
name: path_provider
- sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
+ sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
url: "https://pub.dev"
source: hosted
- version: "2.1.3"
+ version: "2.1.4"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
- sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
+ sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
url: "https://pub.dev"
source: hosted
- version: "2.2.5"
+ version: "2.2.12"
path_provider_foundation:
dependency: transitive
description:
@@ -268,10 +276,10 @@ packages:
dependency: transitive
description:
name: path_provider_windows
- sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+ sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
url: "https://pub.dev"
source: hosted
- version: "2.2.1"
+ version: "2.3.0"
platform:
dependency: transitive
description:
@@ -300,58 +308,58 @@ packages:
dependency: transitive
description:
name: shared_preferences
- sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
+ sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
url: "https://pub.dev"
source: hosted
- version: "2.2.3"
+ version: "2.3.2"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
- sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
+ sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
url: "https://pub.dev"
source: hosted
- version: "2.2.3"
+ version: "2.3.3"
shared_preferences_foundation:
dependency: transitive
description:
name: shared_preferences_foundation
- sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
+ sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
url: "https://pub.dev"
source: hosted
- version: "2.4.0"
+ version: "2.5.3"
shared_preferences_linux:
dependency: transitive
description:
name: shared_preferences_linux
- sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+ sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
url: "https://pub.dev"
source: hosted
- version: "2.3.2"
+ version: "2.4.1"
shared_preferences_platform_interface:
dependency: transitive
description:
name: shared_preferences_platform_interface
- sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+ sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
url: "https://pub.dev"
source: hosted
- version: "2.3.2"
+ version: "2.4.1"
shared_preferences_web:
dependency: transitive
description:
name: shared_preferences_web
- sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
+ sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
url: "https://pub.dev"
source: hosted
- version: "2.3.0"
+ version: "2.4.2"
shared_preferences_windows:
dependency: transitive
description:
name: shared_preferences_windows
- sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+ sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
url: "https://pub.dev"
source: hosted
- version: "2.3.2"
+ version: "2.4.1"
sky_engine:
dependency: transitive
description: flutter
@@ -369,18 +377,18 @@ packages:
dependency: transitive
description:
name: string_scanner
- sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+ sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev"
source: hosted
- version: "1.2.0"
+ version: "1.3.0"
synchronized:
dependency: transitive
description:
name: synchronized
- sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558"
+ sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
url: "https://pub.dev"
source: hosted
- version: "3.1.0+1"
+ version: "3.3.0+3"
term_glyph:
dependency: transitive
description:
@@ -401,10 +409,10 @@ packages:
dependency: "direct main"
description:
name: unicons
- sha256: dbfcf93ff4d4ea19b324113857e358e4882115ab85db04417a4ba1c72b17a670
+ sha256: f3eab9d87c226415ef857cfd2167e1d12ad81ea1f5783b46cf644224fea4eab7
url: "https://pub.dev"
source: hosted
- version: "2.1.1"
+ version: "3.0.0"
vector_math:
dependency: transitive
description:
@@ -417,26 +425,26 @@ packages:
dependency: transitive
description:
name: web
- sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+ sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
url: "https://pub.dev"
source: hosted
- version: "0.5.1"
+ version: "1.1.0"
win32:
dependency: transitive
description:
name: win32
- sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+ sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
url: "https://pub.dev"
source: hosted
- version: "5.5.1"
+ version: "5.5.5"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
- sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+ sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
url: "https://pub.dev"
source: hosted
- version: "1.0.4"
+ version: "1.1.0"
sdks:
- dart: ">=3.4.0 <4.0.0"
- flutter: ">=3.22.0"
+ dart: ">=3.5.0 <4.0.0"
+ flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 4068df4..c19267a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Solitaire Game
publish_to: "none"
-version: 0.1.0+19
+version: 0.1.1+20
environment:
sdk: "^3.0.0"
@@ -13,6 +13,7 @@ dependencies:
sdk: flutter
# base
+ auto_size_text: ^3.0.0
easy_localization: ^3.0.1
equatable: ^2.0.5
flutter_bloc: ^8.1.1
@@ -20,20 +21,20 @@ dependencies:
hydrated_bloc: ^9.0.0
package_info_plus: ^8.0.0
path_provider: ^2.0.11
- unicons: ^2.1.1
+ unicons: ^3.0.0
# specific
# (none)
dev_dependencies:
- flutter_lints: ^4.0.0
+ flutter_lints: ^5.0.0
flutter:
uses-material-design: true
assets:
- assets/skins/
- - assets/ui/
- assets/translations/
+ - assets/ui/
fonts:
- family: Nunito
@@ -46,4 +47,3 @@ flutter:
weight: 400
- asset: assets/fonts/Nunito-Light.ttf
weight: 300
-
diff --git a/resources/app/build_application_resources.sh b/resources/app/build_application_resources.sh
index 6d67b8f..1ace90d 100755
--- a/resources/app/build_application_resources.sh
+++ b/resources/app/build_application_resources.sh
@@ -1,9 +1,18 @@
#! /bin/bash
# Check dependencies
-command -v inkscape >/dev/null 2>&1 || { echo >&2 "I require inkscape but it's not installed. Aborting."; exit 1; }
-command -v scour >/dev/null 2>&1 || { echo >&2 "I require scour but it's not installed. Aborting."; exit 1; }
-command -v optipng >/dev/null 2>&1 || { echo >&2 "I require optipng but it's not installed. Aborting."; exit 1; }
+command -v inkscape >/dev/null 2>&1 || {
+ echo >&2 "I require inkscape but it's not installed. Aborting."
+ exit 1
+}
+command -v scour >/dev/null 2>&1 || {
+ echo >&2 "I require scour but it's not installed. Aborting."
+ exit 1
+}
+command -v optipng >/dev/null 2>&1 || {
+ echo >&2 "I require optipng but it's not installed. Aborting."
+ exit 1
+}
CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
BASE_DIR="$(dirname "$(dirname "${CURRENT_DIR}")")"
@@ -31,14 +40,14 @@ function optimize_svg() {
cp ${SVG} ${SVG}.tmp
scour \
- --remove-descriptive-elements \
- --enable-id-stripping \
- --enable-viewboxing \
- --enable-comment-stripping \
- --nindent=4 \
- --quiet \
- -i ${SVG}.tmp \
- -o ${SVG}
+ --remove-descriptive-elements \
+ --enable-id-stripping \
+ --enable-viewboxing \
+ --enable-comment-stripping \
+ --nindent=4 \
+ --quiet \
+ -i ${SVG}.tmp \
+ -o ${SVG}
rm ${SVG}.tmp
}
@@ -57,10 +66,10 @@ function build_application_icon() {
TARGET_PNG="${TARGET}.png"
inkscape \
- --export-width=${ICON_SIZE} \
- --export-height=${ICON_SIZE} \
- --export-filename=${TARGET_PNG} \
- ${SOURCE_ICON}
+ --export-width=${ICON_SIZE} \
+ --export-height=${ICON_SIZE} \
+ --export-filename=${TARGET_PNG} \
+ ${SOURCE_ICON}
optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
}
@@ -76,10 +85,10 @@ function build_fastlane_image() {
TARGET_PNG="${TARGET}.png"
inkscape \
- --export-width=${WIDTH} \
- --export-height=${HEIGHT} \
- --export-filename=${TARGET_PNG} \
- ${SOURCE_FASTLANE}
+ --export-width=${WIDTH} \
+ --export-height=${HEIGHT} \
+ --export-filename=${TARGET_PNG} \
+ ${SOURCE_FASTLANE}
optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
}
@@ -94,24 +103,24 @@ function build_launch_image() {
TARGET_PNG="${TARGET}.png"
inkscape \
- --export-width=${ICON_SIZE} \
- --export-height=${ICON_SIZE} \
- --export-filename=${TARGET_PNG} \
- ${SOURCE_LAUNCH_IMAGE}
+ --export-width=${ICON_SIZE} \
+ --export-height=${ICON_SIZE} \
+ --export-filename=${TARGET_PNG} \
+ ${SOURCE_LAUNCH_IMAGE}
optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
}
-build_application_icon 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/ic_launcher
-build_application_icon 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/ic_launcher
-build_application_icon 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/ic_launcher
+build_application_icon 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/ic_launcher
+build_application_icon 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/ic_launcher
+build_application_icon 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/ic_launcher
build_application_icon 144 ${BASE_DIR}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher
build_application_icon 192 ${BASE_DIR}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher
build_application_icon 512 ${BASE_DIR}/fastlane/metadata/android/en-US/images/icon
-build_launch_image 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/launch_image
-build_launch_image 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/launch_image
-build_launch_image 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/launch_image
+build_launch_image 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/launch_image
+build_launch_image 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/launch_image
+build_launch_image 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/launch_image
build_launch_image 144 ${BASE_DIR}/android/app/src/main/res/mipmap-xxhdpi/launch_image
build_launch_image 192 ${BASE_DIR}/android/app/src/main/res/mipmap-xxxhdpi/launch_image
diff --git a/resources/build_resources.sh b/resources/build_resources.sh
index 659697a..774953c 100755
--- a/resources/build_resources.sh
+++ b/resources/build_resources.sh
@@ -4,4 +4,3 @@ CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
${CURRENT_DIR}/app/build_application_resources.sh
${CURRENT_DIR}/ui/build_ui_resources.sh
-
diff --git a/resources/ui/build_ui_resources.sh b/resources/ui/build_ui_resources.sh
index 4f365ed..4fa137a 100755
--- a/resources/ui/build_ui_resources.sh
+++ b/resources/ui/build_ui_resources.sh
@@ -1,9 +1,18 @@
#! /bin/bash
# Check dependencies
-command -v inkscape >/dev/null 2>&1 || { echo >&2 "I require inkscape but it's not installed. Aborting."; exit 1; }
-command -v scour >/dev/null 2>&1 || { echo >&2 "I require scour but it's not installed. Aborting."; exit 1; }
-command -v optipng >/dev/null 2>&1 || { echo >&2 "I require optipng but it's not installed. Aborting."; exit 1; }
+command -v inkscape >/dev/null 2>&1 || {
+ echo >&2 "I require inkscape but it's not installed. Aborting."
+ exit 1
+}
+command -v scour >/dev/null 2>&1 || {
+ echo >&2 "I require scour but it's not installed. Aborting."
+ exit 1
+}
+command -v optipng >/dev/null 2>&1 || {
+ echo >&2 "I require optipng but it's not installed. Aborting."
+ exit 1
+}
CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
BASE_DIR="$(dirname "$(dirname "${CURRENT_DIR}")")"
@@ -40,14 +49,14 @@ function optimize_svg() {
cp ${SOURCE} ${SOURCE}.tmp
scour \
- --remove-descriptive-elements \
- --enable-id-stripping \
- --enable-viewboxing \
- --enable-comment-stripping \
- --nindent=4 \
- --quiet \
- -i ${SOURCE}.tmp \
- -o ${SOURCE}
+ --remove-descriptive-elements \
+ --enable-id-stripping \
+ --enable-viewboxing \
+ --enable-comment-stripping \
+ --nindent=4 \
+ --quiet \
+ -i ${SOURCE}.tmp \
+ -o ${SOURCE}
rm ${SOURCE}.tmp
}
@@ -68,10 +77,10 @@ function build_image() {
mkdir -p "$(dirname "${TARGET}")"
inkscape \
- --export-width=${ICON_SIZE} \
- --export-height=${ICON_SIZE} \
- --export-filename=${TARGET} \
- "${SOURCE}"
+ --export-width=${ICON_SIZE} \
+ --export-height=${ICON_SIZE} \
+ --export-filename=${TARGET} \
+ "${SOURCE}"
optipng ${OPTIPNG_OPTIONS} "${TARGET}"
}
@@ -80,8 +89,7 @@ function build_image_for_skin() {
SKIN_CODE="$1"
# skin images
- for SKIN_IMAGE in ${SKIN_IMAGES}
- do
+ for SKIN_IMAGE in ${SKIN_IMAGES}; do
build_image ${CURRENT_DIR}/skins/${SKIN_CODE}/${SKIN_IMAGE}.svg ${ASSETS_DIR}/skins/${SKIN_CODE}_${SKIN_IMAGE}.png
done
}
@@ -97,14 +105,11 @@ if [ -d "${ASSETS_DIR}/skins" ]; then
fi
# build game images
-for GAME_IMAGE in ${AVAILABLE_GAME_IMAGES}
-do
+for GAME_IMAGE in ${AVAILABLE_GAME_IMAGES}; do
build_image ${CURRENT_DIR}/images/${GAME_IMAGE}.svg ${ASSETS_DIR}/ui/${GAME_IMAGE}.png
done
# build skins images
-for SKIN in ${AVAILABLE_SKINS}
-do
+for SKIN in ${AVAILABLE_SKINS}; do
build_image_for_skin "${SKIN}"
done
-
diff --git a/resources/ui/images/button_back.svg b/resources/ui/images/button_back.svg
index 2622a57..018d8b7 100644
--- a/resources/ui/images/button_back.svg
+++ b/resources/ui/images/button_back.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x=".44662" y=".89101" width="92.772" height="91.894" ry="11.689" fill="#e41578" stroke="#fff" stroke-width=".238"/><path d="m59.387 71.362c1.1248 1.1302 4.0012 1.1302 4.0012 0v-45.921c0-1.1316-2.8832-1.1316-4.0121 0l-37.693 20.918c-1.1289 1.1248-1.1479 2.9551-0.02171 4.084z" fill="#fefeff" stroke="#930e4e" stroke-linecap="round" stroke-linejoin="round" stroke-width="8.257"/><path d="m57.857 68.048c0.96243 0.96706 3.4236 0.96706 3.4236 0v-39.292c0-0.96825-2.467-0.96825-3.4329 0l-32.252 17.898c-0.96594 0.96243-0.9822 2.5285-0.01858 3.4945z" fill="#fefeff" stroke="#feffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.314"/></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path transform="matrix(1.3783 .61747 -.61747 1.3783 45.198 93.762)" d="m11.645-14.603-44.77-4.6003 26.369-36.472z" fill="#fff" stroke="#950e4f" stroke-linecap="round" stroke-linejoin="round" stroke-width="7.2832"/></svg>
diff --git a/resources/ui/images/button_delete_saved_game.svg b/resources/ui/images/button_delete_saved_game.svg
index ac7eefe..c3f872e 100644
--- a/resources/ui/images/button_delete_saved_game.svg
+++ b/resources/ui/images/button_delete_saved_game.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x=".44662" y=".89101" width="92.772" height="91.894" ry="11.689" fill="#ee7d49" stroke="#fff" stroke-width=".238"/><path d="m61.07 35.601-1.7399 27.837c-0.13442 2.1535-1.9205 3.8312-4.0781 3.8312h-16.84c-2.1576 0-3.9437-1.6777-4.0781-3.8312l-1.7399-27.837h-2.6176c-0.84621 0-1.5323-0.68613-1.5323-1.5323 0-0.84655 0.68613-1.5323 1.5323-1.5323h33.711c0.84621 0 1.5323 0.68578 1.5323 1.5323 0 0.84621-0.68613 1.5323-1.5323 1.5323zm-3.2617 0h-21.953l1.4715 26.674c0.05985 1.0829 0.95531 1.9305 2.0403 1.9305h14.929c1.085 0 1.9804-0.84757 2.0403-1.9305zm-10.977 3.0647c0.78977 0 1.4301 0.6403 1.4301 1.4301v19.614c0 0.78977-0.6403 1.4301-1.4301 1.4301s-1.4301-0.6403-1.4301-1.4301v-19.614c0-0.78977 0.6403-1.4301 1.4301-1.4301zm-6.1293 0c0.80004 0 1.4588 0.62935 1.495 1.4286l0.89647 19.719c0.03182 0.70016-0.50998 1.2933-1.2101 1.3255-0.01915 7.02e-4 -0.03831 1e-3 -0.05781 1e-3 -0.74462 0-1.3596-0.58215-1.4003-1.3261l-1.0757-19.719c-0.0407-0.74701 0.53188-1.3852 1.2786-1.4259 0.02462-0.0014 0.04926-2e-3 0.07388-2e-3zm12.259 0c0.74804 0 1.3541 0.60609 1.3541 1.3541 0 0.02462-3.28e-4 0.04926-0.0017 0.07388l-1.0703 19.618c-0.04379 0.80106-0.70597 1.4281-1.5081 1.4281-0.74804 0-1.3541-0.60609-1.3541-1.3541 0-0.02462 3.49e-4 -0.04925 0.0017-0.07388l1.0703-19.618c0.04379-0.80106 0.70597-1.4281 1.5081-1.4281zm-10.216-12.259h8.1728c2.2567 0 4.086 1.8293 4.086 4.086v2.0433h-16.344v-2.0433c0-2.2567 1.8293-4.086 4.086-4.086zm0.20453 3.0647c-0.67725 0-1.2259 0.54863-1.2259 1.2259v1.8388h10.215v-1.8388c0-0.67725-0.54863-1.2259-1.2259-1.2259z" fill="#fff" fill-rule="evenodd" stroke="#bd4812" stroke-width=".75383"/></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m76.652 23.303-3.6441 58.302c-0.28153 4.5103-4.0223 8.0241-8.5413 8.0241h-35.27c-4.5189 0-8.2598-3.5138-8.5413-8.0241l-3.6441-58.302h-5.4824c-1.7723 0-3.2093-1.437-3.2093-3.2093 0-1.773 1.437-3.2093 3.2093-3.2093h70.605c1.7723 0 3.2093 1.4363 3.2093 3.2093 0 1.7723-1.437 3.2093-3.2093 3.2093zm-6.8314 0h-45.979l3.0819 55.867c0.12535 2.268 2.0008 4.0433 4.2732 4.0433h31.268c2.2724 0 4.1478-1.7752 4.2732-4.0433zm-22.99 6.4188c1.6541 0 2.9952 1.3411 2.9952 2.9952v41.08c0 1.6541-1.3411 2.9952-2.9952 2.9952-1.6542 0-2.9952-1.3411-2.9952-2.9952v-41.08c0-1.6541 1.3411-2.9952 2.9952-2.9952zm-12.837 0c1.6756 0 3.0553 1.3181 3.1312 2.9921l1.8776 41.3c0.06665 1.4664-1.0681 2.7087-2.5345 2.7762-0.04011 0.0015-0.08024 0.0021-0.12108 0.0021-1.5595 0-2.8476-1.2193-2.9328-2.7774l-2.253-41.3c-0.08524-1.5646 1.114-2.9012 2.6779-2.9864 0.05157-0.0029 0.10317-0.0042 0.15474-0.0042zm25.675 0c1.5667 0 2.8361 1.2694 2.8361 2.8361 0 0.05156-6.87e-4 0.10317-0.0036 0.15474l-2.2416 41.088c-0.09171 1.6778-1.4786 2.991-3.1586 2.991-1.5667 0-2.8361-1.2694-2.8361-2.8361 0-0.05156 7.31e-4 -0.10315 0.0036-0.15474l2.2417-41.088c0.09172-1.6778 1.4786-2.991 3.1586-2.991zm-21.397-25.675h17.117c4.7265 0 8.5578 3.8313 8.5578 8.5578v4.2795h-34.231v-4.2795c0-4.7265 3.8313-8.5578 8.5578-8.5578zm0.42837 6.4188c-1.4184 0-2.5675 1.1491-2.5675 2.5675v3.8512h21.394v-3.8512c0-1.4184-1.1491-2.5675-2.5675-2.5675z" fill="#fff" fill-rule="evenodd" stroke="#050200"/></svg>
diff --git a/resources/ui/images/button_resume_game.svg b/resources/ui/images/button_resume_game.svg
index 6ad8b64..2bf9732 100644
--- a/resources/ui/images/button_resume_game.svg
+++ b/resources/ui/images/button_resume_game.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x=".44662" y=".89101" width="92.772" height="91.894" ry="11.689" fill="#49a1ee" stroke="#fff" stroke-width=".238"/><path d="m39.211 31.236c-0.84086-0.84489-2.9911-0.84489-2.9911 0v34.329c0 0.84594 2.1554 0.84594 2.9993 0l28.178-15.637c0.84392-0.84086 0.85812-2.2091 0.01623-3.053z" fill="#fefeff" stroke="#105ca1" stroke-linecap="round" stroke-linejoin="round" stroke-width="6.1726"/><path d="m40.355 33.714c-0.71948-0.72294-2.5594-0.72294-2.5594 0v29.373c0 0.72383 1.8442 0.72383 2.5663 0l24.11-13.38c0.7221-0.71948 0.73426-1.8902 0.01389-2.6124z" fill="#fefeff" stroke="#feffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.225"/><path d="m28.369 66.919v-37.591" fill="#105ca2" stroke="#105ca2" stroke-linecap="round" stroke-width="4.0337"/></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-5.618)" fill="#fff" stroke="#105ea2" stroke-linecap="round" stroke-linejoin="round"><path transform="matrix(-1.3783 -.61747 .61747 -1.3783 55.567 -.086035)" d="m11.645-14.603-44.77-4.6003 26.369-36.472z" stroke-width="7.2832"/><path d="m15.535 12.852 2e-3 67.973z" stroke-width="11"/></g></svg>
diff --git a/resources/ui/images/button_start.svg b/resources/ui/images/button_start.svg
index e9d49d2..4d7634a 100644
--- a/resources/ui/images/button_start.svg
+++ b/resources/ui/images/button_start.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x=".44662" y=".89101" width="92.772" height="91.894" ry="11.689" fill="#49a1ee" stroke="#fff" stroke-width=".238"/><path d="m34.852 25.44c-1.1248-1.1302-4.0012-1.1302-4.0012 0v45.921c0 1.1316 2.8832 1.1316 4.0121 0l37.693-20.918c1.1289-1.1248 1.1479-2.9551 0.02171-4.084z" fill="#fefeff" stroke="#105ca1" stroke-linecap="round" stroke-linejoin="round" stroke-width="8.257"/><path d="m36.382 28.754c-0.96243-0.96706-3.4236-0.96706-3.4236 0v39.292c0 0.96825 2.467 0.96825 3.4329 0l32.252-17.898c0.96594-0.96243 0.9822-2.5285 0.01858-3.4945z" fill="#fefeff" stroke="#feffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.314"/></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path transform="matrix(-1.3783 -.61747 .61747 -1.3783 46.954 -.086035)" d="m11.645-14.603-44.77-4.6003 26.369-36.472z" fill="#fff" stroke="#105ea2" stroke-linecap="round" stroke-linejoin="round" stroke-width="7.2832"/></svg>
--
GitLab