🔀 merging views branch into viewmodel branch

DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		645834792BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645834782BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift */; };
 		645B4C202BFCCA0500FD658A /* PlayerScoreResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */; };
 		645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */; };
+		646F04BE2C0F54C0003C8600 /* SettingsVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646F04BD2C0F54C0003C8600 /* SettingsVM.swift */; };
 		646FA83E2C072340001466BA /* GameVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646FA83D2C072340001466BA /* GameVM.swift */; };
 		646FA8432C0730D6001466BA /* HistoricVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646FA8422C0730D6001466BA /* HistoricVM.swift */; };
 		647D565C2BFD0212008D02EA /* PlayerResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */; };
@@ -90,6 +91,7 @@
 		645834852BF5FE1400E18321 /* DouShouQi-App-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "DouShouQi-App-Info.plist"; sourceTree = SOURCE_ROOT; };
 		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>"; };
+		646F04BD2C0F54C0003C8600 /* SettingsVM.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsVM.swift; sourceTree = "<group>"; };
 		646FA83D2C072340001466BA /* GameVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameVM.swift; sourceTree = "<group>"; };
 		646FA8422C0730D6001466BA /* HistoricVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricVM.swift; sourceTree = "<group>"; };
 		647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerResumeFrame.swift; sourceTree = "<group>"; };
@@ -170,6 +172,7 @@
 				6458346B2BF5F92600E18321 /* DouShouQi_AppTests */,
 				645834752BF5F92600E18321 /* DouShouQi_AppUITests */,
 				64C87E222C09D52600CCD451 /* Frameworks */,
+				646F04B62C0F5385003C8600 /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -187,7 +190,6 @@
 			isa = PBXGroup;
 			children = (
 				646FA83C2C072284001466BA /* ViewModel */,
-				EC62C5022C045BB90048CD0B /* SoundPlayerClass */,
 				ECB6364F2C04635D007CD5E2 /* SoundPlayerClass */,
 				649B59A52BF64B1B002BAE38 /* Assets */,
 				649ABF5E2BF60ED5002E8894 /* Components */,
@@ -249,10 +251,26 @@
 			path = Player;
 			sourceTree = "<group>";
 		};
+		646F04B62C0F5385003C8600 /* Recovered References */ = {
+			isa = PBXGroup;
+			children = (
+				64E00BE22C08B1D500E90544 /* SettingsVM.swift */,
+			);
+			name = "Recovered References";
+			sourceTree = "<group>";
+		};
+		646F04BC2C0F5491003C8600 /* Settings */ = {
+			isa = PBXGroup;
+			children = (
+				646F04BD2C0F54C0003C8600 /* SettingsVM.swift */,
+			);
+			path = Settings;
+			sourceTree = "<group>";
+		};
 		646FA83C2C072284001466BA /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
-				64E00BE12C08B1BF00E90544 /* Settings */,
+				646F04BC2C0F5491003C8600 /* Settings */,
 				646FA83F2C0730B4001466BA /* Game */,
 			);
 			path = ViewModel;
@@ -560,7 +578,6 @@
 				645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */,
 				649ABF602BF60F2D002E8894 /* MainMenuButton.swift in Sources */,
 				EC62C51B2C09D1790048CD0B /* PlayerStatView.swift in Sources */,
-				643AB6932BFCEFD00018DA73 /* GameResumeFrame.swift in Sources */,
 				649B59B22BF65392002BAE38 /* TextStyles.swift in Sources */,
 				EC62C5092C0467240048CD0B /* SplashScreenView.swift in Sources */,
 				EC2DD03F2C0CDF0C00FC55C0 /* MainMenuView.swift in Sources */,
@@ -573,6 +590,7 @@
 				647D565C2BFD0212008D02EA /* PlayerResumeFrame.swift in Sources */,
 				6493C1C22C046E5E00B5121D /* Fonts.swift in Sources */,
 				649B59A42BF64574002BAE38 /* TitlePageFrame.swift in Sources */,
+				646F04BE2C0F54C0003C8600 /* SettingsVM.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};