From 81dd8f92cf3115c677e1bc14087ca0135f045a05 Mon Sep 17 00:00:00 2001 From: Jonathan Salmon Date: Sat, 3 Sep 2022 20:07:46 +0100 Subject: [PATCH] Removed I from interface names --- example/lib/pages/home_page.dart | 2 +- example/lib/universal_ui/universal_ui.dart | 6 +++--- flutter_quill_extensions/lib/embeds/builders.dart | 6 +++--- flutter_quill_extensions/lib/embeds/toolbar.dart | 2 +- .../lib/flutter_quill_extensions.dart | 2 +- lib/src/widgets/delegate.dart | 10 +--------- lib/src/widgets/editor.dart | 4 ++-- lib/src/widgets/embeds.dart | 4 ++-- lib/src/widgets/raw_editor.dart | 2 +- lib/src/widgets/text_block.dart | 2 +- lib/src/widgets/text_line.dart | 2 +- lib/src/widgets/toolbar.dart | 2 +- 12 files changed, 18 insertions(+), 26 deletions(-) diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart index 45843960..118f4efa 100644 --- a/example/lib/pages/home_page.dart +++ b/example/lib/pages/home_page.dart @@ -398,7 +398,7 @@ class _HomePageState extends State { } } -class NotesEmbedBuilder implements IEmbedBuilder { +class NotesEmbedBuilder implements EmbedBuilder { NotesEmbedBuilder({required this.addEditNote}); Future Function(BuildContext context, {Document? document}) addEditNote; diff --git a/example/lib/universal_ui/universal_ui.dart b/example/lib/universal_ui/universal_ui.dart index b7ec9f5a..54441820 100644 --- a/example/lib/universal_ui/universal_ui.dart +++ b/example/lib/universal_ui/universal_ui.dart @@ -27,7 +27,7 @@ class UniversalUI { var ui = UniversalUI(); -class ImageEmbedBuilderWeb implements IEmbedBuilder { +class ImageEmbedBuilderWeb implements EmbedBuilder { @override String get key => BlockEmbed.imageType; @@ -60,7 +60,7 @@ class ImageEmbedBuilderWeb implements IEmbedBuilder { } } -class VideoEmbedBuilderWeb implements IEmbedBuilder { +class VideoEmbedBuilderWeb implements EmbedBuilder { @override String get key => BlockEmbed.videoType; @@ -92,7 +92,7 @@ class VideoEmbedBuilderWeb implements IEmbedBuilder { } } -List get defaultEmbedBuildersWeb => [ +List get defaultEmbedBuildersWeb => [ ImageEmbedBuilderWeb(), VideoEmbedBuilderWeb(), ]; diff --git a/flutter_quill_extensions/lib/embeds/builders.dart b/flutter_quill_extensions/lib/embeds/builders.dart index a7ed55b0..8e3540c7 100644 --- a/flutter_quill_extensions/lib/embeds/builders.dart +++ b/flutter_quill_extensions/lib/embeds/builders.dart @@ -15,7 +15,7 @@ import 'widgets/image_resizer.dart'; import 'widgets/video_app.dart'; import 'widgets/youtube_video_app.dart'; -class ImageEmbedBuilder implements IEmbedBuilder { +class ImageEmbedBuilder implements EmbedBuilder { @override String get key => BlockEmbed.imageType; @@ -146,7 +146,7 @@ class ImageEmbedBuilder implements IEmbedBuilder { } } -class VideoEmbedBuilder implements IEmbedBuilder { +class VideoEmbedBuilder implements EmbedBuilder { @override String get key => BlockEmbed.videoType; @@ -173,7 +173,7 @@ class VideoEmbedBuilder implements IEmbedBuilder { } } -class FormulaEmbedBuilder implements IEmbedBuilder { +class FormulaEmbedBuilder implements EmbedBuilder { @override String get key => BlockEmbed.formulaType; diff --git a/flutter_quill_extensions/lib/embeds/toolbar.dart b/flutter_quill_extensions/lib/embeds/toolbar.dart index 23623543..10c64f2b 100644 --- a/flutter_quill_extensions/lib/embeds/toolbar.dart +++ b/flutter_quill_extensions/lib/embeds/toolbar.dart @@ -13,7 +13,7 @@ export 'toolbar/video_button.dart'; export 'toolbar/formula_button.dart'; export 'toolbar/camera_button.dart'; -class QuillEmbedToolbar implements IEmbedToolbar { +class QuillEmbedToolbar implements EmbedToolbar { QuillEmbedToolbar({ this.showImageButton = true, this.showVideoButton = true, diff --git a/flutter_quill_extensions/lib/flutter_quill_extensions.dart b/flutter_quill_extensions/lib/flutter_quill_extensions.dart index 74e8affb..c5da4d6f 100644 --- a/flutter_quill_extensions/lib/flutter_quill_extensions.dart +++ b/flutter_quill_extensions/lib/flutter_quill_extensions.dart @@ -10,7 +10,7 @@ export 'embeds/embed_types.dart'; export 'embeds/utils.dart'; class FlutterQuillEmbeds { - static List get builders => [ + static List get builders => [ ImageEmbedBuilder(), VideoEmbedBuilder(), FormulaEmbedBuilder(), diff --git a/lib/src/widgets/delegate.dart b/lib/src/widgets/delegate.dart index 6fdd81af..812277a8 100644 --- a/lib/src/widgets/delegate.dart +++ b/lib/src/widgets/delegate.dart @@ -6,7 +6,7 @@ import 'package:flutter/scheduler.dart'; import '../../flutter_quill.dart'; import 'text_selection.dart'; -typedef EmbedBuilder = Widget Function( +typedef EmbedsBuilder = Widget Function( BuildContext context, QuillController controller, Embed node, @@ -14,14 +14,6 @@ typedef EmbedBuilder = Widget Function( void Function(GlobalKey videoContainerKey)? onVideoInit, ); -typedef CustomEmbedBuilder = Widget Function( - BuildContext context, - QuillController controller, - CustomBlockEmbed block, - bool readOnly, - void Function(GlobalKey videoContainerKey)? onVideoInit, -); - typedef CustomStyleBuilder = TextStyle Function(Attribute attribute); /// Delegate interface for the [EditorTextSelectionGestureDetectorBuilder]. diff --git a/lib/src/widgets/editor.dart b/lib/src/widgets/editor.dart index 39708709..1bb63641 100644 --- a/lib/src/widgets/editor.dart +++ b/lib/src/widgets/editor.dart @@ -182,7 +182,7 @@ class QuillEditor extends StatefulWidget { required QuillController controller, required bool readOnly, Brightness? keyboardAppearance, - Iterable? embedBuilders, + Iterable? embedBuilders, /// The locale to use for the editor toolbar, defaults to system locale /// More at https://github.com/singerdmx/flutter-quill#translation @@ -348,7 +348,7 @@ class QuillEditor extends StatefulWidget { LongPressEndDetails details, TextPosition Function(Offset offset))? onSingleLongTapEnd; - final Iterable? embedBuilders; + final Iterable? embedBuilders; final CustomStyleBuilder? customStyleBuilder; /// The locale to use for the editor toolbar, defaults to system locale diff --git a/lib/src/widgets/embeds.dart b/lib/src/widgets/embeds.dart index 83c1dae8..516a8fcf 100644 --- a/lib/src/widgets/embeds.dart +++ b/lib/src/widgets/embeds.dart @@ -5,7 +5,7 @@ import '../models/themes/quill_dialog_theme.dart'; import '../models/themes/quill_icon_theme.dart'; import 'controller.dart'; -abstract class IEmbedBuilder { +abstract class EmbedBuilder { String get key; Widget build( @@ -17,7 +17,7 @@ abstract class IEmbedBuilder { ); } -abstract class IEmbedToolbar { +abstract class EmbedToolbar { Iterable build(QuillController controller, double toolbarIconSize, QuillIconTheme? iconTheme, QuillDialogTheme? dialogTheme); diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart index 27cea907..9412b042 100644 --- a/lib/src/widgets/raw_editor.dart +++ b/lib/src/widgets/raw_editor.dart @@ -220,7 +220,7 @@ class RawEditor extends StatefulWidget { final ScrollPhysics? scrollPhysics; /// Builder function for embeddable objects. - final EmbedBuilder embedBuilder; + final EmbedsBuilder embedBuilder; final LinkActionPickerDelegate linkActionPickerDelegate; final CustomStyleBuilder? customStyleBuilder; final bool floatingCursorDisabled; diff --git a/lib/src/widgets/text_block.dart b/lib/src/widgets/text_block.dart index cd0d2c36..e4b2990d 100644 --- a/lib/src/widgets/text_block.dart +++ b/lib/src/widgets/text_block.dart @@ -79,7 +79,7 @@ class EditableTextBlock extends StatelessWidget { final bool enableInteractiveSelection; final bool hasFocus; final EdgeInsets? contentPadding; - final EmbedBuilder embedBuilder; + final EmbedsBuilder embedBuilder; final LinkActionPicker linkActionPicker; final ValueChanged? onLaunchUrl; final CustomStyleBuilder? customStyleBuilder; diff --git a/lib/src/widgets/text_line.dart b/lib/src/widgets/text_line.dart index d629485b..8c7d1be2 100644 --- a/lib/src/widgets/text_line.dart +++ b/lib/src/widgets/text_line.dart @@ -45,7 +45,7 @@ class TextLine extends StatefulWidget { final Line line; final TextDirection? textDirection; - final EmbedBuilder embedBuilder; + final EmbedsBuilder embedBuilder; final DefaultStyles styles; final bool readOnly; final QuillController controller; diff --git a/lib/src/widgets/toolbar.dart b/lib/src/widgets/toolbar.dart index 0ba6fd65..9a37a2fe 100644 --- a/lib/src/widgets/toolbar.dart +++ b/lib/src/widgets/toolbar.dart @@ -99,7 +99,7 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget { Map? fontFamilyValues, /// Toolbar items to display for controls of embed blocks - IEmbedToolbar? embedToolbar, + EmbedToolbar? embedToolbar, ///The theme to use for the icons in the toolbar, uses type [QuillIconTheme] QuillIconTheme? iconTheme,