Fix the structure of flutter quill extensions, fix context use

singerdmx · Dec 30, 2023 · 6e4afb2 · 6e4afb2
1 parent 788a9c6
commit 6e4afb2
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 32 deletions.
diff --git a/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart b/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 
-import '../../../models/config/toolbar/buttons/formula_configurations.dart';
+import '../../../models/config/formula/formula_configurations.dart';
 
 class QuillToolbarFormulaButton extends StatelessWidget {
   const QuillToolbarFormulaButton({

diff --git a/flutter_quill_extensions/lib/embeds/image/editor/image_embed.dart b/flutter_quill_extensions/lib/embeds/image/editor/image_embed.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart' hide OptionalSize;
 import 'package:flutter_quill/translations.dart';
 
-import '../../../models/config/editor/image/image_configurations.dart';
+import '../../../models/config/image/editor/image_configurations.dart';
 import '../../../models/config/shared_configurations.dart';
 import '../../../utils/element_utils/element_utils.dart';
 import '../../widgets/image.dart';

diff --git a/flutter_quill_extensions/lib/embeds/image/editor/image_menu.dart b/flutter_quill_extensions/lib/embeds/image/editor/image_menu.dart
@@ -6,7 +6,7 @@ import 'package:flutter_quill/flutter_quill.dart'
 import 'package:flutter_quill/translations.dart';
 import 'package:super_clipboard/super_clipboard.dart';
 
-import '../../../models/config/editor/image/image_configurations.dart';
+import '../../../models/config/image/editor/image_configurations.dart';
 import '../../../models/config/shared_configurations.dart';
 import '../../../services/image_saver/s_image_saver.dart';
 import '../../../utils/element_utils/element_utils.dart';

diff --git a/flutter_quill_extensions/lib/embeds/image/editor/image_web_embed.dart b/flutter_quill_extensions/lib/embeds/image/editor/image_web_embed.dart
@@ -3,7 +3,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:universal_html/html.dart' as html;
 
-import '../../../models/config/editor/image/image_web_configurations.dart';
+import '../../../models/config/image/editor/image_web_configurations.dart';
 import '../../../utils/dart_ui/dart_ui_fake.dart'
     if (dart.library.html) '../../../utils/dart_ui/dart_ui_real.dart' as ui;
 import '../../../utils/element_utils/element_web_utils.dart';

diff --git a/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart b/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart
@@ -5,7 +5,7 @@ import 'package:flutter_quill/flutter_quill.dart';
 import 'package:flutter_quill/translations.dart';
 
 import '../../../models/config/shared_configurations.dart';
-import '../../../models/config/toolbar/buttons/image_configurations.dart';
+import '../../../models/config/image/toolbar/image_configurations.dart';
 import '../../../services/image_picker/image_picker.dart';
 import '../../others/image_video_utils.dart';
 import '../editor/image_embed_types.dart';

diff --git a/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart b/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart
@@ -11,7 +11,7 @@ import 'package:flutter_quill/flutter_quill.dart'
 import 'package:flutter_quill/translations.dart';
 
 import '../../../models/config/shared_configurations.dart';
-import '../../../models/config/toolbar/buttons/camera_configurations.dart';
+import '../../../models/config/camera/camera_configurations.dart';
 import '../../../services/image_picker/image_options.dart';
 import 'camera_types.dart';
 import 'select_camera_action.dart';

diff --git a/flutter_quill_extensions/lib/embeds/video/editor/video_embed.dart b/flutter_quill_extensions/lib/embeds/video/editor/video_embed.dart
@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 
-import '../../../models/config/editor/video/video_configurations.dart';
+import '../../../models/config/video/editor/video_configurations.dart';
 import '../../../utils/element_utils/element_utils.dart';
 import '../../../utils/utils.dart';
 import '../../widgets/video_app.dart';

diff --git a/flutter_quill_extensions/lib/embeds/video/editor/video_web_embed.dart b/flutter_quill_extensions/lib/embeds/video/editor/video_web_embed.dart
@@ -4,7 +4,7 @@ import 'package:universal_html/html.dart' as html;
 import 'package:youtube_player_flutter/youtube_player_flutter.dart'
     show YoutubePlayer;
 
-import '../../../models/config/editor/video/video_web_configurations.dart';
+import '../../../models/config/video/editor/video_web_configurations.dart';
 import '../../../utils/dart_ui/dart_ui_fake.dart'
     if (dart.library.html) '../../../utils/dart_ui/dart_ui_real.dart' as ui;
 import '../../../utils/element_utils/element_web_utils.dart';

diff --git a/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart b/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart
@@ -1,11 +1,9 @@
-// ignore_for_file: use_build_context_synchronously
-
 import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:flutter_quill/translations.dart';
 
 import '../../../models/config/shared_configurations.dart';
-import '../../../models/config/toolbar/buttons/video_configurations.dart';
+import '../../../models/config/video/toolbar/video_configurations.dart';
 import '../../../services/image_picker/image_options.dart';
 import '../../others/image_video_utils.dart';
 import '../video.dart';
@@ -141,7 +139,8 @@ class QuillToolbarVideoButton extends StatelessWidget {
         (await imagePickerService.pickVideo(source: ImageSource.gallery))?.path,
       InsertVideoSource.camera =>
         (await imagePickerService.pickVideo(source: ImageSource.camera))?.path,
-      InsertVideoSource.link => await _typeLink(context),
+      InsertVideoSource.link =>
+        context.mounted ? await _typeLink(context) : null,
     };
     if (videoUrl == null) {
       return;

diff --git a/flutter_quill_extensions/lib/embeds/widgets/image.dart b/flutter_quill_extensions/lib/embeds/widgets/image.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:photo_view/photo_view.dart';
 
-import '../../models/config/editor/image/image_configurations.dart';
+import '../../models/config/image/editor/image_configurations.dart';
 import '../../utils/utils.dart';
 import '../image/editor/image_embed_types.dart';
 

diff --git a/flutter_quill_extensions/lib/flutter_quill_extensions.dart b/flutter_quill_extensions/lib/flutter_quill_extensions.dart
@@ -13,14 +13,14 @@ import 'embeds/others/camera_button/camera_button.dart';
 import 'embeds/video/editor/video_embed.dart';
 import 'embeds/video/editor/video_web_embed.dart';
 import 'embeds/video/toolbar/video_button.dart';
-import 'models/config/editor/image/image_configurations.dart';
-import 'models/config/editor/image/image_web_configurations.dart';
-import 'models/config/editor/video/video_configurations.dart';
-import 'models/config/editor/video/video_web_configurations.dart';
-import 'models/config/toolbar/buttons/camera_configurations.dart';
-import 'models/config/toolbar/buttons/image_configurations.dart';
-import 'models/config/toolbar/buttons/media_button_configurations.dart';
-import 'models/config/toolbar/buttons/video_configurations.dart';
+import 'models/config/image/editor/image_configurations.dart';
+import 'models/config/image/editor/image_web_configurations.dart';
+import 'models/config/video/editor/video_configurations.dart';
+import 'models/config/video/editor/video_web_configurations.dart';
+import 'models/config/camera/camera_configurations.dart';
+import 'models/config/image/toolbar/image_configurations.dart';
+import 'models/config/media/media_button_configurations.dart';
+import 'models/config/video/toolbar/video_configurations.dart';
 
 export 'embeds/embed_types.dart';
 export 'embeds/formula/toolbar/formula_button.dart';
@@ -36,16 +36,16 @@ export 'embeds/video/editor/video_web_embed.dart';
 export 'embeds/video/toolbar/video_button.dart';
 export 'embeds/video/video.dart';
 export 'extensions/controller_ext.dart';
-export 'models/config/editor/image/image_configurations.dart';
-export 'models/config/editor/image/image_web_configurations.dart';
-export 'models/config/editor/video/video_configurations.dart';
-export 'models/config/editor/video/video_web_configurations.dart';
+export 'models/config/image/editor/image_configurations.dart';
+export 'models/config/image/editor/image_web_configurations.dart';
+export 'models/config/video/editor/video_configurations.dart';
+export 'models/config/video/editor/video_web_configurations.dart';
 export 'models/config/shared_configurations.dart';
-export 'models/config/toolbar/buttons/camera_configurations.dart';
-export 'models/config/toolbar/buttons/formula_configurations.dart';
-export 'models/config/toolbar/buttons/image_configurations.dart';
-export 'models/config/toolbar/buttons/media_button_configurations.dart';
-export 'models/config/toolbar/buttons/video_configurations.dart';
+export 'models/config/camera/camera_configurations.dart';
+export 'models/config/formula/formula_configurations.dart';
+export 'models/config/image/toolbar/image_configurations.dart';
+export 'models/config/media/media_button_configurations.dart';
+export 'models/config/video/toolbar/video_configurations.dart';
 export 'utils/utils.dart';
 
 @immutable

diff --git a/...oolbar/buttons/camera_configurations.dart → .../config/camera/camera_configurations.dart b/...oolbar/buttons/camera_configurations.dart → .../config/camera/camera_configurations.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart' show Color;
 import 'package:flutter_quill/flutter_quill.dart';
 
-import '../../../../embeds/others/camera_button/camera_types.dart';
+import '../../../embeds/others/camera_button/camera_types.dart';
 
 class QuillToolbarCameraButtonExtraOptions
     extends QuillToolbarBaseButtonExtraOptions {

diff --git a/...olbar/buttons/formula_configurations.dart → ...onfig/formula/formula_configurations.dart b/...olbar/buttons/formula_configurations.dart → ...onfig/formula/formula_configurations.dart
diff --git a/...ig/editor/image/image_configurations.dart → ...ig/image/editor/image_configurations.dart b/...ig/editor/image/image_configurations.dart → ...ig/image/editor/image_configurations.dart
diff --git a/...ditor/image/image_web_configurations.dart → ...mage/editor/image_web_configurations.dart b/...ditor/image/image_web_configurations.dart → ...mage/editor/image_web_configurations.dart
diff --git a/...toolbar/buttons/image_configurations.dart → ...g/image/toolbar/image_configurations.dart b/...toolbar/buttons/image_configurations.dart → ...g/image/toolbar/image_configurations.dart
diff --git a/.../buttons/media_button_configurations.dart → ...ig/media/media_button_configurations.dart b/.../buttons/media_button_configurations.dart → ...ig/media/media_button_configurations.dart
@@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart' show AutovalidateMode;
 import 'package:flutter/widgets.dart' show Color, Size;
 import 'package:flutter_quill/flutter_quill.dart';
 
-import '../../../../embeds/embed_types.dart';
+import '../../../embeds/embed_types.dart';
 
 class QuillToolbarMediaButtonExtraOptions
     extends QuillToolbarBaseButtonExtraOptions {

diff --git a/...ig/editor/video/video_configurations.dart → ...ig/video/editor/video_configurations.dart b/...ig/editor/video/video_configurations.dart → ...ig/video/editor/video_configurations.dart
diff --git a/...ditor/video/video_web_configurations.dart → ...ideo/editor/video_web_configurations.dart b/...ditor/video/video_web_configurations.dart → ...ideo/editor/video_web_configurations.dart
diff --git a/...toolbar/buttons/video_configurations.dart → ...g/video/toolbar/video_configurations.dart b/...toolbar/buttons/video_configurations.dart → ...g/video/toolbar/video_configurations.dart