From 856e3f57fabadba7002933d4f4cdedcc77b2452a Mon Sep 17 00:00:00 2001 From: Remi Regnault Date: Wed, 22 May 2024 16:23:24 +0200 Subject: [PATCH 1/3] :construction: modifying padding on content in HistoricView --- .../Views/Player/ScoreBoardView.swift | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/DouShouQi_App/DouShouQi_App/Views/Player/ScoreBoardView.swift b/DouShouQi_App/DouShouQi_App/Views/Player/ScoreBoardView.swift index 4b9da01..53c3e1a 100644 --- a/DouShouQi_App/DouShouQi_App/Views/Player/ScoreBoardView.swift +++ b/DouShouQi_App/DouShouQi_App/Views/Player/ScoreBoardView.swift @@ -6,6 +6,7 @@ // import SwiftUI +import DouShouQiModel struct ScoreBoardView: View { var body: some View { @@ -14,35 +15,38 @@ struct ScoreBoardView: View { TitlePageFrame(Text: "Score Board", ImageWidth: 200, ImageHeight: 200) } - HStack { - Text("Rank") - .font(.headline) - .frame(width: 50, alignment: .trailing) - - Text("Name") + VStack { + HStack { + Text("Rank") + .font(.headline) + .frame(width: 50, alignment: .trailing) + + Text("Name") + + Spacer() + + Text("Wins") + .frame(width: 55, alignment: .trailing) + + Text("Looses") + .frame(width: 55, alignment: .trailing) + + } + .padding(10) - Spacer() + HStack { + Rectangle() + .frame(height: 2) + } - Text("Wins") - .frame(width: 55, alignment: .trailing) + PlayerResumeFrame(Name: "Nathan Verdier", Rank: 1, Wins: 19, Looses: 15) + PlayerResumeFrame(Name: "Rayhan Hassou", Rank: 2, Wins: 17, Looses: 17) + PlayerResumeFrame(Name: "Rémi Regnault", Rank: 3, Wins: 15, Looses: 19) - Text("Looses") - .frame(width: 55, alignment: .trailing) - - } - .padding(10) - - HStack { - Rectangle() - .frame(height: 2) + Spacer() } - - PlayerResumeFrame(Name: "Nathan Verdier", Rank: 1, Wins: 19, Looses: 15) - PlayerResumeFrame(Name: "Rayhan Hassou", Rank: 2, Wins: 17, Looses: 17) - PlayerResumeFrame(Name: "Rémi Regnault", Rank: 3, Wins: 15, Looses: 19) - - Spacer() } + .padding(10) } } -- 2.36.3 From 97d859bda0ffd5fd9ea96c2beaac17800956ec99 Mon Sep 17 00:00:00 2001 From: "remi.regnault" Date: Thu, 23 May 2024 17:11:32 +0200 Subject: [PATCH 2/3] :bento: transform png to sag for title image --- .../TitlePageImage.imageset/-16-05-2024.svg | 7 +++++++ .../TitlePageImage.imageset/Contents.json | 16 ++-------------- .../title-background.png | Bin 2935 -> 0 bytes 3 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/-16-05-2024.svg delete mode 100644 DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/-16-05-2024.svg b/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/-16-05-2024.svg new file mode 100644 index 0000000..a587d3e --- /dev/null +++ b/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/-16-05-2024.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json b/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json index 1cfb966..a8e9c51 100644 --- a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json +++ b/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json @@ -1,24 +1,12 @@ { "images" : [ { - "filename" : "title-background.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "filename" : "-16-05-2024.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true } } diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png b/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png deleted file mode 100644 index dcd3220206783d44b6c165c2aae3b8fd8ea1d434..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2935 zcmV--3yAcIP)%C7iTjIObF)a#u70CblC!G|)=STc zoOp!D!4pN^eN*JvlSL+<6g6+kh zjpYOD$%irq(9GxXxW%Zx*Djlq4L0U&bA5gBmm=pXb7=cc$N*cU;Jy3Css@bz@p-pD zAhMsnH=Z4fVJCJ8AG_^&pRc1#Lv9bWXH5~Gl2fkLFTYBpTU&- z03eOWwe(o03Ec4EB4;UEr(IcUo|OYE0GXtbTfR+ICVenpp*gSh~{TK zyJ^0*WvjD;{J%3`(bYu@L>|9C3nV`OOytwW8LI}9Ck44=j}L)W1RflKM|=Ilj_Hk^ z1B(mWOs^Jj@K3P;Wf%k4`c1%ijtcVO7an&&`==HQ7Roo~51&OaK~RBz!t}+&sQh>W z5-lEF-0Gaw_#rrZc+ghfR^cj8LWCE_kvx= zot&u~tgB}}E?^4>mUZgAw?%gB5!rQ=$P(4k2-U01D!cARM5u=wY}f>9Ai%4oEYxGvxNl4$h zl_MNjs1+2n02GY~kl>TCiH2vam%Q&@@s z1M^3?ZmkOQRUUW$%2Um6;lqy60-I}foIC|ye`a9|V7j3@ zuRZ*%_XMOrShnAUb&{kQ$*Ja%dt-`!+_}oq8?fuN~Q;52@{T(Kpv5q@Kf&IQy%OJ!z^^co30Ug z?7n0QnbIGj)LMZ$&}_4NMNU221E%cMFktaX+&yeQV(hAGa?I4oxUnMhw2Yhr_hfr3%2GY-_knL#>~uXKW4 zR_zq1!=?S0J$4YeT;0ILqx!lSczf5dU~xBDRjzfJ_UaFs$Ph2LtfQ;uSS6fWaSMAw=DAs6j&4k7N45;TfAnw%2cub zy=U9(ZhTv}IYOndrBA3Afm>KJNarly;?W8}c^xx|z+0vD#U#Mv$B1mRT_z=A{&@7P zyd4PR@L(BW#xj0?HNeh-<$fCxBDn^&8qAv7 zPBSr2p_rcnFmkFfs#pXPYyZ!37Q?LmzR|*ZKw>62=FPUqr#4mn?|99ps9}F!rKOKQ z2%1y%H-w!73m=9uj~~Mf+QyJEF$_kbQcONpS?)J;G1SE8gAOJu%RIB3-y?Ur?n*F5E0+L^ zyvhYFuxjBBUuT(R-wbFZ&=iMa24NO}m9aRKwZT-^4p$%bQ*(}r>RLeQ5J)y`-2sbl z=Z?fI;==&Ul#a4&a6D9t)i1eJ0|}KU=4cSH$)=fif+#lNA1&ayG zdGDy>)>zoqB^%2uV(iq$$7`!&8oh?jY+kA$b)p^Y zy9-vnhZg#>n=?Pr#1=XWR1jURj@=k%z`4Jn)y|c!^wRo-@Ozk=w|MlAvltuLeE?HKu?7EwGy2ZuiRtmi3yune|@y2LciH+NHL`5@-W1|LFcY9jxK7 z9m=SVMRBJ#hP7i!vx#RJwrgJv82bNA!-+-Vuk8Kz~-yvE*1_M@I90$?y*i65-|)shDRnpMIA z5U<^#ujLcj!HiT1-djDe7}UJvWBbhGckCxON-+3??Lsxd8tf=U^8N%?BtX&41Xcno zq7jIwtBF|&tcXS+qOK-pC9onIfrz@An3ceaXapkaYGPIbE20sIsH=%t39N`lAfm1& hW+kv98i9zq`Y)GL?)=x7*|Puu002ovPDHLkV1juAl>`6) -- 2.36.3 From 45c243708bcafca5cdc86c8c66f1d555bb38a625 Mon Sep 17 00:00:00 2001 From: "remi.regnault" Date: Thu, 23 May 2024 17:23:57 +0200 Subject: [PATCH 3/3] :bento: adding a directory containing all image files (.png, .svg, ...) --- Assets/board.svg | 1931 +++++++++++++++++++++++++++++++++++ Assets/chevron-right.svg | 1 + Assets/title-background.svg | 7 + 3 files changed, 1939 insertions(+) create mode 100644 Assets/board.svg create mode 100644 Assets/chevron-right.svg create mode 100644 Assets/title-background.svg diff --git a/Assets/board.svg b/Assets/board.svg new file mode 100644 index 0000000..b91c80d --- /dev/null +++ b/Assets/board.svg @@ -0,0 +1,1931 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/chevron-right.svg b/Assets/chevron-right.svg new file mode 100644 index 0000000..fc771f7 --- /dev/null +++ b/Assets/chevron-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/title-background.svg b/Assets/title-background.svg new file mode 100644 index 0000000..a587d3e --- /dev/null +++ b/Assets/title-background.svg @@ -0,0 +1,7 @@ + + + + + + + -- 2.36.3