AppVM observable

Author: ming1016

SwiftPamphletApp/AppVM.swift

@@ -9,23 +9,24 @@ import Foundation
 import Combine
 import AppKit
 
-final class AppVM: ObservableObject {
+@Observable
+final class AppVM {
 
-    @Published var alertMsg = "" // 警告信息
-    @Published var webLinkStr = "" // 导航上的外部链接
+    var alertMsg = "" // 警告信息
+    var webLinkStr = "" // 导航上的外部链接
 
     // 开发者动态
-    @Published var devsNotis = [String: Int]()
-    @Published var devsCountNotis = 0
+    var devsNotis = [String: Int]()
+    var devsCountNotis = 0
 
     // MARK: - 库存档
-    @Published var archiveRepos = [SPReposModel]()
+    var archiveRepos = [SPReposModel]()
 
     // MARK: - CCY
     // 探索更多库
-    @Published var expNotis = [String: DBRepoStore]()
-    @Published var expCountNotis = 0
-    @Published var exps = [SPReposModel]()
+    var expNotis = [String: DBRepoStore]()
+    var expCountNotis = 0
+    var exps = [SPReposModel]()
 
     // MARK: - Combine
     private var cc: [AnyCancellable] = []

SwiftPamphletApp/GitHubAPI/DetailView/GuideView.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import Ink
 
 struct GuideView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     var number: Int
     var title: String
     var body: some View {

SwiftPamphletApp/GitHubAPI/DetailView/RepoView.swift

@@ -11,7 +11,7 @@ struct RepoView: View {
     enum EnterType {
         case normal, readme
     }
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     @State var vm: RepoVM
     @State private var tabSelct = 1
     @State var type: EnterType = .normal

SwiftPamphletApp/GitHubAPI/DetailView/RepoWebView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct RepoWebView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     var urlStr: String
     var body: some View {
         WebUIView(urlStr: urlStr)

SwiftPamphletApp/GitHubAPI/DetailView/UserView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct UserView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     @State var vm: UserVM
     var isShowUserEventLink = true
     var isCleanUnread = false

SwiftPamphletApp/GitHubAPI/ListView/ActiveDeveloperListView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct ActiveDeveloperListView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     @State var vm: IssueVM
     var body: some View {
         List {
@@ -49,7 +49,7 @@ struct ActiveDeveloperListView: View {
 // MARK: - 碎视图
 
 struct ActiveDeveloperUnreadLinkView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     var u: ADeveloperModel
     var body: some View {
         if appVM.devsNotis[u.id] ?? 0 > 0 {

SwiftPamphletApp/GitHubAPI/ListView/ExploreRepoListView.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import CodeEditorView
 
 struct ExploreRepoListView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     var showAsGroup: Bool = false
     var isArchive = false
     var body: some View {
@@ -91,7 +91,7 @@ struct ExploreRepoListView: View {
 
 // MARK: - 碎视图
 struct ExpListUnreadLinkView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     var r: ARepoModel
     var body: some View {
         if appVM.expNotis[r.id]?.unRead ?? 0 > 0 {
@@ -106,7 +106,7 @@ struct ExpListUnreadLinkView: View {
 }
 
 struct ExpListLinkView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     var r: ARepoModel
     var rIdArr: [String] {
         r.id.components(separatedBy: "/")

SwiftPamphletApp/GitHubAPI/ListView/IssuesListFromCustomView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct IssuesListFromCustomView: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     @State var vm: IssueVM
     var body: some View {
         List {

SwiftPamphletApp/HomeUI/HomeView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct HomeView: View {
-    @StateObject var appVM = AppVM()
+    @State var appVM = AppVM()
     @State private var selectedDataLinkString: String?
 
     var body: some View {
@@ -17,6 +17,6 @@ struct HomeView: View {
         } detail: {
           DataLink.viewToShow(for: selectedDataLinkString)
         }
-        .environmentObject(appVM)
+        .environment(appVM)
     }
 }

SwiftPamphletApp/SPSidebar.swift

@@ -9,7 +9,7 @@ import SwiftUI
 
 // MARK: - Sidebar
 struct SPSidebar: View {
-    @EnvironmentObject var appVM: AppVM
+    @Environment(AppVM.self) var appVM
     var body: some View {
         List {
             Section("新动态") {

SwiftPamphletApp/SwiftPamphletAppApp.swift

@@ -38,7 +38,7 @@ struct Demo: View {
 
 struct V: View {
 
-    @StateObject var appVM = AppVM()
+    @State var appVM = AppVM()
     @State var isEnterFullScreen: Bool = false // 全屏控制
     var body: some View {
         Button {
@@ -52,7 +52,7 @@ struct V: View {
 
 struct SwiftPamphletApp: View {
 
-    @StateObject var appVM = AppVM()
+    @State var appVM = AppVM()
     @State var networkMonitor = NetworkMonitor()
 
     @State var sb = Set<AnyCancellable>()
@@ -117,7 +117,7 @@ struct SwiftPamphletApp: View {
 
             } // end ToolbarItemGroup
         } // end .toolbar
-        .environmentObject(appVM)
+        .environment(appVM)
         // 网络监控
         .environment(networkMonitor)
         .onChange(of: networkMonitor.hasNetworkConnection, { oldValue, newValue in