Replaced createImageProvider with buildImage in ZefyrImageDelegate

packages/zefyr/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.3
+
+* Breaking change: `ZefyrImageDelegate.createImageProvider` replaced with
+  `ZefyrImageDelegate.buildImage`.
+
 ## 0.1.2
 
 * Fixed analysis warnings.

packages/zefyr/example/lib/main.dart

@@ -113,12 +113,13 @@ class _MyHomePageState extends State<MyHomePage> {
 /// Default image delegate only supports [FileImage]s.
 class CustomImageDelegate extends ZefyrDefaultImageDelegate {
   @override
-  ImageProvider createImageProvider(String imageSource) {
+  Widget buildImage(BuildContext context, String imageSource) {
     // We use custom "asset" scheme to distinguish asset images from other files.
     if (imageSource.startsWith('asset://')) {
-      return new AssetImage(imageSource.replaceFirst('asset://', ''));
+      final asset = new AssetImage(imageSource.replaceFirst('asset://', ''));
+      return new Image(image: asset);
     } else {
-      return super.createImageProvider(imageSource);
+      return super.buildImage(context, imageSource);
     }
   }
 }

packages/zefyr/lib/src/widgets/image.dart

@@ -14,8 +14,8 @@ import 'package:image_picker/image_picker.dart';
 import 'editable_box.dart';
 
 abstract class ZefyrImageDelegate<S> {
-  /// Creates [ImageProvider] for specified [imageSource].
-  ImageProvider createImageProvider(String imageSource);
+  /// Builds image widget for specified [imageSource] and [context].
+  Widget buildImage(BuildContext context, String imageSource);
 
   /// Picks an image from specified [source].
   ///
@@ -26,9 +26,10 @@ abstract class ZefyrImageDelegate<S> {
 
 class ZefyrDefaultImageDelegate implements ZefyrImageDelegate<ImageSource> {
   @override
-  ImageProvider createImageProvider(String imageSource) {
+  Widget buildImage(BuildContext context, String imageSource) {
     final file = new File.fromUri(Uri.parse(imageSource));
-    return new FileImage(file);
+    final image = new FileImage(file);
+    return new Image(image: image);
   }
 
   @override
@@ -51,65 +52,19 @@ class ZefyrImage extends StatefulWidget {
 }
 
 class _ZefyrImageState extends State<ZefyrImage> {
-  ImageProvider _provider;
-  ImageStream _imageStream;
-  ImageInfo _imageInfo;
-
-  @override
-  void initState() {
-    super.initState();
+  String get imageSource {
     EmbedAttribute attribute = widget.node.style.get(NotusAttribute.embed);
-    final source = attribute.value['source'];
-    _provider = widget.delegate.createImageProvider(source);
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _getImage();
-  }
-
-  @override
-  void didUpdateWidget(ZefyrImage oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    EmbedAttribute oldStyle = oldWidget.node.style.get(NotusAttribute.embed);
-    final oldSource = oldStyle.value['source'];
-    EmbedAttribute style = widget.node.style.get(NotusAttribute.embed);
-    final source = style.value['source'];
-    if (oldSource != source || oldWidget.delegate != widget.delegate) {
-      _provider = widget.delegate.createImageProvider(source);
-      _getImage();
-    }
-  }
-
-  @override
-  void dispose() {
-    _imageStream.removeListener(_updateImage);
-    super.dispose();
+    return attribute.value['source'];
   }
 
   @override
   Widget build(BuildContext context) {
+    final image = widget.delegate.buildImage(context, imageSource);
     return _EditableImage(
-      child: new RawImage(image: _imageInfo?.image),
+      child: image,
       node: widget.node,
     );
   }
-
-  void _getImage() {
-    final oldImageStream = _imageStream;
-    _imageStream = _provider.resolve(createLocalImageConfiguration(context));
-    if (_imageStream.key != oldImageStream?.key) {
-      oldImageStream?.removeListener(_updateImage);
-      _imageStream.addListener(_updateImage);
-    }
-  }
-
-  void _updateImage(ImageInfo imageInfo, bool synchronousCall) {
-    setState(() {
-      _imageInfo = imageInfo;
-    });
-  }
 }
 
 class _EditableImage extends SingleChildRenderObjectWidget {

packages/zefyr/pubspec.yaml

@@ -1,6 +1,6 @@
 name: zefyr
 description: Clean, minimalistic and collaboration-ready rich text editor for Flutter.
-version: 0.1.2
+version: 0.1.3
 author: Anatoly Pulyaevskiy <anatoly.pulyaevskiy@gmail.com>
 homepage: https://github.com/memspace/zefyr