Merge remote-tracking branch 'origin/main' into mobile

CHANGELOG.md

@@ -1,14 +1,21 @@
+## 0.1.12
+* chore: minor updates to documentation.
+
+## 0.1.11
+* feat: allow textPadding customization by @simonbengtsson in ([#108](https://github.com/AppFlowy-IO/appflowy-editor/pull/108))
+* fix: nested text node parser by @Xazin ([#115](https://github.com/AppFlowy-IO/appflowy-editor/pull/115))
+
 ## 0.1.10
-* feat: support single asterisk to italic by @Xazin in https://github.com/AppFlowy-IO/appflowy-editor/pull/92
+* feat: support single asterisk to italic by @Xazin in ([#92](https://github.com/AppFlowy-IO/appflowy-editor/pull/92))
-* fix: remove platform check in theme on web by @Xazin in https://github.com/AppFlowy-IO/appflowy-editor/pull/91
+* fix: remove platform check in theme on web by @Xazin in ([#91](https://github.com/AppFlowy-IO/appflowy-editor/pull/91))
-* fix: improves cursor left word delete by @MayurSMahajan in https://github.com/AppFlowy-IO/appflowy-editor/pull/88
+* fix: improves cursor left word delete by @MayurSMahajan in ([#8](https://github.com/AppFlowy-IO/appflowy-editor/pull/88))
-* fix: one overlay entry for selection menu by @Xazin in https://github.com/AppFlowy-IO/appflowy-editor/pull/82
+* fix: one overlay entry for selection menu by @Xazin in ([#82](https://github.com/AppFlowy-IO/appflowy-editor/pull/82))
-* fix: changing heading from one level to another from toolbar by @LucasXu0 in https://github.com/AppFlowy-IO/appflowy-editor/pull/96
+* fix: changing heading from one level to another from toolbar by @LucasXu0 in ([#96](https://github.com/AppFlowy-IO/appflowy-editor/pull/96))
 
 ## 0.1.9
-* feat: dark mode improvement by @hyj1204 in https://github.com/AppFlowy-IO/appflowy-editor/pull/90
+* feat: dark mode improvement by @hyj1204 in ([#90](https://github.com/AppFlowy-IO/appflowy-editor/pull/90))
-* feat: shift+tab to outdent a indented bulletpoint or checkbox. by @MayurSMahajan in https://github.com/AppFlowy-IO/appflowy-editor/pull/63
+* feat: shift+tab to outdent a indented bulletpoint or checkbox. by @MayurSMahajan in ([#63](https://github.com/AppFlowy-IO/appflowy-editor/pull/63))
-* fix: enter to outdent checkbox/bullet lists by @Xazin in https://github.com/AppFlowy-IO/appflowy-editor/pull/84
+* fix: enter to outdent checkbox/bullet lists by @Xazin in ([#84](https://github.com/AppFlowy-IO/appflowy-editor/pull/84))
 
 ## 0.1.8
 * chore: minor updates to documentation.

lib/l10n/intl_en.arb

@@ -101,5 +101,6 @@
   "clearHighlightColor": "clear highlight color",
   "customColor": "custom color",
   "hexValue": "hex value",
-  "opacity": "opacity"
+  "opacity": "opacity",
+  "resetToDefaultColor": "reset to default color"
 }

lib/src/l10n/intl/messages_en.dart

@@ -86,6 +86,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "openLink": MessageLookupByLibrary.simpleMessage("open link"),
         "quote": MessageLookupByLibrary.simpleMessage("Quote"),
         "removeLink": MessageLookupByLibrary.simpleMessage("remove link"),
+        "resetToDefaultColor":
+            MessageLookupByLibrary.simpleMessage("reset to default color"),
         "strikethrough": MessageLookupByLibrary.simpleMessage("Strikethrough"),
         "text": MessageLookupByLibrary.simpleMessage("Text"),
         "textColor": MessageLookupByLibrary.simpleMessage("text color"),

lib/src/l10n/l10n.dart

@@ -221,6 +221,16 @@ class AppFlowyEditorLocalizations {
     );
   }
 
+  /// `Default`
+  String get fontColorDefault {
+    return Intl.message(
+      'Default',
+      name: 'fontColorDefault',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Gray`
   String get fontColorGray {
     return Intl.message(
@@ -311,6 +321,16 @@ class AppFlowyEditorLocalizations {
     );
   }
 
+  /// `Default background`
+  String get backgroundColorDefault {
+    return Intl.message(
+      'Default background',
+      name: 'backgroundColorDefault',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Gray background`
   String get backgroundColorGray {
     return Intl.message(
@@ -581,111 +601,111 @@ class AppFlowyEditorLocalizations {
     );
   }
 
-  /// `Text color`
+  /// `text color`
   String get textColor {
     return Intl.message(
-      'Text color',
+      'text color',
       name: 'textColor',
       desc: '',
       args: [],
     );
   }
 
-  /// `Reset to default color`
+  /// `add your link`
-  String get resetToDefaultColor {
-    return Intl.message(
-      'Reset to default color',
-      name: 'resetToDefaultColor ',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Add your link`
   String get addYourLink {
     return Intl.message(
-      'Add your link',
+      'add your link',
       name: 'addYourLink',
       desc: '',
       args: [],
     );
   }
 
-  /// `Open link`
+  /// `open link`
   String get openLink {
     return Intl.message(
-      'Open link',
+      'open link',
       name: 'openLink',
       desc: '',
       args: [],
     );
   }
 
-  /// `Copy link`
+  /// `copy link`
   String get copyLink {
     return Intl.message(
-      'Copy link',
+      'copy link',
       name: 'copyLink',
       desc: '',
       args: [],
     );
   }
 
-  /// `Remove link`
+  /// `remove link`
   String get removeLink {
     return Intl.message(
-      'Remove link',
+      'remove link',
       name: 'removeLink',
       desc: '',
       args: [],
     );
   }
 
-  /// `Highlight color`
+  /// `highlight color`
   String get highlightColor {
     return Intl.message(
-      'Highlight color',
+      'highlight color',
       name: 'highlightColor',
       desc: '',
       args: [],
     );
   }
 
-  /// `Clear highlight color`
+  /// `clear highlight color`
   String get clearHighlightColor {
     return Intl.message(
-      'Clear highlight color',
+      'clear highlight color',
       name: 'clearHighlightColor',
       desc: '',
       args: [],
     );
   }
 
-  /// `Custom color`
+  /// `custom color`
   String get customColor {
     return Intl.message(
-      'Custom color',
+      'custom color',
       name: 'customColor',
       desc: '',
       args: [],
     );
   }
 
-  /// `Hex value`
+  /// `hex value`
   String get hexValue {
     return Intl.message(
-      'Hex value',
+      'hex value',
       name: 'hexValue',
       desc: '',
       args: [],
     );
   }
 
-  /// `Opacity`
+  /// `opacity`
   String get opacity {
     return Intl.message(
-      'Opacity',
+      'opacity',
-      name: 'Opacity',
+      name: 'opacity',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `reset to default color`
+  String get resetToDefaultColor {
+    return Intl.message(
+      'reset to default color',
+      name: 'resetToDefaultColor',
       desc: '',
       args: [],
     );

lib/src/render/image/image_node_widget.dart

@@ -219,7 +219,7 @@ class ImageNodeWidgetState extends State<ImageNodeWidget> with SelectableMixin {
       padding: const EdgeInsets.only(top: 8.0, bottom: 8.0),
       decoration: BoxDecoration(
         borderRadius: const BorderRadius.all(Radius.circular(4.0)),
-        border: Border.all(width: 1, color: Colors.black),
+        border: Border.all(width: 1, color: Colors.grey),
       ),
       child: const Text('Could not load the image'),
     );

lib/src/render/style/editor_style.dart

@@ -200,6 +200,7 @@ class EditorStyle extends ThemeExtension<EditorStyle> {
     double? lineHeight,
     Color? popupMenuFGColor,
     Color? popupMenuHoverColor,
+    EdgeInsets? textPadding,
   }) {
     return EditorStyle(
       padding: padding ?? this.padding,
@@ -222,7 +223,7 @@ class EditorStyle extends ThemeExtension<EditorStyle> {
           selectionMenuItemSelectedColor ?? this.selectionMenuItemSelectedColor,
       toolbarColor: toolbarColor ?? this.toolbarColor,
       toolbarElevation: toolbarElevation ?? this.toolbarElevation,
-      textPadding: textPadding ?? textPadding,
+      textPadding: textPadding ?? this.textPadding,
       textStyle: textStyle ?? this.textStyle,
       placeholderTextStyle: placeholderTextStyle ?? this.placeholderTextStyle,
       bold: bold ?? this.bold,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: appflowy_editor
 description: A highly customizable rich-text editor for Flutter. The AppFlowy Editor project for AppFlowy and beyond.
-version: 0.1.10
+version: 0.1.12
 homepage: https://github.com/AppFlowy-IO/appflowy-editor
 
 platforms:

test/plugins/markdown/decoder/document_markdown_decoder_test.dart

@@ -196,6 +196,7 @@ void main() async {
   }
 }
 ''';
+
     setUpAll(() {
       TestWidgetsFlutterBinding.ensureInitialized();
     });