🔀 merging

DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj

@@ -19,9 +19,9 @@
 		645834882BF5FEA000E18321 /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 645834872BF5FEA000E18321 /* DSQ.xcframework */; };
 		645B4C202BFCCA0500FD658A /* PlayerScoreResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */; };
 		645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */; };
+		647D565C2BFD0212008D02EA /* PlayerResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D565B2BFD0212008D02EA /* PlayerResumeFrame.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 */; };
@@ -31,6 +31,8 @@
 		649B59B22BF65392002BAE38 /* TextStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B12BF65392002BAE38 /* TextStyles.swift */; };
 		649B59B42BF653E1002BAE38 /* ViewTitleTextStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */; };
 		64D992722C06281B002ACBC6 /* SystemIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D992712C06281B002ACBC6 /* SystemIcons.swift */; };
+		64FC4D692C09C78000D08B8B /* SelectPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FC4D682C09C78000D08B8B /* SelectPlayerView.swift */; };
+		64FC4D6B2C09C7C900D08B8B /* SelectPlayerButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FC4D6A2C09C7C900D08B8B /* SelectPlayerButtonView.swift */; };
 		EC05BFC42C04C3C4000F7B19 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC05BFC32C04C3C4000F7B19 /* SettingsView.swift */; };
 		EC05BFC82C04D832000F7B19 /* CustomSwitchButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC05BFC72C04D832000F7B19 /* CustomSwitchButton.swift */; };
 		EC62C4F92C0371660048CD0B /* MusicPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC62C4F82C0371660048CD0B /* MusicPlayer.swift */; };
@@ -80,9 +82,9 @@
 		645834872BF5FEA000E18321 /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = DSQ.xcframework; 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>"; };
+		647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerResumeFrame.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>"; };
@@ -92,6 +94,8 @@
 		649B59B12BF65392002BAE38 /* TextStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextStyles.swift; sourceTree = "<group>"; };
 		649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewTitleTextStyle.swift; sourceTree = "<group>"; };
 		64D992712C06281B002ACBC6 /* SystemIcons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemIcons.swift; sourceTree = "<group>"; };
+		64FC4D682C09C78000D08B8B /* SelectPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectPlayerView.swift; sourceTree = "<group>"; };
+		64FC4D6A2C09C7C900D08B8B /* SelectPlayerButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectPlayerButtonView.swift; sourceTree = "<group>"; };
 		EC05BFC32C04C3C4000F7B19 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		EC05BFC72C04D832000F7B19 /* CustomSwitchButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSwitchButton.swift; sourceTree = "<group>"; };
 		EC62C4F82C0371660048CD0B /* MusicPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicPlayer.swift; sourceTree = "<group>"; };
@@ -222,6 +226,7 @@
 		645B4C1C2BFCC95000FD658A /* Player */ = {
 			isa = PBXGroup;
 			children = (
+				64FC4D6A2C09C7C900D08B8B /* SelectPlayerButtonView.swift */,
 				645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */,
 				647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */,
 				EC62C4FC2C0391D30048CD0B /* PlayerRow.swift */,
@@ -233,6 +238,7 @@
 		645B4C232BFCD39A00FD658A /* Player */ = {
 			isa = PBXGroup;
 			children = (
+				64FC4D682C09C78000D08B8B /* SelectPlayerView.swift */,
 				645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */,
 				EC62C4FA2C038BD20048CD0B /* PlayersView.swift */,
 			);
@@ -456,7 +462,6 @@
 				6493C1C02C046BF900B5121D /* samurai.ttf in Resources */,
 				EC62C5062C045C1A0048CD0B /* TitleScreenButtonSound.mp3 in Resources */,
 				EC62C5172C0620C00048CD0B /* rap.mp3 in Resources */,
-				649B59AC2BF64E12002BAE38 /* Images.xcassets in Resources */,
 				EC62C50D2C046D9E0048CD0B /* SplashScreenSound.mp3 in Resources */,
 				645834632BF5F92500E18321 /* Preview Assets.xcassets in Resources */,
 				645834602BF5F92500E18321 /* Assets.xcassets in Resources */,
@@ -493,6 +498,7 @@
 				649B59A92BF64C6A002BAE38 /* Colors.swift in Sources */,
 				649B59B42BF653E1002BAE38 /* ViewTitleTextStyle.swift in Sources */,
 				EC62C5012C045B590048CD0B /* SoundPlayer.swift in Sources */,
+				64FC4D6B2C09C7C900D08B8B /* SelectPlayerButtonView.swift in Sources */,
 				EC05BFC82C04D832000F7B19 /* CustomSwitchButton.swift in Sources */,
 				64D992722C06281B002ACBC6 /* SystemIcons.swift in Sources */,
 				645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */,
@@ -502,6 +508,7 @@
 				649B59B22BF65392002BAE38 /* TextStyles.swift in Sources */,
 				EC62C5092C0467240048CD0B /* SplashScreenView.swift in Sources */,
 				EC62C4F92C0371660048CD0B /* MusicPlayer.swift in Sources */,
+				64FC4D692C09C78000D08B8B /* SelectPlayerView.swift in Sources */,
 				EC62C4FD2C0391D30048CD0B /* PlayerRow.swift in Sources */,
 				EC62C4FB2C038BD20048CD0B /* PlayersView.swift in Sources */,
 				6458345C2BF5F92300E18321 /* DouShouQi_AppApp.swift in Sources */,

DouShouQi_App/DouShouQi_App/Components/Player/SelectPlayerButtonView.swift

@@ -98,6 +98,8 @@ struct SelectPlayerButtonView: View {
     }
 }
 
-#Preview {
+struct SelectPlayerButtonView_Previews: PreviewProvider {
+    static var previews: some View {
         SelectPlayerButtonView()
     }
+}

DouShouQi_App/DouShouQi_App/Views/Player/SelectPlayerView.swift

@@ -10,29 +10,22 @@ import SwiftUI
 struct SelectPlayerView: View {
     var body: some View {
         VStack {
-            ZStack {
+            TitlePageFrame(Text: "select players")
-                Image("title-background")
+            
-                   .resizable()
+            Spacer()
-                   .aspectRatio(contentMode: .fit)
-                   .frame(width: 250, height: 250)
-                        
-                Text("Select Your Player")
-                    .font(.largeTitle)
-                    .foregroundColor(.black)
-                    .bold()
-            }
             
             SelectPlayerButtonView()
 
             Spacer()
+            
             HStack {
-                Spacer()
                 VStack(alignment: .trailing)
                 {
-                    ButtonView(button1Title: "Start")
+                    MainMenuButton(text: "Start", destination: ContentView(), sound: "TitleScreenButtonSound", horizontalAlignment: .trailing, topLeftCorner: 10, bottomLeftCorner: 10)
-                    ButtonView(button1Title: "Setting")
+                    MainMenuButton(text: "Settings", destination: ContentView(), sound: "TitleScreenButtonSound", horizontalAlignment: .trailing, topLeftCorner: 10, bottomLeftCorner: 10)
                 }
             }
+            
             Spacer()
         }
     }