#8 multiplatform macos support

Author: smuellner

Examples/GKMatchMaker/GKMatchMaker.xcodeproj/project.pbxproj

@@ -16,6 +16,8 @@
 		151CAAD125E39928002A7FDC /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 151CAAD025E39928002A7FDC /* Config.xcconfig */; };
 		151CAAD225E39928002A7FDC /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 151CAAD025E39928002A7FDC /* Config.xcconfig */; };
 		151CAAD725E399D6002A7FDC /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 151CAAD625E399D6002A7FDC /* GameKit.framework */; };
+		151F91ED25E42EC60015DD88 /* PrimaryButtonModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F91EC25E42EC60015DD88 /* PrimaryButtonModifier.swift */; };
+		151F91EE25E42EC60015DD88 /* PrimaryButtonModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F91EC25E42EC60015DD88 /* PrimaryButtonModifier.swift */; };
 		15A6F7D725E39B7D00FE5387 /* GameKitUI in Frameworks */ = {isa = PBXBuildFile; productRef = 15A6F7D625E39B7D00FE5387 /* GameKitUI */; };
 		15A6F7D925E39B8300FE5387 /* GameKitUI in Frameworks */ = {isa = PBXBuildFile; productRef = 15A6F7D825E39B8300FE5387 /* GameKitUI */; };
 		15A6F7DB25E39B8F00FE5387 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A6F7DA25E39B8F00FE5387 /* GameKit.framework */; };
@@ -39,6 +41,7 @@
 		151CAAD025E39928002A7FDC /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
 		151CAAD625E399D6002A7FDC /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.4.sdk/System/Library/Frameworks/GameKit.framework; sourceTree = DEVELOPER_DIR; };
 		151CAAD825E399DF002A7FDC /* GameKitUI.swift */ = {isa = PBXFileReference; lastKnownFileType = folder; name = GameKitUI.swift; path = ../..; sourceTree = "<group>"; };
+		151F91EC25E42EC60015DD88 /* PrimaryButtonModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryButtonModifier.swift; sourceTree = "<group>"; };
 		15A6F7DA25E39B8F00FE5387 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		15A6F7DF25E39BC100FE5387 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		15A6F7F025E39E0500FE5387 /* MatchMakingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatchMakingViewModel.swift; sourceTree = "<group>"; };
@@ -84,6 +87,7 @@
 			isa = PBXGroup;
 			children = (
 				1507A0BC25E410CA006DDBFC /* GKMatchMakerApp.swift */,
+				151F91E825E42DE30015DD88 /* Modifiers */,
 				15A6F7E025E39BC100FE5387 /* ViewModels */,
 				15A6F7DE25E39BC100FE5387 /* Views */,
 				151CAA8D25E39837002A7FDC /* Assets.xcassets */,
@@ -126,6 +130,14 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		151F91E825E42DE30015DD88 /* Modifiers */ = {
+			isa = PBXGroup;
+			children = (
+				151F91EC25E42EC60015DD88 /* PrimaryButtonModifier.swift */,
+			);
+			path = Modifiers;
+			sourceTree = "<group>";
+		};
 		15A6F7DE25E39BC100FE5387 /* Views */ = {
 			isa = PBXGroup;
 			children = (
@@ -284,6 +296,7 @@
 				1507A0C625E419E5006DDBFC /* SinglePlayerView.swift in Sources */,
 				15A6F7F625E39E5300FE5387 /* MatchMakingView.swift in Sources */,
 				15A6F7E225E39BC100FE5387 /* ContentView.swift in Sources */,
+				151F91ED25E42EC60015DD88 /* PrimaryButtonModifier.swift in Sources */,
 				1507A0BD25E410CA006DDBFC /* GKMatchMakerApp.swift in Sources */,
 				15A6F7F125E39E0500FE5387 /* MatchMakingViewModel.swift in Sources */,
 			);
@@ -296,6 +309,7 @@
 				1507A0C725E419E5006DDBFC /* SinglePlayerView.swift in Sources */,
 				15A6F7F725E39E5300FE5387 /* MatchMakingView.swift in Sources */,
 				15A6F7E325E39BC100FE5387 /* ContentView.swift in Sources */,
+				151F91EE25E42EC60015DD88 /* PrimaryButtonModifier.swift in Sources */,
 				1507A0BE25E410CA006DDBFC /* GKMatchMakerApp.swift in Sources */,
 				15A6F7F225E39E0500FE5387 /* MatchMakingViewModel.swift in Sources */,
 			);

Examples/GKMatchMaker/Shared/Modifiers/PrimaryButtonModifier.swift

@@ -0,0 +1,25 @@
+///
+/// PrimaryButtonModifier.swift
+/// GKMatchMaker
+///
+/// Created by Sascha Müllner on 22.02.21.
+///
+
+import SwiftUI
+
+struct PrimaryButtonModifier: ViewModifier {
+    func body(content: Content) -> some View {
+        return content
+            .font(.title)
+            .padding(40)
+            .background(Color("ButtonColor"))
+            .cornerRadius(40)
+            .foregroundColor(Color("ButtonTextColor"))
+    }
+}
+
+extension Text {
+    func primaryButtonStyle() -> some View {
+        self.modifier(PrimaryButtonModifier())
+    }
+}

Examples/GKMatchMaker/Shared/ViewModels/MultiPlayer/MatchMakingViewModel.swift

@@ -1,6 +1,6 @@
 ///
-/// MatchMakingViewModel.swift
-/// MatchMaking
+/// GKMatchMakerViewModel.swift
+/// GKMatchMaker
 ///
 /// Created by Sascha Müllner on 24.11.20.
 

Examples/GKMatchMaker/Shared/Views/ContentView.swift

@@ -1,40 +1,30 @@
 ///
 /// ContentView.swift
-/// MatchMaking
+/// GKMatchMaker
 ///
 /// Created by Sascha Müllner on 24.11.20.
 
 import SwiftUI
+
 struct ContentView: View {
     var body: some View {
         NavigationView {
             ZStack {
-                Color("BackgroundColor").ignoresSafeArea()
+                Color("BackgroundColor").edgesIgnoringSafeArea(.all)
                 VStack(alignment: .center, spacing: 32) {
                     NavigationLink(destination: SinglePlayerView()) {
                         Text("Single Player")
-                            .fontWeight(.bold)
-                            .font(.title)
-                            .padding(40)
-                            .background(Color("ButtonColor"))
-                            .cornerRadius(40)
-                            .foregroundColor(Color("ButtonTextColor"))
+                            .primaryButtonStyle()
                     }
                     NavigationLink(destination: MatchMakingView()) {
                         Text("Multi Player")
-                            .fontWeight(.bold)
-                            .font(.title)
-                            .padding(40)
-                            .background(Color("ButtonColor"))
-                            .cornerRadius(40)
-                            .foregroundColor(Color("ButtonTextColor"))
-                        
+                            .primaryButtonStyle()
                     }
                 }
             }
-            .navigationViewStyle(StackNavigationViewStyle())
             .navigationBarTitle(Text("Match Making"))
         }
+        .navigationViewStyle(StackNavigationViewStyle())
     }
 }
 

Examples/GKMatchMaker/Shared/Views/MultiPlayer/MatchMakingView.swift

@@ -1,6 +1,6 @@
 ///
-/// MatchMakingView.swift
-/// MatchMaking
+/// GKMatchMakerView.swift
+/// GKMatchMaker
 ///
 /// Created by Sascha Müllner on 24.11.20.
 
@@ -19,10 +19,16 @@ struct MatchMakingView: View {
                 Text(self.viewModel.currentState)
                     .font(.body)
                     .padding(8)
+                Button() {
+                    self.viewModel.showAuthenticationModal()
+                } label: {
+                    Text("Authenticate")
+                        .primaryButtonStyle()
+                }
+                
             }
+            .navigationBarTitle(Text("GameKit Matchmaker"))
         }
-        .navigationViewStyle(StackNavigationViewStyle())
-        .navigationBarTitle(Text("GameKit Matchmaker"))
         .onAppear() {
             self.viewModel.load()
         }

Examples/GKMatchMaker/Shared/Views/SinglePlayer/SinglePlayerView.swift

@@ -16,6 +16,7 @@ struct SinglePlayerView: View {
                     .font(.body)
                     .padding(8)
             }
+            .navigationBarTitle(Text("Single Player"))
         }
     }
 }