variable enter color

Author: eagleoflqj

fcitx5

@@ -27,6 +27,14 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
   var hostingController: UIHostingController<VirtualKeyboardView>!
   var removedBySlide = ""
 
+  private func updateTextIsEmpty() {
+    let text =
+      (textDocumentProxy.documentContextBeforeInput ?? "")
+      + (textDocumentProxy.selectedText ?? "")
+      + (textDocumentProxy.documentContextAfterInput ?? "")
+    virtualKeyboardView.setTextIsEmpty(text.isEmpty)
+  }
+
   override func updateViewConstraints() {
     super.updateViewConstraints()
 
@@ -99,6 +107,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
 
   override func textDidChange(_ textInput: UITextInput?) {
     // The app has just changed the document's contents, the document context has been updated.
+    updateTextIsEmpty()
   }
 
   public func keyPressed(_ key: String, _ code: String) {
@@ -143,17 +152,18 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
         }
       case "Backspace":
         textDocumentProxy.deleteBackward()
+        updateTextIsEmpty()
       case "End":
         let textAfter = textDocumentProxy.documentContextAfterInput ?? ""
         textDocumentProxy.adjustTextPosition(byCharacterOffset: lengthOfFirstLine(textAfter))
       case "Enter":
-        textDocumentProxy.insertText("\n")  // \r doesn't work in Safari address bar.
+        commitString("\n")  // \r doesn't work in Safari address bar.
       case "Home":
         let textBefore = textDocumentProxy.documentContextBeforeInput ?? ""
         textDocumentProxy.adjustTextPosition(byCharacterOffset: -lengthOfLastLine(textBefore))
       default:
         if !key.isEmpty {
-          textDocumentProxy.insertText(key)
+          commitString(key)
         }
       }
     }
@@ -165,6 +175,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
 
   public func commitString(_ commit: String) {
     textDocumentProxy.insertText(commit)
+    updateTextIsEmpty()
   }
 
   public func setPreedit(_ preedit: String, _ caret: Int) {
@@ -175,6 +186,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
     if let text = textDocumentProxy.selectedText {
       UIPasteboard.general.string = text
       textDocumentProxy.deleteBackward()
+      updateTextIsEmpty()
     }
   }
 
@@ -186,7 +198,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
 
   public func paste() {
     if let text = UIPasteboard.general.string {
-      textDocumentProxy.insertText(text)
+      commitString(text)
     }
   }
 
@@ -208,12 +220,13 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
       for _ in 0..<newRemoval.count {
         textDocumentProxy.deleteBackward()
       }
+      updateTextIsEmpty()
     } else {
       let refillCount = min(step, removedBySlide.count)
       let index = removedBySlide.index(removedBySlide.startIndex, offsetBy: refillCount)
       let refill = String(removedBySlide[..<index])
       removedBySlide = String(removedBySlide[index...])
-      textDocumentProxy.insertText(refill)
+      commitString(refill)
     }
   }
 }

keyboard/KeyboardViewController.swift

@@ -39,6 +39,9 @@ struct CandidateBarView: View {
   let rowItemCount: [Int]
   let batch: Int
   let scrollEnd: Bool
+  let enterLabel: String
+  let enterHighlight: Bool
+  let hasPreedit: Bool
   @Binding var expanded: Bool
   @Binding var pendingScroll: Int
   @State private var visibleRows = Set<Int>()
@@ -172,7 +175,8 @@ struct CandidateBarView: View {
             BackspaceView(width: keyWidth, height: keyHeight)
 
             EnterView(
-              label: NSLocalizedString("return", comment: ""), width: keyWidth, height: keyHeight)
+              label: enterLabel, width: keyWidth, height: keyHeight, cr: hasPreedit,
+              disable: false, highlight: enterHighlight)
           }
         } else {
           Rectangle().frame(width: 1, height: barHeight * expandDividerRatio).foregroundColor(

uipanel/CandidateBar.swift

@@ -28,6 +28,7 @@ struct KeyModifier: ViewModifier {
   let background: Color
   let pressedBackground: Color
   let foreground: Color
+  let pressedForeground: Color
   let shadow: Color
   let action: GestureAction
   let pressedView: (any View)?
@@ -43,7 +44,7 @@ struct KeyModifier: ViewModifier {
     }.frame(width: width - columnGap, height: height - rowGap)
       .background(isPressed ? pressedBackground : background)
       .cornerRadius(keyCornerRadius)
-      .foregroundColor(foreground)
+      .foregroundColor(isPressed ? pressedForeground : foreground)
       .shadow(color: shadow, radius: 0, x: 0, y: 1)
       .condition(topRight != nil) {
         $0.overlay(
@@ -150,12 +151,13 @@ extension View {
 
   func keyProperties(
     width: CGFloat, height: CGFloat, background: Color, pressedBackground: Color, foreground: Color,
-    shadow: Color, action: GestureAction, pressedView: (any View)? = nil, topRight: String? = nil
+    shadow: Color, action: GestureAction, pressedForeground: Color? = nil,
+    pressedView: (any View)? = nil, topRight: String? = nil
   ) -> some View {
     self.modifier(
       KeyModifier(
         width: width, height: height, background: background, pressedBackground: pressedBackground,
-        foreground: foreground,
+        foreground: foreground, pressedForeground: pressedForeground ?? foreground,
         shadow: shadow, action: action, pressedView: pressedView, topRight: topRight
       )
     )
@@ -363,17 +365,42 @@ struct EnterView: View {
   let label: String
   let width: CGFloat
   let height: CGFloat
+  let cr: Bool
+  let disable: Bool
+  let highlight: Bool
 
   var body: some View {
-    Button {
-      virtualKeyboardView.resetLayerIfNotLocked()
-      client.keyPressed("\r", "Enter")
-    } label: {
-      Text(label)
-        .commonContentStyle(
-          width: width, height: height, background: getFunctionBackground(colorScheme),
-          foreground: getNormalForeground(colorScheme))
-    }.commonContainerStyle(width: width, height: height, shadow: getShadow(colorScheme))
+    VStack {
+      if cr {
+        Image(systemName: "return")
+          .resizable()
+          .aspectRatio(contentMode: .fit)
+          .frame(height: height * 0.4)
+      } else {
+        Text(label)
+      }
+    }
+    .keyProperties(
+      width: width, height: height,
+      background: !cr && !disable && highlight
+        ? highlightBackground : getFunctionBackground(colorScheme),
+      pressedBackground: !cr && disable
+        ? getFunctionBackground(colorScheme) : getNormalBackground(colorScheme),
+      foreground: !cr && disable
+        ? disabledForeground
+        : (!cr && highlight ? highlightForeground : getNormalForeground(colorScheme)),
+      shadow: getShadow(colorScheme),
+      action: GestureAction(
+        onTap: {
+          // 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()
+          client.keyPressed("\r", "Enter")
+        }
+      ),
+      pressedForeground: !cr && !disable && highlight ? getNormalForeground(colorScheme) : nil
+    )
   }
 }
 

uipanel/Key.swift

@@ -18,6 +18,9 @@ struct KeyboardView: View {
   let lock: Bool
   let spaceLabel: String
   let enterLabel: String
+  let textIsEmpty: Bool
+  let enterHighlight: Bool
+  let hasPreedit: Bool
   @State private var defaultRows = [[String: Any]]()
   @State private var shiftRows = [[String: Any]]()
 
@@ -81,7 +84,9 @@ struct KeyboardView: View {
             case "globe":
               GlobeView(width: keyWidth, height: height)
             case "enter":
-              EnterView(label: enterLabel, width: keyWidth, height: height)
+              EnterView(
+                label: enterLabel, width: keyWidth, height: height, cr: hasPreedit,
+                disable: textIsEmpty && enterHighlight, highlight: enterHighlight)
             case "shift":
               ShiftView(
                 state: layer == "shift" ? (lock ? .capslock : .shift) : .normal, width: keyWidth,

uipanel/Keyboard.swift

@@ -31,12 +31,16 @@ class ViewModel: ObservableObject {
   @Published var inputMethods = [InputMethod]()
   @Published var spaceLabel = ""
   @Published var enterLabel = ""
+  @Published var enterHighlight = false
+  @Published var textIsEmpty = false
   @Published var layer = "default"
   @Published var lock = false
 
   @Published var frame = CGRect()
   @Published var menuItems = [MenuItem]()
   @Published var showMenu = false
+
+  var hasPreedit: Bool { !preedit.isEmpty || hasClientPreedit }
 }
 
 public struct VirtualKeyboardView: View {
@@ -57,6 +61,9 @@ public struct VirtualKeyboardView: View {
               highlighted: viewModel.highlighted,
               rowItemCount: viewModel.rowItemCount,
               batch: viewModel.batch, scrollEnd: viewModel.scrollEnd,
+              enterLabel: viewModel.enterLabel,
+              enterHighlight: viewModel.enterHighlight,
+              hasPreedit: viewModel.hasPreedit,
               expanded: $viewModel.expanded,
               pendingScroll: $viewModel.pendingScroll)
           }
@@ -70,7 +77,10 @@ public struct VirtualKeyboardView: View {
             KeyboardView(
               width: width, layer: viewModel.layer, lock: viewModel.lock,
               spaceLabel: viewModel.spaceLabel,
-              enterLabel: viewModel.enterLabel)
+              enterLabel: viewModel.enterLabel,
+              textIsEmpty: viewModel.textIsEmpty,
+              enterHighlight: viewModel.enterHighlight,
+              hasPreedit: viewModel.hasPreedit)
           }
         }.background(colorScheme == .dark ? darkBackground : lightBackground)
         if viewModel.showMenu {
@@ -151,7 +161,12 @@ public struct VirtualKeyboardView: View {
     }
   }
 
+  public func setTextIsEmpty(_ isEmpty: Bool) {
+    viewModel.textIsEmpty = isEmpty
+  }
+
   public func setReturnKeyType(_ type: UIReturnKeyType?) {
+    viewModel.enterHighlight = true
     switch type {
     case .done:
       viewModel.enterLabel = NSLocalizedString("done", comment: "")
@@ -165,6 +180,7 @@ public struct VirtualKeyboardView: View {
       viewModel.enterLabel = NSLocalizedString("send", comment: "")
     default:
       viewModel.enterLabel = NSLocalizedString("return", comment: "")
+      viewModel.enterHighlight = false
     }
   }
 
@@ -186,7 +202,7 @@ public struct VirtualKeyboardView: View {
   }
 
   func slideBackspace(_ step: Int) {
-    if !viewModel.preedit.isEmpty || viewModel.hasClientPreedit || !viewModel.candidates.isEmpty {
+    if viewModel.hasPreedit || !viewModel.candidates.isEmpty {
       if step == 0 {
         client.resetInput()
       }

uipanel/VirtualKeyboard.swift

@@ -31,3 +31,8 @@ let darkFunctionBackground = Color(
 let darkShadow = Color(.sRGB, red: 37 / 255.0, green: 37 / 255.0, blue: 37 / 255.0, opacity: 1)
 let darkHighlightBackground = Color(
   .sRGB, red: 67 / 255.0, green: 67 / 255.0, blue: 70 / 255.0, opacity: 1)
+
+let disabledForeground = Color.gray
+let highlightForeground = Color.white
+let highlightBackground = Color(
+  .sRGB, red: 0, green: 122 / 255.0, blue: 1, opacity: 1)