fix image

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

@@ -3,7 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:io';
+import 'dart:typed_data';
 
+import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:zefyr/zefyr.dart';
@@ -37,4 +39,10 @@ class CustomImageDelegate implements ZefyrImageDelegate<ImageSource> {
       return Image(image: image);
     }
   }
+
+  @override
+  Future<String> picked(asset) async {
+    File file = await asset.file;
+    return file.uri.toString();
+  }
 }

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

@@ -1,8 +1,8 @@
 // Copyright (c) 2018, the Zefyr project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
+import 'dart:async';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -437,6 +437,9 @@ class ImageButton extends StatefulWidget {
 }
 
 class _ImageButtonState extends State<ImageButton> {
+
+  List<AssetEntity> pickedAssetList = [];
+
   @override
   Widget build(BuildContext context) {
     final toolbar = ZefyrToolbar.of(context);
@@ -464,6 +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();
     return Material(
       color: theme.color,
       child: Container(
@@ -527,8 +531,17 @@ class _ImageButtonState extends State<ImageButton> {
                                     sortDelegate: SortDelegate.common,
                                     pickType: PickType.onlyImage,
                                     photoPathList: null,
-                                  ).then((List<AssetEntity> imgList) {
-                                    
+                                  ).then((List<AssetEntity> entity) async {
+                                    if (entity.isNotEmpty) {
+                                      toolbar.closeOverlay();
+                                      final editor = ZefyrToolbar.of(context).editor;
+                                      for (var asset in entity) {
+                                        final image = await editor.imageDelegate.picked(asset);
+                                        if (image != null) {
+                                          editor.formatSelection(NotusAttribute.embed.image(image));
+                                        }
+                                      }
+                                    }
                                   });
                                 },
                                 child: Container(
@@ -565,15 +578,25 @@ class _ImageButtonState extends State<ImageButton> {
                           toolbar.editor.tapHandle = TapHandle.previewImage;
                         },
                         child: PhotoPicker.buildGallery(
-                          context: context,
-                          padding: 4,
-                          thumbSize: 300,
-                          itemRadio: 0.5,
-                          provider: I18nProvider.chinese,
-                          sortDelegate: SortDelegate.common,
-                          pickType: PickType.onlyImage,
-                          photoPathList: null,
-                        ),
+                              context: context,
+                              padding: 4,
+                              thumbSize: 300,
+                              itemRadio: 0.5,
+                              provider: I18nProvider.chinese,
+                              sortDelegate: SortDelegate.common,
+                              pickType: PickType.onlyImage,
+                              photoPathList: null,
+                              onSelected: (List<AssetEntity> entity) {
+                                pickedChangeController.add(entity);
+                              }
+                            ),
+                        // StreamBuilder<List<AssetEntity>>(
+                        //   stream: pickedChangeController.stream,
+                        //   initialData: [],
+                        //   builder: (context, snapshot) {
+                        //     return 
+                        //   },
+                        // ),
                       ),
                     ),
                   ],
@@ -584,52 +607,67 @@ class _ImageButtonState extends State<ImageButton> {
               height: 50,
               color: theme.color,
               padding: EdgeInsets.symmetric(horizontal: 20),
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Row(
-                      children: [
-                        SizedBox(
-                          width: 16,
-                          height: 16,
-                          child: Radio<bool>(
-                            value: false,
-                            groupValue: false,
-                            onChanged: (bool result) {},
-                          ),
+              child: StreamBuilder(
+                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) {},
+                              ),
+                            ),
+                            Padding(
+                              padding: EdgeInsets.symmetric(horizontal: 8),
+                              child: Text(
+                                '原图',
+                                style: TextStyle(color: theme.iconColor, fontSize: 16),
+                              ),
+                            ),
+                          ],
                         ),
-                        Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 8),
+                      ),
+                      FlatButton(
+                        padding: EdgeInsets.zero,
+                        color: theme.toggleColor,
+                        disabledColor: theme.disabledIconColor,
+                        shape: StadiumBorder(),
+                        onPressed: snapshot.data.isNotEmpty ? () async {
+                          pickedChangeController.add([]);
+                          toolbar.closeOverlay();
+                          for (var asset in snapshot.data) {
+                            final image = await toolbar.editor.imageDelegate.picked(asset);
+                            if (image != null) {
+                              toolbar.editor.formatSelection(NotusAttribute.embed.image(image));
+                            }
+                          }
+                        } : null,
+                        child: Container(
+                          height: 30,
+                          alignment: Alignment.center,
+                          padding: EdgeInsets.symmetric(horizontal: 20),
                           child: Text(
-                            '原图',
-                            style:
-                                TextStyle(color: theme.iconColor, fontSize: 16),
+                              '上传 (${snapshot.data.length})',
+                              style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 14,
+                              ),
+                            ),
                           ),
                         ),
-                      ],
-                    ),
-                  ),
-                  FlatButton(
-                    padding: EdgeInsets.zero,
-                    color: theme.toggleColor,
-                    shape: StadiumBorder(),
-                    onPressed: () {},
-                    child: Container(
-                      height: 30,
-                      alignment: Alignment.center,
-                      padding: EdgeInsets.symmetric(horizontal: 20),
-                      child: Text(
-                        '上传 (2)',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 14,
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
+                    ],
+                  );
+                },
+                initialData: [],
+                stream: pickedChangeController.stream,
               ),
-            )
+            ),
           ],
         ),
       ),
@@ -647,10 +685,11 @@ class _ImageButtonState extends State<ImageButton> {
 
   void _pickFromGallery() async {
     final editor = ZefyrToolbar.of(context).editor;
-    final image = await editor.imageDelegate
-        .pickImage(editor.imageDelegate.gallerySource);
-    if (image != null) {
-      editor.formatSelection(NotusAttribute.embed.image(image));
+    for (var asset in pickedAssetList) {
+      final image = await editor.imageDelegate.picked(asset);
+      if (image != null) {
+        editor.formatSelection(NotusAttribute.embed.image(image));
+      }
     }
   }
 }

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

@@ -118,7 +118,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
     final scope = ZefyrScope.of(context);
     if (_focusNode.hasFocus) {
       // var show = scope.overlayBuilder == null ? true : false;
-      _input.openConnection(widget.controller.plainTextEditingValue, widget.keyboardAppearance, show: _focusNode.consumeKeyboardToken());
+      _input.openConnection(widget.controller.plainTextEditingValue, widget.keyboardAppearance, showKeyboard: _focusNode.consumeKeyboardToken());
     } else {
       FocusScope.of(context).requestFocus(_focusNode);
     }
@@ -308,14 +308,14 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   void _handleFocusChange() {
     final scope = ZefyrScope.of(context);
-    var show = true;
+    var showKeyboard = true;
     if (_focusNode.consumeKeyboardToken()) {
-      show = scope.tapHandle == null;
+      showKeyboard = scope.tapHandle == null;
     } else {
-      show = false;
+      showKeyboard = false;
     }
     _input.openOrCloseConnection(_focusNode,
-        widget.controller.plainTextEditingValue, widget.keyboardAppearance, show: show);
+        widget.controller.plainTextEditingValue, widget.keyboardAppearance, showKeyboard: showKeyboard);
     _cursorTimer.startOrStop(_focusNode, selection);
     updateKeepAlive();
   }

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

@@ -10,6 +10,7 @@ import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
 import 'package:notus/notus.dart';
 import 'package:zefyr/zefyr.dart';
+import 'package:photo_manager/photo_manager.dart';
 
 import 'editable_box.dart';
 
@@ -38,6 +39,8 @@ abstract class ZefyrImageDelegate<S> {
   /// an image file on user's device, an HTTP link, or an identifier generated
   /// by a file hosting service like AWS S3 or Google Drive.
   Future<String> pickImage(S source);
+
+  Future<String> picked(AssetEntity list);
 }
 
 class ZefyrImage extends StatefulWidget {
@@ -220,7 +223,7 @@ class RenderEditableImage extends RenderBox
         minWidth: 0.0,
         maxWidth: width,
         minHeight: 0.0,
-        maxHeight: (width * 9 / 16).floorToDouble(),
+        //maxHeight: (width * 9 / 16).floorToDouble(),
       );
       child.layout(childConstraints, parentUsesSize: true);
       _lastChildSize = child.size;

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

@@ -25,16 +25,16 @@ class InputConnectionController implements TextInputClient {
   /// Opens or closes input connection based on the current state of
   /// [focusNode] and [value].
   void openOrCloseConnection(FocusNode focusNode, TextEditingValue value,
-      Brightness keyboardAppearance, {bool show = true}) {
+      Brightness keyboardAppearance, {bool showKeyboard = true}) {
         //  && focusNode.consumeKeyboardToken()
     if (focusNode.hasFocus) {
-      openConnection(value, keyboardAppearance, show: show);
+      openConnection(value, keyboardAppearance, showKeyboard: showKeyboard);
     } else if (!focusNode.hasFocus) {
       closeConnection();
     }
   }
 
-  void openConnection(TextEditingValue value, Brightness keyboardAppearance, {bool show = true}) {
+  void openConnection(TextEditingValue value, Brightness keyboardAppearance, {bool showKeyboard = true}) {
     if (!hasConnection) {
       _lastKnownRemoteTextEditingValue = value;
       _textInputConnection = TextInput.attach(
@@ -50,7 +50,7 @@ class InputConnectionController implements TextInputClient {
       )..setEditingState(value);
       _sentRemoteValues.add(value);
     }
-    if (show) {
+    if (showKeyboard) {
       _textInputConnection.show();
     }
   }

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

@@ -310,7 +310,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
     } else {
       layers.add(
         Container(
-          height: keyboardHeight ?? 300,
+          height: keyboardHeight,
         ),
       );
     }

packages/zefyr/test/widgets/buttons_test.dart

@@ -199,4 +199,9 @@ class _TestImageDelegate implements ZefyrImageDelegate<String> {
   Future<String> pickImage(String source) {
     return Future.value("file:///tmp/test.jpg");
   }
+
+  @override
+  Future<String> picked(list) async {
+    return Future.value("file:///tmp/test.jpg");
+  }
 }

packages/zefyr/test/widgets/image_test.dart

@@ -103,4 +103,9 @@ class _TestImageDelegate implements ZefyrImageDelegate<String> {
   Future<String> pickImage(String source) {
     return Future.value("file:///tmp/test.jpg");
   }
+
+  @override
+  Future<String> picked(asset) async {
+    return Future.value("file:///tmp/test.jpg");
+  }
 }

packages/zefyr/test/widgets/scope_test.dart

@@ -90,4 +90,9 @@ class _TestImageDelegate implements ZefyrImageDelegate<String> {
   Future<String> pickImage(String source) {
     return null;
   }
+
+  @override
+  Future<String> picked(asset) async {
+    return null;
+  }
 }