Fix all issues (#60)

* Remove conditional import

* fix pickWeb

* Fix all issues

Co-authored-by: Xin Yao <singerdmx@gmail.com>

app/lib/pages/home_page.dart

@@ -95,38 +95,39 @@ class _HomePageState extends State<HomePage> {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: <Widget>[
-          Container(
+          Expanded(
-            height: MediaQuery.of(context).size.height * 0.88,
+            flex: 20,
-            color: Colors.white,
+            child: Container(
-            padding: const EdgeInsets.only(left: 16.0, right: 16.0),
+              color: Colors.white,
-            child: QuillEditor(
+              padding: const EdgeInsets.only(left: 16.0, right: 16.0),
-              controller: _controller,
+              child: QuillEditor(
-              scrollController: ScrollController(),
+                controller: _controller,
-              scrollable: true,
+                scrollController: ScrollController(),
-              focusNode: _focusNode,
+                scrollable: true,
-              autoFocus: false,
+                focusNode: _focusNode,
-              readOnly: false,
+                autoFocus: false,
-              placeholder: 'Add content',
+                readOnly: false,
-              enableInteractiveSelection: true,
+                placeholder: 'Add content',
-              expands: false,
+                enableInteractiveSelection: true,
-              padding: EdgeInsets.zero,
+                expands: false,
-              customStyles: DefaultStyles(
+                padding: EdgeInsets.zero,
-                h1: DefaultTextBlockStyle(
+                customStyles: DefaultStyles(
-                    TextStyle(
+                  h1: DefaultTextBlockStyle(
-                      fontSize: 32.0,
+                      TextStyle(
-                      color: Colors.black,
+                        fontSize: 32.0,
-                      height: 1.15,
+                        color: Colors.black,
-                      fontWeight: FontWeight.w300,
+                        height: 1.15,
-                    ),
+                        fontWeight: FontWeight.w300,
-                    Tuple2(16.0, 0.0),
+                      ),
-                    Tuple2(0.0, 0.0),
+                      Tuple2(16.0, 0.0),
-                    null),
+                      Tuple2(0.0, 0.0),
-                sizeSmall: TextStyle(fontSize: 9.0),
+                      null),
+                  sizeSmall: TextStyle(fontSize: 9.0),
+                ),
               ),
             ),
           ),
-          Padding(
+          Expanded(
-            padding: const EdgeInsets.all(8.0),
             child: Container(
               child: QuillToolbar.basic(
                   controller: _controller,

app/pubspec.lock

@@ -110,14 +110,14 @@ packages:
       name: flutter_colorpicker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0-nullsafety.0"
+    version: "0.3.5"
   flutter_keyboard_visibility:
     dependency: transitive
     description:
       name: flutter_keyboard_visibility
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0-nullsafety.3"
+    version: "5.0.0"
   flutter_keyboard_visibility_platform_interface:
     dependency: transitive
     description:
@@ -131,7 +131,7 @@ packages:
       name: flutter_keyboard_visibility_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0-nullsafety.0"
+    version: "2.0.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -295,7 +295,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "2.1.5"
   quiver_hashcode:
     dependency: transitive
     description:
@@ -342,7 +342,7 @@ packages:
       name: string_validator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0-nullsafety.0"
+    version: "0.1.4"
   term_glyph:
     dependency: transitive
     description:
@@ -363,7 +363,7 @@ packages:
       name: tuple
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0-nullsafety.0"
+    version: "1.0.3"
   typed_data:
     dependency: transitive
     description:
@@ -385,6 +385,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  universal_ui:
+    dependency: transitive
+    description:
+      name: universal_ui
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.8"
   url_launcher:
     dependency: transitive
     description:
@@ -457,4 +464,6 @@ packages:
     version: "0.1.2"
 sdks:
   dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.24.0-10.2.pre"
+
+  flutter: ">=1.22.0"
+

lib/widgets/editor.dart

@@ -23,6 +23,7 @@ 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:universal_ui/universal_ui.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'box.dart';

pubspec.lock

@@ -89,7 +89,7 @@ packages:
       name: flutter_colorpicker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0-nullsafety.0"
+    version: "0.3.5"
   flutter_keyboard_visibility:
     dependency: "direct main"
     description:
@@ -218,7 +218,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "2.1.5"
   quiver_hashcode:
     dependency: "direct main"
     description:
@@ -265,7 +265,7 @@ packages:
       name: string_validator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0-nullsafety.0"
+    version: "0.1.4"
   term_glyph:
     dependency: transitive
     description:
@@ -286,7 +286,7 @@ packages:
       name: tuple
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0-nullsafety.0"
+    version: "1.0.3"
   typed_data:
     dependency: transitive
     description:
@@ -308,6 +308,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  universal_ui:
+    dependency: "direct main"
+    description:
+      name: universal_ui
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.8"
   url_launcher:
     dependency: "direct main"
     description:
@@ -366,4 +373,4 @@ packages:
     version: "0.1.2"
 sdks:
   dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.24.0-10.2.pre"
+  flutter: ">=1.22.0"

pubspec.yaml

@@ -14,15 +14,17 @@ dependencies:
     sdk: flutter
   quiver_hashcode: ^2.0.0
   collection: ^1.15.0
-  tuple: ^2.0.0-nullsafety.0
+  tuple: ^1.0.3
   url_launcher: ^6.0.0
-  flutter_colorpicker: ^0.4.0-nullsafety.0
+  flutter_colorpicker: ^0.3.5
-  image_picker: ^0.7.0
+  image_picker: ^0.7.2
   photo_view: ^0.10.3
   universal_html: ^1.2.4
-  file_picker: ^3.0.0-nullsafety.4
+  file_picker: ^3.0.0
-  string_validator: ^0.2.0-nullsafety.0
+  string_validator: ^0.1.4
-  flutter_keyboard_visibility: ^5.0.0-nullsafety.2
+  flutter_keyboard_visibility: ^5.0.0
+  universal_ui: ^0.0.8
+
 
 
 dev_dependencies: