fix widget rebuild

packages/zefyr/example/android/gradle.properties

@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true

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

@@ -516,8 +516,9 @@ class _ImageButtonState extends State<ImageButton> {
                             child: FlatButton(
                                 shape: RoundedRectangleBorder(),
                                 color: Color(0xFFF6F6F6),
-                                onPressed: () async {
-                                  List<AssetEntity> imgList = await PhotoPicker.pickAsset(
+                                onPressed: () {
+                                  toolbar.editor.tapHandle = TapHandle.pickAsset;
+                                  PhotoPicker.pickAsset(
                                     context: context,
                                     rowCount: 4,
                                     itemRadio: 1,
@@ -526,8 +527,9 @@ class _ImageButtonState extends State<ImageButton> {
                                     sortDelegate: SortDelegate.common,
                                     pickType: PickType.onlyImage,
                                     photoPathList: null,
-                                  );
-                                  print(imgList);
+                                  ).then((List<AssetEntity> imgList) {
+                                    
+                                  });
                                 },
                                 child: Container(
                                   child: Column(
@@ -557,14 +559,21 @@ class _ImageButtonState extends State<ImageButton> {
                       ),
                     ),
                     Expanded(
-                      child: PhotoPicker.buildGallery(
-                        context: context,
-                        itemWidth: (toolbar.keyboardHeight - 50) * 0.5,
-                        padding: 4,
-                        provider: I18nProvider.chinese,
-                        sortDelegate: SortDelegate.common,
-                        pickType: PickType.onlyImage,
-                        photoPathList: null,
+                      child: Listener(
+                        behavior: HitTestBehavior.translucent,
+                        onPointerUp: (PointerUpEvent event) {
+                          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,
+                        ),
                       ),
                     ),
                   ],

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

@@ -117,11 +117,8 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   void requestKeyboard() {
     final scope = ZefyrScope.of(context);
     if (_focusNode.hasFocus) {
-      var show = scope.toolbarStatus == ToolbarStatus.open ? false : true;
-      _input.openConnection(widget.controller.plainTextEditingValue, widget.keyboardAppearance, show: show);
-      if (show) {
-        print(MediaQuery.of(context).viewInsets.bottom);
-      }
+      // var show = scope.overlayBuilder == null ? true : false;
+      _input.openConnection(widget.controller.plainTextEditingValue, widget.keyboardAppearance, show: _focusNode.consumeKeyboardToken());
     } else {
       FocusScope.of(context).requestFocus(_focusNode);
     }
@@ -310,8 +307,15 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   }
 
   void _handleFocusChange() {
+    final scope = ZefyrScope.of(context);
+    var show = true;
+    if (_focusNode.consumeKeyboardToken()) {
+      show = scope.tapHandle == null;
+    } else {
+      show = false;
+    }
     _input.openOrCloseConnection(_focusNode,
-        widget.controller.plainTextEditingValue, widget.keyboardAppearance, show: !_focusNode.consumeKeyboardToken());
+        widget.controller.plainTextEditingValue, widget.keyboardAppearance, show: show);
     _cursorTimer.startOrStop(_focusNode, selection);
     updateKeepAlive();
   }

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

@@ -95,14 +95,12 @@ class _ZefyrEditorState extends State<ZefyrEditor> {
     assert(_toolbarKey == null);
     _toolbarKey = GlobalKey();
     _scaffold.showToolbar(buildToolbar);
-    _scope.toolbarStatus = ToolbarStatus.show;
   }
 
   void hideToolbar() {
     if (_toolbarKey == null) return;
     _scaffold.hideToolbar(buildToolbar);
     _toolbarKey = null;
-    _scope.toolbarStatus = ToolbarStatus.hide;
   }
 
   Widget buildToolbar(BuildContext context) {
@@ -118,7 +116,9 @@ class _ZefyrEditorState extends State<ZefyrEditor> {
 
   void _handleChange() {
     if (_scope.focusOwner == FocusOwner.none) {
-      hideToolbar();
+      if (_scope.tapHandle == null) {
+        hideToolbar();
+      }
     } else if (!hasToolbar) {
       showToolbar();
     } else {

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

@@ -39,22 +39,6 @@ class ZefyrScaffoldState extends State<ZefyrScaffold> {
   Widget build(BuildContext context) {
     final toolbar =
         (_toolbarBuilder == null) ? Container() : _toolbarBuilder(context);
-    // return Container(
-    //   margin: EdgeInsets.only(
-    //     bottom: MediaQuery.of(context).viewInsets.bottom > 0
-    //         ? MediaQuery.of(context).viewInsets.bottom
-    //         : 0,
-    //   ),
-    //   child: _ZefyrScaffoldAccess(
-    //     scaffold: this,
-    //     child: Column(
-    //       children: <Widget>[
-    //         Expanded(child: widget.child),
-    //         toolbar,
-    //       ],
-    //     ),
-    //   ),
-    // );
     return _ZefyrScaffoldAccess(
         scaffold: this,
         child: Column(

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

@@ -71,22 +71,37 @@ class ZefyrScope extends ChangeNotifier {
   InputConnectionController _input;
   InputConnectionController get input => _input;
 
-  ToolbarStatus _toolbarStatus = ToolbarStatus.hide;
-  ToolbarStatus get toolbarStatus => _toolbarStatus;
-  set toolbarStatus(ToolbarStatus value) {
-    if (_toolbarStatus != value) {
-      _toolbarStatus = value;
-      if (_toolbarStatus == ToolbarStatus.open) {
-        hideKeyboard();
-      } else if (_toolbarStatus == ToolbarStatus.hide) {
-        closeKeyboard();
-      } else if (_toolbarStatus == ToolbarStatus.show) {
-        showKeyboard();
-      }
+  TapHandle _tapHandle;
+  TapHandle get tapHandle => _tapHandle;
+  set tapHandle(TapHandle value) {
+    if (_tapHandle != value) {
+      _tapHandle = value;
       notifyListeners();
     }
   }
 
+  // ToolbarStatus _toolbarStatus = ToolbarStatus.hide;
+  // ToolbarStatus get toolbarStatus => _toolbarStatus;
+  // set toolbarStatus(ToolbarStatus value) {
+  //   if (_toolbarStatus != value) {
+  //     _toolbarStatus = value;
+  //     notifyListeners();
+  //   }
+  // }
+
+  // WidgetBuilder _overlayBuilder;
+  // WidgetBuilder get overlayBuilder => _overlayBuilder;
+  // set overlayBuilder(WidgetBuilder builder) {
+  //   _overlayBuilder = builder;
+  //   if (builder != null) {
+  //     hideKeyboard();
+  //   } else {
+  //     showKeyboard();
+  //   }
+  //   notifyListeners();
+  // }
+
+
   ZefyrImageDelegate _imageDelegate;
   ZefyrImageDelegate get imageDelegate => _imageDelegate;
   set imageDelegate(ZefyrImageDelegate value) {
@@ -215,18 +230,21 @@ class ZefyrScope extends ChangeNotifier {
     assert(isEditable);
     assert(!_disposed);
     _focusNode.unfocus();
+    tapHandle = null;
   }
 
   void showKeyboard() {
     assert(isEditable);
     assert(!_disposed);
     SystemChannels.textInput.invokeMethod('TextInput.show');
+    tapHandle = null;
   }
 
   void hideKeyboard() {
     assert(isEditable);
     assert(!_disposed);
     SystemChannels.textInput.invokeMethod('TextInput.hide');
+    tapHandle = null;
   }
 
   @override
@@ -283,4 +301,10 @@ enum ToolbarStatus {
   show,
   hide,
   open,
+}
+
+enum TapHandle {
+  previewImage,
+  pickAsset,
+  takePhoto,
 }

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

@@ -203,8 +203,8 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
   double get keyboardHeight => _keyboardHeight;
 
   ZefyrToolbarDelegate _delegate;
-  AnimationController _overlayAnimation;
   WidgetBuilder _overlayBuilder;
+  AnimationController _overlayAnimation;
   Completer<void> _overlayCompleter;
 
   TextSelection _selection;
@@ -233,7 +233,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
       _overlayCompleter = completer;
       _overlayAnimation.forward();
     });
-    editor.toolbarStatus = ToolbarStatus.open;
+    editor.hideKeyboard();
     return completer.future;
   }
 
@@ -245,7 +245,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
         _overlayCompleter?.complete();
         _overlayCompleter = null;
       });
-      editor.toolbarStatus = ToolbarStatus.show;
+      editor.showKeyboard();
     });
   }
 
@@ -284,7 +284,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
     final theme = ZefyrTheme.of(context).toolbarTheme;
     
     final layers = <Widget>[];
-    var overlay;
+    Widget overlay;
 
     // Must set unique key for the toolbar to prevent it from reconstructing
     // new state each time we toggle overlay.
@@ -296,20 +296,25 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
     );
     layers.add(toolbar);
     if (hasOverlay) {
-      Widget widget = Builder(builder: _overlayBuilder);
+      Widget widget = Container(
+        height: keyboardHeight ?? 300,
+        child: Builder(builder: _overlayBuilder),
+      );
       assert(widget != null);
       overlay = FadeTransition(
         key: _overlayKey,
         opacity: _overlayAnimation,
         child: widget,
       );
+      layers.add(overlay);
+    } else {
+      layers.add(
+        Container(
+          height: keyboardHeight ?? 300,
+        ),
+      );
     }
-    layers.add(
-      Container(
-        height: keyboardHeight,
-        child: overlay,
-      ),
-    );
+    
 
     return _ZefyrToolbarScope(
       toolbar: this,