From e729683abee1cf20f66caae8c511f32886a5474e Mon Sep 17 00:00:00 2001 From: Ellet Date: Tue, 14 Nov 2023 06:32:59 +0300 Subject: [PATCH] Nameing fixes --- .../embeds/editor/video/video.dart | 6 ++-- .../embeds/widgets/image_resizer.dart | 2 +- .../embeds/widgets/simple_dialog_item.dart | 33 ------------------- .../embeds/widgets/youtube_video_app.dart | 24 ++++++++------ .../lib/presentation/utils/utils.dart | 24 +++++++------- 5 files changed, 30 insertions(+), 59 deletions(-) delete mode 100644 flutter_quill_extensions/lib/presentation/embeds/widgets/simple_dialog_item.dart diff --git a/flutter_quill_extensions/lib/presentation/embeds/editor/video/video.dart b/flutter_quill_extensions/lib/presentation/embeds/editor/video/video.dart index 11b4b74a..a4b2a9b8 100644 --- a/flutter_quill_extensions/lib/presentation/embeds/editor/video/video.dart +++ b/flutter_quill_extensions/lib/presentation/embeds/editor/video/video.dart @@ -37,10 +37,10 @@ class QuillEditorVideoEmbedBuilder extends EmbedBuilder { readOnly: readOnly, ); } - final ((imageSize), margin, alignment) = getElementAttributes(node); + final ((elementSize), margin, alignment) = getElementAttributes(node); - final width = imageSize.width; - final height = imageSize.height; + final width = elementSize.width; + final height = elementSize.height; return Container( width: width, height: height, diff --git a/flutter_quill_extensions/lib/presentation/embeds/widgets/image_resizer.dart b/flutter_quill_extensions/lib/presentation/embeds/widgets/image_resizer.dart index 35b0eb66..844381fb 100644 --- a/flutter_quill_extensions/lib/presentation/embeds/widgets/image_resizer.dart +++ b/flutter_quill_extensions/lib/presentation/embeds/widgets/image_resizer.dart @@ -20,7 +20,7 @@ class ImageResizer extends StatefulWidget { final double? imageHeight; final double maxWidth; final double maxHeight; - final Function(double, double) onImageResize; + final Function(double width, double height) onImageResize; @override ImageResizerState createState() => ImageResizerState(); diff --git a/flutter_quill_extensions/lib/presentation/embeds/widgets/simple_dialog_item.dart b/flutter_quill_extensions/lib/presentation/embeds/widgets/simple_dialog_item.dart deleted file mode 100644 index 4053fc05..00000000 --- a/flutter_quill_extensions/lib/presentation/embeds/widgets/simple_dialog_item.dart +++ /dev/null @@ -1,33 +0,0 @@ -import 'package:flutter/material.dart'; - -class SimpleDialogItem extends StatelessWidget { - const SimpleDialogItem({ - required this.icon, - required this.color, - required this.text, - required this.onPressed, - super.key, - }); - - final IconData icon; - final Color color; - final String text; - final VoidCallback onPressed; - - @override - Widget build(BuildContext context) { - return SimpleDialogOption( - onPressed: onPressed, - child: Row( - children: [ - Icon(icon, size: 36, color: color), - Padding( - padding: const EdgeInsetsDirectional.only(start: 16), - child: - Text(text, style: const TextStyle(fontWeight: FontWeight.bold)), - ), - ], - ), - ); - } -} diff --git a/flutter_quill_extensions/lib/presentation/embeds/widgets/youtube_video_app.dart b/flutter_quill_extensions/lib/presentation/embeds/widgets/youtube_video_app.dart index e278280b..71d6fb5c 100644 --- a/flutter_quill_extensions/lib/presentation/embeds/widgets/youtube_video_app.dart +++ b/flutter_quill_extensions/lib/presentation/embeds/widgets/youtube_video_app.dart @@ -1,7 +1,7 @@ -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_quill/flutter_quill.dart'; -import 'package:url_launcher/url_launcher.dart'; +import 'package:flutter/gestures.dart' show TapGestureRecognizer; +import 'package:flutter/widgets.dart'; +import 'package:flutter_quill/flutter_quill.dart' show DefaultStyles; +import 'package:url_launcher/url_launcher.dart' show launchUrl; import 'package:youtube_player_flutter/youtube_player_flutter.dart'; class YoutubeVideoApp extends StatefulWidget { @@ -45,15 +45,19 @@ class YoutubeVideoAppState extends State { if (widget.readOnly) { return RichText( text: TextSpan( - text: widget.videoUrl, - style: defaultStyles.link, - recognizer: TapGestureRecognizer() - ..onTap = () => launchUrl(Uri.parse(widget.videoUrl))), + text: widget.videoUrl, + style: defaultStyles.link, + recognizer: TapGestureRecognizer() + ..onTap = () => launchUrl( + Uri.parse(widget.videoUrl), + ), + ), ); } return RichText( - text: TextSpan(text: widget.videoUrl, style: defaultStyles.link)); + text: TextSpan(text: widget.videoUrl, style: defaultStyles.link), + ); } return SizedBox( @@ -78,7 +82,7 @@ class YoutubeVideoAppState extends State { @override void dispose() { - super.dispose(); _youtubeController?.dispose(); + super.dispose(); } } diff --git a/flutter_quill_extensions/lib/presentation/utils/utils.dart b/flutter_quill_extensions/lib/presentation/utils/utils.dart index 681e44cd..fe25b7c4 100644 --- a/flutter_quill_extensions/lib/presentation/utils/utils.dart +++ b/flutter_quill_extensions/lib/presentation/utils/utils.dart @@ -92,15 +92,15 @@ Future saveImage({ } ( - OptionalSize imageSize, + OptionalSize elementSize, double? margin, Alignment alignment, ) getElementAttributes( Node node, ) { - var imageSize = const OptionalSize(null, null); - var imageAlignment = Alignment.center; - double? imageMargin; + var elementSize = const OptionalSize(null, null); + var elementAlignment = Alignment.center; + double? elementMargin; // Usually double value final heightValue = double.tryParse( @@ -109,12 +109,12 @@ Future saveImage({ node.style.attributes[Attribute.width.key]?.value.toString() ?? ''); if (heightValue != null) { - imageSize = imageSize.copyWith( + elementSize = elementSize.copyWith( height: heightValue, ); } if (widthValue != null) { - imageSize = imageSize.copyWith( + elementSize = elementSize.copyWith( width: widthValue, ); } @@ -136,7 +136,7 @@ Future saveImage({ 'alignment', }); if (attrs.isEmpty) { - return (imageSize, imageMargin, imageAlignment); + return (elementSize, elementMargin, elementAlignment); } // It css value as string but we will try to support it anyway @@ -154,24 +154,24 @@ Future saveImage({ .replaceFirst('px', '')); if (cssHeightValue != null) { - imageSize = imageSize.copyWith(height: cssHeightValue); + elementSize = elementSize.copyWith(height: cssHeightValue); } if (cssWidthValue != null) { - imageSize = imageSize.copyWith(width: cssWidthValue); + elementSize = elementSize.copyWith(width: cssWidthValue); } - imageAlignment = base.getAlignment(base.isMobile(supportWeb: false) + elementAlignment = base.getAlignment(base.isMobile(supportWeb: false) ? attrs[AttributeExt.mobileAlignment.key] : attrs['alignment']); final margin = (base.isMobile(supportWeb: false) ? double.tryParse(AttributeExt.mobileMargin.key) : double.tryParse('margin')); if (margin != null) { - imageMargin = margin; + elementMargin = margin; } } - return (imageSize, imageMargin, imageAlignment); + return (elementSize, elementMargin, elementAlignment); } @immutable