3++

1 year ago · ec38dee3e3
parent d67bd71ca4
commit ec38dee3e3
51 changed files with 143 additions and 203 deletions
--- a/example/lib/presentation/quill/quill_screen.dart
+++ b/example/lib/presentation/quill/quill_screen.dart
@ -3,7 +3,7 @@ import 'dart:convert' show jsonEncode;
 import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:flutter_quill_extensions/flutter_quill_extensions.dart'
-    show FlutterQuillEmbeds, QuillSharedExtensionsConfigurations;
+    show FlutterQuillEmbeds;

 import 'package:quill_html_converter/quill_html_converter.dart';
 import 'package:share_plus/share_plus.dart' show Share;
@ -100,40 +100,28 @@ class _QuillScreenState extends State<QuillScreen> {
          const HomeScreenButton(),
        ],
      ),
-      body: QuillProvider(
-        configurations: const QuillConfigurations(
-          sharedConfigurations: QuillSharedConfigurations(
-            extraConfigurations: {
-              QuillSharedExtensionsConfigurations.key:
-                  QuillSharedExtensionsConfigurations(
-                assetsPrefix: 'assets',
-              ),
+      body: Column(
+        children: [
+          if (!_isReadOnly)
+            MyQuillToolbar(
+              controller: _controller,
+              focusNode: _editorFocusNode,
+            ),
+          Builder(
+            builder: (context) {
+              return Expanded(
+                child: MyQuillEditor(
+                  configurations: QuillEditorConfigurations(
+                    controller: _controller,
+                    readOnly: _isReadOnly,
+                  ),
+                  scrollController: _editorScrollController,
+                  focusNode: _editorFocusNode,
+                ),
+              );
            },
          ),
-        ),
-        child: Column(
-          children: [
-            if (!_isReadOnly)
-              MyQuillToolbar(
-                controller: _controller,
-                focusNode: _editorFocusNode,
-              ),
-            Builder(
-              builder: (context) {
-                return Expanded(
-                  child: MyQuillEditor(
-                    configurations: QuillEditorConfigurations(
-                      controller: _controller,
-                      readOnly: _isReadOnly,
-                    ),
-                    scrollController: _editorScrollController,
-                    focusNode: _editorFocusNode,
-                  ),
-                );
-              },
-            ),
-          ],
-        ),
+        ],
      ),
      floatingActionButton: FloatingActionButton(
        child: Icon(_isReadOnly ? Icons.lock : Icons.edit),
--- a/flutter_quill_extensions/README.md
+++ b/flutter_quill_extensions/README.md
@ -16,6 +16,7 @@ to support embedding widgets like images, formulas, videos, and more.
  - [Embed Blocks](#embed-blocks)
    - [Element properties](#element-properties)
    - [Custom Element properties](#custom-element-properties)
+    - [Image Assets](#image-assets)
    - [Drag and drop feature](#drag-and-drop-feature)
  - [Features](#features)
  - [Contributing](#contributing)
@ -165,6 +166,28 @@ Define flutterAlignment` as follows:

 This works for all platforms except Web

+### Image Assets
+
+If you want to use image assets in the Quill Editor, you need to make sure your assets folder is `assets` otherwise:
+
+```dart
+   QuillProvider(
+     configurations: const QuillConfigurations(
+          sharedConfigurations: QuillSharedConfigurations(
+            extraConfigurations: {
+              QuillSharedExtensionsConfigurations.key:
+                  QuillSharedExtensionsConfigurations(
+                assetsPrefix: 'your-assets-folder-name', // Defaults to assets
+              ),
+            },
+          ),
+        ),
+        child: ...,
+   )
+```
+
+This info is needed by the package to check if it asset image to use the `AssetImage` provider
+
 ### Drag and drop feature
 Currently, the drag-and-drop feature is not officially supported, but you can achieve this very easily in the following steps:

--- a/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart
+++ b/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart
@ -91,9 +91,8 @@ class QuillToolbarFormulaButton extends StatelessWidget {
    }

    return QuillToolbarIconButton(
-      icon: Icon(iconData, size: iconSize, color: iconColor),
+      icon: Icon(iconData, size: iconSize * 1.77, color: iconColor),
      tooltip: tooltip,
-      size: iconSize * 1.77,
      onPressed: () => _sharedOnPressed(context),
      isFilled: false,
    );
--- a/flutter_quill_extensions/lib/embeds/image/editor/image_embed.dart
+++ b/flutter_quill_extensions/lib/embeds/image/editor/image_embed.dart
@ -30,7 +30,7 @@ class QuillEditorImageEmbedBuilder extends EmbedBuilder {
    bool inline,
    TextStyle textStyle,
  ) {
-    assert(!kIsWeb, 'Please provide image EmbedBuilder for Web');
+    // assert(!kIsWeb, 'Please provide image EmbedBuilder for Web');

    final imageSource = standardizeImageUrl(node.value.data);
    final ((imageSize), margin, alignment) = getElementAttributes(node);
--- a/flutter_quill_extensions/lib/embeds/image/editor/image_menu.dart
+++ b/flutter_quill_extensions/lib/embeds/image/editor/image_menu.dart
@ -1,4 +1,5 @@
 import 'package:flutter/cupertino.dart' show showCupertinoModalPopup;
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart'
    show ImageUrl, QuillController, StyleAttribute, getEmbedNode;
@ -130,7 +131,7 @@ class ImageOptionsMenu extends StatelessWidget {
                await configurations.onImageRemovedCallback.call(imageSource);
              },
            ),
-          ...[
+          if (!kIsWeb)
            ListTile(
              leading: const Icon(Icons.save),
              title: Text(context.loc.save),
@ -172,23 +173,22 @@ class ImageOptionsMenu extends StatelessWidget {
                );
              },
            ),
-            ListTile(
-              leading: const Icon(Icons.zoom_in),
-              title: Text(context.loc.zoom),
-              onTap: () => Navigator.pushReplacement(
-                context,
-                MaterialPageRoute(
-                  builder: (_) => ImageTapWrapper(
-                    assetsPrefix: QuillSharedExtensionsConfigurations.get(
-                            context: context)
-                        .assetsPrefix,
-                    imageUrl: imageSource,
-                    configurations: configurations,
-                  ),
+          ListTile(
+            leading: const Icon(Icons.zoom_in),
+            title: Text(context.loc.zoom),
+            onTap: () => Navigator.pushReplacement(
+              context,
+              MaterialPageRoute(
+                builder: (_) => ImageTapWrapper(
+                  assetsPrefix:
+                      QuillSharedExtensionsConfigurations.get(context: context)
+                          .assetsPrefix,
+                  imageUrl: imageSource,
+                  configurations: configurations,
                ),
              ),
            ),
-          ],
+          ),
        ],
      ),
    );
--- a/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart
+++ b/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart
@ -105,11 +105,10 @@ class QuillToolbarImageButton extends StatelessWidget {
    return QuillToolbarIconButton(
      icon: Icon(
        iconData,
-        size: iconSize,
+        size: iconSize * 1.77,
        color: iconColor,
      ),
      tooltip: tooltip,
-      size: iconSize * 1.77,
      isFilled: false,
      onPressed: () => _sharedOnPressed(context),
    );
--- a/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart
+++ b/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart
@ -98,9 +98,8 @@ class QuillToolbarCameraButton extends StatelessWidget {
    final iconColor = iconTheme?.iconUnselectedColor ?? theme.iconTheme.color;

    return QuillToolbarIconButton(
-      icon: Icon(iconData, size: iconSize, color: iconColor),
+      icon: Icon(iconData, size: iconSize * 1.77, color: iconColor),
      tooltip: tooltip,
-      size: iconSize * 1.77,
      isFilled: false,
      // isDesktop(supportWeb: false) ? null :
      onPressed: () => _sharedOnPressed(context),
--- a/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart
+++ b/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart
@ -98,9 +98,8 @@ class QuillToolbarVideoButton extends StatelessWidget {
    }

    return QuillToolbarIconButton(
-      icon: Icon(iconData, size: iconSize, color: iconColor),
+      icon: Icon(iconData, size: iconSize * 1.77, color: iconColor),
      tooltip: tooltip,
-      size: iconSize * 1.77,
      isFilled: false,
      onPressed: () => _sharedOnPressed(context),
    );
--- a/flutter_quill_extensions/lib/flutter_quill_extensions.dart
+++ b/flutter_quill_extensions/lib/flutter_quill_extensions.dart
@ -113,8 +113,8 @@ class FlutterQuillEmbeds {
  ///  videos iframe on the web.
  ///
  static List<EmbedBuilder> editorWebBuilders(
-      {QuillEditorWebImageEmbedConfigurations? imageEmbedConfigurations =
-          const QuillEditorWebImageEmbedConfigurations(),
+      {QuillEditorImageEmbedConfigurations? imageEmbedConfigurations =
+          const QuillEditorImageEmbedConfigurations(),
      QuillEditorWebVideoEmbedConfigurations? videoEmbedConfigurations =
          const QuillEditorWebVideoEmbedConfigurations()}) {
    if (!kIsWeb) {
@ -125,7 +125,7 @@ class FlutterQuillEmbeds {
    }
    return [
      if (imageEmbedConfigurations != null)
-        QuillEditorWebImageEmbedBuilder(
+        QuillEditorImageEmbedBuilder(
          configurations: imageEmbedConfigurations,
        ),
      if (videoEmbedConfigurations != null)
--- a/lib/src/l10n/generated/quill_localizations.dart
+++ b/lib/src/l10n/generated/quill_localizations.dart
@ -634,7 +634,7 @@ abstract class FlutterQuillLocalizations {
  /// No description provided for @takeAPhotoUsingYourCamera.
  ///
  /// In en, this message translates to:
-  /// **'Take a photo using your phone camera'**
+  /// **'Take a photo using your camera'**
  String get takeAPhotoUsingYourCamera;

  /// No description provided for @pasteAPhotoUsingALink.
@ -652,7 +652,7 @@ abstract class FlutterQuillLocalizations {
  /// No description provided for @recordAVideoUsingYourCamera.
  ///
  /// In en, this message translates to:
-  /// **'Record a video using your phone camera'**
+  /// **'Record a video using your camera'**
  String get recordAVideoUsingYourCamera;

  /// No description provided for @pasteAVideoUsingALink.
--- a/lib/src/l10n/generated/quill_localizations_ar.dart
+++ b/lib/src/l10n/generated/quill_localizations_ar.dart
@ -243,8 +243,7 @@ class FlutterQuillLocalizationsAr extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -253,8 +252,7 @@ class FlutterQuillLocalizationsAr extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_bg.dart
+++ b/lib/src/l10n/generated/quill_localizations_bg.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsBg extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsBg extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_bn.dart
+++ b/lib/src/l10n/generated/quill_localizations_bn.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsBn extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsBn extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_cs.dart
+++ b/lib/src/l10n/generated/quill_localizations_cs.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsCs extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsCs extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_da.dart
+++ b/lib/src/l10n/generated/quill_localizations_da.dart
@ -243,8 +243,7 @@ class FlutterQuillLocalizationsDa extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -253,8 +252,7 @@ class FlutterQuillLocalizationsDa extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_de.dart
+++ b/lib/src/l10n/generated/quill_localizations_de.dart
@ -244,8 +244,7 @@ class FlutterQuillLocalizationsDe extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -254,8 +253,7 @@ class FlutterQuillLocalizationsDe extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_en.dart
+++ b/lib/src/l10n/generated/quill_localizations_en.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsEn extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsEn extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_es.dart
+++ b/lib/src/l10n/generated/quill_localizations_es.dart
@ -244,8 +244,7 @@ class FlutterQuillLocalizationsEs extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -254,8 +253,7 @@ class FlutterQuillLocalizationsEs extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_fa.dart
+++ b/lib/src/l10n/generated/quill_localizations_fa.dart
@ -246,8 +246,7 @@ class FlutterQuillLocalizationsFa extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -256,8 +255,7 @@ class FlutterQuillLocalizationsFa extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_fr.dart
+++ b/lib/src/l10n/generated/quill_localizations_fr.dart
@ -247,8 +247,7 @@ class FlutterQuillLocalizationsFr extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -257,8 +256,7 @@ class FlutterQuillLocalizationsFr extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_he.dart
+++ b/lib/src/l10n/generated/quill_localizations_he.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsHe extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsHe extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_hi.dart
+++ b/lib/src/l10n/generated/quill_localizations_hi.dart
@ -246,8 +246,7 @@ class FlutterQuillLocalizationsHi extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -256,8 +255,7 @@ class FlutterQuillLocalizationsHi extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_id.dart
+++ b/lib/src/l10n/generated/quill_localizations_id.dart
@ -247,8 +247,7 @@ class FlutterQuillLocalizationsId extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -257,8 +256,7 @@ class FlutterQuillLocalizationsId extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_it.dart
+++ b/lib/src/l10n/generated/quill_localizations_it.dart
@ -247,8 +247,7 @@ class FlutterQuillLocalizationsIt extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -257,8 +256,7 @@ class FlutterQuillLocalizationsIt extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_ja.dart
+++ b/lib/src/l10n/generated/quill_localizations_ja.dart
@ -242,8 +242,7 @@ class FlutterQuillLocalizationsJa extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -252,8 +251,7 @@ class FlutterQuillLocalizationsJa extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_ko.dart
+++ b/lib/src/l10n/generated/quill_localizations_ko.dart
@ -242,8 +242,7 @@ class FlutterQuillLocalizationsKo extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -252,8 +251,7 @@ class FlutterQuillLocalizationsKo extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_ms.dart
+++ b/lib/src/l10n/generated/quill_localizations_ms.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsMs extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsMs extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_nl.dart
+++ b/lib/src/l10n/generated/quill_localizations_nl.dart
@ -247,8 +247,7 @@ class FlutterQuillLocalizationsNl extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -257,8 +256,7 @@ class FlutterQuillLocalizationsNl extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_no.dart
+++ b/lib/src/l10n/generated/quill_localizations_no.dart
@ -247,8 +247,7 @@ class FlutterQuillLocalizationsNo extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -257,8 +256,7 @@ class FlutterQuillLocalizationsNo extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_pl.dart
+++ b/lib/src/l10n/generated/quill_localizations_pl.dart
@ -244,8 +244,7 @@ class FlutterQuillLocalizationsPl extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -254,8 +253,7 @@ class FlutterQuillLocalizationsPl extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_pt.dart
+++ b/lib/src/l10n/generated/quill_localizations_pt.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsPt extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsPt extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_ru.dart
+++ b/lib/src/l10n/generated/quill_localizations_ru.dart
@ -244,8 +244,7 @@ class FlutterQuillLocalizationsRu extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -254,8 +253,7 @@ class FlutterQuillLocalizationsRu extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_sr.dart
+++ b/lib/src/l10n/generated/quill_localizations_sr.dart
@ -246,8 +246,7 @@ class FlutterQuillLocalizationsSr extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -256,8 +255,7 @@ class FlutterQuillLocalizationsSr extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_sw.dart
+++ b/lib/src/l10n/generated/quill_localizations_sw.dart
@ -244,8 +244,7 @@ class FlutterQuillLocalizationsSw extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -254,8 +253,7 @@ class FlutterQuillLocalizationsSw extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_tk.dart
+++ b/lib/src/l10n/generated/quill_localizations_tk.dart
@ -243,8 +243,7 @@ class FlutterQuillLocalizationsTk extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -253,8 +252,7 @@ class FlutterQuillLocalizationsTk extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_tr.dart
+++ b/lib/src/l10n/generated/quill_localizations_tr.dart
@ -244,8 +244,7 @@ class FlutterQuillLocalizationsTr extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -254,8 +253,7 @@ class FlutterQuillLocalizationsTr extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_uk.dart
+++ b/lib/src/l10n/generated/quill_localizations_uk.dart
@ -246,8 +246,7 @@ class FlutterQuillLocalizationsUk extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -256,8 +255,7 @@ class FlutterQuillLocalizationsUk extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_ur.dart
+++ b/lib/src/l10n/generated/quill_localizations_ur.dart
@ -248,8 +248,7 @@ class FlutterQuillLocalizationsUr extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -258,8 +257,7 @@ class FlutterQuillLocalizationsUr extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_vi.dart
+++ b/lib/src/l10n/generated/quill_localizations_vi.dart
@ -245,8 +245,7 @@ class FlutterQuillLocalizationsVi extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -255,8 +254,7 @@ class FlutterQuillLocalizationsVi extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/generated/quill_localizations_zh.dart
+++ b/lib/src/l10n/generated/quill_localizations_zh.dart
@ -242,8 +242,7 @@ class FlutterQuillLocalizationsZh extends FlutterQuillLocalizations {
  String get pickAPhotoFromYourGallery => 'Pick a photo from your gallery';

  @override
-  String get takeAPhotoUsingYourCamera =>
-      'Take a photo using your phone camera';
+  String get takeAPhotoUsingYourCamera => 'Take a photo using your camera';

  @override
  String get pasteAPhotoUsingALink => 'Paste a photo using a link';
@ -252,8 +251,7 @@ class FlutterQuillLocalizationsZh extends FlutterQuillLocalizations {
  String get pickAVideoFromYourGallery => 'Pick a video from your gallery';

  @override
-  String get recordAVideoUsingYourCamera =>
-      'Record a video using your phone camera';
+  String get recordAVideoUsingYourCamera => 'Record a video using your camera';

  @override
  String get pasteAVideoUsingALink => 'Paste a video using a link';
--- a/lib/src/l10n/quill_en.arb
+++ b/lib/src/l10n/quill_en.arb
@ -79,9 +79,9 @@
  "caseSensitivityAndWholeWordSearch": "Case sensitivity and whole word search",
  "insertImage": "Insert image",
  "pickAPhotoFromYourGallery": "Pick a photo from your gallery",
-  "takeAPhotoUsingYourCamera": "Take a photo using your phone camera",
+  "takeAPhotoUsingYourCamera": "Take a photo using your camera",
  "pasteAPhotoUsingALink": "Paste a photo using a link",
  "pickAVideoFromYourGallery": "Pick a video from your gallery",
-  "recordAVideoUsingYourCamera": "Record a video using your phone camera",
+  "recordAVideoUsingYourCamera": "Record a video using your camera",
  "pasteAVideoUsingALink": "Paste a video using a link"
 }
--- a/lib/src/models/config/toolbar/simple_toolbar_configurations.dart
+++ b/lib/src/models/config/toolbar/simple_toolbar_configurations.dart
@ -48,7 +48,7 @@ const double kDefaultIconSize = 18;
 const double defaultToolbarSize = kDefaultIconSize * 2;

 /// The factor of how much larger the button is in relation to the icon.
-const double kIconButtonFactor = 1.77;
+const double kIconButtonFactor = 1.6;

 /// The horizontal margin between the contents of each toolbar section.
 const double kToolbarSectionSpacing = 4;
--- a/lib/src/widgets/toolbar/buttons/clear_format_button.dart
+++ b/lib/src/widgets/toolbar/buttons/clear_format_button.dart
@ -111,8 +111,7 @@ class QuillToolbarClearFormatButton extends StatelessWidget {

    return QuillToolbarIconButton(
      tooltip: tooltip,
-      size: iconSize * iconButtonFactor,
-      icon: Icon(iconData, size: iconSize, color: iconColor),
+      icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor),
      isFilled: false,
      onPressed: _sharedOnPressed,
      afterPressed: afterButtonPressed,
--- a/lib/src/widgets/toolbar/buttons/custom_button_button.dart
+++ b/lib/src/widgets/toolbar/buttons/custom_button_button.dart
@ -81,7 +81,6 @@ class QuillToolbarCustomButton extends StatelessWidget {
    }

    return QuillToolbarIconButton(
-      size: iconSize * iconButtonFactor,
      icon: options.icon ?? const SizedBox.shrink(),
      isFilled: false,
      tooltip: tooltip,
--- a/lib/src/widgets/toolbar/buttons/history_button.dart
+++ b/lib/src/widgets/toolbar/buttons/history_button.dart
@ -95,10 +95,9 @@ class QuillToolbarHistoryButtonState extends State<QuillToolbarHistoryButton> {
    theme = Theme.of(context);
    return QuillToolbarIconButton(
      tooltip: tooltip,
-      size: iconSize * iconButtonFactor,
      icon: Icon(
        iconData,
-        size: iconSize,
+        size: iconSize * iconButtonFactor,
        color: _canPressed
            ? iconTheme?.iconUnselectedColor ?? theme.iconTheme.color
            : iconTheme?.disabledIconColor ?? theme.disabledColor,
--- a/lib/src/widgets/toolbar/buttons/indent_button.dart
+++ b/lib/src/widgets/toolbar/buttons/indent_button.dart
@ -109,8 +109,7 @@ class QuillToolbarIndentButtonState extends State<QuillToolbarIndentButton> {
    final iconColor = iconTheme?.iconUnselectedColor ?? theme.iconTheme.color;
    return QuillToolbarIconButton(
      tooltip: tooltip,
-      size: iconSize * iconButtonFactor,
-      icon: Icon(iconData, size: iconSize, color: iconColor),
+      icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor),
      isFilled: false,
      onPressed: _sharedOnPressed,
      afterPressed: afterButtonPressed,
--- a/lib/src/widgets/toolbar/buttons/link_style2_button.dart
+++ b/lib/src/widgets/toolbar/buttons/link_style2_button.dart
@ -148,10 +148,9 @@ class _QuillToolbarLinkStyleButton2State
    final isToggled = _getLinkAttributeValue() != null;
    return QuillToolbarIconButton(
      tooltip: tooltip,
-      size: iconSize * iconButtonFactor,
      icon: Icon(
        iconData,
-        size: iconSize,
+        size: iconSize * iconButtonFactor,
        color: isToggled
            ? (iconTheme?.iconSelectedColor ?? theme.primaryIconTheme.color)
            : (iconTheme?.iconUnselectedColor ?? theme.iconTheme.color),
--- a/lib/src/widgets/toolbar/buttons/link_style_button.dart
+++ b/lib/src/widgets/toolbar/buttons/link_style_button.dart
@ -141,10 +141,9 @@ class QuillToolbarLinkStyleButtonState
    final theme = Theme.of(context);
    return QuillToolbarIconButton(
      tooltip: tooltip,
-      size: iconSize * iconButtonFactor,
      icon: Icon(
        iconData,
-        size: iconSize,
+        size: iconSize * iconButtonFactor,
        color: isToggled
            ? (iconTheme?.iconSelectedColor ?? theme.primaryIconTheme.color)
            : (iconTheme?.iconUnselectedColor ?? theme.iconTheme.color),
--- a/lib/src/widgets/toolbar/buttons/quill_icon_button.dart
+++ b/lib/src/widgets/toolbar/buttons/quill_icon_button.dart
@ -6,7 +6,6 @@ class QuillToolbarIconButton extends StatelessWidget {
    required this.icon,
    required this.isFilled,
    this.afterPressed,
-    this.size = 40,
    this.tooltip,
    super.key,
  });
@ -15,7 +14,6 @@ class QuillToolbarIconButton extends StatelessWidget {
  final VoidCallback? afterPressed;
  final Widget icon;

-  final double size;
  final String? tooltip;
  final bool isFilled;

@ -25,7 +23,10 @@ class QuillToolbarIconButton extends StatelessWidget {
      return IconButton.filled(onPressed: onPressed, icon: icon);
    }
    return IconButton(
-      onPressed: onPressed,
+      onPressed: () {
+        onPressed?.call();
+        afterPressed?.call();
+      },
      icon: icon,
    );
  }
--- a/lib/src/widgets/toolbar/buttons/search/search_button.dart
+++ b/lib/src/widgets/toolbar/buttons/search/search_button.dart
@ -116,10 +116,9 @@ class QuillToolbarSearchButton extends StatelessWidget {
      tooltip: tooltip,
      icon: Icon(
        iconData,
-        size: iconSize,
+        size: iconSize * iconButtonFactor,
        color: iconColor,
      ),
-      size: iconSize * iconButtonFactor,
      isFilled: false,
      onPressed: () => _sharedOnPressed(context),
      afterPressed: afterButtonPressed,
--- a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart
+++ b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart
@ -251,8 +251,7 @@ Widget defaultToggleStyleButtonBuilder(
          : (iconTheme?.iconUnselectedColor ?? theme.iconTheme.color)
      : (iconTheme?.disabledIconColor ?? theme.disabledColor);
  return QuillToolbarIconButton(
-    size: iconSize * iconButtonFactor,
-    icon: Icon(icon, size: iconSize, color: iconColor),
+    icon: Icon(icon, size: iconSize * iconButtonFactor, color: iconColor),
    isFilled: isEnabled ? isToggled == true : false,
    onPressed: onPressed,
    afterPressed: afterPressed,