fix: keep keyboard appearance as same brightness as system theme

AppFlowy-IO · Jun 29, 2023 · dbf8e0d · dbf8e0d
1 parent ed75bf6
commit dbf8e0d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/lib/src/editor/editor_component/service/ime/delta_input_service.dart b/lib/src/editor/editor_component/service/ime/delta_input_service.dart
@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 abstract class TextInputService {
@@ -27,8 +28,10 @@ abstract class TextInputService {
   /// Updates the [TextEditingValue] of the text currently being edited.
   ///
   /// Note that if there are IME-related requirements,
-  ///   please config `composing` value within [TextEditingValue]
-  void attach(TextEditingValue textEditingValue);
+  /// please config `composing` value within [TextEditingValue]
+  ///
+  /// [BuildContext] is used to get current keyboard appearance(light or dark)
+  void attach(TextEditingValue textEditingValue, BuildContext context);
 
   /// Applies insertion, deletion and replacement
   ///   to the text currently being edited.
@@ -82,16 +85,17 @@ class DeltaTextInputService extends TextInputService with DeltaTextInputClient {
   }
 
   @override
-  void attach(TextEditingValue textEditingValue) {
+  void attach(TextEditingValue textEditingValue, BuildContext context) {
     if (_textInputConnection == null ||
         _textInputConnection!.attached == false) {
       _textInputConnection = TextInput.attach(
         this,
-        const TextInputConfiguration(
+        TextInputConfiguration(
           enableDeltaModel: true,
           inputType: TextInputType.multiline,
           textCapitalization: TextCapitalization.sentences,
           inputAction: TextInputAction.newline,
+          keyboardAppearance: Theme.of(context).brightness,
         ),
       );
     }

diff --git a/lib/src/editor/editor_component/service/ime/non_delta_input_service.dart b/lib/src/editor/editor_component/service/ime/non_delta_input_service.dart
@@ -2,6 +2,7 @@ import 'dart:math';
 
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:appflowy_editor/src/editor/editor_component/service/ime/text_diff.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 class NonDeltaTextInputService extends TextInputService with TextInputClient {
@@ -54,7 +55,10 @@ class NonDeltaTextInputService extends TextInputService with TextInputClient {
   }
 
   @override
-  void attach(TextEditingValue textEditingValue) {
+  void attach(
+    TextEditingValue textEditingValue,
+    BuildContext context,
+  ) {
     final formattedValue = textEditingValue.format();
     if (currentTextEditingValue == formattedValue) {
       return;
@@ -64,11 +68,12 @@ class NonDeltaTextInputService extends TextInputService with TextInputClient {
         _textInputConnection!.attached == false) {
       _textInputConnection = TextInput.attach(
         this,
-        const TextInputConfiguration(
+        TextInputConfiguration(
           enableDeltaModel: false,
           inputType: TextInputType.multiline,
           textCapitalization: TextCapitalization.sentences,
           inputAction: TextInputAction.newline,
+          keyboardAppearance: Theme.of(context).brightness,
         ),
       );
     }

diff --git a/lib/src/editor/editor_component/service/keyboard_service_widget.dart b/lib/src/editor/editor_component/service/keyboard_service_widget.dart
@@ -198,7 +198,10 @@ class KeyboardServiceWidgetState extends State<KeyboardServiceWidget>
   void _attachTextInputService(Selection selection) {
     final textEditingValue = _getCurrentTextEditingValue(selection);
     if (textEditingValue != null) {
-      textInputService.attach(textEditingValue);
+      textInputService.attach(
+        textEditingValue,
+        context,
+      );
       // disable shortcuts when the IME active
       enableShortcuts = textEditingValue.composing == TextRange.empty;
     } else {