From 9393ae1d9844feb49d2647799b14e00adc442b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lui=CC=81s=20Arteiro?= Date: Tue, 22 Aug 2023 20:00:09 +0100 Subject: [PATCH] refactor: Simplifying universal_ui for web. Using `dart:ui_web` to define `platformViewRegistry`. --- example/lib/universal_ui/fake_ui.dart | 3 --- example/lib/universal_ui/real_ui.dart | 7 ------ example/lib/universal_ui/universal_ui.dart | 29 +++++----------------- 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 example/lib/universal_ui/fake_ui.dart delete mode 100644 example/lib/universal_ui/real_ui.dart diff --git a/example/lib/universal_ui/fake_ui.dart b/example/lib/universal_ui/fake_ui.dart deleted file mode 100644 index 1711ad5f..00000000 --- a/example/lib/universal_ui/fake_ui.dart +++ /dev/null @@ -1,3 +0,0 @@ -class PlatformViewRegistry { - static void registerViewFactory(String viewId, dynamic cb) {} -} diff --git a/example/lib/universal_ui/real_ui.dart b/example/lib/universal_ui/real_ui.dart deleted file mode 100644 index b701caf4..00000000 --- a/example/lib/universal_ui/real_ui.dart +++ /dev/null @@ -1,7 +0,0 @@ -import 'dart:ui' as ui; - -class PlatformViewRegistry { - static void registerViewFactory(String viewId, dynamic cb) { - ui.platformViewRegistry.registerViewFactory(viewId, cb); - } -} diff --git a/example/lib/universal_ui/universal_ui.dart b/example/lib/universal_ui/universal_ui.dart index 91344afb..41dc0731 100644 --- a/example/lib/universal_ui/universal_ui.dart +++ b/example/lib/universal_ui/universal_ui.dart @@ -1,31 +1,14 @@ library universal_ui; +import 'dart:ui_web' as ui_web; + import 'package:flutter/cupertino.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter_quill/flutter_quill.dart'; import 'package:flutter_quill_extensions/flutter_quill_extensions.dart'; import 'package:universal_html/html.dart' as html; import 'package:youtube_player_flutter/youtube_player_flutter.dart'; -import '../widgets/responsive_widget.dart'; -import 'fake_ui.dart' if (dart.library.html) 'real_ui.dart' as ui_instance; - -class PlatformViewRegistryFix { - void registerViewFactory(dynamic x, dynamic y) { - if (kIsWeb) { - ui_instance.PlatformViewRegistry.registerViewFactory( - x, - y, - ); - } - } -} - -class UniversalUI { - PlatformViewRegistryFix platformViewRegistry = PlatformViewRegistryFix(); -} - -var ui = UniversalUI(); +import '../widgets/responsive_widget.dart'; class ImageEmbedBuilderWeb extends EmbedBuilder { @override @@ -46,10 +29,10 @@ class ImageEmbedBuilderWeb extends EmbedBuilder { return const SizedBox(); } final size = MediaQuery.of(context).size; - UniversalUI().platformViewRegistry.registerViewFactory(imageUrl, (viewId) { + ui_web.platformViewRegistry.registerViewFactory(imageUrl, (viewId) { return html.ImageElement() ..src = imageUrl - ..style.height = 'auto' + ..style.height = '300px' ..style.width = 'auto'; }); return Padding( @@ -91,7 +74,7 @@ class VideoEmbedBuilderWeb extends EmbedBuilder { } } - UniversalUI().platformViewRegistry.registerViewFactory( + ui_web.platformViewRegistry.registerViewFactory( videoUrl, (id) => html.IFrameElement() ..width = MediaQuery.of(context).size.width.toString()