From 9810fae5d9de0393ba7b660f5e215bad488461e6 Mon Sep 17 00:00:00 2001
From: Xin Yao <singerdmx@gmail.com>
Date: Fri, 5 Mar 2021 23:50:59 -0800
Subject: [PATCH] Remove conditional import (#59)

* Remove conditional import

* fix pickWeb

Co-authored-by: rish07 <rishirajsinghchhabra@gmail.com>
---
 app/pubspec.lock         | 22 +++++++++++-----------
 lib/widgets/editor.dart  |  2 +-
 lib/widgets/fake_ui.dart |  4 ----
 lib/widgets/real_ui.dart |  9 ---------
 lib/widgets/toolbar.dart |  3 ++-
 5 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 lib/widgets/fake_ui.dart
 delete mode 100644 lib/widgets/real_ui.dart

diff --git a/app/pubspec.lock b/app/pubspec.lock
index 1db2fb1e..8b6e9a99 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -84,7 +84,7 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "1.0.0"
   file:
     dependency: transitive
     description:
@@ -98,7 +98,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.2"
+    version: "3.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -124,7 +124,7 @@ packages:
       name: flutter_keyboard_visibility_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0-nullsafety.0"
+    version: "2.0.0"
   flutter_keyboard_visibility_web:
     dependency: transitive
     description:
@@ -232,28 +232,28 @@ packages:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+2"
+    version: "2.0.0"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4+8"
+    version: "2.0.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.1"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4+3"
+    version: "2.0.0"
   pedantic:
     dependency: transitive
     description:
@@ -281,7 +281,7 @@ packages:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.2"
+    version: "2.0.0"
   process:
     dependency: transitive
     description:
@@ -440,14 +440,14 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.4+1"
+    version: "2.0.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2"
+    version: "0.2.0"
   zone_local:
     dependency: transitive
     description:
@@ -456,5 +456,5 @@ packages:
     source: hosted
     version: "0.1.2"
 sdks:
-  dart: ">=2.12.0-259.9.beta <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.24.0-10.2.pre"
diff --git a/lib/widgets/editor.dart b/lib/widgets/editor.dart
index d58fb7e4..2e548474 100644
--- a/lib/widgets/editor.dart
+++ b/lib/widgets/editor.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io' as io;
 import 'dart:math' as math;
+import 'dart:ui' as ui;
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
@@ -24,7 +25,6 @@ import 'package:string_validator/string_validator.dart';
 import 'package:universal_html/prefer_universal/html.dart' as html;
 import 'package:url_launcher/url_launcher.dart';
 
-import 'fake_ui.dart' if (dart.library.html) 'real_ui.dart' as ui;
 import 'box.dart';
 import 'controller.dart';
 import 'cursor.dart';
diff --git a/lib/widgets/fake_ui.dart b/lib/widgets/fake_ui.dart
deleted file mode 100644
index bc9799af..00000000
--- a/lib/widgets/fake_ui.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-// ignore: camel_case_types
-class platformViewRegistry {
-  static registerViewFactory(String viewId, dynamic cb) {}
-}
diff --git a/lib/widgets/real_ui.dart b/lib/widgets/real_ui.dart
deleted file mode 100644
index c2b8ea23..00000000
--- a/lib/widgets/real_ui.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-import 'dart:ui' as ui;
-
-// ignore: camel_case_types
-class platformViewRegistry {
-  static registerViewFactory(String viewId, dynamic cb) {
-    // ignore:undefined_prefixed_name
-    ui.platformViewRegistry.registerViewFactory(viewId, cb);
-  }
-}
diff --git a/lib/widgets/toolbar.dart b/lib/widgets/toolbar.dart
index 92dccc3a..9ca7ee80 100644
--- a/lib/widgets/toolbar.dart
+++ b/lib/widgets/toolbar.dart
@@ -519,7 +519,7 @@ class _ImageButtonState extends State<ImageButton> {
   Future<String> _pickImage(ImageSource source) async {
     final PickedFile pickedFile = await _picker.getImage(source: source);
     if (pickedFile == null) return null;
-    
+
     final File file = File(pickedFile.path);
 
     if (file == null || widget.onImagePickCallback == null) return null;
@@ -567,6 +567,7 @@ class _ImageButtonState extends State<ImageButton> {
     } else {
       // User canceled the picker
     }
+    return null;
   }
 
   @override