singerdmx · singerdmx · Oct 19, 2023 · Oct 19, 2023 · Oct 19, 2023 · Oct 19, 2023
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -42,7 +42,7 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        // I removed the todo because it's not required for this example
         applicationId "com.example.app"
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
@@ -53,7 +53,7 @@ android {
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+            // I removed the todo because it's not required for this example
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
         }

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.app">
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-feature android:name="android.hardware.location.gps" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
    <application
         android:name="${applicationName}"
         android:label="app"

diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart
@@ -190,23 +190,23 @@ class _HomePageState extends State<HomePage> {
       onTapUp: (details, p1) {
         return _onTripleClickSelection();
       },
-      customStyles: DefaultStyles(
+      customStyles: const DefaultStyles(
         h1: DefaultTextBlockStyle(
-            const TextStyle(
+            TextStyle(
               fontSize: 32,
               color: Colors.black,
               height: 1.15,
               fontWeight: FontWeight.w300,
             ),
-            const VerticalSpacing(16, 0),
-            const VerticalSpacing(0, 0),
+            VerticalSpacing(16, 0),
+            VerticalSpacing(0, 0),
             null),
-        sizeSmall: const TextStyle(fontSize: 9),
-        subscript: const TextStyle(
+        sizeSmall: TextStyle(fontSize: 9),
+        subscript: TextStyle(
           fontFamily: 'SF-UI-Display',
           fontFeatures: [FontFeature.subscripts()],
         ),
-        superscript: const TextStyle(
+        superscript: TextStyle(
           fontFamily: 'SF-UI-Display',
           fontFeatures: [FontFeature.superscripts()],
         ),
@@ -230,18 +230,18 @@ class _HomePageState extends State<HomePage> {
           onTapUp: (details, p1) {
             return _onTripleClickSelection();
           },
-          customStyles: DefaultStyles(
+          customStyles: const DefaultStyles(
             h1: DefaultTextBlockStyle(
-                const TextStyle(
+                TextStyle(
                   fontSize: 32,
                   color: Colors.black,
                   height: 1.15,
                   fontWeight: FontWeight.w300,
                 ),
-                const VerticalSpacing(16, 0),
-                const VerticalSpacing(0, 0),
+                VerticalSpacing(16, 0),
+                VerticalSpacing(0, 0),
                 null),
-            sizeSmall: const TextStyle(fontSize: 9),
+            sizeSmall: TextStyle(fontSize: 9),
           ),
           embedBuilders: [
             ...defaultEmbedBuildersWeb,

diff --git a/flutter_quill_extensions/lib/embeds/builders.dart b/flutter_quill_extensions/lib/embeds/builders.dart
@@ -55,10 +55,6 @@ class ImageEmbedBuilder extends EmbedBuilder {
     OptionalSize? imageSize;
     final style = node.style.attributes['style'];
 
-    // TODO: Please use the one from [Attribute.margin]
-    const marginKey = 'margin';
-    // TODO: Please use the one from [Attribute.alignment]
-    const alignmentKey = 'alignment';
     if (style != null) {
       final attrs = base.isMobile()
           ? base.parseKeyValuePairs(style.value.toString(), {
@@ -70,8 +66,8 @@ class ImageEmbedBuilder extends EmbedBuilder {
           : base.parseKeyValuePairs(style.value.toString(), {
               Attribute.width.key,
               Attribute.height.key,
-              marginKey,
-              alignmentKey,
+              Attribute.margin,
+              Attribute.alignment,
             });
       if (attrs.isNotEmpty) {
         final width = double.tryParse(
@@ -88,10 +84,10 @@ class ImageEmbedBuilder extends EmbedBuilder {
         );
         final alignment = base.getAlignment(base.isMobile()
             ? attrs[Attribute.mobileAlignment]
-            : attrs[alignmentKey]);
+            : attrs[Attribute.alignment]);
         final margin = (base.isMobile()
                 ? double.tryParse(Attribute.mobileMargin)
-                : double.tryParse(marginKey)) ??
+                : double.tryParse(Attribute.margin)) ??
             0.0;
 
         assert(
@@ -198,57 +194,14 @@ class ImageEmbedBuilder extends EmbedBuilder {
                                       controller,
                                       controller.selection.start,
                                     );
-                                    // For desktop
-                                    String _replaceStyleStringWithSize(
-                                      String s,
-                                      double width,
-                                      double height,
-                                    ) {
-                                      final result = <String, String>{};
-                                      final pairs = s.split(';');
-                                      for (final pair in pairs) {
-                                        final _index = pair.indexOf(':');
-                                        if (_index < 0) {
-                                          continue;
-                                        }
-                                        final _key =
-                                            pair.substring(0, _index).trim();
-                                        result[_key] =
-                                            pair.substring(_index + 1).trim();
-                                      }
-
-                                      result[Attribute.width.key] =
-                                          width.toString();
-                                      result[Attribute.height.key] =
-                                          height.toString();
-                                      final sb = StringBuffer();
-                                      for (final pair in result.entries) {
-                                        sb
-                                          ..write(pair.key)
-                                          ..write(': ')
-                                          ..write(pair.value)
-                                          ..write('; ');
-                                      }
-                                      return sb.toString();
-                                    }
-
-                                    // TODO: When update flutter_quill
-                                    // we should update flutter_quill_extensions
-                                    // to use the latest version and use
-                                    // base.replaceStyleStringWithSize()
-                                    // instead of replaceStyleString
-
-                                    final attr = base.isMobile()
-                                        ? base.replaceStyleString(
-                                            getImageStyleString(controller),
-                                            w,
-                                            h,
-                                          )
-                                        : _replaceStyleStringWithSize(
-                                            getImageStyleString(controller),
-                                            w,
-                                            h,
-                                          );
+
+                                    final attr =
+                                        base.replaceStyleStringWithSize(
+                                      getImageStyleString(controller),
+                                      width: w,
+                                      height: h,
+                                      isMobile: base.isMobile(),
+                                    );
                                     controller
                                       ..skipRequestKeyboard = true
                                       ..formatText(

diff --git a/flutter_quill_extensions/lib/embeds/toolbar/camera_button.dart b/flutter_quill_extensions/lib/embeds/toolbar/camera_button.dart
@@ -146,11 +146,13 @@ class CameraButton extends StatelessWidget {
         break;
       case MediaPickSetting.Gallery:
         throw ArgumentError(
-          'Invalid MediaSetting for the camera button',
+          'Invalid MediaSetting for the camera button.\n'
+          'gallery is not related to camera button',
         );
       case MediaPickSetting.Link:
         throw ArgumentError(
-          'Invalid MediaSetting for the camera button',
+          'Invalid MediaSetting for the camera button.\n'
+          'link is not related to camera button',
         );
     }
   }

diff --git a/flutter_quill_extensions/lib/embeds/toolbar/image_video_utils.dart b/flutter_quill_extensions/lib/embeds/toolbar/image_video_utils.dart
@@ -35,41 +35,52 @@ class LinkDialogState extends State<LinkDialog> {
     super.initState();
     _link = widget.link ?? '';
     _controller = TextEditingController(text: _link);
-    // TODO: Consider replace the default Regex with this one
-    // Since that is not the reason I sent the changes then I will not edit it
 
-    // TODO: Consider use one of those as default or provide a
-    // way to custmize the check, that are not based on RegExp,
-    // I already implemented one so tell me if you are interested
+    final defaultLinkNonSecureRegExp = RegExp(
+      r'https?://.*?\.(?:png|jpe?g|gif|bmp|webp|tiff?)',
+      caseSensitive: false,
+    ); // Not secure
+    // final defaultLinkRegExp = RegExp(
+    //   r'https://.*?\.(?:png|jpe?g|gif|bmp|webp|tiff?)',
+    //   caseSensitive: false,
+    // ); // Secure
+    _linkRegExp = widget.linkRegExp ?? defaultLinkNonSecureRegExp;
+  }
 
-    // final defaultLinkNonSecureRegExp = RegExp(r'https?://.*?\.(?:png|jpe?g|gif|bmp|webp|tiff?)'); // Not secure
-    // final defaultLinkRegExp = RegExp(r'https://.*?\.(?:png|jpe?g|gif|bmp|webp|tiff?)'); // Secure
-    // _linkRegExp = widget.linkRegExp ?? defaultLinkRegExp;
-    _linkRegExp = widget.linkRegExp ?? AutoFormatMultipleLinksRule.linkRegExp;
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
       backgroundColor: widget.dialogTheme?.dialogBackgroundColor,
       content: TextField(
-        keyboardType: TextInputType.multiline,
+        keyboardType: TextInputType.url,
+        textInputAction: TextInputAction.done,
         maxLines: null,
         style: widget.dialogTheme?.inputTextStyle,
         decoration: InputDecoration(
           labelText: 'Paste a link'.i18n,
+          hintText: 'Please enter a valid image url'.i18n,
           labelStyle: widget.dialogTheme?.labelTextStyle,
           floatingLabelStyle: widget.dialogTheme?.labelTextStyle,
         ),
         autofocus: true,
         onChanged: _linkChanged,
         controller: _controller,
+        onEditingComplete: () {
+          if (!_canPress()) {
+            return;
+          }
+          _applyLink();
+        },
       ),
       actions: [
         TextButton(
-          onPressed: _link.isNotEmpty && _linkRegExp.hasMatch(_link)
-              ? _applyLink
-              : null,
+          onPressed: _canPress() ? _applyLink : null,
           child: Text(
             'Ok'.i18n,
             style: widget.dialogTheme?.labelTextStyle,
@@ -88,6 +99,10 @@ class LinkDialogState extends State<LinkDialog> {
   void _applyLink() {
     Navigator.pop(context, _link.trim());
   }
+
+  bool _canPress() {
+    return _link.isNotEmpty && _linkRegExp.hasMatch(_link);
+  }
 }
 
 class ImageVideoUtils {
@@ -179,12 +194,13 @@ class ImageVideoUtils {
 
   /// For video picking logic
   static Future<void> handleVideoButtonTap(
-      BuildContext context,
-      QuillController controller,
-      ImageSource videoSource,
-      OnVideoPickCallback onVideoPickCallback,
-      {FilePickImpl? filePickImpl,
-      WebVideoPickImpl? webVideoPickImpl}) async {
+    BuildContext context,
+    QuillController controller,
+    ImageSource videoSource,
+    OnVideoPickCallback onVideoPickCallback, {
+    FilePickImpl? filePickImpl,
+    WebVideoPickImpl? webVideoPickImpl,
+  }) async {
     final index = controller.selection.baseOffset;
     final length = controller.selection.extentOffset - index;