remi.regnault
/
DouShouQi_App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🔀 merging

Browse Source
pull/13/head
Rémi REGNAULT 11 months ago
parent 2e84bc3d23 a8194b5ace
commit 095c1a5305
4 changed files with 60 additions and 36 deletions
Show Stats Download Patch File Download Diff File

12
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
Unescape View File

@ -17,10 +17,11 @@
645834772BF5F92600E18321 /* DouShouQi_AppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645834762BF5F92600E18321 /* DouShouQi_AppUITests.swift */; };
645834792BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645834782BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift */; };
645834882BF5FEA000E18321 /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 645834872BF5FEA000E18321 /* DSQ.xcframework */; };
645B4C202BFCCA0500FD658A /* PlayerResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C1F2BFCCA0500FD658A /* PlayerResumeFrame.swift */; };
645B4C202BFCCA0500FD658A /* PlayerScoreResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */; };
645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */; };
6493C1C02C046BF900B5121D /* samurai.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6493C1BF2C046BF900B5121D /* samurai.ttf */; };
6493C1C22C046E5E00B5121D /* Fonts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6493C1C12C046E5E00B5121D /* Fonts.swift */; };
647D565C2BFD0212008D02EA /* PlayerResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */; };
649ABF5B2BF60D78002E8894 /* MainMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649ABF5A2BF60D78002E8894 /* MainMenuView.swift */; };
649ABF602BF60F2D002E8894 /* MainMenuButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649ABF5F2BF60F2D002E8894 /* MainMenuButton.swift */; };
649B59A42BF64574002BAE38 /* TitlePageFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59A32BF64574002BAE38 /* TitlePageFrame.swift */; };
@ -77,10 +78,11 @@
645834782BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DouShouQi_AppUITestsLaunchTests.swift; sourceTree = "<group>"; };
645834852BF5FE1400E18321 /* DouShouQi-App-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "DouShouQi-App-Info.plist"; sourceTree = SOURCE_ROOT; };
645834872BF5FEA000E18321 /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = DSQ.xcframework; sourceTree = "<group>"; };
645B4C1F2BFCCA0500FD658A /* PlayerResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerResumeFrame.swift; sourceTree = "<group>"; };
645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerScoreResumeFrame.swift; sourceTree = "<group>"; };
645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScoreBoardView.swift; sourceTree = "<group>"; };
6493C1BF2C046BF900B5121D /* samurai.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = samurai.ttf; sourceTree = "<group>"; };
6493C1C12C046E5E00B5121D /* Fonts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fonts.swift; sourceTree = "<group>"; };
647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerResumeFrame.swift; sourceTree = "<group>"; };
649ABF5A2BF60D78002E8894 /* MainMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuView.swift; sourceTree = "<group>"; };
649ABF5F2BF60F2D002E8894 /* MainMenuButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuButton.swift; sourceTree = "<group>"; };
649B59A32BF64574002BAE38 /* TitlePageFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitlePageFrame.swift; sourceTree = "<group>"; };
@ -220,7 +222,8 @@
645B4C1C2BFCC95000FD658A /* Player */ = {
isa = PBXGroup;
children = (
645B4C1F2BFCCA0500FD658A /* PlayerResumeFrame.swift */,
645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */,
647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */,
EC62C4FC2C0391D30048CD0B /* PlayerRow.swift */,
EC62C50E2C05D06A0048CD0B /* AddPlayerView.swift */,
);
@ -501,7 +504,8 @@
EC62C4FD2C0391D30048CD0B /* PlayerRow.swift in Sources */,
EC62C4FB2C038BD20048CD0B /* PlayersView.swift in Sources */,
6458345C2BF5F92300E18321 /* DouShouQi_AppApp.swift in Sources */,
645B4C202BFCCA0500FD658A /* PlayerResumeFrame.swift in Sources */,
645B4C202BFCCA0500FD658A /* PlayerScoreResumeFrame.swift in Sources */,
647D565C2BFD0212008D02EA /* PlayerResumeFrame.swift in Sources */,
649ABF5B2BF60D78002E8894 /* MainMenuView.swift in Sources */,
6493C1C22C046E5E00B5121D /* Fonts.swift in Sources */,
649B59A42BF64574002BAE38 /* TitlePageFrame.swift in Sources */,

29
DouShouQi_App/DouShouQi_App/Components/Player/PlayerResumeFrame.swift
Unescape View File

@ -8,38 +8,13 @@
import SwiftUI
struct PlayerResumeFrame: View {
// Player Params
let Name: String
let Rank: Int
let Wins: Int
let Looses: Int
var body: some View {
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)
}
Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
}
}
struct PlayerResumeFrame_Previews: PreviewProvider {
static var previews: some View {
PlayerResumeFrame(Name: "Michel Polnaref", Rank: 178, Wins: 0, Looses: 296)
PlayerResumeFrame()
}
}

45
DouShouQi_App/DouShouQi_App/Components/Player/PlayerScoreResumeFrame.swift
Unescape View File

@ -0,0 +1,45 @@
//
// PlayerScoreResumeFrame.swift
// DouShouQi_App
//
// Created by Rémi REGNAULT on 21/05/2024.
//
import SwiftUI
struct PlayerScoreResumeFrame: View {
// Player Params
let Name: String
let Rank: Int
let Wins: Int
let Looses: Int
var body: some View {
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)
}
}
}
struct PlayerScoreResumeFrame_Previews: PreviewProvider {
static var previews: some View {
PlayerScoreResumeFrame(Name: "Michel Polnaref", Rank: 178, Wins: 0, Looses: 296)
}
}

10
DouShouQi_App/DouShouQi_App/Views/Player/ScoreBoardView.swift
Unescape View File

@ -39,12 +39,12 @@ struct ScoreBoardView: View {
.frame(height: 2)
}
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()
PlayerScoreResumeFrame(Name: "Nathan Verdier", Rank: 1, Wins: 19, Looses: 15)
PlayerScoreResumeFrame(Name: "Rayhan Hassou", Rank: 2, Wins: 17, Looses: 17)
PlayerScoreResumeFrame(Name: "Rémi Regnault", Rank: 3, Wins: 15, Looses: 19)
}
Spacer()
}
.padding(10)
}

Write Preview
Loading…
Cancel
Save