Simplify and migrate onboarding screens to SwiftUI

HomeAssistant.xcodeproj/xcshareddata/xcschemes/App-Debug.xcscheme

@@ -47,7 +47,8 @@
       </CodeCoverageTargets>
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "B657A8FB1CA646EB00121384"
@@ -57,7 +58,8 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D03D894120E0BC1800D4F28D"

HomeAssistant.xcodeproj/xcshareddata/xcschemes/Shared-iOS.xcscheme

@@ -54,7 +54,8 @@
       </CodeCoverageTargets>
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D03D894120E0BC1800D4F28D"

HomeAssistant.xcodeproj/xcshareddata/xcschemes/Tests-Unit.xcscheme

@@ -47,7 +47,8 @@
       </CodeCoverageTargets>
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "B657A8FB1CA646EB00121384"
@@ -57,7 +58,8 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D03D894120E0BC1800D4F28D"

Sources/App/Assist/AssistView.swift

@@ -173,7 +173,7 @@ struct AssistView: View {
                 .frame(height: 45)
                 .padding(.horizontal, viewModel.isRecording ? .zero : Spaces.two)
                 .overlay(content: {
-                    RoundedRectangle(cornerRadius: 8)
+                    RoundedRectangle(cornerRadius: CornerRadiusSizes.one)
                         .stroke(.gray)
                 })
                 .opacity(viewModel.isRecording ? 0 : 1)

Sources/App/Onboarding/API/Bonjour.swift

@@ -1,12 +1,17 @@
 import Foundation
-import Shared
 
 public protocol BonjourObserver: AnyObject {
     func bonjour(_ bonjour: Bonjour, didAdd instance: DiscoveredHomeAssistant)
     func bonjour(_ bonjour: Bonjour, didRemoveInstanceWithName name: String)
 }
 
-public class Bonjour: NSObject, NetServiceBrowserDelegate, NetServiceDelegate {
+public protocol BonjourProtocol {
+    var observer: BonjourObserver? { get set }
+    func start()
+    func stop()
+}
+
+public class Bonjour: NSObject, NetServiceBrowserDelegate, NetServiceDelegate, BonjourProtocol {
     public weak var observer: BonjourObserver?
 
     private var browser: NetServiceBrowser

Sources/App/Onboarding/API/OnboardingAuth.swift

@@ -6,10 +6,6 @@ import Shared
 import SwiftUI
 
 class OnboardingAuth {
-    func successController(server: Server?) -> UIViewController {
-        OnboardingPermissionViewControllerFactory.next(server: server)
-    }
-
     func failureController(error: Error) -> UIViewController {
         UIHostingController(rootView: OnboardingErrorView(error: error))
     }

Sources/App/Onboarding/Container/OnboardingNavigationView.swift

@@ -0,0 +1,94 @@
+import Shared
+import SwiftUI
+
+enum OnboardingStyle: Equatable {
+    enum RequiredType: Equatable {
+        case full
+        case permissions
+    }
+
+    case initial
+    case required(RequiredType)
+    case secondary
+
+    var insertsCancelButton: Bool {
+        switch self {
+        case .initial, .required: return false
+        case .secondary: return true
+        }
+    }
+}
+
+enum OnboardingNavigation {
+    public static var requiredOnboardingStyle: OnboardingStyle? {
+        if Current.servers.all.isEmpty {
+            return .required(.full)
+        } else if !OnboardingPermissionHandler.notDeterminedPermissions.isEmpty {
+            return .required(.permissions)
+        } else {
+            return nil
+        }
+    }
+}
+
+struct OnboardingNavigationView: View {
+    static func controller(onboardingStyle: OnboardingStyle) -> UIViewController {
+        OnboardingNavigationView(onboardingStyle: onboardingStyle).embeddedInHostingController()
+    }
+
+    @Environment(\.dismiss) private var dismiss
+    @StateObject public var viewModel = OnboardingNavigationViewModel()
+    public let onboardingStyle: OnboardingStyle
+
+    init(onboardingStyle: OnboardingStyle) {
+        self.onboardingStyle = onboardingStyle
+    }
+
+    var body: some View {
+        NavigationView {
+            Group {
+                switch onboardingStyle {
+                case .initial:
+                    OnboardingWelcomeView(shouldDismissOnboarding: $viewModel.shouldDismiss)
+                case .secondary:
+                    OnboardingServersListView(shouldDismissOnboarding: $viewModel.shouldDismiss)
+                case let .required(type):
+                    switch type {
+                    case .full:
+                        OnboardingWelcomeView(shouldDismissOnboarding: $viewModel.shouldDismiss)
+                    case .permissions:
+                        OnboardingPermissionsNavigationView(onboardingServer: nil)
+                    }
+                }
+            }
+            .navigationViewStyle(.stack)
+            .toolbar {
+                ToolbarItem(placement: .topBarLeading) {
+                    if onboardingStyle.insertsCancelButton {
+                        Button(action: {
+                            closeOnboarding()
+                        }) {
+                            Text(L10n.cancelLabel)
+                        }
+                    }
+                }
+            }
+        }
+        .navigationViewStyle(.stack)
+        .onChange(of: viewModel.shouldDismiss) { newValue in
+            if newValue {
+                closeOnboarding()
+            }
+        }
+    }
+
+    private func closeOnboarding() {
+        if onboardingStyle == .secondary {
+            dismiss()
+        } else {
+            Current.sceneManager.webViewWindowControllerPromise.done { windowController in
+                windowController.setup()
+            }
+        }
+    }
+}

Sources/App/Onboarding/Container/OnboardingNavigationViewModel.swift

@@ -0,0 +1,23 @@
+import Foundation
+import Shared
+
+final class OnboardingNavigationViewModel: ObservableObject {
+    @Published var shouldDismiss: Bool = false
+
+    init() {
+        Current.onboardingObservation.register(observer: self)
+    }
+
+    deinit {
+        Current.onboardingObservation.unregister(observer: self)
+    }
+}
+
+extension OnboardingNavigationViewModel: OnboardingStateObserver {
+    func onboardingStateDidChange(to state: OnboardingState) {
+        guard state == .complete else { return }
+        DispatchQueue.main.async { [weak self] in
+            self?.shouldDismiss = true
+        }
+    }
+}