From 5619535fe6831e543f50872c36757ea254e70a41 Mon Sep 17 00:00:00 2001
From: rish07 <rishirajsinghchhabra@gmail.com>
Date: Thu, 25 Feb 2021 12:12:02 +0530
Subject: [PATCH] Add base64 support in image import

---
 app/android/settings_aar.gradle | 1 +
 app/pubspec.lock                | 7 +++++++
 lib/widgets/editor.dart         | 4 +++-
 pubspec.lock                    | 7 +++++++
 pubspec.yaml                    | 1 +
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 app/android/settings_aar.gradle

diff --git a/app/android/settings_aar.gradle b/app/android/settings_aar.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/app/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 53c35ed4..230200a9 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -322,6 +322,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  string_validator:
+    dependency: transitive
+    description:
+      name: string_validator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   term_glyph:
     dependency: transitive
     description:
diff --git a/lib/widgets/editor.dart b/lib/widgets/editor.dart
index 29472aae..07bde9ec 100644
--- a/lib/widgets/editor.dart
+++ b/lib/widgets/editor.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:io' as io;
 import 'dart:math' as math;
 
@@ -19,6 +20,7 @@ import 'package:flutter_quill/widgets/image.dart';
 import 'package:flutter_quill/widgets/raw_editor.dart';
 import 'package:flutter_quill/widgets/responsive_widget.dart';
 import 'package:flutter_quill/widgets/text_selection.dart';
+import 'package:string_validator/string_validator.dart';
 import 'package:universal_html/prefer_universal/html.dart' as html;
 import 'package:url_launcher/url_launcher.dart';
 
@@ -409,7 +411,7 @@ class _QuillEditorSelectionGestureDetectorBuilder
             builder: (context) => ImageTapWrapper(
                 imageProvider: imageUrl.startsWith('http')
                     ? NetworkImage(imageUrl)
-                    : FileImage(io.File(blockEmbed.data))),
+                    :(isBase64(imageUrl))?Image.memory(base64.decode(imageUrl),): FileImage(io.File(blockEmbed.data),),),
           ),
         );
       }
diff --git a/pubspec.lock b/pubspec.lock
index 9842e845..1a84362e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -245,6 +245,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  string_validator:
+    dependency: "direct main"
+    description:
+      name: string_validator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   term_glyph:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 93c91366..ffab3d55 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -22,6 +22,7 @@ dependencies:
   photo_view: ^0.10.3
   universal_html: ^1.2.1
   file_picker: ^2.1.6
+  string_validator: ^0.1.4
 
 
 dev_dependencies: