[Optimize] Migrate from ObservableObject to @observable

Kyle-Ye · Kyle-Ye · commit 379504e7f384 · 2023-11-06T23:36:00.000+08:00
diff --git a/MenuHelper.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MenuHelper.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/MenuHelper/Store/CoffieStoreView.swift b/MenuHelper/Store/CoffieStoreView.swift
@@ -9,7 +9,7 @@ import StoreKit
 import SwiftUI
 
 struct CoffieStoreView: View {
-    @EnvironmentObject var store: Store
+    @Environment(Store.self) var store
     let coffies: [Product]
     let onPurchase: (Product) -> Void
 
@@ -51,6 +51,6 @@ struct CoffieStoreView_Previews: PreviewProvider {
         CoffieStoreView(coffies: []) {
             print($0.displayName + $0.displayPrice)
         }
-        .environmentObject(Store())
+        .environment(Store())
     }
 }
diff --git a/MenuHelper/Store/CoffieView.swift b/MenuHelper/Store/CoffieView.swift
@@ -10,7 +10,7 @@ import SwiftUI
 
 struct CoffieView: View {
     @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var store: Store
+    @Environment(Store.self) var store
     @State private var errorTitle = ""
     @State private var isShowingError = false
 
diff --git a/MenuHelper/Store/Store.swift b/MenuHelper/Store/Store.swift
@@ -15,9 +15,10 @@ enum StoreError: Error {
     case failedVerification
 }
 
-class Store: ObservableObject {
-    @Published private(set) var coffies: [Product] = []
-    @Published private(set) var purchased = false
+@Observable
+final class Store {
+    private(set) var coffies: [Product] = []
+    private(set) var purchased = false
     var updateListenerTask: Task<Void, any Error>?
 
     private let storage = NSUbiquitousKeyValueStore.default
diff --git a/MenuHelper/View/AppMenuItemView.swift b/MenuHelper/View/AppMenuItemView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct AppMenuItemView: View {
-    @EnvironmentObject var store: MenuItemStore
+    @Environment(MenuItemStore.self) var store
     @State private var editingItem = false
     var item: AppMenuItem
 
@@ -29,14 +29,14 @@ struct AppMenuItemView: View {
         }
         .sheet(isPresented: $editingItem, onDismiss: nil) {
             AppMenuItemEditor(item: item, index: store.appItems.firstIndex(of: item))
-                .environmentObject(store)
+                .environment(store)
         }
     }
 }
 
 struct AppMenuItemView_Previews: PreviewProvider {
     static var previews: some View {
         AppMenuItemView(item: .xcode!)
-            .environmentObject(MenuItemStore())
+            .environment(MenuItemStore())
     }
 }
diff --git a/MenuHelper/View/Editor/AppMenuItemEditor.swift b/MenuHelper/View/Editor/AppMenuItemEditor.swift
@@ -9,7 +9,7 @@ import SwiftUI
 
 struct AppMenuItemEditor: View {
     @Environment(\.dismiss) private var dismiss
-    @EnvironmentObject var store: MenuItemStore
+    @Environment(MenuItemStore.self) private var store
 
     @State var item: AppMenuItem
     @State private var argumentString: String = ""
@@ -98,6 +98,6 @@ struct AppMenuItemEditor: View {
 struct AppMenuItemEditor_Previews: PreviewProvider {
     static var previews: some View {
         AppMenuItemEditor(item: AppMenuItem(bundleIdentifier: "com.apple.dt.Xcode")!)
-            .environmentObject(MenuItemStore())
+            .environment(MenuItemStore())
     }
 }
diff --git a/MenuHelper/View/SettingView/FolderSettingTab.swift b/MenuHelper/View/SettingView/FolderSettingTab.swift
@@ -10,7 +10,7 @@ import enum Settings.Settings
 import SwiftUI
 
 struct FolderSettingTab: View {
-    @ObservedObject var store: FolderItemStore
+    var store: FolderItemStore
     @State private var isExpanded = false
 
     var body: some View {
@@ -25,6 +25,7 @@ struct FolderSettingTab: View {
         }
     }
 
+    @MainActor
     var openSection: Settings.Section {
         Settings.Section(bottomDivider: true, verticalAlignment: .top) {
             EmptyView()
@@ -77,6 +78,7 @@ struct FolderSettingTab: View {
         }
     }
 
+    @MainActor
     var syncSection: Settings.Section {
         Settings.Section {
             EmptyView()
diff --git a/MenuHelper/View/SettingView/GeneralSettingTab.swift b/MenuHelper/View/SettingView/GeneralSettingTab.swift
@@ -74,7 +74,7 @@ struct GeneralSettingTab: View {
     @AppStorage(Key.newFileExtension)
     private var newFileExtension = NewFileExtension.none
 
-    @ObservedObject var menuItemStore: MenuItemStore
+    var menuItemStore: MenuItemStore
 
     @State private var model = GeneralSettingTabState()
 
diff --git a/MenuHelper/View/SettingView/MenuSettingTab.swift b/MenuHelper/View/SettingView/MenuSettingTab.swift
@@ -37,7 +37,7 @@ class MenuSettingTabState {
 }
 
 struct MenuSettingTab: View {
-    @ObservedObject var store: MenuItemStore
+    var store: MenuItemStore
     @State private var isDrogTargeted = false
     @State private var appMenuItemEdited = false
 
@@ -50,6 +50,7 @@ struct MenuSettingTab: View {
         }
     }
 
+    @MainActor
     var appItemSection: Settings.Section {
         Settings.Section(bottomDivider: true, verticalAlignment: .top) {
             EmptyView()
@@ -78,7 +79,7 @@ struct MenuSettingTab: View {
                     }
                     ForEach(store.appItems) { item in
                         AppMenuItemView(item: item)
-                            .environmentObject(store)
+                            .environment(store)
                     }
                     .onDelete { store.deleteAppItems(offsets: $0) }
                     .onMove { store.moveAppItems(from: $0, to: $1) }
@@ -103,6 +104,7 @@ struct MenuSettingTab: View {
         }
     }
 
+    @MainActor
     var actionItemSection: Settings.Section {
         Settings.Section {
             EmptyView()
diff --git a/MenuHelper/View/SettingView/SettingView.swift b/MenuHelper/View/SettingView/SettingView.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct SettingView: View {
-    @StateObject var menuItemStore = MenuItemStore()
-    @StateObject var folderItemStore = FolderItemStore()
+    @State var menuItemStore = MenuItemStore()
+    @State var folderItemStore = FolderItemStore()
 
     var body: some View {
         TabView {
diff --git a/MenuHelper/Windows/SupportWindow.swift b/MenuHelper/Windows/SupportWindow.swift
@@ -9,11 +9,11 @@ import Foundation
 import SwiftUI
 
 struct SupportWindow: View {
-    @StateObject var store = Store()
+    @State var store = Store()
 
     var body: some View {
         CoffieStoreView(coffies: store.coffies) { _ in }
-            .environmentObject(store)
+            .environment(store)
     }
 }
 
diff --git a/Shared/ViewModel/FolderItemStore.swift b/Shared/ViewModel/FolderItemStore.swift
@@ -12,9 +12,10 @@ import SwiftUI
 
 private let logger = Logger(subsystem: subsystem, category: "folder_item_store")
 
-class FolderItemStore: ObservableObject {
-    @Published private(set) var bookmarkItems: [BookmarkFolderItem] = []
-    @Published private(set) var syncItems: [SyncFolderItem] = []
+@Observable
+final class FolderItemStore: Sendable {
+    private(set) var bookmarkItems: [BookmarkFolderItem] = []
+    private(set) var syncItems: [SyncFolderItem] = []
 
     // MARK: - Init
 
@@ -82,23 +83,28 @@ class FolderItemStore: ObservableObject {
         try? save()
     }
 
-    @MainActor func deleteAllBookmarkItems() {
+    func deleteAllBookmarkItems() {
         withAnimation {
             bookmarkItems.removeAll()
         }
-        try? save()
+        Task.detached {
+            try await self.save()
+        }
     }
 
-    @MainActor func deleteAllSyncItems() {
+    func deleteAllSyncItems() {
         withAnimation {
             syncItems.removeAll()
         }
-        try? save()
+        Task.detached {
+            try await self.save()
+        }
     }
 
     // MARK: - UserDefaults
 
-    @MainActor private func load() throws {
+    @MainActor
+    private func load() throws {
         if let bookmarkItemData = UserDefaults.group.data(forKey: "BOOKMARK_ITEMS"),
            let syncItemData = UserDefaults.group.data(forKey: "SYNC_ITEMS") {
             let decoder = PropertyListDecoder()
@@ -115,6 +121,7 @@ class FolderItemStore: ObservableObject {
         }
     }
 
+    @MainActor
     private func save() throws {
         let encoder = PropertyListEncoder()
         let bookmarkItemData = try encoder.encode(OrderedSet(bookmarkItems))
diff --git a/Shared/ViewModel/MenuItemStore.swift b/Shared/ViewModel/MenuItemStore.swift
@@ -8,9 +8,10 @@
 import OrderedCollections
 import SwiftUI
 
-@MainActor class MenuItemStore: ObservableObject {
-    @Published private(set) var appItems: [AppMenuItem] = []
-    @Published private(set) var actionItems: [ActionMenuItem] = []
+@Observable
+class MenuItemStore {
+    private(set) var appItems: [AppMenuItem] = []
+    private(set) var actionItems: [ActionMenuItem] = []
 
     // MARK: - Init
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import StoreKit`
`9`	`9`	`import SwiftUI`
`10`	`10`
`11`	`11`	`struct CoffieStoreView: View {`
`12`		`- @EnvironmentObject var store: Store`
	`12`	`+ @Environment(Store.self) var store`
`13`	`13`	`let coffies: [Product]`
`14`	`14`	`let onPurchase: (Product) -> Void`
`15`	`15`
`@@ -51,6 +51,6 @@ struct CoffieStoreView_Previews: PreviewProvider {`
`51`	`51`	`CoffieStoreView(coffies: []) {`
`52`	`52`	`print($0.displayName + $0.displayPrice)`
`53`	`53`	`}`
`54`		`- .environmentObject(Store())`
	`54`	`+ .environment(Store())`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`import SwiftUI`
`9`	`9`
`10`	`10`	`struct AppMenuItemView: View {`
`11`		`- @EnvironmentObject var store: MenuItemStore`
	`11`	`+ @Environment(MenuItemStore.self) var store`
`12`	`12`	`@State private var editingItem = false`
`13`	`13`	`var item: AppMenuItem`
`14`	`14`
`@@ -29,14 +29,14 @@ struct AppMenuItemView: View {`
`29`	`29`	`}`
`30`	`30`	`.sheet(isPresented: $editingItem, onDismiss: nil) {`
`31`	`31`	`AppMenuItemEditor(item: item, index: store.appItems.firstIndex(of: item))`
`32`		`- .environmentObject(store)`
	`32`	`+ .environment(store)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`struct AppMenuItemView_Previews: PreviewProvider {`
`38`	`38`	`static var previews: some View {`
`39`	`39`	`AppMenuItemView(item: .xcode!)`
`40`		`- .environmentObject(MenuItemStore())`
	`40`	`+ .environment(MenuItemStore())`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import SwiftUI`
`9`	`9`
`10`	`10`	`struct AppMenuItemEditor: View {`
`11`	`11`	`@Environment(\.dismiss) private var dismiss`
`12`		`- @EnvironmentObject var store: MenuItemStore`
	`12`	`+ @Environment(MenuItemStore.self) private var store`
`13`	`13`
`14`	`14`	`@State var item: AppMenuItem`
`15`	`15`	`@State private var argumentString: String = ""`
`@@ -98,6 +98,6 @@ struct AppMenuItemEditor: View {`
`98`	`98`	`struct AppMenuItemEditor_Previews: PreviewProvider {`
`99`	`99`	`static var previews: some View {`
`100`	`100`	`AppMenuItemEditor(item: AppMenuItem(bundleIdentifier: "com.apple.dt.Xcode")!)`
`101`		`- .environmentObject(MenuItemStore())`
	`101`	`+ .environment(MenuItemStore())`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import enum Settings.Settings`
`10`	`10`	`import SwiftUI`
`11`	`11`
`12`	`12`	`struct FolderSettingTab: View {`
`13`		`- @ObservedObject var store: FolderItemStore`
	`13`	`+ var store: FolderItemStore`
`14`	`14`	`@State private var isExpanded = false`
`15`	`15`
`16`	`16`	`var body: some View {`
`@@ -25,6 +25,7 @@ struct FolderSettingTab: View {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ @MainActor`
`28`	`29`	`var openSection: Settings.Section {`
`29`	`30`	`Settings.Section(bottomDivider: true, verticalAlignment: .top) {`
`30`	`31`	`EmptyView()`
`@@ -77,6 +78,7 @@ struct FolderSettingTab: View {`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
	`81`	`+ @MainActor`
`80`	`82`	`var syncSection: Settings.Section {`
`81`	`83`	`Settings.Section {`
`82`	`84`	`EmptyView()`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class MenuSettingTabState {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`struct MenuSettingTab: View {`
`40`		`- @ObservedObject var store: MenuItemStore`
	`40`	`+ var store: MenuItemStore`
`41`	`41`	`@State private var isDrogTargeted = false`
`42`	`42`	`@State private var appMenuItemEdited = false`
`43`	`43`
`@@ -50,6 +50,7 @@ struct MenuSettingTab: View {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ @MainActor`
`53`	`54`	`var appItemSection: Settings.Section {`
`54`	`55`	`Settings.Section(bottomDivider: true, verticalAlignment: .top) {`
`55`	`56`	`EmptyView()`
`@@ -78,7 +79,7 @@ struct MenuSettingTab: View {`
`78`	`79`	`}`
`79`	`80`	`ForEach(store.appItems) { item in`
`80`	`81`	`AppMenuItemView(item: item)`
`81`		`- .environmentObject(store)`
	`82`	`+ .environment(store)`
`82`	`83`	`}`
`83`	`84`	`.onDelete { store.deleteAppItems(offsets: $0) }`
`84`	`85`	`.onMove { store.moveAppItems(from: $0, to: $1) }`
`@@ -103,6 +104,7 @@ struct MenuSettingTab: View {`
`103`	`104`	`}`
`104`	`105`	`}`
`105`	`106`
	`107`	`+ @MainActor`
`106`	`108`	`var actionItemSection: Settings.Section {`
`107`	`109`	`Settings.Section {`
`108`	`110`	`EmptyView()`