fix: remove item view model

tisfeng · Jan 19, 2024 · ceb5e36 · ceb5e36
1 parent 75d3b56
commit ceb5e36
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift b/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift
@@ -88,7 +88,7 @@ struct DisabledAppTab: View {
     var appListView: some View {
         List(selection: $disabledAppViewModel.selectedAppModels) {
             ForEach(disabledAppViewModel.appModelList, id: \.self) { app in
-                BlockAppItemView(with: app)
+                BlockAppItemView(appModel: app)
                     .tag(app)
             }
             .listRowSeparator(.hidden)
@@ -170,43 +170,32 @@ private struct ListButton: View {
 
 @available(macOS 13.0, *)
 private struct BlockAppItemView: View {
-    @StateObject private var appItemViewModel: AppItemViewModel
-
     @EnvironmentObject var disabledAppViewModel: DisabledAppViewModel
 
-    init(with appModel: EZAppModel) {
-        _appItemViewModel = StateObject(wrappedValue: AppItemViewModel(appModel: appModel))
-    }
+    var appModel: EZAppModel
+
+    @State private var appIcon: NSImage = .init()
+
+    @State private var appName = ""
 
     var body: some View {
         HStack(alignment: .center) {
-            Image(nsImage: appItemViewModel.appIcon ?? NSImage())
+            Image(nsImage: appIcon)
                 .resizable()
                 .scaledToFit()
                 .frame(width: 24, height: 24)
 
-            Text(appItemViewModel.appName)
+            Text(appName)
 
             Spacer()
         }
         .frame(maxWidth: .infinity)
         .contentShape(Rectangle())
         .padding(.vertical, 4)
         .padding(.leading, 6)
-    }
-}
-
-@available(macOS 13.0, *)
-private class AppItemViewModel: ObservableObject {
-    @Published var appIcon: NSImage? = nil
-
-    @Published var appName = ""
-
-    var appModel: EZAppModel
-
-    init(appModel: EZAppModel) {
-        self.appModel = appModel
-        getAppBundleInfo()
+        .onAppear {
+            getAppBundleInfo()
+        }
     }
 
     func getAppBundleInfo() {