diff --git a/NearDrop/AppDelegate.swift b/NearDrop/AppDelegate.swift index 1c6c1a4..f147913 100644 --- a/NearDrop/AppDelegate.swift +++ b/NearDrop/AppDelegate.swift @@ -160,9 +160,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele @objc func openWelcomeScreen() { // Create the welcome screen SwiftUI view - let welcomeView = WelcomeScreen { - self.openPlusScreen() - } + let welcomeView = WelcomeScreen(openPlusScreen: openPlusScreen, checkForNetworkIssues: performDeviceToDeviceCheck) // Create an NSWindow to host the SwiftUI view welcomeWindow = NSWindow( diff --git a/NearDrop/TutorialView.swift b/NearDrop/TutorialView.swift index 5b6c098..6acd866 100644 --- a/NearDrop/TutorialView.swift +++ b/NearDrop/TutorialView.swift @@ -165,5 +165,5 @@ func copyToClipboard(_ text: String) { #Preview { - WelcomeScreen(openIAP: {}) + WelcomeScreen(openPlusScreen: {}, checkForNetworkIssues: {}) } diff --git a/NearDrop/WelcomeScreen.swift b/NearDrop/WelcomeScreen.swift index 2af67aa..0f812c2 100644 --- a/NearDrop/WelcomeScreen.swift +++ b/NearDrop/WelcomeScreen.swift @@ -13,7 +13,8 @@ struct WelcomeScreen: View { @AppStorage(UserDefaultsKeys.plusVersion.rawValue) var isPlusVersion = false @Environment(\.colorScheme) var colorScheme - let openIAP: () -> Void + let openPlusScreen: () -> Void + let checkForNetworkIssues: () -> Void @State private var selection: Tabs? = Tabs.receive @@ -85,16 +86,19 @@ struct WelcomeScreen: View { switch selection { case .receive: - TutorialView(title: "WelcomeToQuickDrop", text: "UserManualDescription", showsLicense: true, openIAP: openIAP) + TutorialView(title: "WelcomeToQuickDrop", text: "UserManualDescription", showsLicense: true, openIAP: openPlusScreen) case .send: - TutorialView(title: "SendFiles", text: "SendFilesDescription", showsLicense: false, openIAP: openIAP) + TutorialView(title: "SendFiles", text: "SendFilesDescription", showsLicense: false, openIAP: openPlusScreen) case .troubleshooting: - TutorialView(title: "Troubleshooting", text: "TroubleshootingDescription", showsLicense: false, openIAP: openIAP) + TutorialView(title: "Troubleshooting", text: "TroubleshootingDescription", showsLicense: false, openIAP: openPlusScreen) + .onAppear { + checkForNetworkIssues() + } case .app: - TutorialView(title: "AndroidApp", text: "AndroidAppDescription", showsLicense: false, showsBetaJoinButton: true, openIAP: openIAP) + TutorialView(title: "AndroidApp", text: "AndroidAppDescription", showsLicense: false, showsBetaJoinButton: true, openIAP: openPlusScreen) default: SettingsView() @@ -158,5 +162,5 @@ enum Tabs: CaseIterable { #Preview { - WelcomeScreen(openIAP: {}) + WelcomeScreen(openPlusScreen: {}, checkForNetworkIssues: {}) }