shifted match to main screen

Author: smuellner

Examples/GKMatchMaker/Shared/ViewModels/GKMatchMakerAppModel.swift

@@ -19,15 +19,21 @@ class GKMatchMakerAppModel: ObservableObject {
     @Published public var showAuthentication = false
     @Published public var showInvite = false
     @Published public var showMatch = false
-    @Published public var invite: Invite = Invite.zero
+    @Published public var invite: Invite = Invite.zero {
+        didSet {
+            self.showInvite = invite.gkInvite != nil
+            self.showAuthentication = invite.needsToAuthenticate ?? false
+        }
+    }
     @Published public var match: GKMatch? {
         didSet {
             self.showInvite = false
             self.showMatch = true
         }
     }
 
-    private var cancellable: AnyCancellable?
+    private var cancellableInvite: AnyCancellable?
+    private var cancellableMatch: AnyCancellable?
 
     public init() {
         self.subscribe()
@@ -46,18 +52,23 @@ class GKMatchMakerAppModel: ObservableObject {
     }
 
     func subscribe() {
-        self.cancellable = GKMatchManager
+        self.cancellableInvite = GKMatchManager
             .shared
             .invite
             .sink { (invite) in
                 self.invite = invite
-                self.showInvite = invite.gkInvite != nil
-                self.showAuthentication = invite.needsToAuthenticate ?? false
+        }
+        self.cancellableMatch = GKMatchManager
+            .shared
+            .match
+            .sink { (match) in
+                self.match = match.gkMatch
         }
     }
 
     func unsubscribe() {
-        self.cancellable?.cancel()
+        self.cancellableInvite?.cancel()
+        self.cancellableMatch?.cancel()
     }
 
     public func showAlert(title: String, message: String) {

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

@@ -13,15 +13,9 @@ class MatchMakingViewModel: ObservableObject {
 
     @Published public var showModal = false
     @Published public var showAlert = false
-    @Published public var showMatch = false
     @Published public var alertTitle: String = ""
     @Published public var alertMessage: String = ""
     @Published public var currentState: String = "Loading GameKit..."
-    @Published public var match: GKMatch? {
-        didSet {
-            self.showMatch = self.match != nil
-        }
-    }
 
     public init() {
     }

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

@@ -15,19 +15,14 @@ struct MatchMakingView: View {
         ZStack {
             Color("BackgroundColor").ignoresSafeArea()
             VStack() {
-                if self.viewModel.showMatch,
-                   let match = self.viewModel.match {
-                     MatchView(match)
-                } else {
-                    Text(self.viewModel.currentState)
-                        .font(.body)
-                        .padding(8)
-                    Button() {
-                        self.viewModel.showMatchMakerModal()
-                    } label: {
-                        Text("Create Match")
-                            .primaryButtonStyle()
-                    }
+                Text(self.viewModel.currentState)
+                    .font(.body)
+                    .padding(8)
+                Button() {
+                    self.viewModel.showMatchMakerModal()
+                } label: {
+                    Text("Create Match")
+                        .primaryButtonStyle()
                 }
             }
             .navigationBarTitle(Text("GameKit Matchmaker"))
@@ -49,7 +44,6 @@ struct MatchMakingView: View {
                 self.viewModel.showAlert(title: "Match Making Failed", message: error.localizedDescription)
             } started: { (match) in
                 self.viewModel.showModal = false
-                self.viewModel.match = match
             }
         }
         .alert(isPresented: self.$viewModel.showAlert) {

Sources/GameKitUI/InviteAndMatchManager/GKMatchManager.swift

@@ -80,6 +80,7 @@ public final class GKMatchManager: NSObject {
 
         guard GKLocalPlayer.local.isAuthenticated,
               let matchmakerViewController = GKMatchmakerViewController(invite: invite) else {
+            GKMatchmaker.shared().cancel()
             canceled()
             return nil
         }
@@ -91,6 +92,7 @@ public final class GKMatchManager: NSObject {
     public func createMatchmaker(invite: GKInvite) -> GKMatchmakerViewController? {
         guard GKLocalPlayer.local.isAuthenticated,
               let matchmakerViewController = GKMatchmakerViewController(invite: invite) else {
+            GKMatchmaker.shared().cancel()
             return nil
         }
 
@@ -105,16 +107,20 @@ public final class GKMatchManager: NSObject {
         self.canceled = canceled
         self.failed = failed
         self.started = started
-        
         guard GKLocalPlayer.local.isAuthenticated,
               let matchmakerViewController = GKMatchmakerViewController(matchRequest: request) else {
+            GKMatchmaker.shared().cancel()
             canceled()
             return nil
         }
 
         matchmakerViewController.matchmakerDelegate = self
         return matchmakerViewController
     }
+    
+    public func cancel() {
+        GKMatchmaker.shared().cancel()
+    }
 }
 
 extension GKMatchManager: GKMatchmakerViewControllerDelegate {
@@ -123,7 +129,7 @@ extension GKMatchManager: GKMatchmakerViewControllerDelegate {
         viewController.dismiss(
             animated: true,
             completion: {
-                os_log("Found match!", log: OSLog.matchmaking, type: .info)
+                os_log("Matchmaking successful!", log: OSLog.matchmaking, type: .info)
                 self.match.send(Match(gkMatch: match))
                 self.started(match)
                 viewController.remove()

Sources/GameKitUI/InviteAndMatchManager/Match.swift

@@ -26,7 +26,7 @@
 import GameKit
 
 public struct Match {
-    var gkMatch: GKMatch?
+    public private(set) var gkMatch: GKMatch?
 }
 
 extension Match {

Sources/GameKitUI/Matchmaker/MatchmakerViewController+iOS.swift

@@ -79,7 +79,6 @@ public class MatchmakerViewController: UIViewController, GKMatchDelegate, GKLoca
 
         guard let invite = invite.gkInvite else { return }
 
-        // self.removeAll()
         if let viewController = GKMatchManager.shared.createInvite(invite: invite,
                                                                      canceled: self.canceled,
                                                                      failed: self.failed,