Merge pull request #13 from SwiftPackageRepository/macOS-support-#11

macOS Support

Author: smuellner

Examples/GKMatchMaker/GKMatchMaker.xcodeproj/project.pbxproj

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

Examples/GKMatchMaker/GKMatchMaker.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -34,6 +34,7 @@ struct GKMatchMakerApp: App {
     public var body: some Scene {
         WindowGroup {
             ZStack {
+                Color("BackgroundColor").ignoresSafeArea()
                 ContentView()
                     .alert(isPresented: self.$viewModel.showAlert) {
                         Alert(title: Text(self.viewModel.alertTitle),

Examples/GKMatchMaker/Shared/GKMatchMakerApp.swift

@@ -26,19 +26,13 @@
 
 import SwiftUI
 
-struct PrimaryButtonModifier: ViewModifier {
-    func body(content: Content) -> some View {
-        return content
+struct PrimaryButtonStyle: ButtonStyle {
+    func makeBody(configuration: Self.Configuration) -> some View {
+        configuration.label
             .font(.title)
             .padding(32)
-            .background(Color("ButtonColor"))
+            .foregroundColor(configuration.isPressed ? Color("ButtonColor") : Color("ButtonTextColor"))
+            .background(configuration.isPressed ? Color("ButtonTextColor") : Color("ButtonColor"))
             .cornerRadius(32)
-            .foregroundColor(Color("ButtonTextColor"))
-    }
-}
-
-extension Text {
-    func primaryButtonStyle() -> some View {
-        self.modifier(PrimaryButtonModifier())
     }
 }

…ed/Modifiers/PrimaryButtonModifier.swift …hared/Modifiers/PrimaryButtonStyle.swiftExamples/GKMatchMaker/Shared/Modifiers/PrimaryButtonModifier.swift renamed to Examples/GKMatchMaker/Shared/Modifiers/PrimaryButtonStyle.swift Examples/GKMatchMaker/Shared/Modifiers/PrimaryButtonModifier.swift renamed to Examples/GKMatchMaker/Shared/Modifiers/PrimaryButtonStyle.swift

@@ -56,6 +56,7 @@ class GKMatchMakerAppModel: ObservableObject {
 
     public init() {
         self.subscribe()
+        /*
         NotificationCenter.default.addObserver(forName: nil, object: nil, queue: nil) { notification in
             os_log("Notification found with:\r\n name:%{public}@\r\nobject:%{public}\r\nuserInfo: %{public})",
                    log: .default,
@@ -65,6 +66,7 @@ class GKMatchMakerAppModel: ObservableObject {
                    String(describing: notification.userInfo)
             )
         }
+ */
     }
 
     deinit {

Examples/GKMatchMaker/Shared/ViewModels/GKMatchMakerAppModel.swift

@@ -42,10 +42,10 @@ struct AuthenticationView: View {
                     self.viewModel.showAuthenticationModal()
                 } label: {
                     Text("Login")
-                        .primaryButtonStyle()
                 }
+                .buttonStyle(PrimaryButtonStyle())
             }
-            .navigationBarTitle(Text("GameKit Authentication"))
+            .navigationTitle(Text("GameKit Authentication"))
         }
         .onAppear() {
             self.viewModel.load()
@@ -59,6 +59,7 @@ struct AuthenticationView: View {
                 self.viewModel.showModal = false
                 self.viewModel.currentState = "Hello \(player.displayName)"
             }
+            .frame(width: 640, height: 480)
         }
         .alert(isPresented: self.$viewModel.showAlert) {
             Alert(title: Text(self.viewModel.alertTitle),

Examples/GKMatchMaker/Shared/Views/Authentication/AuthenticationView.swift

@@ -41,10 +41,10 @@ struct MatchMakingView: View {
                     self.viewModel.showMatchMakerModal()
                 } label: {
                     Text("Create Match")
-                        .primaryButtonStyle()
                 }
+                .buttonStyle(PrimaryButtonStyle())
             }
-            .navigationBarTitle(Text("GameKit Matchmaker"))
+            .navigationTitle(Text("GameKit Matchmaker"))
         }
         .onAppear() {
             self.viewModel.load()
@@ -64,6 +64,7 @@ struct MatchMakingView: View {
             } started: { (match) in
                 self.viewModel.showModal = false
             }
+            .frame(width: 640, height: 480)
         }
         .alert(isPresented: self.$viewModel.showAlert) {
             Alert(title: Text(self.viewModel.alertTitle),

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

@@ -51,19 +51,20 @@ struct MatchView: View {
                     }
                 }
             }
-            .navigationBarTitle(Text("GameKit Match"), displayMode: .inline)
-            .navigationBarItems(trailing:
-                Button(action: {
-                    GKMatchManager.shared.cancel()
-                }) {
-                    HStack(alignment: .center) {
-                        Image(systemName: "xmark.circle").imageScale(.large)
-                        Text("Cancel")
+            .navigationTitle(Text("GameKit Match"))
+            .toolbar {
+                ToolbarItemGroup {
+                    Button(action: {
+                        GKMatchManager.shared.cancel()
+                    }) {
+                        HStack(alignment: .center) {
+                            Image(systemName: "xmark.circle").imageScale(.large)
+                            Text("Cancel")
+                        }
                     }
                 }
-            )
+            }
         }
-        .navigationViewStyle(StackNavigationViewStyle())
     }
 }
 

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

@@ -44,9 +44,8 @@ struct ContentView: View {
                     }
                 }
             }
-            .navigationBarTitle(Text("GameKit"))
+            .navigationTitle(Text("GameKit"))
         }
-        .navigationViewStyle(StackNavigationViewStyle())
     }
 }
 

…atchMaker/Shared/Views/ContentView.swift …GKMatchMaker/iOS/Views/ContentView.swiftExamples/GKMatchMaker/Shared/Views/ContentView.swift renamed to Examples/GKMatchMaker/iOS/Views/ContentView.swift Examples/GKMatchMaker/Shared/Views/ContentView.swift renamed to Examples/GKMatchMaker/iOS/Views/ContentView.swift

@@ -0,0 +1,42 @@
+///
+/// MIT License
+///
+/// Copyright (c) 2020 Sascha Müllner
+///
+/// Permission is hereby granted, free of charge, to any person obtaining a copy
+/// of this software and associated documentation files (the "Software"), to deal
+/// in the Software without restriction, including without limitation the rights
+/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+/// copies of the Software, and to permit persons to whom the Software is
+/// furnished to do so, subject to the following conditions:
+///
+/// The above copyright notice and this permission notice shall be included in all
+/// copies or substantial portions of the Software.
+///
+/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+/// SOFTWARE.
+///
+/// Created by Sascha Müllner on 03.04.21.
+
+import SwiftUI
+import GameKit
+import GameKitUI
+
+struct ContentView: View {
+    
+    var body: some View {
+        SidebarView()
+            .frame(minWidth: 800, maxWidth: .infinity, minHeight: 600, maxHeight: .infinity)
+    }
+}
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
+    }
+}