Skip to content

Commit 6e4afb2

Browse files
author
Ellet
committed
Fix the structure of flutter quill extensions, fix context use
1 parent 788a9c6 commit 6e4afb2

20 files changed

+31
-32
lines changed

flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_quill/flutter_quill.dart';
33

4-
import '../../../models/config/toolbar/buttons/formula_configurations.dart';
4+
import '../../../models/config/formula/formula_configurations.dart';
55

66
class QuillToolbarFormulaButton extends StatelessWidget {
77
const QuillToolbarFormulaButton({

flutter_quill_extensions/lib/embeds/image/editor/image_embed.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_quill/flutter_quill.dart' hide OptionalSize;
33
import 'package:flutter_quill/translations.dart';
44

5-
import '../../../models/config/editor/image/image_configurations.dart';
5+
import '../../../models/config/image/editor/image_configurations.dart';
66
import '../../../models/config/shared_configurations.dart';
77
import '../../../utils/element_utils/element_utils.dart';
88
import '../../widgets/image.dart';

flutter_quill_extensions/lib/embeds/image/editor/image_menu.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter_quill/flutter_quill.dart'
66
import 'package:flutter_quill/translations.dart';
77
import 'package:super_clipboard/super_clipboard.dart';
88

9-
import '../../../models/config/editor/image/image_configurations.dart';
9+
import '../../../models/config/image/editor/image_configurations.dart';
1010
import '../../../models/config/shared_configurations.dart';
1111
import '../../../services/image_saver/s_image_saver.dart';
1212
import '../../../utils/element_utils/element_utils.dart';

flutter_quill_extensions/lib/embeds/image/editor/image_web_embed.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:flutter/widgets.dart';
33
import 'package:flutter_quill/flutter_quill.dart';
44
import 'package:universal_html/html.dart' as html;
55

6-
import '../../../models/config/editor/image/image_web_configurations.dart';
6+
import '../../../models/config/image/editor/image_web_configurations.dart';
77
import '../../../utils/dart_ui/dart_ui_fake.dart'
88
if (dart.library.html) '../../../utils/dart_ui/dart_ui_real.dart' as ui;
99
import '../../../utils/element_utils/element_web_utils.dart';

flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:flutter_quill/flutter_quill.dart';
55
import 'package:flutter_quill/translations.dart';
66

77
import '../../../models/config/shared_configurations.dart';
8-
import '../../../models/config/toolbar/buttons/image_configurations.dart';
8+
import '../../../models/config/image/toolbar/image_configurations.dart';
99
import '../../../services/image_picker/image_picker.dart';
1010
import '../../others/image_video_utils.dart';
1111
import '../editor/image_embed_types.dart';

flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:flutter_quill/flutter_quill.dart'
1111
import 'package:flutter_quill/translations.dart';
1212

1313
import '../../../models/config/shared_configurations.dart';
14-
import '../../../models/config/toolbar/buttons/camera_configurations.dart';
14+
import '../../../models/config/camera/camera_configurations.dart';
1515
import '../../../services/image_picker/image_options.dart';
1616
import 'camera_types.dart';
1717
import 'select_camera_action.dart';

flutter_quill_extensions/lib/embeds/video/editor/video_embed.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart' show kIsWeb;
22
import 'package:flutter/material.dart';
33
import 'package:flutter_quill/flutter_quill.dart';
44

5-
import '../../../models/config/editor/video/video_configurations.dart';
5+
import '../../../models/config/video/editor/video_configurations.dart';
66
import '../../../utils/element_utils/element_utils.dart';
77
import '../../../utils/utils.dart';
88
import '../../widgets/video_app.dart';

flutter_quill_extensions/lib/embeds/video/editor/video_web_embed.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:universal_html/html.dart' as html;
44
import 'package:youtube_player_flutter/youtube_player_flutter.dart'
55
show YoutubePlayer;
66

7-
import '../../../models/config/editor/video/video_web_configurations.dart';
7+
import '../../../models/config/video/editor/video_web_configurations.dart';
88
import '../../../utils/dart_ui/dart_ui_fake.dart'
99
if (dart.library.html) '../../../utils/dart_ui/dart_ui_real.dart' as ui;
1010
import '../../../utils/element_utils/element_web_utils.dart';

flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
// ignore_for_file: use_build_context_synchronously
2-
31
import 'package:flutter/material.dart';
42
import 'package:flutter_quill/flutter_quill.dart';
53
import 'package:flutter_quill/translations.dart';
64

75
import '../../../models/config/shared_configurations.dart';
8-
import '../../../models/config/toolbar/buttons/video_configurations.dart';
6+
import '../../../models/config/video/toolbar/video_configurations.dart';
97
import '../../../services/image_picker/image_options.dart';
108
import '../../others/image_video_utils.dart';
119
import '../video.dart';
@@ -141,7 +139,8 @@ class QuillToolbarVideoButton extends StatelessWidget {
141139
(await imagePickerService.pickVideo(source: ImageSource.gallery))?.path,
142140
InsertVideoSource.camera =>
143141
(await imagePickerService.pickVideo(source: ImageSource.camera))?.path,
144-
InsertVideoSource.link => await _typeLink(context),
142+
InsertVideoSource.link =>
143+
context.mounted ? await _typeLink(context) : null,
145144
};
146145
if (videoUrl == null) {
147146
return;

flutter_quill_extensions/lib/embeds/widgets/image.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
66
import 'package:flutter_quill/flutter_quill.dart';
77
import 'package:photo_view/photo_view.dart';
88

9-
import '../../models/config/editor/image/image_configurations.dart';
9+
import '../../models/config/image/editor/image_configurations.dart';
1010
import '../../utils/utils.dart';
1111
import '../image/editor/image_embed_types.dart';
1212

flutter_quill_extensions/lib/flutter_quill_extensions.dart

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import 'embeds/others/camera_button/camera_button.dart';
1313
import 'embeds/video/editor/video_embed.dart';
1414
import 'embeds/video/editor/video_web_embed.dart';
1515
import 'embeds/video/toolbar/video_button.dart';
16-
import 'models/config/editor/image/image_configurations.dart';
17-
import 'models/config/editor/image/image_web_configurations.dart';
18-
import 'models/config/editor/video/video_configurations.dart';
19-
import 'models/config/editor/video/video_web_configurations.dart';
20-
import 'models/config/toolbar/buttons/camera_configurations.dart';
21-
import 'models/config/toolbar/buttons/image_configurations.dart';
22-
import 'models/config/toolbar/buttons/media_button_configurations.dart';
23-
import 'models/config/toolbar/buttons/video_configurations.dart';
16+
import 'models/config/image/editor/image_configurations.dart';
17+
import 'models/config/image/editor/image_web_configurations.dart';
18+
import 'models/config/video/editor/video_configurations.dart';
19+
import 'models/config/video/editor/video_web_configurations.dart';
20+
import 'models/config/camera/camera_configurations.dart';
21+
import 'models/config/image/toolbar/image_configurations.dart';
22+
import 'models/config/media/media_button_configurations.dart';
23+
import 'models/config/video/toolbar/video_configurations.dart';
2424

2525
export 'embeds/embed_types.dart';
2626
export 'embeds/formula/toolbar/formula_button.dart';
@@ -36,16 +36,16 @@ export 'embeds/video/editor/video_web_embed.dart';
3636
export 'embeds/video/toolbar/video_button.dart';
3737
export 'embeds/video/video.dart';
3838
export 'extensions/controller_ext.dart';
39-
export 'models/config/editor/image/image_configurations.dart';
40-
export 'models/config/editor/image/image_web_configurations.dart';
41-
export 'models/config/editor/video/video_configurations.dart';
42-
export 'models/config/editor/video/video_web_configurations.dart';
39+
export 'models/config/image/editor/image_configurations.dart';
40+
export 'models/config/image/editor/image_web_configurations.dart';
41+
export 'models/config/video/editor/video_configurations.dart';
42+
export 'models/config/video/editor/video_web_configurations.dart';
4343
export 'models/config/shared_configurations.dart';
44-
export 'models/config/toolbar/buttons/camera_configurations.dart';
45-
export 'models/config/toolbar/buttons/formula_configurations.dart';
46-
export 'models/config/toolbar/buttons/image_configurations.dart';
47-
export 'models/config/toolbar/buttons/media_button_configurations.dart';
48-
export 'models/config/toolbar/buttons/video_configurations.dart';
44+
export 'models/config/camera/camera_configurations.dart';
45+
export 'models/config/formula/formula_configurations.dart';
46+
export 'models/config/image/toolbar/image_configurations.dart';
47+
export 'models/config/media/media_button_configurations.dart';
48+
export 'models/config/video/toolbar/video_configurations.dart';
4949
export 'utils/utils.dart';
5050

5151
@immutable

flutter_quill_extensions/lib/models/config/toolbar/buttons/camera_configurations.dart renamed to flutter_quill_extensions/lib/models/config/camera/camera_configurations.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/widgets.dart' show Color;
22
import 'package:flutter_quill/flutter_quill.dart';
33

4-
import '../../../../embeds/others/camera_button/camera_types.dart';
4+
import '../../../embeds/others/camera_button/camera_types.dart';
55

66
class QuillToolbarCameraButtonExtraOptions
77
extends QuillToolbarBaseButtonExtraOptions {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart' show AutovalidateMode;
22
import 'package:flutter/widgets.dart' show Color, Size;
33
import 'package:flutter_quill/flutter_quill.dart';
44

5-
import '../../../../embeds/embed_types.dart';
5+
import '../../../embeds/embed_types.dart';
66

77
class QuillToolbarMediaButtonExtraOptions
88
extends QuillToolbarBaseButtonExtraOptions {

0 commit comments

Comments
 (0)