fix: operate on view model instead of view

Author: eagleoflqj

keyboard/KeyboardViewController.swift

@@ -35,7 +35,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
       (textDocumentProxy.documentContextBeforeInput ?? "")
       + (textDocumentProxy.selectedText ?? "")
       + (textDocumentProxy.documentContextAfterInput ?? "")
-    virtualKeyboardView.setTextIsEmpty(text.isEmpty)
+    vm.setTextIsEmpty(text.isEmpty)
   }
 
   override func updateViewConstraints() {
@@ -57,7 +57,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
     startFcitx(appBundlePath, "\(Bundle.main.bundlePath)/share", appGroup.path)
 
     // Must recreate SwiftUI view, otherwise rotating may have old height which can't be updated.
-    hostingController = UIHostingController(rootView: newVirtualKeyboardView())
+    hostingController = UIHostingController(rootView: VirtualKeyboardView())
     hostingController.view.translatesAutoresizingMaskIntoConstraints = false
 
     // Spotlight shows that system keyboard has transparent background.
@@ -83,14 +83,14 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
 
     hostingController.didMove(toParent: self)
 
-    virtualKeyboardView.setReturnKeyType(textDocumentProxy.returnKeyType)
+    vm.setReturnKeyType(textDocumentProxy.returnKeyType)
     super.viewWillAppear(animated)
     let keyboard = Bundle.main.bundleURL.deletingPathExtension().lastPathComponent
     if removeFile(appGroupTmp.appendingPathComponent("\(keyboard).reload")) {
       logger.info("Reload accepted")
       reload()
     }
-    virtualKeyboardView.setDisplayMode(.initial)
+    vm.setDisplayMode(.initial)
     self.resetInput()  // Avoid old context carried over, since focusOut is dummy.
     focusIn()
   }

uipanel/ContextMenu.swift

@@ -111,7 +111,7 @@ struct LongPressMeasureModifier: ViewModifier {
               if items.isEmpty {
                 return
               }
-              virtualKeyboardView.showContextMenu(frame, items)
+              vm.showContextMenu(frame, items)
             }
         }
       }

uipanel/Key.swift

@@ -45,7 +45,7 @@ struct KeyView: View {
         shadow: getShadow(colorScheme),
         action: GestureAction(
           onTap: {
-            virtualKeyboardView.resetLayerIfNotLocked()
+            vm.resetLayerIfNotLocked()
             client.keyPressed(key, "")
           },
           onLongPress: { highlight in
@@ -95,7 +95,7 @@ struct SpaceView: View {
         shadow: getShadow(colorScheme),
         action: GestureAction(
           onTap: {
-            virtualKeyboardView.resetLayerIfNotLocked()
+            vm.resetLayerIfNotLocked()
             client.keyPressed(" ", "")
           },
           onSlide: { step in
@@ -129,7 +129,7 @@ struct BackspaceView: View {
   func startDelete() {
     stopDelete()
     deleteTimer = Timer.scheduledTimer(withTimeInterval: 0.08, repeats: true) { _ in
-      virtualKeyboardView.resetLayerIfNotLocked()
+      vm.resetLayerIfNotLocked()
       client.keyPressed("", "Backspace")
     }
   }
@@ -155,14 +155,14 @@ struct BackspaceView: View {
         shadow: getShadow(colorScheme),
         action: GestureAction(
           onTap: {
-            virtualKeyboardView.resetLayerIfNotLocked()
+            vm.resetLayerIfNotLocked()
             client.keyPressed("", "Backspace")
           },
           onLongPress: { _ in
             startDelete()
           },
           onSlide: { step in
-            virtualKeyboardView.slideBackspace(step)
+            vm.slideBackspace(step)
           },
           onRelease: {
             stopDelete()
@@ -201,22 +201,22 @@ struct GlobeView: View {
         shadow: getShadow(colorScheme),
         action: GestureAction(
           onTap: {
-            virtualKeyboardView.resetLayerIfNotLocked()
+            vm.resetLayerIfNotLocked()
             client.globe()
           },
           onLongPress: { _ in
-            let items = virtualKeyboardView.viewModel.inputMethods.map { inputMethod in
+            let items = vm.inputMethods.map { inputMethod in
               MenuItem(
                 text: inputMethod.displayName,
                 action: {
-                  virtualKeyboardView.resetLayerIfNotLocked()
+                  vm.resetLayerIfNotLocked()
                   client.setCurrentInputMethod(inputMethod.name)
                 })
             }
             if !items.isEmpty {
               let frame = CGRect(
                 x: x, y: y + getBarHeight(totalHeight), width: width, height: height)
-              virtualKeyboardView.showContextMenu(frame, items)
+              vm.showContextMenu(frame, items)
             }
           }
         )
@@ -263,7 +263,7 @@ struct EnterView: View {
           // When !cr && disable, still allow key press, because text empty detection is not reliable.
           // e.g. In WeChat when the first line is empty and caret is there and the second line is not empty,
           // it says text is empty but should be sendable.
-          virtualKeyboardView.resetLayerIfNotLocked()
+          vm.resetLayerIfNotLocked()
           client.keyPressed("\r", "Enter")
         }
       ),
@@ -302,12 +302,12 @@ struct ShiftView: View {
       shadow: getShadow(colorScheme),
       action: GestureAction(
         onPress: {
-          virtualKeyboardView.setLayer(
+          vm.setLayer(
             state == .normal ? "shift" : "default"
           )
         },
         onDoubleTap: {
-          virtualKeyboardView.setLayer("shift", lock: true)
+          vm.setLayer("shift", lock: true)
         }
       )
     )
@@ -331,7 +331,7 @@ struct SymbolKeyView: View {
         shadow: getShadow(colorScheme),
         action: GestureAction(
           onTap: {
-            virtualKeyboardView.setDisplayMode(.symbol)
+            vm.setDisplayMode(.symbol)
           }
         )
       )

uipanel/KeyModifier.swift

@@ -28,7 +28,7 @@ private func getNStep(_ start: CGFloat, _ end: CGFloat, _ step: CGFloat) -> Int
 
 @MainActor
 private func clearBubble() {
-  virtualKeyboardView.setBubble(0, 0, 0, 0, .clear, .light, .clear, nil, [], 0, 0)
+  vm.setBubble(0, 0, 0, 0, .clear, .light, .clear, nil, [], 0, 0)
 }
 
 struct KeyModifier: ViewModifier {
@@ -108,7 +108,7 @@ struct KeyModifier: ViewModifier {
               startLocation = value.startLocation
               lastLocation = value.startLocation.x
 
-              virtualKeyboardView.setBubble(
+              vm.setBubble(
                 bubbleX, bubbleY, bubbleWidth, bubbleHeight,
                 background, colorScheme, shadow,
                 bubbleLabel, [], 0, 0)
@@ -123,7 +123,7 @@ struct KeyModifier: ViewModifier {
                   didTriggerLongPress = true
                   if longPressIndex >= 0 && longPressIndex < longPressLabels.count {
                     bubbleHighlight = longPressIndex
-                    virtualKeyboardView.setBubble(
+                    vm.setBubble(
                       bubbleX, bubbleY, bubbleWidth, bubbleHeight,
                       background, colorScheme, shadow, nil, longPressLabels, longPressIndex,
                       bubbleHighlight)
@@ -153,7 +153,7 @@ struct KeyModifier: ViewModifier {
                 }
                 if didMoveFarEnough {
                   if getSwipeDirection(dx, dy) == .up {
-                    virtualKeyboardView.setBubble(
+                    vm.setBubble(
                       bubbleX, bubbleY, bubbleWidth, bubbleHeight, background, colorScheme,
                       shadow, swipeUpLabel, [], 0, 0)
                   } else {
@@ -185,7 +185,7 @@ struct KeyModifier: ViewModifier {
                 if delta != 0 {
                   bubbleHighlight = max(
                     0, min(bubbleHighlight + delta, longPressLabels.count - 1))
-                  virtualKeyboardView.setBubble(
+                  vm.setBubble(
                     bubbleX, bubbleY, bubbleWidth, bubbleHeight,
                     background, colorScheme, shadow, nil, longPressLabels, longPressIndex,
                     bubbleHighlight)

uipanel/ReturnBar.swift

@@ -8,7 +8,7 @@ struct ReturnBarView: View {
     let barHeight = getBarHeight(totalHeight)
     HStack {
       Button {
-        virtualKeyboardView.popDisplayMode()
+        vm.popDisplayMode()
       } label: {
         Image(systemName: "arrow.backward")
           .foregroundColor(getNormalForeground(colorScheme))

uipanel/Symbol.swift

@@ -103,7 +103,7 @@ struct SymbolView: View {
                     SymbolButton(symbol: symbol) {
                       client.resetInput()
                       client.commitString(symbol)
-                      virtualKeyboardView.popDisplayMode()
+                      vm.popDisplayMode()
                     }
                   }
                 }

uipanel/Toolbar.swift

@@ -11,14 +11,14 @@ struct ToolbarView: View {
     HStack(spacing: width / 6) {
       Spacer()
       Button {
-        virtualKeyboardView.setDisplayMode(.edit)
+        vm.setDisplayMode(.edit)
       } label: {
         Image(systemName: "character.cursor.ibeam")
           .foregroundColor(getNormalForeground(colorScheme))
           .frame(width: barHeight, height: barHeight)
       }
       Button {
-        virtualKeyboardView.setDisplayMode(.statusArea)
+        vm.setDisplayMode(.statusArea)
       } label: {
         Image(systemName: "ellipsis")
           .foregroundColor(getNormalForeground(colorScheme))