refactor

Author: olwang

Examples/Sources/ChatbotExample/ChatbotApp.swift

@@ -10,22 +10,16 @@ import SwiftCrossUI
 @main
 @HotReloadable
 struct ChatbotApp: App {
-    @State private var viewModel = ChatbotViewModel()
+    @SwiftCrossUI.State private var viewModel = ChatbotViewModel()
 
     var body: some Scene {
         WindowGroup("ChatBot") {
             #hotReloadable {
                 NavigationSplitView {
                     // Sidebar content
                     ThreadSidebarView(
-                        threads: Binding(
-                            get: { viewModel.threads },
-                            set: { viewModel.threads = $0 }
-                        ),
-                        selectedThread: Binding(
-                            get: { viewModel.selectedThread },
-                            set: { viewModel.selectedThread = $0 }
-                        ),
+                        threads: viewModel.threadsBinding,
+                        selectedThread: viewModel.selectedThreadBinding,
                         onNewThread: viewModel.createNewThread,
                         onSelectThread: viewModel.selectThread,
                         onDeleteThread: viewModel.deleteThread
@@ -38,14 +32,8 @@ struct ChatbotApp: App {
                     // Settings Overlay
                     if viewModel.showSettings {
                         ChatSettingsDialog(
-                            isPresented: Binding(
-                                get: { viewModel.showSettings },
-                                set: { viewModel.showSettings = $0 }
-                            ),
-                            selectedModel: Binding(
-                                get: { viewModel.selectedLLM },
-                                set: { viewModel.selectedLLM = $0 }
-                            ),
+                            isPresented: viewModel.showSettingsBinding,
+                            selectedModel: viewModel.selectedLLMBinding,
                             openAIService: viewModel.openAIService,
                             apiKeyStorage: viewModel.apiKeyStorage,
                             onSave: viewModel.reloadAPIKey

Examples/Sources/ChatbotExample/ViewModels/ChatbotViewModel.swift

@@ -189,3 +189,49 @@ class ChatbotViewModel: SwiftCrossUI.ObservableObject {
         }
     }
 }
+
+// MARK: - Binding Extensions
+
+extension ChatbotViewModel {
+    var threadsBinding: Binding<[ChatThread]> {
+        Binding(
+            get: { self.threads },
+            set: { self.threads = $0 }
+        )
+    }
+    
+    var selectedThreadBinding: Binding<ChatThread?> {
+        Binding(
+            get: { self.selectedThread },
+            set: { self.selectedThread = $0 }
+        )
+    }
+    
+    var currentMessageBinding: Binding<String> {
+        Binding(
+            get: { self.currentMessage },
+            set: { self.currentMessage = $0 }
+        )
+    }
+    
+    var errorMessageBinding: Binding<String?> {
+        Binding(
+            get: { self.errorMessage },
+            set: { self.errorMessage = $0 }
+        )
+    }
+    
+    var showSettingsBinding: Binding<Bool> {
+        Binding(
+            get: { self.showSettings },
+            set: { self.showSettings = $0 }
+        )
+    }
+    
+    var selectedLLMBinding: Binding<LLM> {
+        Binding(
+            get: { self.selectedLLM },
+            set: { self.selectedLLM = $0 }
+        )
+    }
+}

Examples/Sources/ChatbotExample/Views/ChatSettingsDialog.swift

@@ -19,7 +19,7 @@ struct ModelInfo: Identifiable, Equatable {
 struct ChatSettingsDialog: View {
     @Binding var isPresented: Bool
     @Binding var selectedModel: LLM
-    @State private var model: ChatSettingsViewModel
+    @SwiftCrossUI.State private var model: ChatSettingsViewModel
 
     let onSave: () -> Void
 

Examples/Sources/ChatbotExample/Views/LLMSelectionView.swift

@@ -15,9 +15,9 @@ extension Array {
 
 struct LLMSelectionView: View {
     @Binding var selectedModel: LLM
-    @State private var availableModels: [LLM] = [.gpt4_o, .gpt4_o_mini, .gpt4_turbo, .gpt4, .gpt3_5Turbo]
-    @State private var isLoading = false
-    @State private var errorMessage: String?
+    @SwiftCrossUI.State private var availableModels: [LLM] = [.gpt4_o, .gpt4_o_mini, .gpt4_turbo, .gpt4, .gpt3_5Turbo]
+    @SwiftCrossUI.State private var isLoading = false
+    @SwiftCrossUI.State private var errorMessage: String?
 
     let openAIService: OpenAIService
 

Examples/Sources/ChatbotExample/Views/MainChatView.swift

@@ -30,14 +30,8 @@ struct MainChatView: View {
             // Input area
             if viewModel.isThreadSelected {
                 ChatInputView(
-                    currentMessage: Binding(
-                        get: { viewModel.currentMessage },
-                        set: { viewModel.currentMessage = $0 }
-                    ),
-                    errorMessage: Binding(
-                        get: { viewModel.errorMessage },
-                        set: { viewModel.errorMessage = $0 }
-                    ),
+                    currentMessage: viewModel.currentMessageBinding,
+                    errorMessage: viewModel.errorMessageBinding,
                     isLoading: viewModel.isLoading,
                     messageCount: viewModel.currentThreadMessages.count,
                     onSend: viewModel.sendMessage