diff --git a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj index 864b865..0f597c9 100644 --- a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj +++ b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 643AB6932BFCEFD00018DA73 /* GameResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 643AB6922BFCEFD00018DA73 /* GameResumeFrame.swift */; }; - 643AB69B2BFCFB5C0018DA73 /* HistoricView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 643AB69A2BFCFB5C0018DA73 /* HistoricView.swift */; }; 6458345C2BF5F92300E18321 /* DouShouQi_AppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6458345B2BF5F92300E18321 /* DouShouQi_AppApp.swift */; }; 6458345E2BF5F92300E18321 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6458345D2BF5F92300E18321 /* ContentView.swift */; }; 645834602BF5F92500E18321 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6458345F2BF5F92500E18321 /* Assets.xcassets */; }; @@ -18,18 +16,14 @@ 645834792BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645834782BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift */; }; 645834882BF5FEA000E18321 /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 645834872BF5FEA000E18321 /* DSQ.xcframework */; }; 645834892BF5FEA000E18321 /* DSQ.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 645834872BF5FEA000E18321 /* DSQ.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 645B4C202BFCCA0500FD658A /* PlayerResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C1F2BFCCA0500FD658A /* PlayerResumeFrame.swift */; }; - 645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C242BFCD3C600FD658A /* ScoreBoardView.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 */; }; + 649ABF5B2BF60D78002E8894 /* GameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649ABF5A2BF60D78002E8894 /* GameView.swift */; }; + 649B59A42BF64574002BAE38 /* TopGameBoard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59A32BF64574002BAE38 /* TopGameBoard.swift */; }; 649B59A72BF64BA9002BAE38 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 649B59A62BF64BA9002BAE38 /* Colors.xcassets */; }; 649B59A92BF64C6A002BAE38 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59A82BF64C6A002BAE38 /* Colors.swift */; }; 649B59AC2BF64E12002BAE38 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 649B59AB2BF64E12002BAE38 /* Images.xcassets */; }; 649B59AE2BF64EAB002BAE38 /* AppImages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59AD2BF64EAB002BAE38 /* AppImages.swift */; }; 649B59B22BF65392002BAE38 /* TextStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B12BF65392002BAE38 /* TextStyles.swift */; }; 649B59B42BF653E1002BAE38 /* ViewTitleTextStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */; }; - EC62C4EF2BFE367F0048CD0B /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC62C4EE2BFE367F0048CD0B /* SwiftUIView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -64,8 +58,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 643AB6922BFCEFD00018DA73 /* GameResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameResumeFrame.swift; sourceTree = ""; }; - 643AB69A2BFCFB5C0018DA73 /* HistoricView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricView.swift; sourceTree = ""; }; 645834582BF5F92300E18321 /* DouShouQi_App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DouShouQi_App.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6458345B2BF5F92300E18321 /* DouShouQi_AppApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DouShouQi_AppApp.swift; sourceTree = ""; }; 6458345D2BF5F92300E18321 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -78,18 +70,14 @@ 645834782BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DouShouQi_AppUITestsLaunchTests.swift; sourceTree = ""; }; 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 = ""; }; - 645B4C1F2BFCCA0500FD658A /* PlayerResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerResumeFrame.swift; sourceTree = ""; }; - 645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScoreBoardView.swift; sourceTree = ""; }; - 649ABF5A2BF60D78002E8894 /* MainMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuView.swift; sourceTree = ""; }; - 649ABF5F2BF60F2D002E8894 /* MainMenuButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuButton.swift; sourceTree = ""; }; - 649B59A32BF64574002BAE38 /* TitlePageFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitlePageFrame.swift; sourceTree = ""; }; + 649ABF5A2BF60D78002E8894 /* GameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameView.swift; sourceTree = ""; }; + 649B59A32BF64574002BAE38 /* TopGameBoard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopGameBoard.swift; sourceTree = ""; }; 649B59A62BF64BA9002BAE38 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; 649B59A82BF64C6A002BAE38 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = ""; }; 649B59AB2BF64E12002BAE38 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 649B59AD2BF64EAB002BAE38 /* AppImages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppImages.swift; sourceTree = ""; }; 649B59B12BF65392002BAE38 /* TextStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextStyles.swift; sourceTree = ""; }; 649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewTitleTextStyle.swift; sourceTree = ""; }; - EC62C4EE2BFE367F0048CD0B /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -118,23 +106,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 643AB6912BFCEFB70018DA73 /* Game */ = { - isa = PBXGroup; - children = ( - 643AB6922BFCEFD00018DA73 /* GameResumeFrame.swift */, - ); - path = Game; - sourceTree = ""; - }; - 643AB6992BFCFB480018DA73 /* Game */ = { - isa = PBXGroup; - children = ( - 643AB69A2BFCFB5C0018DA73 /* HistoricView.swift */, - EC62C4EE2BFE367F0048CD0B /* SwiftUIView.swift */, - ); - path = Game; - sourceTree = ""; - }; 6458344F2BF5F92300E18321 = { isa = PBXGroup; children = ( @@ -204,28 +175,10 @@ name = Frameworks; sourceTree = ""; }; - 645B4C1C2BFCC95000FD658A /* Player */ = { - isa = PBXGroup; - children = ( - 645B4C1F2BFCCA0500FD658A /* PlayerResumeFrame.swift */, - ); - path = Player; - sourceTree = ""; - }; - 645B4C232BFCD39A00FD658A /* Player */ = { - isa = PBXGroup; - children = ( - 645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */, - ); - path = Player; - sourceTree = ""; - }; 649ABF592BF60D13002E8894 /* Views */ = { isa = PBXGroup; children = ( - 643AB6992BFCFB480018DA73 /* Game */, - 645B4C232BFCD39A00FD658A /* Player */, - 649ABF5A2BF60D78002E8894 /* MainMenuView.swift */, + 649ABF5A2BF60D78002E8894 /* GameView.swift */, ); path = Views; sourceTree = ""; @@ -233,10 +186,7 @@ 649ABF5E2BF60ED5002E8894 /* Components */ = { isa = PBXGroup; children = ( - 643AB6912BFCEFB70018DA73 /* Game */, - 645B4C1C2BFCC95000FD658A /* Player */, - 649ABF5F2BF60F2D002E8894 /* MainMenuButton.swift */, - 649B59A32BF64574002BAE38 /* TitlePageFrame.swift */, + 649B59A32BF64574002BAE38 /* TopGameBoard.swift */, ); path = Components; sourceTree = ""; @@ -411,20 +361,14 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 643AB69B2BFCFB5C0018DA73 /* HistoricView.swift in Sources */, 6458345E2BF5F92300E18321 /* ContentView.swift in Sources */, 649B59A92BF64C6A002BAE38 /* Colors.swift in Sources */, 649B59B42BF653E1002BAE38 /* ViewTitleTextStyle.swift in Sources */, - 645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */, 649B59AE2BF64EAB002BAE38 /* AppImages.swift in Sources */, - 649ABF602BF60F2D002E8894 /* MainMenuButton.swift in Sources */, - 643AB6932BFCEFD00018DA73 /* GameResumeFrame.swift in Sources */, - EC62C4EF2BFE367F0048CD0B /* SwiftUIView.swift in Sources */, 649B59B22BF65392002BAE38 /* TextStyles.swift in Sources */, 6458345C2BF5F92300E18321 /* DouShouQi_AppApp.swift in Sources */, - 645B4C202BFCCA0500FD658A /* PlayerResumeFrame.swift in Sources */, - 649ABF5B2BF60D78002E8894 /* MainMenuView.swift in Sources */, - 649B59A42BF64574002BAE38 /* TitlePageFrame.swift in Sources */, + 649ABF5B2BF60D78002E8894 /* GameView.swift in Sources */, + 649B59A42BF64574002BAE38 /* TopGameBoard.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/DouShouQi_App/DouShouQi_App/Assets.xcassets/gameBoard.imageset/Contents.json b/DouShouQi_App/DouShouQi_App/Assets.xcassets/gameBoard.imageset/Contents.json new file mode 100644 index 0000000..79a7d31 --- /dev/null +++ b/DouShouQi_App/DouShouQi_App/Assets.xcassets/gameBoard.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "board.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DouShouQi_App/DouShouQi_App/Assets.xcassets/gameBoard.imageset/board.svg b/DouShouQi_App/DouShouQi_App/Assets.xcassets/gameBoard.imageset/board.svg new file mode 100644 index 0000000..b91c80d --- /dev/null +++ b/DouShouQi_App/DouShouQi_App/Assets.xcassets/gameBoard.imageset/board.svg @@ -0,0 +1,1931 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift b/DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift deleted file mode 100644 index 7f6be9c..0000000 --- a/DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// TitlePageFrame.swift -// DouShouQi_App -// -// Created by Rémi REGNAULT on 16/05/2024. -// - -import SwiftUI - -struct TitlePageFrame: View { - - // Text Params - var Text: String - - // Image Params - var ImageWidth: CGFloat - var ImageHeight: CGFloat - - var body: some View { - VStack(alignment: .leading) { - ZStack { - Image(AppImages.TitleImage) - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: ImageWidth, height: ImageHeight) - - SwiftUI.Text(self.Text) - .foregroundColor(Colors.TitleText) - .fontWeight(.bold) - .font(.title) - - } - } - } -} - -struct TitlePageFrame_Previews: PreviewProvider { - static var previews: some View { - TitlePageFrame(Text: "DouShouQi", ImageWidth: 200, ImageHeight: 200) - } -} diff --git a/DouShouQi_App/DouShouQi_App/Components/TopGameBoard.swift b/DouShouQi_App/DouShouQi_App/Components/TopGameBoard.swift new file mode 100644 index 0000000..284b3cf --- /dev/null +++ b/DouShouQi_App/DouShouQi_App/Components/TopGameBoard.swift @@ -0,0 +1,67 @@ +// +// TitlePageFrame.swift +// DouShouQi_App +// +// Created by Nathan Verdier on 26/05/2024. +// + +import SwiftUI + +struct TopGameBoard: View { + var body: some View { + VStack { + HStack { + Circle() + .fill(Color.white) + .frame(width: 40, height: 40) + Text("Player 1 Turn") + .font(.title) + .foregroundColor(.white) + } + .padding() + .background(Color.red) + .cornerRadius(10) + + Spacer().frame(height: 20) + + HStack { + HStack { + Image(systemName: "clock") + .resizable() + .frame(width: 30, height: 30) + Text("4:11") + .font(.title) + .foregroundColor(.black) + } + + Spacer() + + HStack { + Text("Last moove :") + .font(.title2) + .foregroundColor(.black) + /*Image(systemName: "cheetah") + .resizable() + .frame(width: 30, height: 30)*/ + Text("🦁") + Text("2.3") + .font(.title2) + .foregroundColor(.black) + } + } + .padding() + .background(Color.white) + .cornerRadius(10) + + Spacer() + } + .padding() + .background(Color.red.opacity(0.5)) + } +} + +struct TopGameBoard_Previews: PreviewProvider { + static var previews: some View { + TopGameBoard() + } +} diff --git a/DouShouQi_App/DouShouQi_App/Views/MainMenuView.swift b/DouShouQi_App/DouShouQi_App/Views/GameView.swift similarity index 100% rename from DouShouQi_App/DouShouQi_App/Views/MainMenuView.swift rename to DouShouQi_App/DouShouQi_App/Views/GameView.swift