支持monterey

caol64 · Oct 21, 2024 · c0ec902 · c0ec902
1 parent a987371
commit c0ec902
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/WenYan/ContentView.swift b/WenYan/ContentView.swift
@@ -9,13 +9,13 @@ import SwiftUI
 
 struct ContentView: View {
 
-    @State private var markdownViewModel: MarkdownViewModel
-    @State private var htmlViewModel: HtmlViewModel
-    @State private var appState: AppState
+    @ObservedObject private var markdownViewModel: MarkdownViewModel
+    @ObservedObject private var htmlViewModel: HtmlViewModel
+    @ObservedObject private var appState: AppState
 
     init(appState: AppState) {
-        _markdownViewModel = State(initialValue: MarkdownViewModel(appState: appState))
-        _htmlViewModel = State(initialValue: HtmlViewModel(appState: appState))
+        _markdownViewModel = ObservedObject(initialValue: MarkdownViewModel(appState: appState))
+        _htmlViewModel = ObservedObject(initialValue: HtmlViewModel(appState: appState))
         self.appState = appState
     }
 
@@ -129,8 +129,8 @@ struct ContentView: View {
                                 .environment(\.colorScheme, .light)
                         }
                     }
-                    .onChange(of: markdownViewModel.scrollFactor) {
-                        htmlViewModel.scroll(scrollFactor: markdownViewModel.scrollFactor)
+                    .onReceive(markdownViewModel.$scrollFactor) { newScrollFactor in
+                        htmlViewModel.scroll(scrollFactor: newScrollFactor)
                     }
             }
             .background(.white)
@@ -141,8 +141,8 @@ struct ContentView: View {
                 htmlViewModel.content = markdownViewModel.content
             }
         }
-        .onChange(of: markdownViewModel.content) {
-            htmlViewModel.content = markdownViewModel.content
+        .onReceive(markdownViewModel.$content) { newContent in
+            htmlViewModel.content = newContent
             htmlViewModel.onUpdate()
         }
         .toolbar() {
@@ -166,20 +166,24 @@ struct ContentView: View {
 
         var body: some View {
             VStack {
-                List(selection: $htmlViewModel.gzhTheme) {
+                List {
                     ForEach(Platform.gzh.themes, id: \.self) { theme in
                         HStack {
                             Text(theme.name)
                             Spacer()
                             Text(theme.author)
                         }
+                        .background(htmlViewModel.gzhTheme == theme ? Color.gray.opacity(0.3) : Color.clear)
+                        .onTapGesture {
+                            htmlViewModel.gzhTheme = theme
+                        }
                     }
                 }
                 .padding(5)
                 .listStyle(PlainListStyle())
                 .background(Color.clear)
                 .frame(width: menuWidth, height: menuHeight)
-                .onChange(of: htmlViewModel.gzhTheme) {
+                .onReceive(htmlViewModel.$gzhTheme) { _ in
                     htmlViewModel.changeTheme()
                 }
             }

diff --git a/WenYan/WenYanApp.swift b/WenYan/WenYanApp.swift
@@ -11,7 +11,7 @@ import SwiftData
 @main
 struct WenYanApp: App {
 
-    @State private var appState = AppState()
+    @ObservedObject private var appState = AppState()
 
     var body: some Scene {
         WindowGroup {