Unify DashboardViewModel instances

2025-12-01 21:02:28 +08:00
parent 4ddfcdb324
commit 714f77dbbf
7 changed files with 47 additions and 42 deletions
@@ -7,7 +7,7 @@ import SwiftUI
    @Environment(\.scenePhase) private var scenePhase
    @EnvironmentObject private var environments: ExtensionEnvironments
    @EnvironmentObject private var profile: ExtensionProfile
-    @StateObject private var coordinator = DashboardViewModel()
+    @ObservedObject private var coordinator: DashboardViewModel
    @State private var cardConfigurationVersion = 0
    #if os(iOS) || os(tvOS)
        @State private var showCardManagement = false
@@ -18,20 +18,25 @@ import SwiftUI

    private let externalCardConfigurationVersion: Int?

-    public init(externalCardConfigurationVersion: Int? = nil) {
+    public init(coordinator: DashboardViewModel, externalCardConfigurationVersion: Int? = nil) {
+        _coordinator = ObservedObject(wrappedValue: coordinator)
        self.externalCardConfigurationVersion = externalCardConfigurationVersion
    }

    public var body: some View {
+        viewContent
+    }
+
+    @ViewBuilder private var viewContent: some View {
        if coordinator.isLoading {
-            ProgressView().onAppear {
-                coordinator.onEmptyProfilesChange = {
-                    environments.emptyProfiles = $0
+            ProgressView()
+            #if os(iOS) || os(tvOS)
+                .onAppear {
+                    Task {
+                        await coordinator.reload()
+                    }
                }
-                Task {
-                    await coordinator.reload()
-                }
-            }
+            #endif
        } else {
            content.onAppear {
                guard !ApplicationLibrary.inPreview, profile.status.isConnected else {
@@ -40,8 +45,7 @@ import SwiftUI
                Task {
                    await coordinator.reloadSystemProxy()
                }
-            }.onChangeCompat(of: profile.status) {
-                status in
+            }.onChangeCompat(of: profile.status) { status in
                guard !ApplicationLibrary.inPreview, status == .connected else {
                    return
                }
@@ -77,25 +81,21 @@ import SwiftUI
            } else {
                environments.connect()
            }
-        }.onChangeCompat(of: scenePhase) {
-            phase in
+        }.onChangeCompat(of: scenePhase) { phase in
            guard phase == .active else {
                return
            }
            environments.connect()
-        }.onChangeCompat(of: profile.status) {
-            status in
+        }.onChangeCompat(of: profile.status) { status in
            guard status.isConnected else {
                return
            }
            environments.connect()
-        }.onReceive(environments.profileUpdate) {
-            _ in
+        }.onReceive(environments.profileUpdate) { _ in
            Task {
                await coordinator.reload()
            }
-        }.onReceive(environments.selectedProfileUpdate) {
-            _ in
+        }.onReceive(environments.selectedProfileUpdate) { _ in
            Task {
                await coordinator.updateSelectedProfile()
                if profile.status.isConnected {
@@ -104,20 +104,16 @@ import SwiftUI
            }
        }
        #if os(iOS) || os(tvOS)
-        .onReceive(environments.commandClient.$groups) {
-            _ in
+        .onReceive(environments.commandClient.$groups) { _ in
            updateButtonVisibility()
-        }.onReceive(environments.commandClient.$connections) {
-            _ in
+        }.onReceive(environments.commandClient.$connections) { _ in
            updateButtonVisibility()
-        }.onReceive(profile.$status) {
-            _ in
+        }.onReceive(profile.$status) { _ in
            updateButtonVisibility()
        }.onAppear {
            updateButtonVisibility()
        }
        #endif
-        .alert($coordinator.alert)
    }

    @ViewBuilder private var overviewPage: some View {
@@ -22,6 +22,7 @@ public struct DashboardView: View {
        content
            .onAppear {
                coordinator.setOpenURL { openURL($0) }
+                coordinator.setEnvironments(environments)
                #if os(macOS)
                    Task { await coordinator.reload() }
                #endif
@@ -133,9 +134,9 @@ public struct DashboardView: View {
    @ViewBuilder
    private var activeDashboardView: some View {
        #if os(macOS)
-            ActiveDashboardView(externalCardConfigurationVersion: cardConfigurationVersion)
+            ActiveDashboardView(coordinator: coordinator, externalCardConfigurationVersion: cardConfigurationVersion)
        #else
-            ActiveDashboardView()
+            ActiveDashboardView(coordinator: coordinator)
        #endif
    }
 }
@@ -17,9 +17,13 @@ public final class DashboardViewModel: BaseViewModel {
        @Published public var systemExtensionInstalled = true
    #endif

-    public var onEmptyProfilesChange: ((Bool) -> Void)?
+    private weak var environments: ExtensionEnvironments?
    private var openURL: ((URL) -> Void)?

+    public func setEnvironments(_ environments: ExtensionEnvironments) {
+        self.environments = environments
+    }
+
    override public init() {
        super.init()
        isLoading = true
@@ -55,7 +59,7 @@ public final class DashboardViewModel: BaseViewModel {
            do {
                profileList = try await ProfileManager.list().map { ProfilePreview($0) }
                guard !profileList.isEmpty else {
-                    onEmptyProfilesChange?(true)
+                    environments?.emptyProfiles = true
                    return
                }

@@ -69,7 +73,7 @@ public final class DashboardViewModel: BaseViewModel {
                return
            }
        }
-        onEmptyProfilesChange?(profileList.isEmpty)
+        environments?.emptyProfiles = profileList.isEmpty
    }

    public func reloadSystemProxy() async {