fix picked callback

packages/zefyr/example/lib/src/images.dart

@@ -41,7 +41,8 @@ class CustomImageDelegate implements ZefyrImageDelegate<ImageSource> {
   }
 
   @override
-  Future<String> picked(asset) async {
+  Future<String> picked(asset, isFullImage) async {
+    print(isFullImage);
     File file = await asset.file;
     return file.uri.toString();
   }

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

@@ -467,7 +467,7 @@ class _ImageButtonState extends State<ImageButton> {
   Widget buildOverlay(BuildContext context) {
     final theme = ZefyrTheme.of(context).toolbarTheme;
     final toolbar = ZefyrToolbar.of(context);
-    final pickedChangeController = StreamController<List<AssetEntity>>.broadcast();
+    final pickedChangeController = StreamController<PickedEntity>.broadcast();
     return Material(
       color: theme.color,
       child: Container(
@@ -531,12 +531,12 @@ class _ImageButtonState extends State<ImageButton> {
                                     sortDelegate: SortDelegate.common,
                                     pickType: PickType.onlyImage,
                                     photoPathList: null,
-                                  ).then((List<AssetEntity> entity) async {
-                                    if (entity.isNotEmpty) {
+                                  ).then((PickedEntity entity) async {
+                                    if (entity.asset.isNotEmpty) {
                                       toolbar.closeOverlay();
                                       final editor = ZefyrToolbar.of(context).editor;
-                                      for (var asset in entity) {
-                                        final image = await editor.imageDelegate.picked(asset);
+                                      for (var asset in entity.asset) {
+                                        final image = await editor.imageDelegate.picked(asset, entity.isFullImage);
                                         if (image != null) {
                                           editor.formatSelection(NotusAttribute.embed.image(image));
                                         }
@@ -577,7 +577,11 @@ class _ImageButtonState extends State<ImageButton> {
                         onPointerUp: (PointerUpEvent event) {
                           toolbar.editor.tapHandle = TapHandle.previewImage;
                         },
-                        child: PhotoPicker.buildGallery(
+                        child: StreamBuilder<PickedEntity>(
+                          stream: pickedChangeController.stream,
+                          initialData: PickedEntity(),
+                          builder: (context, snapshot) {
+                            return PhotoPicker.buildGallery(
                               context: context,
                               padding: 4,
                               thumbSize: 300,
@@ -586,17 +590,13 @@ class _ImageButtonState extends State<ImageButton> {
                               sortDelegate: SortDelegate.common,
                               pickType: PickType.onlyImage,
                               photoPathList: null,
-                              onSelected: (List<AssetEntity> entity) {
+                              isFullImage: snapshot.data.isFullImage,
+                              onSelected: (PickedEntity entity) {
                                 pickedChangeController.add(entity);
                               }
-                            ),
-                        // StreamBuilder<List<AssetEntity>>(
-                        //   stream: pickedChangeController.stream,
-                        //   initialData: [],
-                        //   builder: (context, snapshot) {
-                        //     return 
-                        //   },
-                        // ),
+                            );
+                          },
+                        ),
                       ),
                     ),
                   ],
@@ -607,27 +607,49 @@ class _ImageButtonState extends State<ImageButton> {
               height: 50,
               color: theme.color,
               padding: EdgeInsets.symmetric(horizontal: 20),
-              child: StreamBuilder(
+              child: StreamBuilder<PickedEntity>(
                 builder: (context, snapshot) {
                   return Row(
                     children: [
                       Expanded(
-                        child: Row(
-                          children: [
-                            SizedBox(
-                              width: 16,
-                              height: 16,
-                              child: Radio<bool>(
-                                value: false,
-                                groupValue: false,
-                                onChanged: (bool result) {},
+                        child: Stack(
+                          children: <Widget>[
+                            IgnorePointer(
+                              child: Row(
+                                children: [
+                                  SizedBox(
+                                    width: 16,
+                                    height: 16,
+                                    child: Radio<bool>(
+                                      value: true,
+                                      groupValue: snapshot.data.isFullImage,
+                                      onChanged: (bool result) {},
+                                    ),
+                                  ),
+                                  Padding(
+                                    padding: EdgeInsets.symmetric(horizontal: 8),
+                                    child: Text(
+                                      '原图',
+                                      style: TextStyle(color: theme.iconColor, fontSize: 16),
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
-                            Padding(
-                              padding: EdgeInsets.symmetric(horizontal: 8),
-                              child: Text(
-                                '原图',
-                                style: TextStyle(color: theme.iconColor, fontSize: 16),
+                            Positioned(
+                              top: 0.0,
+                              bottom: 0.0,
+                              left: 0.0,
+                              right: 0.0,
+                              child: GestureDetector(
+                                onTap: () {
+                                  pickedChangeController.add(PickedEntity(
+                                    asset: snapshot.data.asset,
+                                    isFullImage: !snapshot.data.isFullImage,
+                                  ));
+                                },
+                                behavior: HitTestBehavior.translucent,
+                                child: Container(),
                               ),
                             ),
                           ],
@@ -638,11 +660,11 @@ class _ImageButtonState extends State<ImageButton> {
                         color: theme.toggleColor,
                         disabledColor: theme.disabledIconColor,
                         shape: StadiumBorder(),
-                        onPressed: snapshot.data.isNotEmpty ? () async {
-                          pickedChangeController.add([]);
+                        onPressed: snapshot.data.asset.isNotEmpty ? () async {
+                          pickedChangeController.add(PickedEntity());
                           toolbar.closeOverlay();
-                          for (var asset in snapshot.data) {
-                            final image = await toolbar.editor.imageDelegate.picked(asset);
+                          for (var asset in snapshot.data.asset) {
+                            final image = await toolbar.editor.imageDelegate.picked(asset, snapshot.data.isFullImage);
                             if (image != null) {
                               toolbar.editor.formatSelection(NotusAttribute.embed.image(image));
                             }
@@ -653,7 +675,7 @@ class _ImageButtonState extends State<ImageButton> {
                           alignment: Alignment.center,
                           padding: EdgeInsets.symmetric(horizontal: 20),
                           child: Text(
-                              '上传 (${snapshot.data.length})',
+                              '上传 ${snapshot.data.asset.isNotEmpty ? "(${snapshot.data.asset.length})" : ''}',
                               style: TextStyle(
                                 color: Colors.white,
                                 fontSize: 14,
@@ -664,7 +686,7 @@ class _ImageButtonState extends State<ImageButton> {
                     ],
                   );
                 },
-                initialData: [],
+                initialData: PickedEntity(),
                 stream: pickedChangeController.stream,
               ),
             ),
@@ -674,24 +696,24 @@ class _ImageButtonState extends State<ImageButton> {
     );
   }
 
-  void _pickFromCamera() async {
-    final editor = ZefyrToolbar.of(context).editor;
-    final image =
-        await editor.imageDelegate.pickImage(editor.imageDelegate.cameraSource);
-    if (image != null) {
-      editor.formatSelection(NotusAttribute.embed.image(image));
-    }
-  }
-
-  void _pickFromGallery() async {
-    final editor = ZefyrToolbar.of(context).editor;
-    for (var asset in pickedAssetList) {
-      final image = await editor.imageDelegate.picked(asset);
-      if (image != null) {
-        editor.formatSelection(NotusAttribute.embed.image(image));
-      }
-    }
-  }
+  // void _pickFromCamera() async {
+  //   final editor = ZefyrToolbar.of(context).editor;
+  //   final image =
+  //       await editor.imageDelegate.pickImage(editor.imageDelegate.cameraSource);
+  //   if (image != null) {
+  //     editor.formatSelection(NotusAttribute.embed.image(image));
+  //   }
+  // }
+
+  // void _pickFromGallery() async {
+  //   final editor = ZefyrToolbar.of(context).editor;
+  //   for (var asset in pickedAssetList) {
+  //     final image = await editor.imageDelegate.picked(asset);
+  //     if (image != null) {
+  //       editor.formatSelection(NotusAttribute.embed.image(image));
+  //     }
+  //   }
+  // }
 }
 
 class LinkButton extends StatefulWidget {

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

@@ -40,7 +40,7 @@ abstract class ZefyrImageDelegate<S> {
   /// by a file hosting service like AWS S3 or Google Drive.
   Future<String> pickImage(S source);
 
-  Future<String> picked(AssetEntity list);
+  Future<String> picked(AssetEntity list, bool isFullImage);
 }
 
 class ZefyrImage extends StatefulWidget {

packages/zefyr/test/widgets/buttons_test.dart

@@ -201,7 +201,7 @@ class _TestImageDelegate implements ZefyrImageDelegate<String> {
   }
 
   @override
-  Future<String> picked(list) async {
+  Future<String> picked(list, isFull) async {
     return Future.value("file:///tmp/test.jpg");
   }
 }

packages/zefyr/test/widgets/image_test.dart

@@ -105,7 +105,7 @@ class _TestImageDelegate implements ZefyrImageDelegate<String> {
   }
 
   @override
-  Future<String> picked(asset) async {
+  Future<String> picked(asset, isFull) async {
     return Future.value("file:///tmp/test.jpg");
   }
 }

packages/zefyr/test/widgets/scope_test.dart

@@ -92,7 +92,7 @@ class _TestImageDelegate implements ZefyrImageDelegate<String> {
   }
 
   @override
-  Future<String> picked(asset) async {
+  Future<String> picked(asset, isFull) async {
     return null;
   }
 }