perf: add updater in Configuration for easy outside use

tisfeng · Jan 28, 2024 · 8a3b626 · 8a3b626
1 parent 8ae30df
commit 8a3b626
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/Easydict/Feature/Configuration/Configuration.swift b/Easydict/Feature/Configuration/Configuration.swift
@@ -57,12 +57,14 @@ let kHideMenuBarIconKey = "EZConfiguration_kHideMenuBarIconKey"
     @DefaultsWrapper(.launchAtStartup)
     var launchAtStartup: Bool
 
+    let updater = GlobalContext.shared.updaterController.updater
+
     var automaticallyChecksForUpdates: Bool {
         get {
-            GlobalContext.shared.updaterController.updater.automaticallyChecksForUpdates
+            updater.automaticallyChecksForUpdates
         }
         set {
-            GlobalContext.shared.updaterController.updater.automaticallyChecksForUpdates = newValue
+            updater.automaticallyChecksForUpdates = newValue
             logSettings(["automatically_checks_for_updates": newValue])
         }
     }

diff --git a/Easydict/NewApp/View/MenuItemView.swift b/Easydict/NewApp/View/MenuItemView.swift
@@ -15,9 +15,7 @@ final class MenuItemStore: ObservableObject {
     @Published var canCheckForUpdates = false
 
     init() {
-        GlobalContext.shared
-            .updaterController
-            .updater
+        Configuration.shared.updater
             .publisher(for: \.canCheckForUpdates)
             .assign(to: &$canCheckForUpdates)
     }
@@ -171,7 +169,7 @@ struct MenuItemView: View {
     private var checkUpdateItem: some View {
         Button("check_updates") {
             NSLog("检查更新")
-            GlobalContext.shared.updaterController.updater.checkForUpdates()
+            Configuration.shared.updater.checkForUpdates()
         }.disabled(!store.canCheckForUpdates)
     }
 

diff --git a/Easydict/NewApp/View/SettingView/Tabs/AboutTab.swift b/Easydict/NewApp/View/SettingView/Tabs/AboutTab.swift
@@ -59,7 +59,7 @@ struct AboutTab: View {
     }
 
     class CheckUpdaterViewModel: ObservableObject {
-        private let updater = GlobalContext.shared.updaterController.updater
+        private let updater = Configuration.shared.updater
 
         @Published var autoChecksForUpdates = true {
             didSet {

diff --git a/Easydict/NewApp/View/SettingView/Tabs/PrivacyTab.swift b/Easydict/NewApp/View/SettingView/Tabs/PrivacyTab.swift
@@ -35,7 +35,6 @@ struct PrivacyTab: View {
     }
 
     @Default(.allowCrashLog) private var allowCollectCrashLog
-
     @Default(.allowAnalytics) private var allowCollectAnalytics
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ struct PrivacyTab: View { @@
         }
         @Default(.allowCrashLog) private var allowCollectCrashLog
         @Default(.allowAnalytics) private var allowCollectAnalytics
     }
@@ Expand Down @@