Use the new isMacOS()

pull/1437/head
Ahmed Hnewa 2 years ago
parent 51aae46e51
commit 21bab1d21d
No known key found for this signature in database
GPG Key ID: C488CC70BBCEF0D1
  1. 4
      flutter_quill_extensions/pubspec.yaml
  2. 86
      lib/src/widgets/raw_editor.dart

@ -13,6 +13,9 @@ dependencies:
sdk: flutter sdk: flutter
flutter_quill: ^7.4.14 flutter_quill: ^7.4.14
# In case you are working on changes for both libraries,
# flutter_quill:
# path: ~/development/playground/framework_based/flutter/flutter-quill
http: ^1.1.0 http: ^1.1.0
image_picker: ">=1.0.4" image_picker: ">=1.0.4"
@ -29,5 +32,4 @@ dev_dependencies:
sdk: flutter sdk: flutter
pedantic: ^1.11.1 pedantic: ^1.11.1
# The following section is specific to Flutter packages.
flutter: flutter:

@ -539,7 +539,7 @@ class RawEditorState extends EditorState
// so if we ovveride the platform in material app theme data // so if we ovveride the platform in material app theme data
// it will not depend on it and doesn't change here but I don't think // it will not depend on it and doesn't change here but I don't think
// we need to // we need to
final isMacOS = isAppleOS(); final isDesktopMacOS = isMacOS();
return TextFieldTapRegion( return TextFieldTapRegion(
enabled: widget.enableUnfocusOnTapOutside, enabled: widget.enableUnfocusOnTapOutside,
@ -554,125 +554,125 @@ class RawEditorState extends EditorState
): const HideSelectionToolbarIntent(), ): const HideSelectionToolbarIntent(),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyZ, LogicalKeyboardKey.keyZ,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const UndoTextIntent(SelectionChangedCause.keyboard), ): const UndoTextIntent(SelectionChangedCause.keyboard),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyY, LogicalKeyboardKey.keyY,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const RedoTextIntent(SelectionChangedCause.keyboard), ): const RedoTextIntent(SelectionChangedCause.keyboard),
// Selection formatting. // Selection formatting.
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyB, LogicalKeyboardKey.keyB,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ToggleTextStyleIntent(Attribute.bold), ): const ToggleTextStyleIntent(Attribute.bold),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyU, LogicalKeyboardKey.keyU,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ToggleTextStyleIntent(Attribute.underline), ): const ToggleTextStyleIntent(Attribute.underline),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyI, LogicalKeyboardKey.keyI,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ToggleTextStyleIntent(Attribute.italic), ): const ToggleTextStyleIntent(Attribute.italic),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyS, LogicalKeyboardKey.keyS,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
shift: true, shift: true,
): const ToggleTextStyleIntent(Attribute.strikeThrough), ): const ToggleTextStyleIntent(Attribute.strikeThrough),
SingleActivator( SingleActivator(
LogicalKeyboardKey.backquote, LogicalKeyboardKey.backquote,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ToggleTextStyleIntent(Attribute.inlineCode), ): const ToggleTextStyleIntent(Attribute.inlineCode),
SingleActivator( SingleActivator(
LogicalKeyboardKey.tilde, LogicalKeyboardKey.tilde,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
shift: true, shift: true,
): const ToggleTextStyleIntent(Attribute.codeBlock), ): const ToggleTextStyleIntent(Attribute.codeBlock),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyB, LogicalKeyboardKey.keyB,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
shift: true, shift: true,
): const ToggleTextStyleIntent(Attribute.blockQuote), ): const ToggleTextStyleIntent(Attribute.blockQuote),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyK, LogicalKeyboardKey.keyK,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ApplyLinkIntent(), ): const ApplyLinkIntent(),
// Lists // Lists
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyL, LogicalKeyboardKey.keyL,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
shift: true, shift: true,
): const ToggleTextStyleIntent(Attribute.ul), ): const ToggleTextStyleIntent(Attribute.ul),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyO, LogicalKeyboardKey.keyO,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
shift: true, shift: true,
): const ToggleTextStyleIntent(Attribute.ol), ): const ToggleTextStyleIntent(Attribute.ol),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyC, LogicalKeyboardKey.keyC,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
shift: true, shift: true,
): const ApplyCheckListIntent(), ): const ApplyCheckListIntent(),
// Indents // Indents
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyM, LogicalKeyboardKey.keyM,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const IndentSelectionIntent(true), ): const IndentSelectionIntent(true),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyM, LogicalKeyboardKey.keyM,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
shift: true, shift: true,
): const IndentSelectionIntent(false), ): const IndentSelectionIntent(false),
// Headers // Headers
SingleActivator( SingleActivator(
LogicalKeyboardKey.digit1, LogicalKeyboardKey.digit1,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ApplyHeaderIntent(Attribute.h1), ): const ApplyHeaderIntent(Attribute.h1),
SingleActivator( SingleActivator(
LogicalKeyboardKey.digit2, LogicalKeyboardKey.digit2,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ApplyHeaderIntent(Attribute.h2), ): const ApplyHeaderIntent(Attribute.h2),
SingleActivator( SingleActivator(
LogicalKeyboardKey.digit3, LogicalKeyboardKey.digit3,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ApplyHeaderIntent(Attribute.h3), ): const ApplyHeaderIntent(Attribute.h3),
SingleActivator( SingleActivator(
LogicalKeyboardKey.digit0, LogicalKeyboardKey.digit0,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const ApplyHeaderIntent(Attribute.header), ): const ApplyHeaderIntent(Attribute.header),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyG, LogicalKeyboardKey.keyG,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const InsertEmbedIntent(Attribute.image), ): const InsertEmbedIntent(Attribute.image),
SingleActivator( SingleActivator(
LogicalKeyboardKey.keyF, LogicalKeyboardKey.keyF,
control: !isMacOS, control: !isDesktopMacOS,
meta: isMacOS, meta: isDesktopMacOS,
): const OpenSearchIntent(), ): const OpenSearchIntent(),
}, { }, {
...?widget.customShortcuts ...?widget.customShortcuts

Loading…
Cancel
Save