fix bug

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+  // 使用 IntelliSense 了解相关属性。
+  // 悬停以查看现有属性的描述。
+  // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Flutter",
+      "request": "launch",
+      "type": "dart",
+      "program": "packages/zefyr/example/lib/main.dart"
+    }
+  ]
+}

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

@@ -71,7 +71,7 @@ class _FullPageEditorScreenState extends State<FullPageEditorScreen> {
         ? IconButton(onPressed: _stopEditing, icon: Icon(Icons.save))
         : IconButton(onPressed: _startEditing, icon: Icon(Icons.edit));
     final result = Scaffold(
-      resizeToAvoidBottomPadding: true,
+      resizeToAvoidBottomInset: false,
       appBar: AppBar(
         title: ZefyrLogo(),
         actions: [
@@ -84,9 +84,10 @@ class _FullPageEditorScreenState extends State<FullPageEditorScreen> {
       ),
       body: ZefyrScaffold(
         child: ZefyrEditor(
+          autofocus: false,
           controller: _controller,
           focusNode: _focusNode,
-          mode: _editing ? ZefyrMode.edit : ZefyrMode.select,
+          mode: ZefyrMode.edit,
           imageDelegate: CustomImageDelegate(),
           keyboardAppearance: _darkTheme ? Brightness.dark : Brightness.light,
         ),
@@ -95,7 +96,16 @@ class _FullPageEditorScreenState extends State<FullPageEditorScreen> {
     if (_darkTheme) {
       return Theme(data: ThemeData.dark(), child: result);
     }
-    return Theme(data: ThemeData(primarySwatch: Colors.cyan), child: result);
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onTap: () {
+        _focusNode.unfocus();
+      },
+      child: Theme(
+        data: ThemeData(primarySwatch: Colors.cyan),
+        child: result,
+      ),
+    );
   }
 
   void handlePopupItemSelected(value) {

packages/zefyr/example/pubspec.yaml

@@ -51,10 +51,6 @@ flutter:
   # "family" key with the font family name, and a "fonts" key with a
   # list giving the asset and other descriptors for the font. For
   # example:
-  fonts:
-    - family: ZefyrFont
-      fonts:
-        - asset: ../lib/fonts/iconfont.ttf
   #   - family: Trajan Pro
   #     fonts:
   #       - asset: fonts/TrajanPro.ttf

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

@@ -282,10 +282,10 @@ class StyleTheme {
 /// Defines styles and colors for [ZefyrToolbar].
 class ZefyrToolbarTheme {
   /// The background color of toolbar.
-  final Color color;
+  final Color backgroundColor;
 
   /// Color of buttons in toggled state.
-  final Color toggleColor;
+  final Color primaryColor;
 
   /// Color of button icons.
   final Color iconColor;
@@ -297,10 +297,8 @@ class ZefyrToolbarTheme {
   factory ZefyrToolbarTheme.fallback(BuildContext context) {
     final theme = Theme.of(context);
     return ZefyrToolbarTheme._(
-      color: theme.primaryColorBrightness == Brightness.light
-          ? Colors.grey.shade300
-          : Colors.grey.shade800,
-      toggleColor: theme.primaryColorBrightness == Brightness.light
+      backgroundColor: theme.brightness == Brightness.light ? Color(0xFFFFFFFF) : Color(0xFF282828),
+      primaryColor: theme.brightness == Brightness.light
           ? Colors.grey.shade400
           : Colors.grey.shade900,
       iconColor: theme.primaryIconTheme.color,
@@ -309,8 +307,8 @@ class ZefyrToolbarTheme {
   }
 
   ZefyrToolbarTheme._({
-    @required this.color,
-    @required this.toggleColor,
+    @required this.backgroundColor,
+    @required this.primaryColor,
     @required this.iconColor,
     @required this.disabledIconColor,
   });
@@ -322,8 +320,8 @@ class ZefyrToolbarTheme {
     Color disabledIconColor,
   }) {
     return ZefyrToolbarTheme._(
-      color: color ?? this.color,
-      toggleColor: toggleColor ?? this.toggleColor,
+      backgroundColor: color ?? this.backgroundColor,
+      primaryColor: toggleColor ?? this.primaryColor,
       iconColor: iconColor ?? this.iconColor,
       disabledIconColor: disabledIconColor ?? this.disabledIconColor,
     );

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

@@ -7,14 +7,26 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:notus/notus.dart';
+import 'package:photo/photo.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:zefyr/src/widgets/gallery_item.dart';
 
 import 'scope.dart';
 import 'theme.dart';
 import 'toolbar.dart';
 
+const kToolbarButtonIcons = [
+  ZefyrToolbarAction.text,
+  ZefyrToolbarAction.heading,
+  ZefyrToolbarAction.emoji,
+  ZefyrToolbarAction.image,
+  ZefyrToolbarAction.link,
+  ZefyrToolbarAction.hideKeyboard,
+  ZefyrToolbarAction.showKeyboard,
+  ZefyrToolbarAction.close,
+  ZefyrToolbarAction.confirm,
+];
+
 /// A button used in [ZefyrToolbar].
 ///
 /// Create an instance of this widget with [ZefyrButton.icon] or
@@ -88,7 +100,9 @@ class ZefyrButton extends StatelessWidget {
     } else {
       assert(_text != null);
       var style = _textStyle ?? TextStyle();
-      style = style.copyWith(color: _getColor(editor, toolbarTheme),);
+      style = style.copyWith(
+        color: _getColor(editor, toolbarTheme),
+      );
       return RawZefyrButton(
         action: action,
         child: Text(_text, style: style),
@@ -110,7 +124,7 @@ class ZefyrButton extends StatelessWidget {
   }
 
   Color _getFillColor(ZefyrToolbarAction action, ToolbarTheme theme) {
-    if (action == ZefyrToolbarAction.text || action == ZefyrToolbarAction.heading || action == ZefyrToolbarAction.hideKeyboard || action == ZefyrToolbarAction.emoji || action == ZefyrToolbarAction.image || action == ZefyrToolbarAction.link) {
+    if (kToolbarButtonIcons.contains(action)) {
       return theme.color;
     }
     return theme.iconFillColor;
@@ -128,7 +142,9 @@ class ZefyrButton extends StatelessWidget {
     } else if (action == ZefyrToolbarAction.close) {
       return () => toolbar.closeOverlay();
     } else if (action == ZefyrToolbarAction.hideKeyboard) {
-      return () => editor.hideKeyboard();
+      return () => editor.closeKeyboard();
+    } else if (action == ZefyrToolbarAction.showKeyboard) {
+      return () => toolbar.closeOverlay();
     }
 
     return null;
@@ -189,21 +205,33 @@ class RawZefyrButton extends StatelessWidget {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final constraints = theme.buttonTheme.constraints.copyWith(
-      minWidth: 64, minHeight: 40, maxHeight: 40,
+      minWidth: 64,
+      minHeight: 40,
+      maxHeight: 40,
     );
     var radius = BorderRadius.all(Radius.circular(0));
-    if (action == ZefyrToolbarAction.headingLevel1 || action == ZefyrToolbarAction.bold || action == ZefyrToolbarAction.numberList) {
+    if (action == ZefyrToolbarAction.headingLevel1 ||
+        action == ZefyrToolbarAction.bold ||
+        action == ZefyrToolbarAction.numberList) {
       radius = BorderRadius.horizontal(left: Radius.circular(4));
     }
-    if (action == ZefyrToolbarAction.headingLevel6 || action == ZefyrToolbarAction.deleteline || action == ZefyrToolbarAction.bulletList) {
+    if (action == ZefyrToolbarAction.headingLevel6 ||
+        action == ZefyrToolbarAction.deleteline ||
+        action == ZefyrToolbarAction.bulletList) {
       radius = BorderRadius.horizontal(left: Radius.circular(4));
     }
-    if (action == ZefyrToolbarAction.quote || action == ZefyrToolbarAction.horizontalRule || action == ZefyrToolbarAction.code) {
+    if (action == ZefyrToolbarAction.quote ||
+        action == ZefyrToolbarAction.horizontalRule ||
+        action == ZefyrToolbarAction.code) {
       radius = BorderRadius.all(Radius.circular(4));
     }
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 1.0, vertical: 6.0).copyWith(
-        left: action == ZefyrToolbarAction.code || action == ZefyrToolbarAction.quote ? 12.0 : 1.0,
+      padding:
+          const EdgeInsets.symmetric(horizontal: 1.0, vertical: 6.0).copyWith(
+        left: action == ZefyrToolbarAction.code ||
+                action == ZefyrToolbarAction.quote
+            ? 12.0
+            : 1.0,
       ),
       child: RawMaterialButton(
         shape: RoundedRectangleBorder(borderRadius: radius),
@@ -283,11 +311,9 @@ class _HeadingButtonState extends State<HeadingButton> {
     ];
     return Material(
       color: theme.color,
-          child: Container(
+      child: Container(
         decoration: BoxDecoration(
-          border: Border(
-            top: BorderSide(color: theme.dividerColor, width: 1)
-          ),
+          border: Border(top: BorderSide(color: theme.dividerColor, width: 1)),
         ),
         child: Column(
           children: [
@@ -305,8 +331,7 @@ class _HeadingButtonState extends State<HeadingButton> {
             Container(
               decoration: BoxDecoration(
                 border: Border(
-                  top: BorderSide(color: theme.dividerColor, width: 1)
-                ),
+                    top: BorderSide(color: theme.dividerColor, width: 1)),
               ),
               padding: EdgeInsets.symmetric(vertical: 16),
               margin: EdgeInsets.symmetric(horizontal: 16),
@@ -314,11 +339,14 @@ class _HeadingButtonState extends State<HeadingButton> {
                 children: <Widget>[
                   Padding(
                     padding: EdgeInsets.only(right: 12),
-                    child: Text('文字色', style: Theme.of(context).textTheme.caption.copyWith(
-                      color: Theme.of(context).colorScheme.onSurface,
-                      fontSize: 14,
-                      fontWeight: FontWeight.w500,
-                    ),),
+                    child: Text(
+                      '文字色',
+                      style: Theme.of(context).textTheme.caption.copyWith(
+                            color: Theme.of(context).colorScheme.onSurface,
+                            fontSize: 14,
+                            fontWeight: FontWeight.w500,
+                          ),
+                    ),
                   ),
                   Expanded(
                     child: Container(
@@ -330,7 +358,8 @@ class _HeadingButtonState extends State<HeadingButton> {
                             padding: EdgeInsets.all(1),
                             decoration: ShapeDecoration(
                               shape: CircleBorder(
-                                side: BorderSide(width: 1, color: theme.toggleColor),
+                                side: BorderSide(
+                                    width: 1, color: theme.toggleColor),
                               ),
                             ),
                             margin: EdgeInsets.symmetric(horizontal: 8),
@@ -396,31 +425,6 @@ class _HeadingButtonState extends State<HeadingButton> {
   }
 }
 
-// TODO(lucky1213): image预览这个无效
-extension AssetEntityExtension on AssetEntity {
-  static String idd;
-  static Uint8List _cacheThumbData;
-
-  Future<Uint8List> getThumbData() async {
-      print((idd ?? '') != id);
-      print(id);
-    if ((idd ?? '') != id) {
-      idd = id;
-      _cacheThumbData = await thumbData;
-      return thumbData;
-    } else {
-      print(idd);
-      return _cacheThumbData;
-    }
-    if (_cacheThumbData == null) {
-      _cacheThumbData = await thumbData;
-      return thumbData;
-    } else {
-      return _cacheThumbData;
-    }
-  }
-}
-
 /// Controls image attribute.
 ///
 /// When pressed, this button displays overlay toolbar with three
@@ -433,7 +437,6 @@ class ImageButton extends StatefulWidget {
 }
 
 class _ImageButtonState extends State<ImageButton> {
-  List<AssetEntity> assetList = [];
   @override
   Widget build(BuildContext context) {
     final toolbar = ZefyrToolbar.of(context);
@@ -449,8 +452,6 @@ class _ImageButtonState extends State<ImageButton> {
     if (Platform.isIOS || Platform.isAndroid) {
       var result = await PhotoManager.requestPermission();
       if (result) {
-        var list = await PhotoManager.getAssetPathList(onlyAll: true, type: RequestType.image);
-        assetList = await list[0].assetList;
         return toolbar.showOverlay(buildOverlay);
       } else {
         PhotoManager.openSetting();
@@ -463,19 +464,9 @@ class _ImageButtonState extends State<ImageButton> {
   Widget buildOverlay(BuildContext context) {
     final theme = ZefyrTheme.of(context).toolbarTheme;
     final toolbar = ZefyrToolbar.of(context);
-    final buttons = Row(
-      children: <Widget>[
-        SizedBox(width: 8.0),
-        toolbar.buildButton(context, ZefyrToolbarAction.cameraImage,
-            onPressed: _pickFromCamera),
-        toolbar.buildButton(context, ZefyrToolbarAction.galleryImage,
-            onPressed: _pickFromGallery),
-      ],
-    );
     return Material(
       color: theme.color,
       child: Container(
-        height: 260,
         child: Column(
           children: <Widget>[
             Expanded(
@@ -494,65 +485,86 @@ class _ImageButtonState extends State<ImageButton> {
                         children: [
                           Expanded(
                             child: FlatButton(
-                              shape: RoundedRectangleBorder(),
-                              color: Color(0xFFF6F6F6),
-                              onPressed: () {
-
-                              }, 
-                              child: Container(
-                                child: Column(
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: [
-                                    Icon(kDefaultButtonIcons[ZefyrToolbarAction.cameraImage], size: 24, color: Color(0xFFBFBFBF),),
-                                    Padding(
-                                      padding: EdgeInsets.only(top: 6),
-                                      child: Text('拍照', style: TextStyle(
-                                        fontSize: 12,
-                                        color: Color(0xFF8C8C8C),
-                                      ),),
-                                    )
-                                  ],
-                                ),
-                              )
-                            ),
+                                shape: RoundedRectangleBorder(),
+                                color: Color(0xFFF6F6F6),
+                                onPressed: () {},
+                                child: Container(
+                                  child: Column(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Icon(
+                                        kDefaultButtonIcons[
+                                            ZefyrToolbarAction.cameraImage],
+                                        size: 24,
+                                        color: Color(0xFFBFBFBF),
+                                      ),
+                                      Padding(
+                                        padding: EdgeInsets.only(top: 6),
+                                        child: Text(
+                                          '拍照',
+                                          style: TextStyle(
+                                            fontSize: 12,
+                                            color: Color(0xFF8C8C8C),
+                                          ),
+                                        ),
+                                      )
+                                    ],
+                                  ),
+                                )),
                           ),
                           Expanded(
                             child: FlatButton(
-                              shape: RoundedRectangleBorder(),
-                              color: Color(0xFFF6F6F6),
-                              onPressed: () {
-
-                              }, 
-                              child: Container(
-                                child: Column(
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: [
-                                    Icon(kDefaultButtonIcons[ZefyrToolbarAction.galleryImage], size: 24, color: Color(0xFFBFBFBF),),
-                                    Padding(
-                                      padding: EdgeInsets.only(top: 6),
-                                      child: Text('相册', style: TextStyle(
-                                        fontSize: 12,
-                                        color: Color(0xFF8C8C8C),
-                                      ),),
-                                    )
-                                  ],
-                                ),
-                              )
-                            ),
+                                shape: RoundedRectangleBorder(),
+                                color: Color(0xFFF6F6F6),
+                                onPressed: () async {
+                                  List<AssetEntity> imgList = await PhotoPicker.pickAsset(
+                                    context: context,
+                                    rowCount: 4,
+                                    itemRadio: 1,
+                                    padding: 4,
+                                    provider: I18nProvider.chinese,
+                                    sortDelegate: SortDelegate.common,
+                                    pickType: PickType.onlyImage,
+                                    photoPathList: null,
+                                  );
+                                  print(imgList);
+                                },
+                                child: Container(
+                                  child: Column(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Icon(
+                                        kDefaultButtonIcons[
+                                            ZefyrToolbarAction.galleryImage],
+                                        size: 24,
+                                        color: Color(0xFFBFBFBF),
+                                      ),
+                                      Padding(
+                                        padding: EdgeInsets.only(top: 6),
+                                        child: Text(
+                                          '相册',
+                                          style: TextStyle(
+                                            fontSize: 12,
+                                            color: Color(0xFF8C8C8C),
+                                          ),
+                                        ),
+                                      )
+                                    ],
+                                  ),
+                                )),
                           ),
                         ],
                       ),
                     ),
                     Expanded(
-                      child: ListView.builder(
-                        key: ValueKey(assetList.length),
-                        scrollDirection: Axis.horizontal,
-                        physics: ClampingScrollPhysics(),
-                        itemCount: assetList.length,
-                        itemExtent: 122,
-                        itemBuilder: (context, index) {
-                          return GalleryItem(key: ObjectKey(assetList[index].id), asset: assetList[index],);
-                        },
+                      child: PhotoPicker.buildGallery(
+                        context: context,
+                        itemWidth: (toolbar.keyboardHeight - 50) * 0.5,
+                        padding: 4,
+                        provider: I18nProvider.chinese,
+                        sortDelegate: SortDelegate.common,
+                        pickType: PickType.onlyImage,
+                        photoPathList: null,
                       ),
                     ),
                   ],
@@ -572,19 +584,18 @@ class _ImageButtonState extends State<ImageButton> {
                           width: 16,
                           height: 16,
                           child: Radio<bool>(
-                            value: false, 
-                            groupValue: false, 
-                            onChanged: (bool result) {
-
-                            },
+                            value: false,
+                            groupValue: false,
+                            onChanged: (bool result) {},
                           ),
                         ),
                         Padding(
                           padding: EdgeInsets.symmetric(horizontal: 8),
-                          child: Text('原图', style: TextStyle(
-                            color: theme.iconColor,
-                            fontSize: 16
-                          ),),
+                          child: Text(
+                            '原图',
+                            style:
+                                TextStyle(color: theme.iconColor, fontSize: 16),
+                          ),
                         ),
                       ],
                     ),
@@ -593,17 +604,18 @@ class _ImageButtonState extends State<ImageButton> {
                     padding: EdgeInsets.zero,
                     color: theme.toggleColor,
                     shape: StadiumBorder(),
-                    onPressed: () {
-
-                    }, 
+                    onPressed: () {},
                     child: Container(
                       height: 30,
                       alignment: Alignment.center,
                       padding: EdgeInsets.symmetric(horizontal: 20),
-                      child: Text('上传 (2)', style: TextStyle(
-                        color: Colors.white,
-                        fontSize: 14,
-                      ),),
+                      child: Text(
+                        '上传 (2)',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 14,
+                        ),
+                      ),
                     ),
                   ),
                 ],
@@ -753,7 +765,7 @@ class _LinkButtonState extends State<LinkButton> {
     var link = getLink();
     assert(link != null);
     if (await canLaunch(link)) {
-      editor.hideKeyboard();
+      editor.closeKeyboard();
       await launch(link, forceWebView: true);
     }
   }
@@ -921,4 +933,4 @@ class _LinkView extends StatelessWidget {
     }
     return widget;
   }
-}
+}

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

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:notus/notus.dart';
 
+import '../../zefyr.dart';
 import 'code.dart';
 import 'common.dart';
 import 'controller.dart';
@@ -38,6 +39,7 @@ class ZefyrEditableText extends StatefulWidget {
     this.selectionControls,
     this.autofocus = true,
     this.mode = ZefyrMode.edit,
+    @required this.input,
     this.padding = const EdgeInsets.symmetric(horizontal: 16.0),
     this.physics,
     this.keyboardAppearance = Brightness.light,
@@ -66,6 +68,8 @@ class ZefyrEditableText extends StatefulWidget {
   /// Editing mode of this text field.
   final ZefyrMode mode;
 
+  final InputConnectionController input;
+
   /// Controls physics of scrollable text field.
   final ScrollPhysics physics;
 
@@ -111,9 +115,13 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   /// focus, the control will then attach to the keyboard and request that the
   /// keyboard become visible.
   void requestKeyboard() {
+    final scope = ZefyrScope.of(context);
     if (_focusNode.hasFocus) {
-      _input.openConnection(
-          widget.controller.plainTextEditingValue, widget.keyboardAppearance);
+      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);
+      }
     } else {
       FocusScope.of(context).requestFocus(_focusNode);
     }
@@ -171,7 +179,6 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
     _focusNode = widget.focusNode;
     super.initState();
     _focusAttachment = _focusNode.attach(context);
-    _input = InputConnectionController(_handleRemoteValueChange);
     _updateSubscriptions();
   }
 
@@ -225,7 +232,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
   final ScrollController _scrollController = ScrollController();
   ZefyrRenderContext _renderContext;
   CursorTimer _cursorTimer;
-  InputConnectionController _input;
+  InputConnectionController get _input => widget.input;
   bool _didAutoFocus = false;
 
   List<Widget> _buildChildren(BuildContext context) {
@@ -304,7 +311,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
 
   void _handleFocusChange() {
     _input.openOrCloseConnection(_focusNode,
-        widget.controller.plainTextEditingValue, widget.keyboardAppearance);
+        widget.controller.plainTextEditingValue, widget.keyboardAppearance, show: !_focusNode.consumeKeyboardToken());
     _cursorTimer.startOrStop(_focusNode, selection);
     updateKeepAlive();
   }

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

@@ -8,6 +8,7 @@ import 'package:flutter/widgets.dart';
 import 'controller.dart';
 import 'editable_text.dart';
 import 'image.dart';
+import 'input.dart';
 import 'mode.dart';
 import 'scaffold.dart';
 import 'scope.dart';
@@ -94,12 +95,14 @@ 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) {
@@ -197,6 +200,7 @@ class _ZefyrEditorState extends State<ZefyrEditor> {
       selectionControls: widget.selectionControls,
       autofocus: widget.autofocus,
       mode: widget.mode,
+      input: _scope.input,
       padding: widget.padding,
       physics: widget.physics,
       keyboardAppearance: keyboardAppearance,

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

@@ -1,86 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:flutter/material.dart';
-import 'package:photo_manager/photo_manager.dart';
-
-import 'iconfont.dart';
-import 'theme.dart';
-
-class GalleryItem extends StatefulWidget {
-  const GalleryItem({Key key, this.asset}) : super(key: key);
-  final AssetEntity asset;
-
-  @override
-  _GalleryItemState createState() => _GalleryItemState();
-}
-
-class _GalleryItemState extends State<GalleryItem> {
-  final ValueNotifier<bool> _checked = ValueNotifier<bool>(false);
-  Uint8List _thumbData;
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = ZefyrTheme.of(context).toolbarTheme;
-    return Stack(
-      children: <Widget>[
-        GestureDetector(
-          behavior: HitTestBehavior.opaque,
-          child: Container(
-            height: 210,
-            margin: EdgeInsets.only(left: 4),
-            child: _thumbData != null
-                ? Image.memory(
-                    _thumbData,
-                    fit: BoxFit.cover,
-                  )
-                : FutureBuilder<Uint8List>(
-                    future: widget.asset.thumbData,
-                    builder: (BuildContext context, snapshot) {
-                      Widget w;
-                      if (snapshot.hasError) {
-                        w = ErrorWidget(snapshot.error);
-                      } else if (snapshot.hasData) {
-                        _thumbData = snapshot.data;
-                        w = Image.memory(
-                          snapshot.data,
-                          fit: BoxFit.cover,
-                        );
-                      } else {
-                        w = Center(
-                          child: Container(
-                            color: Colors.white,
-                            padding: const EdgeInsets.all(20),
-                            child: CircularProgressIndicator(),
-                          ),
-                        );
-                      }
-                      return w;
-                    },
-                  ),
-          ),
-          onTap: () {},
-        ),
-        Positioned(
-          top: 6,
-          right: 6,
-          child: ValueListenableBuilder(
-            valueListenable: _checked,
-            builder: (BuildContext context, bool value, Widget child) {
-              return GestureDetector(
-                behavior: HitTestBehavior.opaque,
-                onTap: () {
-                  _checked.value = !value;
-                },
-                child: Icon(
-                  IconFont.list_update_complete,
-                  size: 24,
-                  color: value ? theme.toggleColor : Colors.white,
-                ),
-              );
-            },
-          ),
-        ),
-      ],
-    );
-  }
-}

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

@@ -1,318 +1,319 @@
 import 'package:flutter/widgets.dart';
 
-class IconFont {
-  IconFont._();
+class ZefyrFont {
+  ZefyrFont._();
   static const String _family = 'ZefyrFont';
-  static const IconData global_language = IconData(0xe725, fontFamily: _family);
-	static const IconData light = IconData(0xe723, fontFamily: _family);
-	static const IconData checked = IconData(0xe724, fontFamily: _family);
-  static const IconData largetitle_dropdown = IconData(0xe722, fontFamily: _family);
-	static const IconData global_toast_loading_delete = IconData(0xe721, fontFamily: _family);
-	static const IconData toast_fail = IconData(0xe71e, fontFamily: _family);
-	static const IconData toast_success = IconData(0xe71f, fontFamily: _family);
-	static const IconData toast_loading = IconData(0xe720, fontFamily: _family);
-	static const IconData global_sidebar_profile = IconData(0xe71d, fontFamily: _family);
-	static const IconData lightmode = IconData(0xe71c, fontFamily: _family);
-	static const IconData salary_details_time = IconData(0xe71b, fontFamily: _family);
-	static const IconData share = IconData(0xe719, fontFamily: _family);
-	static const IconData btn_global_videoplay = IconData(0xe6c5, fontFamily: _family);
-	static const IconData im_groupdetails_archive = IconData(0xe6cf, fontFamily: _family);
-	static const IconData im_notice_arrow = IconData(0xe71a, fontFamily: _family);
-	static const IconData minus = IconData(0xe718, fontFamily: _family);
-	static const IconData staffdetails_review = IconData(0xe716, fontFamily: _family);
-	static const IconData staffdetails_salary = IconData(0xe717, fontFamily: _family);
+  static const String _fontPackage = 'zefyr';
+  static const IconData global_language = IconData(0xe725, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData light = IconData(0xe723, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData checked = IconData(0xe724, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData largetitle_dropdown = IconData(0xe722, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData global_toast_loading_delete = IconData(0xe721, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData toast_fail = IconData(0xe71e, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData toast_success = IconData(0xe71f, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData toast_loading = IconData(0xe720, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData global_sidebar_profile = IconData(0xe71d, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData lightmode = IconData(0xe71c, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData salary_details_time = IconData(0xe71b, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData share = IconData(0xe719, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData btn_global_videoplay = IconData(0xe6c5, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData im_groupdetails_archive = IconData(0xe6cf, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData im_notice_arrow = IconData(0xe71a, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData minus = IconData(0xe718, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData staffdetails_review = IconData(0xe716, fontFamily: _family , fontPackage: _fontPackage);
+	static const IconData staffdetails_salary = IconData(0xe717, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData list_update_fail =
-      IconData(0xe715, fontFamily: _family);
+      IconData(0xe715, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData list_update_complete =
-      IconData(0xe712, fontFamily: _family);
+      IconData(0xe712, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData list_update_pull =
-      IconData(0xe713, fontFamily: _family);
+      IconData(0xe713, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData list_update_loading =
-      IconData(0xe714, fontFamily: _family);
+      IconData(0xe714, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData contact_organization =
-      IconData(0xe70d, fontFamily: _family);
+      IconData(0xe70d, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData contact_outsider =
-      IconData(0xe70e, fontFamily: _family);
-  static const IconData contact_new = IconData(0xe70f, fontFamily: _family);
-  static const IconData contact_mygroup = IconData(0xe710, fontFamily: _family);
-  static const IconData contact_robot = IconData(0xe711, fontFamily: _family);
-  static const IconData note_createnote = IconData(0xe70b, fontFamily: _family);
+      IconData(0xe70e, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData contact_new = IconData(0xe70f, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData contact_mygroup = IconData(0xe710, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData contact_robot = IconData(0xe711, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData note_createnote = IconData(0xe70b, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_createfolder =
-      IconData(0xe70c, fontFamily: _family);
-  static const IconData rating_full = IconData(0xe708, fontFamily: _family);
-  static const IconData rating_half = IconData(0xe709, fontFamily: _family);
-  static const IconData rating_unfull = IconData(0xe70a, fontFamily: _family);
+      IconData(0xe70c, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData rating_full = IconData(0xe708, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData rating_half = IconData(0xe709, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData rating_unfull = IconData(0xe70a, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_searchfile_pre =
-      IconData(0xe706, fontFamily: _family);
+      IconData(0xe706, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_searchfile_next =
-      IconData(0xe707, fontFamily: _family);
+      IconData(0xe707, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_notelist_more =
-      IconData(0xe705, fontFamily: _family);
+      IconData(0xe705, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_notelist_folder =
-      IconData(0xe700, fontFamily: _family);
+      IconData(0xe700, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_notelist_emptyfolder =
-      IconData(0xe701, fontFamily: _family);
+      IconData(0xe701, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_notelist_rubbish =
-      IconData(0xe702, fontFamily: _family);
+      IconData(0xe702, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_notelist_note =
-      IconData(0xe703, fontFamily: _family);
+      IconData(0xe703, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_notelist_savefolder =
-      IconData(0xe704, fontFamily: _family);
+      IconData(0xe704, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_more_comment =
-      IconData(0xe6f7, fontFamily: _family);
+      IconData(0xe6f7, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_more_history =
-      IconData(0xe6f8, fontFamily: _family);
-  static const IconData note_more_info = IconData(0xe6f9, fontFamily: _family);
+      IconData(0xe6f8, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData note_more_info = IconData(0xe6f9, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_more_search =
-      IconData(0xe6fa, fontFamily: _family);
-  static const IconData note_more_copy = IconData(0xe6fb, fontFamily: _family);
-  static const IconData note_more_pin = IconData(0xe6fc, fontFamily: _family);
+      IconData(0xe6fa, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData note_more_copy = IconData(0xe6fb, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData note_more_pin = IconData(0xe6fc, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_more_delete =
-      IconData(0xe6fd, fontFamily: _family);
+      IconData(0xe6fd, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_more_favorite =
-      IconData(0xe6fe, fontFamily: _family);
-  static const IconData note_more_move = IconData(0xe6ff, fontFamily: _family);
+      IconData(0xe6fe, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData note_more_move = IconData(0xe6ff, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_h =
-      IconData(0xe6e4, fontFamily: _family);
+      IconData(0xe6e4, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_code =
-      IconData(0xe6e5, fontFamily: _family);
+      IconData(0xe6e5, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_bold =
-      IconData(0xe6e6, fontFamily: _family);
+      IconData(0xe6e6, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_h1 =
-      IconData(0xe6e7, fontFamily: _family);
+      IconData(0xe6e7, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_center =
-      IconData(0xe6e8, fontFamily: _family);
+      IconData(0xe6e8, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_deleteline =
-      IconData(0xe6e9, fontFamily: _family);
+      IconData(0xe6e9, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_left =
-      IconData(0xe6ea, fontFamily: _family);
+      IconData(0xe6ea, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_h2 =
-      IconData(0xe6eb, fontFamily: _family);
+      IconData(0xe6eb, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_h3 =
-      IconData(0xe6ec, fontFamily: _family);
+      IconData(0xe6ec, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_right =
-      IconData(0xe6ed, fontFamily: _family);
+      IconData(0xe6ed, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_hr =
-      IconData(0xe6ee, fontFamily: _family);
+      IconData(0xe6ee, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_h4 =
-      IconData(0xe6ef, fontFamily: _family);
+      IconData(0xe6ef, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_underline =
-      IconData(0xe6f0, fontFamily: _family);
+      IconData(0xe6f0, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_ul =
-      IconData(0xe6f1, fontFamily: _family);
+      IconData(0xe6f1, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_quote =
-      IconData(0xe6f2, fontFamily: _family);
+      IconData(0xe6f2, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_in =
-      IconData(0xe6f3, fontFamily: _family);
+      IconData(0xe6f3, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_h5 =
-      IconData(0xe6f4, fontFamily: _family);
+      IconData(0xe6f4, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_para =
-      IconData(0xe6f5, fontFamily: _family);
+      IconData(0xe6f5, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text_ol =
-      IconData(0xe6f6, fontFamily: _family);
+      IconData(0xe6f6, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_unkeyboard =
-      IconData(0xe6dc, fontFamily: _family);
+      IconData(0xe6dc, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_keyboard =
-      IconData(0xe6dd, fontFamily: _family);
+      IconData(0xe6dd, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_redo =
-      IconData(0xe6de, fontFamily: _family);
+      IconData(0xe6de, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_undo =
-      IconData(0xe6df, fontFamily: _family);
+      IconData(0xe6df, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_text =
-      IconData(0xe6e0, fontFamily: _family);
+      IconData(0xe6e0, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_image =
-      IconData(0xe6e1, fontFamily: _family);
+      IconData(0xe6e1, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_link =
-      IconData(0xe6e2, fontFamily: _family);
+      IconData(0xe6e2, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData note_editor_save =
-      IconData(0xe6e3, fontFamily: _family);
+      IconData(0xe6e3, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData desktop_todolist_warning =
-      IconData(0xe6d8, fontFamily: _family);
+      IconData(0xe6d8, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData desktop_global_calender =
-      IconData(0xe6d9, fontFamily: _family);
+      IconData(0xe6d9, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData desktop_global_repeat =
-      IconData(0xe6da, fontFamily: _family);
+      IconData(0xe6da, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData desktop_global_important =
-      IconData(0xe6db, fontFamily: _family);
+      IconData(0xe6db, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData startpage_jointeam =
-      IconData(0xe6d6, fontFamily: _family);
+      IconData(0xe6d6, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData startpage_creatteam =
-      IconData(0xe6d7, fontFamily: _family);
+      IconData(0xe6d7, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData staffdetails_videocall =
-      IconData(0xe6d3, fontFamily: _family);
+      IconData(0xe6d3, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData staffdetails_voicecall =
-      IconData(0xe6d4, fontFamily: _family);
+      IconData(0xe6d4, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData staffdetails_sendmessage =
-      IconData(0xe6d5, fontFamily: _family);
+      IconData(0xe6d5, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData staffdetails_job =
-      IconData(0xe6d0, fontFamily: _family);
+      IconData(0xe6d0, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData staffdetails_contact =
-      IconData(0xe6d1, fontFamily: _family);
+      IconData(0xe6d1, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData staffdetails_basic =
-      IconData(0xe6d2, fontFamily: _family);
+      IconData(0xe6d2, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData selectpeople_delete =
-      IconData(0xe6cf, fontFamily: _family);
+      IconData(0xe6cf, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_comment_empty =
-      IconData(0xe6ce, fontFamily: _family);
+      IconData(0xe6ce, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_filebar_download =
-      IconData(0xe6c8, fontFamily: _family);
+      IconData(0xe6c8, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_filebar_favorite_faved =
-      IconData(0xe6c9, fontFamily: _family);
+      IconData(0xe6c9, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_filebar_forward =
-      IconData(0xe6ca, fontFamily: _family);
+      IconData(0xe6ca, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_filebar_comment =
-      IconData(0xe6cb, fontFamily: _family);
+      IconData(0xe6cb, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_filebar_delete =
-      IconData(0xe6cc, fontFamily: _family);
+      IconData(0xe6cc, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_filebar_favorite_unfav =
-      IconData(0xe6cd, fontFamily: _family);
+      IconData(0xe6cd, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_groupdetails_edit =
-      IconData(0xe6c5, fontFamily: _family);
+      IconData(0xe6c5, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_groupdetails_member =
-      IconData(0xe6c6, fontFamily: _family);
+      IconData(0xe6c6, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_groupdetails_robot =
-      IconData(0xe6c7, fontFamily: _family);
+      IconData(0xe6c7, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_groupdetails_file =
-      IconData(0xe6c1, fontFamily: _family);
+      IconData(0xe6c1, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_groupdetails_history =
-      IconData(0xe6c2, fontFamily: _family);
+      IconData(0xe6c2, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_groupdetails_pin =
-      IconData(0xe6c3, fontFamily: _family);
+      IconData(0xe6c3, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_groupdetails_board =
-      IconData(0xe6c4, fontFamily: _family);
+      IconData(0xe6c4, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_list_nodisturb =
-      IconData(0xe6c0, fontFamily: _family);
+      IconData(0xe6c0, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_videocall_camera =
-      IconData(0xe6ba, fontFamily: _family);
+      IconData(0xe6ba, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_voicecall_sound =
-      IconData(0xe6bb, fontFamily: _family);
+      IconData(0xe6bb, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_videocall_stretch =
-      IconData(0xe6bc, fontFamily: _family);
+      IconData(0xe6bc, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_voicecall_video =
-      IconData(0xe6bd, fontFamily: _family);
+      IconData(0xe6bd, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_videocall_voice =
-      IconData(0xe6be, fontFamily: _family);
+      IconData(0xe6be, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_voicecall_mute =
-      IconData(0xe6bf, fontFamily: _family);
+      IconData(0xe6bf, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_sidebar_favorite =
-      IconData(0xe6b6, fontFamily: _family);
-  static const IconData im_sidebar_file = IconData(0xe6b7, fontFamily: _family);
-  static const IconData im_sidebar_at = IconData(0xe6b8, fontFamily: _family);
+      IconData(0xe6b6, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData im_sidebar_file = IconData(0xe6b7, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData im_sidebar_at = IconData(0xe6b8, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_sidebar_notice =
-      IconData(0xe6b9, fontFamily: _family);
+      IconData(0xe6b9, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_more_voicecall =
-      IconData(0xe6af, fontFamily: _family);
+      IconData(0xe6af, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_more_takephoto =
-      IconData(0xe6b0, fontFamily: _family);
+      IconData(0xe6b0, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_more_album =
-      IconData(0xe6b1, fontFamily: _family);
+      IconData(0xe6b1, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_more_note =
-      IconData(0xe6b2, fontFamily: _family);
+      IconData(0xe6b2, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_more_task =
-      IconData(0xe6b3, fontFamily: _family);
+      IconData(0xe6b3, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_more_videocall =
-      IconData(0xe6b4, fontFamily: _family);
+      IconData(0xe6b4, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_more_project =
-      IconData(0xe6b5, fontFamily: _family);
+      IconData(0xe6b5, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialogebar_sendmore =
-      IconData(0xe6ac, fontFamily: _family);
+      IconData(0xe6ac, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialogebar_sendemoji =
-      IconData(0xe6ad, fontFamily: _family);
+      IconData(0xe6ad, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialogebar_sendvoice =
-      IconData(0xe6ae, fontFamily: _family);
+      IconData(0xe6ae, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_voicestop =
-      IconData(0xe6a7, fontFamily: _family);
+      IconData(0xe6a7, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_voice =
-      IconData(0xe6a8, fontFamily: _family);
-  static const IconData im_dialoge_pin = IconData(0xe6a9, fontFamily: _family);
+      IconData(0xe6a8, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData im_dialoge_pin = IconData(0xe6a9, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_voiceplay =
-      IconData(0xe6aa, fontFamily: _family);
+      IconData(0xe6aa, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData im_dialoge_record =
-      IconData(0xe6ab, fontFamily: _family);
+      IconData(0xe6ab, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_list_arrow =
-      IconData(0xe6a5, fontFamily: _family);
+      IconData(0xe6a5, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_list_delete =
-      IconData(0xe6a6, fontFamily: _family);
+      IconData(0xe6a6, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData multiselect_unselected =
-      IconData(0xe6a2, fontFamily: _family);
+      IconData(0xe6a2, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData multiselect_audio =
-      IconData(0xe6a3, fontFamily: _family);
+      IconData(0xe6a3, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData multiselect_selected =
-      IconData(0xe6a4, fontFamily: _family);
-  static const IconData login_dropdown = IconData(0xe6a1, fontFamily: _family);
+      IconData(0xe6a4, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData login_dropdown = IconData(0xe6a1, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_actionsheet_close =
-      IconData(0xe6a0, fontFamily: _family);
+      IconData(0xe6a0, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_status =
-      IconData(0xe69f, fontFamily: _family);
+      IconData(0xe69f, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_qrcode =
-      IconData(0xe69a, fontFamily: _family);
+      IconData(0xe69a, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_teamsetting =
-      IconData(0xe69b, fontFamily: _family);
+      IconData(0xe69b, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_account =
-      IconData(0xe69c, fontFamily: _family);
+      IconData(0xe69c, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_noticesetting =
-      IconData(0xe69d, fontFamily: _family);
+      IconData(0xe69d, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_system =
-      IconData(0xe69e, fontFamily: _family);
+      IconData(0xe69e, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_notice =
-      IconData(0xe698, fontFamily: _family);
+      IconData(0xe698, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_darkmode =
-      IconData(0xe699, fontFamily: _family);
+      IconData(0xe699, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_lightmode =
-      IconData(0xe71c, fontFamily: _family);
+      IconData(0xe71c, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_sidebar_add =
-      IconData(0xe697, fontFamily: _family);
+      IconData(0xe697, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_share_more =
-      IconData(0xe691, fontFamily: _family);
+      IconData(0xe691, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_share_message =
-      IconData(0xe692, fontFamily: _family);
-  static const IconData global_share_qq = IconData(0xe693, fontFamily: _family);
+      IconData(0xe692, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData global_share_qq = IconData(0xe693, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_share_copylink =
-      IconData(0xe694, fontFamily: _family);
+      IconData(0xe694, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_share_weibo =
-      IconData(0xe695, fontFamily: _family);
+      IconData(0xe695, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_share_wechat =
-      IconData(0xe696, fontFamily: _family);
+      IconData(0xe696, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_searchbox_delete =
-      IconData(0xe68f, fontFamily: _family);
+      IconData(0xe68f, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_searchbox_search =
-      IconData(0xe690, fontFamily: _family);
+      IconData(0xe690, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_invitecode_refresh =
-      IconData(0xe68c, fontFamily: _family);
+      IconData(0xe68c, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_invitecode_link =
-      IconData(0xe68d, fontFamily: _family);
+      IconData(0xe68d, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_invitecode_qrcode =
-      IconData(0xe68e, fontFamily: _family);
+      IconData(0xe68e, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_invite_qrcode =
-      IconData(0xe688, fontFamily: _family);
+      IconData(0xe688, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_invite_code =
-      IconData(0xe689, fontFamily: _family);
+      IconData(0xe689, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_invite_wechat =
-      IconData(0xe68a, fontFamily: _family);
+      IconData(0xe68a, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_invite_qq =
-      IconData(0xe68b, fontFamily: _family);
+      IconData(0xe68b, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_hoverbtn_add =
-      IconData(0xe686, fontFamily: _family);
+      IconData(0xe686, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData global_hoverbtn_close =
-      IconData(0xe687, fontFamily: _family);
-  static const IconData tabbar_note = IconData(0xe681, fontFamily: _family);
-  static const IconData tabbar_desktop = IconData(0xe682, fontFamily: _family);
-  static const IconData tabbar_explore = IconData(0xe683, fontFamily: _family);
-  static const IconData tabbar_message = IconData(0xe684, fontFamily: _family);
-  static const IconData tabbar_contact = IconData(0xe685, fontFamily: _family);
-  static const IconData topbar_back = IconData(0xe680, fontFamily: _family);
+      IconData(0xe687, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData tabbar_note = IconData(0xe681, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData tabbar_desktop = IconData(0xe682, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData tabbar_explore = IconData(0xe683, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData tabbar_message = IconData(0xe684, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData tabbar_contact = IconData(0xe685, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_back = IconData(0xe680, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData topbar_closesidebar =
-      IconData(0xe67d, fontFamily: _family);
-  static const IconData topbar_people = IconData(0xe67e, fontFamily: _family);
-  static const IconData topbar_sidebar = IconData(0xe67f, fontFamily: _family);
-  static const IconData topbar_add = IconData(0xe674, fontFamily: _family);
-  static const IconData topbar_more = IconData(0xe675, fontFamily: _family);
-  static const IconData topbar_addrobot = IconData(0xe676, fontFamily: _family);
+      IconData(0xe67d, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_people = IconData(0xe67e, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_sidebar = IconData(0xe67f, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_add = IconData(0xe674, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_more = IconData(0xe675, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_addrobot = IconData(0xe676, fontFamily: _family , fontPackage: _fontPackage);
   static const IconData topbar_calenderview =
-      IconData(0xe677, fontFamily: _family);
-  static const IconData topbar_invite = IconData(0xe678, fontFamily: _family);
-  static const IconData topbar_share = IconData(0xe679, fontFamily: _family);
-  static const IconData topbar_group = IconData(0xe67a, fontFamily: _family);
-  static const IconData topbar_setting = IconData(0xe67b, fontFamily: _family);
-  static const IconData topbar_close = IconData(0xe67c, fontFamily: _family);
+      IconData(0xe677, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_invite = IconData(0xe678, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_share = IconData(0xe679, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_group = IconData(0xe67a, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_setting = IconData(0xe67b, fontFamily: _family , fontPackage: _fontPackage);
+  static const IconData topbar_close = IconData(0xe67c, fontFamily: _family , fontPackage: _fontPackage);
 }

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

@@ -25,15 +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) {
-    if (focusNode.hasFocus && focusNode.consumeKeyboardToken()) {
-      openConnection(value, keyboardAppearance);
+      Brightness keyboardAppearance, {bool show = true}) {
+        //  && focusNode.consumeKeyboardToken()
+    if (focusNode.hasFocus) {
+      openConnection(value, keyboardAppearance, show: show);
     } else if (!focusNode.hasFocus) {
       closeConnection();
     }
   }
 
-  void openConnection(TextEditingValue value, Brightness keyboardAppearance) {
+  void openConnection(TextEditingValue value, Brightness keyboardAppearance, {bool show = true}) {
     if (!hasConnection) {
       _lastKnownRemoteTextEditingValue = value;
       _textInputConnection = TextInput.attach(
@@ -49,7 +50,9 @@ class InputConnectionController implements TextInputClient {
       )..setEditingState(value);
       _sentRemoteValues.add(value);
     }
-    _textInputConnection.show();
+    if (show) {
+      _textInputConnection.show();
+    }
   }
 
   /// Closes input connection if it's currently open. Otherwise does nothing.
@@ -172,9 +175,7 @@ class InputConnectionController implements TextInputClient {
   }
 
   @override
-  // TODO: implement currentTextEditingValue
-  TextEditingValue get currentTextEditingValue =>
-      _lastKnownRemoteTextEditingValue;
+  TextEditingValue get currentTextEditingValue => _lastKnownRemoteTextEditingValue;
   
   @override
   void connectionClosed() {

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

@@ -39,15 +39,31 @@ 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(
-        children: <Widget>[
-          Expanded(child: widget.child),
-          toolbar,
-        ],
-      ),
-    );
+        scaffold: this,
+        child: Column(
+          children: <Widget>[
+            Expanded(child: widget.child),
+            toolbar,
+          ],
+        ),
+      );
   }
 }
 

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

@@ -1,11 +1,13 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:notus/notus.dart';
 
 import 'controller.dart';
 import 'cursor_timer.dart';
 import 'editor.dart';
 import 'image.dart';
+import 'input.dart';
 import 'mode.dart';
 import 'render_context.dart';
 import 'view.dart';
@@ -50,6 +52,9 @@ class ZefyrScope extends ChangeNotifier {
         _focusNode = focusNode,
         _focusScope = focusScope,
         _cursorTimer = CursorTimer(),
+        _input = InputConnectionController((int start, String deleted, String inserted, TextSelection selection) {
+          controller.replaceText(start, deleted.length, inserted, selection: selection);
+        }),
         _renderContext = ZefyrRenderContext() {
     _selectionStyle = _controller.getSelectionStyle();
     _selection = _controller.selection;
@@ -63,6 +68,25 @@ class ZefyrScope extends ChangeNotifier {
     return widget.scope;
   }
 
+  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();
+      }
+      notifyListeners();
+    }
+  }
+
   ZefyrImageDelegate _imageDelegate;
   ZefyrImageDelegate get imageDelegate => _imageDelegate;
   set imageDelegate(ZefyrImageDelegate value) {
@@ -187,12 +211,24 @@ class ZefyrScope extends ChangeNotifier {
     _focusScope.requestFocus(_focusNode);
   }
 
-  void hideKeyboard() {
+  void closeKeyboard() {
     assert(isEditable);
     assert(!_disposed);
     _focusNode.unfocus();
   }
 
+  void showKeyboard() {
+    assert(isEditable);
+    assert(!_disposed);
+    SystemChannels.textInput.invokeMethod('TextInput.show');
+  }
+
+  void hideKeyboard() {
+    assert(isEditable);
+    assert(!_disposed);
+    SystemChannels.textInput.invokeMethod('TextInput.hide');
+  }
+
   @override
   void dispose() {
     assert(!_disposed);
@@ -242,3 +278,9 @@ class ZefyrScopeAccess extends InheritedWidget {
     return scope != oldWidget.scope;
   }
 }
+
+enum ToolbarStatus {
+  show,
+  hide,
+  open,
+}

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

@@ -509,12 +509,12 @@ class ToolbarTheme {
   factory ToolbarTheme.fallback(BuildContext context) {
     final theme = Theme.of(context);
     return ToolbarTheme._(
-      color: theme.brightness == Brightness.dark ? Color(0xFF282828) : Color(0xFFFFFFFF),
+      color: theme.brightness == Brightness.light ? Color(0xFFFFFFFF) : Color(0xFF282828),
       toggleColor: Color(0xFF01AAFF),
-      iconFillColor: theme.brightness == Brightness.dark ? Color(0xFF1F1F1F) : Color(0xFFF2F2F2),
+      iconFillColor: theme.brightness == Brightness.light ? Color(0xFFF2F2F2) : Color(0xFF1F1F1F),
       iconColor: Color(0xFF595959),
-      disabledIconColor: Color(0xFF8C8C8C),
-      dividerColor: theme.brightness == Brightness.dark ? Color(0xFF3B3B3B) : Color(0xFFF2F2F2),
+      disabledIconColor: theme.disabledColor,
+      dividerColor: theme.dividerColor ?? (theme.brightness == Brightness.light ? Color(0xFFF2F2F2) : Color(0xFF3B3B3B)),
     );
   }
 

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

@@ -5,6 +5,7 @@ import 'dart:async';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:notus/notus.dart';
 
 import 'iconfont.dart';
@@ -40,6 +41,7 @@ enum ZefyrToolbarAction {
   cameraImage,
   galleryImage,
   hideKeyboard,
+  showKeyboard,
   close,
   confirm,
 }
@@ -60,34 +62,35 @@ final kZefyrToolbarAttributeActions = <ZefyrToolbarAction, NotusAttributeKey>{
 };
 
 const kDefaultButtonIcons = {
-  ZefyrToolbarAction.bold: IconFont.note_editor_text_bold,
-  ZefyrToolbarAction.italic: IconFont.note_editor_text_in,
-  ZefyrToolbarAction.underline: IconFont.note_editor_text_underline,
-  ZefyrToolbarAction.deleteline: IconFont.note_editor_text_deleteline,
-  ZefyrToolbarAction.quote: IconFont.note_editor_text_quote,
-  ZefyrToolbarAction.numberList: IconFont.note_editor_text_ol,
-  ZefyrToolbarAction.bulletList: IconFont.note_editor_text_ul,
-  ZefyrToolbarAction.link: IconFont.note_editor_link,
+  ZefyrToolbarAction.heading: ZefyrFont.note_editor_text,
+  ZefyrToolbarAction.emoji: ZefyrFont.im_dialogebar_sendemoji,
+  ZefyrToolbarAction.image: ZefyrFont.note_editor_image,
+  ZefyrToolbarAction.link: ZefyrFont.note_editor_link,
+  ZefyrToolbarAction.hideKeyboard: ZefyrFont.note_editor_keyboard,
+  ZefyrToolbarAction.showKeyboard: ZefyrFont.note_editor_unkeyboard,
+  ZefyrToolbarAction.close: Icons.close,
+  ZefyrToolbarAction.confirm: Icons.check,
+  ZefyrToolbarAction.bold: ZefyrFont.note_editor_text_bold,
+  ZefyrToolbarAction.italic: ZefyrFont.note_editor_text_in,
+  ZefyrToolbarAction.underline: ZefyrFont.note_editor_text_underline,
+  ZefyrToolbarAction.deleteline: ZefyrFont.note_editor_text_deleteline,
+  ZefyrToolbarAction.quote: ZefyrFont.note_editor_text_quote,
+  ZefyrToolbarAction.numberList: ZefyrFont.note_editor_text_ol,
+  ZefyrToolbarAction.bulletList: ZefyrFont.note_editor_text_ul,
   ZefyrToolbarAction.unlink: Icons.link_off,
-  ZefyrToolbarAction.emoji: IconFont.im_dialogebar_sendemoji,
   ZefyrToolbarAction.clipboardCopy: Icons.content_copy,
   ZefyrToolbarAction.openInBrowser: Icons.open_in_new,
-  ZefyrToolbarAction.heading: IconFont.note_editor_text,
-  ZefyrToolbarAction.headingLevel1: IconFont.note_editor_text_h,
-  ZefyrToolbarAction.headingLevel2: IconFont.note_editor_text_h1,
-  ZefyrToolbarAction.headingLevel3: IconFont.note_editor_text_h2,
-  ZefyrToolbarAction.headingLevel4: IconFont.note_editor_text_h3,
-  ZefyrToolbarAction.headingLevel5: IconFont.note_editor_text_h4,
-  ZefyrToolbarAction.headingLevel6: IconFont.note_editor_text_h5,
-  ZefyrToolbarAction.text: IconFont.note_editor_text,
-  ZefyrToolbarAction.code: IconFont.note_editor_text_code,
-  ZefyrToolbarAction.horizontalRule: IconFont.note_editor_text_hr,
-  ZefyrToolbarAction.image: IconFont.note_editor_image,
-  ZefyrToolbarAction.cameraImage: IconFont.im_dialoge_more_takephoto,
-  ZefyrToolbarAction.galleryImage: IconFont.im_dialoge_more_album,
-  ZefyrToolbarAction.hideKeyboard: IconFont.note_editor_keyboard,
-  ZefyrToolbarAction.close: Icons.close,
-  ZefyrToolbarAction.confirm: Icons.check,
+  ZefyrToolbarAction.headingLevel1: ZefyrFont.note_editor_text_h,
+  ZefyrToolbarAction.headingLevel2: ZefyrFont.note_editor_text_h1,
+  ZefyrToolbarAction.headingLevel3: ZefyrFont.note_editor_text_h2,
+  ZefyrToolbarAction.headingLevel4: ZefyrFont.note_editor_text_h3,
+  ZefyrToolbarAction.headingLevel5: ZefyrFont.note_editor_text_h4,
+  ZefyrToolbarAction.headingLevel6: ZefyrFont.note_editor_text_h5,
+  ZefyrToolbarAction.text: ZefyrFont.note_editor_text,
+  ZefyrToolbarAction.code: ZefyrFont.note_editor_text_code,
+  ZefyrToolbarAction.horizontalRule: ZefyrFont.note_editor_text_hr,
+  ZefyrToolbarAction.cameraImage: ZefyrFont.im_dialoge_more_takephoto,
+  ZefyrToolbarAction.galleryImage: ZefyrFont.im_dialoge_more_album,
 };
 
 const kSpecialIconSizes = {
@@ -158,7 +161,7 @@ class ZefyrToolbar extends StatefulWidget implements PreferredSizeWidget {
     @required this.editor,
     this.autoHide = true,
     this.delegate,
-  }) : super(key: key);
+  }) :  super(key: key);
 
   final ZefyrToolbarDelegate delegate;
   final ZefyrScope editor;
@@ -196,6 +199,9 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
   final Key _toolbarKey = UniqueKey();
   final Key _overlayKey = UniqueKey();
 
+  double _keyboardHeight;
+  double get keyboardHeight => _keyboardHeight;
+
   ZefyrToolbarDelegate _delegate;
   AnimationController _overlayAnimation;
   WidgetBuilder _overlayBuilder;
@@ -227,17 +233,19 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
       _overlayCompleter = completer;
       _overlayAnimation.forward();
     });
+    editor.toolbarStatus = ToolbarStatus.open;
     return completer.future;
   }
 
   void closeOverlay() {
     if (!hasOverlay) return;
-    _overlayAnimation.reverse().whenComplete(() {
+    _overlayAnimation.reverse().whenComplete(() async {
       setState(() {
         _overlayBuilder = null;
         _overlayCompleter?.complete();
         _overlayCompleter = null;
       });
+      editor.toolbarStatus = ToolbarStatus.show;
     });
   }
 
@@ -270,7 +278,13 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
 
   @override
   Widget build(BuildContext context) {
+    if (MediaQuery.of(context).viewInsets.bottom > 0) {
+      _keyboardHeight = MediaQuery.of(context).viewInsets.bottom;
+    }
+    final theme = ZefyrTheme.of(context).toolbarTheme;
+    
     final layers = <Widget>[];
+    var overlay;
 
     // Must set unique key for the toolbar to prevent it from reconstructing
     // new state each time we toggle overlay.
@@ -278,21 +292,25 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
     final toolbar = ZefyrToolbarScaffold(
       key: _toolbarKey,
       body: ZefyrButtonList(buttons: _buildButtons(context)),
-      trailing: buildButton(context, ZefyrToolbarAction.hideKeyboard),
+      trailing: hasOverlay ? buildButton(context, ZefyrToolbarAction.showKeyboard) : buildButton(context, ZefyrToolbarAction.hideKeyboard),
     );
-
     layers.add(toolbar);
-
     if (hasOverlay) {
       Widget widget = Builder(builder: _overlayBuilder);
       assert(widget != null);
-      final overlay = FadeTransition(
+      overlay = FadeTransition(
         key: _overlayKey,
         opacity: _overlayAnimation,
         child: widget,
       );
-      layers.add(overlay);
     }
+    layers.add(
+      Container(
+        height: keyboardHeight,
+        child: overlay,
+      ),
+    );
+
     return _ZefyrToolbarScope(
       toolbar: this,
       child: Column(
@@ -306,6 +324,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
       HeadingButton(),
       buildButton(context, ZefyrToolbarAction.emoji),
       if (editor.imageDelegate != null) ImageButton(),
+      // ImageButton(),
       LinkButton(),
       
       // buildButton(context, ZefyrToolbarAction.bulletList),

packages/zefyr/pubspec.yaml

@@ -1,6 +1,6 @@
 name: zefyr
 description: Clean, minimalistic and collaboration-ready rich text editor for Flutter.
-version: 0.10.0
+version: 0.10.1
 author: Anatoly Pulyaevskiy <anatoly.pulyaevskiy@gmail.com>
 homepage: https://github.com/memspace/zefyr
 
@@ -17,7 +17,8 @@ dependencies:
     path: ../notus
   meta: ^1.1.0
   quiver_hashcode: ^2.0.0
-  photo_manager: ^0.5.1-dev.4
+  photo: 
+    path: /Users/imac/Documents/flutter/projects/mutli_image_picker
 
 dev_dependencies:
   flutter_test:
@@ -29,4 +30,4 @@ flutter:
   fonts:
     - family: ZefyrFont
       fonts:
-        - asset: lib/fonts/iconfont.ttf
+        - asset: lib/fonts/zefyrfont.ttf