RepoVM 和 UserVM 改成 Observable

Author: ming1016

SwiftPamphletApp/GitHubAPI/DetailView/RepoView.swift

@@ -12,7 +12,7 @@ struct RepoView: View {
         case normal, readme
     }
     @EnvironmentObject var appVM: AppVM
-    @StateObject var vm: RepoVM
+    @State var vm: RepoVM
     @State private var tabSelct = 1
     @State var type: EnterType = .normal
     var isShowRepoCommitsLink = true

SwiftPamphletApp/GitHubAPI/DetailView/UserView.swift

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct UserView: View {
     @EnvironmentObject var appVM: AppVM
-    @StateObject var vm: UserVM
+    @State var vm: UserVM
     var isShowUserEventLink = true
     var isCleanUnread = false
     @State private var unReadCount = 0

SwiftPamphletApp/GitHubAPI/VM/RepoVM.swift

@@ -8,19 +8,21 @@
 import Foundation
 import Combine
 
+@Observable
 final class RepoVM: APIVMable {
     private var cancellables: [AnyCancellable] = []
 
+    @ObservationIgnored
     public let repoName: String
 
-    @Published private(set) var repo: RepoModel
-    @Published private(set) var commits: [CommitModel]
-    @Published private(set) var issueEvents: [IssueEventModel]
-    @Published private(set) var issues: [IssueModel]
-    @Published private(set) var readme: RepoContent
+    var repo: RepoModel
+    var commits: [CommitModel]
+    var issueEvents: [IssueEventModel]
+    var issues: [IssueModel]
+    var readme: RepoContent
 
-    @Published var errHint = false
-    @Published var errMsg = ""
+    var errHint = false
+    var errMsg = ""
     private let errSj = PassthroughSubject<APISevError, Never>()
 
     private let apiSev: APISev

SwiftPamphletApp/GitHubAPI/VM/UserVM.swift

@@ -8,18 +8,21 @@
 import Foundation
 import Combine
 import AppKit
+import Observation
 
+@Observable
 final class UserVM: APIVMable {
     private var cancellables: [AnyCancellable] = []
 
+    @ObservationIgnored
     public let userName: String
 
-    @Published private(set) var user: UserModel
-    @Published private(set) var events: [EventModel]
-    @Published private(set) var receivedEvents: [EventModel]
+    var user: UserModel
+    var events: [EventModel]
+    var receivedEvents: [EventModel]
 
-    @Published var errHint = false
-    @Published var errMsg = ""
+    var errHint = false
+    var errMsg = ""
     private let errSj = PassthroughSubject<APISevError, Never>()
 
     private let apiSev: APISev