Fix some conflicts

pull/1419/head
Ahmed Hnewa 2 years ago
parent 28b325d4f5
commit deed5b2a1b
No known key found for this signature in database
GPG Key ID: C488CC70BBCEF0D1
  1. 13
      flutter_quill_extensions/lib/embeds/builders.dart
  2. 5
      flutter_quill_extensions/lib/embeds/embed_types.dart
  3. 18
      flutter_quill_extensions/lib/flutter_quill_extensions.dart
  4. 4
      flutter_quill_extensions/pubspec.yaml

@ -21,13 +21,12 @@ import 'widgets/youtube_video_app.dart';
class ImageEmbedBuilder extends EmbedBuilder {
ImageEmbedBuilder({
this.afterRemoveImageFromEditor,
this.shouldRemoveImageFromEditor,
this.onImageRemovedCallback,
this.shouldRemoveImageCallback,
this.forceUseMobileOptionMenu = false,
});
final ImageEmbedBuilderAfterRemoveImageFromEditor? afterRemoveImageFromEditor;
final ImageEmbedBuilderShouldRemoveImageFromEditor?
shouldRemoveImageFromEditor;
final ImageEmbedBuilderWillRemoveCallback? onImageRemovedCallback;
final ImageEmbedBuilderOnRemovedCallback? shouldRemoveImageCallback;
final bool forceUseMobileOptionMenu;
@override
@ -138,7 +137,7 @@ class ImageEmbedBuilder extends EmbedBuilder {
final imageFile = File(imageUrl);
final shouldRemoveImageEvent = shouldRemoveImageFromEditor;
final shouldRemoveImageEvent = shouldRemoveImageCallback;
var shouldRemoveImage = true;
if (shouldRemoveImageEvent != null) {
@ -160,7 +159,7 @@ class ImageEmbedBuilder extends EmbedBuilder {
'',
TextSelection.collapsed(offset: offset),
);
final afterRemoveImageEvent = afterRemoveImageFromEditor;
final afterRemoveImageEvent = onImageRemovedCallback;
if (afterRemoveImageEvent != null) {
await afterRemoveImageEvent(imageFile);
}

@ -45,11 +45,10 @@ class QuillFile {
final Uint8List bytes;
}
typedef ImageEmbedBuilderAfterRemoveImageFromEditor = Future<void> Function(
typedef ImageEmbedBuilderWillRemoveCallback = Future<void> Function(
File imageFile,
);
typedef ImageEmbedBuilderShouldRemoveImageFromEditor = Future<bool> Function(
typedef ImageEmbedBuilderOnRemovedCallback = Future<bool> Function(
File imageFile,
);

@ -38,15 +38,15 @@ class FlutterQuillEmbeds {
/// You can use this to perform actions or setup configurations related
/// to video embedding.
///
/// [afterRemoveImageFromEditor] is called when an image is
/// [onImageRemovedCallback] is called when an image is
/// removed from the editor.
/// By default, [afterRemoveImageFromEditor] deletes the
/// By default, [onImageRemovedCallback] deletes the
/// temporary image file if
/// the platform is mobile and if it still exists. You
/// can customize this behavior
/// by passing your own function that handles the removal process.
///
/// Example of [afterRemoveImageFromEditor] customization:
/// Example of [onImageRemovedCallback] customization:
/// ```dart
/// afterRemoveImageFromEditor: (imageFile) async {
/// // Your custom logic here
@ -54,12 +54,12 @@ class FlutterQuillEmbeds {
/// }
/// ```
///
/// [shouldRemoveImageFromEditor] is a callback
/// [shouldRemoveImageCallback] is a callback
/// function that is invoked when the
/// user attempts to remove an image from the editor. It allows you to control
/// whether the image should be removed based on your custom logic.
///
/// Example of [shouldRemoveImageFromEditor] customization:
/// Example of [shouldRemoveImageCallback] customization:
/// ```dart
/// shouldRemoveImageFromEditor: (imageFile) async {
/// // Show a confirmation dialog before removing the image
@ -104,14 +104,14 @@ class FlutterQuillEmbeds {
/// ```
static List<EmbedBuilder> builders({
void Function(GlobalKey videoContainerKey)? onVideoInit,
ImageEmbedBuilderAfterRemoveImageFromEditor? afterRemoveImageFromEditor,
ImageEmbedBuilderShouldRemoveImageFromEditor? shouldRemoveImageFromEditor,
ImageEmbedBuilderWillRemoveCallback? onImageRemovedCallback,
ImageEmbedBuilderOnRemovedCallback? shouldRemoveImageCallback,
bool forceUseMobileOptionMenuForImageClick = false,
}) =>
[
ImageEmbedBuilder(
forceUseMobileOptionMenu: forceUseMobileOptionMenuForImageClick,
afterRemoveImageFromEditor: afterRemoveImageFromEditor ??
onImageRemovedCallback: onImageRemovedCallback ??
(imageFile) async {
final mobile = isMobile();
// If the platform is not mobile, return void;
@ -139,7 +139,7 @@ class FlutterQuillEmbeds {
await imageFile.delete();
}
},
shouldRemoveImageFromEditor: shouldRemoveImageFromEditor,
shouldRemoveImageCallback: shouldRemoveImageCallback,
),
VideoEmbedBuilder(onVideoInit: onVideoInit),
FormulaEmbedBuilder(),

@ -19,12 +19,8 @@ dependencies:
photo_view: ^0.14.0
video_player: ^2.7.2
youtube_player_flutter: ^8.1.2
# gallery_saver: ^2.1.1
math_keyboard: ">=0.2.1"
# string_validator: ^1.0.0
universal_html: ^2.2.4
# url_launcher: ^6.1.14
# dio: ^5.3.3
gal: ^2.1.1

Loading…
Cancel
Save