## [0.6.5]

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.6.5]
+
+* Features:
+  Add completedWidget for ExtendedImageState, it is include gesture or editor, so that you would't miss them
+* Improve:
+  improve documents about Load State 
+
 ## [0.6.4]
 
 * Issues:

README-ZH.md

@@ -101,6 +101,16 @@ loadStateChanged 不仅仅只在网络图片中可以使用, 如果你的图片
 
 ![img](https://github.com/fluttercandies/Flutter_Candies/blob/master/gif/extended_image/custom.gif)
 
+注意:
+
+* 如果你不想重写某个状态，那么请返回null
+
+* 如果你想重写完成图片的 size 或者 soucreRect, 你可以通过使用 ExtendedRawImage 来完成
+
+* 如果你想增加一些新效果 (比如动画), 你可以重写并且使用ExtendedImageState.completedWidget
+
+* ExtendedImageState.completedWidget 包含手势或者裁剪, 这样你不会丢失它们
+
 ```dart
 /// custom load state widget if you want
     final LoadStateChanged loadStateChanged;
@@ -132,6 +142,7 @@ ExtendedImageState 状态回调
 | invertColors                 | 是否反转颜色                                                                                       | -    |
 | imageStreamKey               | 图片流的唯一键                                                                                     | -    |
 | reLoadImage()                | 如果图片加载失败，你可以通过调用这个方法来重新加载图片                                             | -    |
+| completedWidget              | 返回图片完成的Widget，它包含手势以及裁剪                                                                                             | -       |
 
 ```dart
 abstract class ExtendedImageState {
@@ -168,6 +179,10 @@ ExtendedImage.network(
           fit: BoxFit.fill,
         );
         break;
+      ///if you don't want override completed widget
+      ///please return null or state.completedWidget
+      //return null;
+      //return state.completedWidget;             
       case LoadState.completed:
         _controller.forward();
         return FadeTransition(

README.md

@@ -97,6 +97,17 @@ you can set enableLoadState(default value is ture for network and others are fal
 
 ![img](https://github.com/fluttercandies/Flutter_Candies/blob/master/gif/extended_image/custom.gif)
 
+Notice:
+
+* if you don't want to override any state, please return null in this case
+
+* if you want to override size or soucreRect, you can override it with ExtendedRawImage at completed state
+
+* if you want to add something (like animation) at completed state, you can override it with ExtendedImageState.completedWidget
+
+* ExtendedImageState.completedWidget is include gesture or editor, so that you would't miss them
+
+
 ```dart
 /// custom load state widget if you want
     final LoadStateChanged loadStateChanged;
@@ -128,6 +139,7 @@ ExtendedImageState(LoadStateChanged call back)
 | invertColors                 | invertColors                                                                                                                                  | -       |
 | imageStreamKey               | key of image                                                                                                                                  | -       |
 | reLoadImage()                | if image load failed,you can reload image by call it                                                                                          | -       |
+| completedWidget              | return completed widget include gesture or editor                                                                                             | -       |
 
 ```dart
 abstract class ExtendedImageState {
@@ -143,6 +155,8 @@ abstract class ExtendedImageState {
   bool get invertColors;
 
   Object get imageStreamKey;
+
+  Widget get completedWidget;
 }
 ```
 
@@ -164,6 +178,11 @@ ExtendedImage.network(
           fit: BoxFit.fill,
         );
         break;
+
+      ///if you don't want override completed widget
+      ///please return null or state.completedWidget
+      //return null;
+      //return state.completedWidget;        
       case LoadState.completed:
         _controller.forward();
         return FadeTransition(

example/android/build.gradle

@@ -1,10 +1,10 @@
 buildscript {
     repositories {
-// google()
-// jcenter()
-maven { url 'https://maven.aliyun.com/repository/google' }
-maven { url 'https://maven.aliyun.com/repository/jcenter' }
-maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
+google()
+jcenter()
+// maven { url 'https://maven.aliyun.com/repository/google' }
+// maven { url 'https://maven.aliyun.com/repository/jcenter' }
+// maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
     }
 
     dependencies {
@@ -25,11 +25,11 @@ maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
 
 allprojects {
     repositories {
-// google()
-// jcenter()        
-maven { url 'https://maven.aliyun.com/repository/google' }
-maven { url 'https://maven.aliyun.com/repository/jcenter' }
-maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
+google()
+jcenter()        
+// maven { url 'https://maven.aliyun.com/repository/google' }
+// maven { url 'https://maven.aliyun.com/repository/jcenter' }
+// maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
     }
 }
 

example/lib/common/crop_image.dart

@@ -75,6 +75,11 @@ class CropImage extends StatelessWidget {
             //image will not to be limited by size which you set for ExtendedImage first time.
             state.returnLoadStateChangedWidget = !knowImageSize;
 
+            ///if you don't want override completed widget
+            ///please return null or state.completedWidget
+            //return null;
+            //return state.completedWidget;
+
             widget = Hero(
                 tag: item.imageUrl + index.toString(),
                 child:

example/lib/pages/custom_image_demo.dart

@@ -71,6 +71,11 @@ class _CustomImageDemoState extends State<CustomImageDemo>
                       break;
                     case LoadState.completed:
                       _controller.forward();
+
+                      ///if you don't want override completed widget
+                      ///please return null or state.completedWidget
+                      //return null;
+                      //return state.completedWidget;
                       return FadeTransition(
                         opacity: _controller,
                         child: ExtendedRawImage(

lib/src/extended_image.dart

@@ -845,16 +845,7 @@ class _ExtendedImageState extends State<ExtendedImage>
             );
             break;
           case LoadState.completed:
-            if (widget.mode == ExtendedImageMode.gesture) {
-              current = ExtendedImageGesture(this, _slidePageState);
-            } else if (widget.mode == ExtendedImageMode.editor) {
-              current = ExtendedImageEditor(
-                extendedImageState: this,
-                key: widget.extendedImageEditorKey,
-              );
-            } else {
-              current = _buildExtendedRawImage();
-            }
+            current = _getCompletedWidget();
             break;
           case LoadState.failed:
             current = Container(
@@ -869,15 +860,8 @@ class _ExtendedImageState extends State<ExtendedImage>
             break;
         }
       } else {
-        if (_loadState == LoadState.completed &&
-            widget.mode == ExtendedImageMode.gesture) {
-          current = ExtendedImageGesture(this, _slidePageState);
-        } else if (_loadState == LoadState.completed &&
-            widget.mode == ExtendedImageMode.editor) {
-          current = ExtendedImageEditor(
-            extendedImageState: this,
-            key: widget.extendedImageEditorKey,
-          );
+        if (_loadState == LoadState.completed) {
+          current = _getCompletedWidget();
         } else {
           current = _buildExtendedRawImage();
         }
@@ -934,6 +918,21 @@ class _ExtendedImageState extends State<ExtendedImage>
     );
   }
 
+  Widget _getCompletedWidget() {
+    Widget current;
+    if (widget.mode == ExtendedImageMode.gesture) {
+      current = ExtendedImageGesture(this, _slidePageState);
+    } else if (widget.mode == ExtendedImageMode.editor) {
+      current = ExtendedImageEditor(
+        extendedImageState: this,
+        key: widget.extendedImageEditorKey,
+      );
+    } else {
+      current = _buildExtendedRawImage();
+    }
+    return current;
+  }
+
   Widget _getIndicator(BuildContext context) {
     return Theme.of(context).platform == TargetPlatform.iOS
         ? CupertinoActivityIndicator(
@@ -996,4 +995,7 @@ class _ExtendedImageState extends State<ExtendedImage>
 
   @override
   ExtendedImage get imageWidget => this.widget;
+
+  @override
+  Widget get completedWidget => _getCompletedWidget();
 }

lib/src/extended_image_utils.dart

@@ -26,6 +26,8 @@ abstract class ExtendedImageState {
   Object get imageStreamKey;
 
   ExtendedImage get imageWidget;
+
+  Widget get completedWidget;
 }
 
 enum ExtendedImageMode {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: extended_image
 description: Official extension image, support placeholder(loading)/ failed state, cache network, zoom/pan, photo view, slide out page, editor(crop,rotate,flip), painting etc.
-version: 0.6.4
+version: 0.6.5
 author: zmtzawqlp <[email protected]>
 homepage: https://github.com/fluttercandies/extended_image