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 @@ + + + + + + + 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 dcd3220..0000000 Binary files a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png and /dev/null differ 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) } }