update toolbar theme

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

@@ -4,6 +4,7 @@
 
 import 'dart:io';
 import 'dart:typed_data';
+import 'package:image/image.dart' as Im;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -41,9 +42,14 @@ class CustomImageDelegate implements ZefyrImageDelegate<ImageSource> {
   }
 
   @override
-  Future<String> picked(asset, isFullImage) async {
+  Future<String> picked(file, isFullImage) async {
     print(isFullImage);
-    File file = await asset.file;
+    //File file = await asset.file;
     return file.uri.toString();
+    // Im.Image image = Im.decodeImage(file.readAsBytesSync());
+    // Im.Image smallerImage = Im.copyResize(image, width: 500);
+    // List<int> data = Im.encodeJpg(smallerImage, quality: 50);
+    // final compressFile = File.fromRawPath(Uint8List.fromList(data));
+    // return compressFile.uri.toString();
   }
 }

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

@@ -6,6 +6,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:notus/notus.dart';
 import 'package:photo/photo.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -21,6 +22,9 @@ const kToolbarButtonIcons = [
   ZefyrToolbarAction.emoji,
   ZefyrToolbarAction.image,
   ZefyrToolbarAction.link,
+  ZefyrToolbarAction.undo,
+  ZefyrToolbarAction.redo,
+  ZefyrToolbarAction.save,
   ZefyrToolbarAction.hideKeyboard,
   ZefyrToolbarAction.showKeyboard,
   ZefyrToolbarAction.close,
@@ -85,16 +89,15 @@ class ZefyrButton extends StatelessWidget {
     final editor = toolbar.editor;
     final toolbarTheme = ZefyrTheme.of(context).toolbarTheme;
     final pressedHandler = _getPressedHandler(editor, toolbar);
-    final iconColor = (pressedHandler == null)
-        ? toolbarTheme.disabledIconColor
-        : toolbarTheme.iconColor;
     if (_icon != null) {
       return RawZefyrButton.icon(
         action: action,
         icon: _icon,
-        size: _iconSize,
-        iconColor: _getColor(editor, toolbarTheme),
-        color: _getFillColor(action, toolbarTheme),
+        size: 24,
+        iconColor: (pressedHandler == null)
+            ? toolbarTheme.disabledIconColor
+            : _getColor(editor, toolbarTheme),
+        color: _getFillColor(editor, toolbarTheme),
         onPressed: _getPressedHandler(editor, toolbar),
       );
     } else {
@@ -106,28 +109,42 @@ class ZefyrButton extends StatelessWidget {
       return RawZefyrButton(
         action: action,
         child: Text(_text, style: style),
-        color: _getFillColor(action, toolbarTheme),
+        color: _getFillColor(editor, toolbarTheme),
         onPressed: _getPressedHandler(editor, toolbar),
       );
     }
   }
 
   Color _getColor(ZefyrScope editor, ToolbarTheme theme) {
-    if (isAttributeAction) {
-      final attribute = kZefyrToolbarAttributeActions[action];
-      final isToggled = (attribute is NotusAttribute)
-          ? editor.selectionStyle.containsSame(attribute)
-          : editor.selectionStyle.contains(attribute);
-      return isToggled ? theme.toggleColor : null;
+    if (kToolbarButtonIcons.contains(action)) {
+      return editor.toolbarAction == action ? theme.toggleColor : theme.surfaceColor;
+    } else {
+      if (isAttributeAction) {
+        final attribute = kZefyrToolbarAttributeActions[action];
+        final isToggled = (attribute is NotusAttribute)
+            ? editor.selectionStyle.containsSame(attribute)
+            : editor.selectionStyle.contains(attribute);
+        return isToggled
+            ? theme.toggleColor
+            : theme.iconColor;
+      }
+      return null;
     }
-    return null;
   }
 
-  Color _getFillColor(ZefyrToolbarAction action, ToolbarTheme theme) {
+  Color _getFillColor(ZefyrScope editor, ToolbarTheme theme) {
     if (kToolbarButtonIcons.contains(action)) {
       return theme.color;
+    } else {
+      if (isAttributeAction) {
+        final attribute = kZefyrToolbarAttributeActions[action];
+        final isToggled = (attribute is NotusAttribute)
+            ? editor.selectionStyle.containsSame(attribute)
+            : editor.selectionStyle.contains(attribute);
+        return isToggled ? Color(0xFFE1F5FF) : theme.iconFillColor;
+      }
+      return theme.iconFillColor;
     }
-    return theme.iconFillColor;
   }
 
   VoidCallback _getPressedHandler(
@@ -204,44 +221,71 @@ class RawZefyrButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final constraints = theme.buttonTheme.constraints.copyWith(
+    final isToolbarButton = kToolbarButtonIcons.contains(action);
+    var constraints = theme.buttonTheme.constraints.copyWith(
       minWidth: 64,
       minHeight: 40,
       maxHeight: 40,
     );
     var radius = BorderRadius.all(Radius.circular(0));
-    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) {
-      radius = BorderRadius.horizontal(left: Radius.circular(4));
-    }
-    if (action == ZefyrToolbarAction.quote ||
-        action == ZefyrToolbarAction.horizontalRule ||
-        action == ZefyrToolbarAction.code) {
-      radius = BorderRadius.all(Radius.circular(4));
+    var padding = EdgeInsets.symmetric(horizontal: 1.0, vertical: 5.0);
+    if (isToolbarButton) {
+      constraints = theme.buttonTheme.constraints.copyWith(
+        minWidth: 40,
+        maxWidth: 40,
+        minHeight: 30,
+        maxHeight: 30,
+      );
+      padding = EdgeInsets.symmetric(horizontal: 0.0, vertical: 10);
+    } else {
+      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) {
+        radius = BorderRadius.horizontal(right: Radius.circular(4));
+      }
+      if (action == ZefyrToolbarAction.quote ||
+          action == ZefyrToolbarAction.horizontalRule ||
+          action == ZefyrToolbarAction.code) {
+        radius = BorderRadius.all(Radius.circular(4));
+        if (action == ZefyrToolbarAction.code ||
+            action == ZefyrToolbarAction.quote) {
+          padding = padding.copyWith(left: 12.0);
+        }
+      }
     }
+
+    // Widget button = Row(
+    //   children: <Widget>[
+        
+    //     // if (action == ZefyrToolbarAction.showKeyboard || action == ZefyrToolbarAction.hideKeyboard || action == ZefyrToolbarAction.link)
+    //     // Container(
+    //     //   width: 1,
+    //     //   color: Color(0xFFE2E2E2),
+    //     //   height: 28,
+    //     //   margin: EdgeInsets.symmetric(horizontal: 10),
+    //     // ),
+    //   ],
+    // );
     return Padding(
-      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),
-        elevation: 0.0,
-        fillColor: color,
+      padding: padding,
+      child: ConstrainedBox(
         constraints: constraints,
-        onPressed: onPressed,
-        child: child,
+        child: RawMaterialButton(
+          shape: RoundedRectangleBorder(borderRadius: radius),
+          elevation: 0.0,
+          fillColor: color,
+          constraints: constraints,
+          onPressed: onPressed,
+          child: child,
+        ),
       ),
     );
+    //return isToolbarButton && action != ZefyrToolbarAction.showKeyboard && action != ZefyrToolbarAction.hideKeyboard  ? Expanded(child: button) : button;
   }
 }
 
@@ -269,7 +313,7 @@ class _HeadingButtonState extends State<HeadingButton> {
 
   void showOverlay() {
     final toolbar = ZefyrToolbar.of(context);
-    toolbar.showOverlay(buildOverlay);
+    toolbar.showOverlay(buildOverlay, ZefyrToolbarAction.heading);
   }
 
   Widget _buildButtonsView(List<Widget> buttons) {
@@ -437,7 +481,6 @@ class ImageButton extends StatefulWidget {
 }
 
 class _ImageButtonState extends State<ImageButton> {
-
   List<AssetEntity> pickedAssetList = [];
 
   @override
@@ -455,7 +498,7 @@ class _ImageButtonState extends State<ImageButton> {
     if (Platform.isIOS || Platform.isAndroid) {
       var result = await PhotoManager.requestPermission();
       if (result) {
-        return toolbar.showOverlay(buildOverlay);
+        return toolbar.showOverlay(buildOverlay, ZefyrToolbarAction.image);
       } else {
         PhotoManager.openSetting();
       }
@@ -491,7 +534,18 @@ class _ImageButtonState extends State<ImageButton> {
                             child: FlatButton(
                                 shape: RoundedRectangleBorder(),
                                 color: Color(0xFFF6F6F6),
-                                onPressed: () {},
+                                onPressed: () async {
+                                  // toolbar.editor.tapHandle =
+                                  //     TapHandle.takePhoto;
+                                  var file = await ImagePicker.pickImage(
+                                      source: ImageSource.camera);
+                                  if (file != null) {
+                                    toolbar.closeOverlay();
+                                    final image = await toolbar
+                                        .editor.imageDelegate
+                                        .picked(file, true);
+                                  }
+                                },
                                 child: Container(
                                   child: Column(
                                     mainAxisAlignment: MainAxisAlignment.center,
@@ -521,7 +575,7 @@ class _ImageButtonState extends State<ImageButton> {
                                 shape: RoundedRectangleBorder(),
                                 color: Color(0xFFF6F6F6),
                                 onPressed: () {
-                                  toolbar.editor.tapHandle = TapHandle.pickAsset;
+                                  toolbar.editor.keepOverlay = true;
                                   PhotoPicker.pickAsset(
                                     context: context,
                                     rowCount: 4,
@@ -534,11 +588,16 @@ class _ImageButtonState extends State<ImageButton> {
                                   ).then((PickedEntity entity) async {
                                     if (entity.asset.isNotEmpty) {
                                       toolbar.closeOverlay();
-                                      final editor = ZefyrToolbar.of(context).editor;
+                                      final editor =
+                                          ZefyrToolbar.of(context).editor;
                                       for (var asset in entity.asset) {
-                                        final image = await editor.imageDelegate.picked(asset, entity.isFullImage);
+                                        var file = await asset.originFile;
+                                        final image = await editor.imageDelegate
+                                            .picked(file, entity.isFullImage);
                                         if (image != null) {
-                                          editor.formatSelection(NotusAttribute.embed.image(image));
+                                          editor.formatSelection(NotusAttribute
+                                              .embed
+                                              .image(image));
                                         }
                                       }
                                     }
@@ -575,26 +634,25 @@ class _ImageButtonState extends State<ImageButton> {
                       child: Listener(
                         behavior: HitTestBehavior.translucent,
                         onPointerUp: (PointerUpEvent event) {
-                          toolbar.editor.tapHandle = TapHandle.previewImage;
+                          toolbar.editor.keepOverlay = true;
                         },
                         child: StreamBuilder<PickedEntity>(
                           stream: pickedChangeController.stream,
                           initialData: PickedEntity(),
                           builder: (context, snapshot) {
                             return PhotoPicker.buildGallery(
-                              context: context,
-                              padding: 4,
-                              thumbSize: 300,
-                              itemRadio: 0.5,
-                              provider: I18nProvider.chinese,
-                              sortDelegate: SortDelegate.common,
-                              pickType: PickType.onlyImage,
-                              photoPathList: null,
-                              isFullImage: snapshot.data.isFullImage,
-                              onSelected: (PickedEntity entity) {
-                                pickedChangeController.add(entity);
-                              }
-                            );
+                                context: context,
+                                padding: 4,
+                                thumbSize: 300,
+                                itemRadio: 0.5,
+                                provider: I18nProvider.chinese,
+                                sortDelegate: SortDelegate.common,
+                                pickType: PickType.onlyImage,
+                                photoPathList: null,
+                                isFullImage: snapshot.data.isFullImage,
+                                onSelected: (PickedEntity entity) {
+                                  pickedChangeController.add(entity);
+                                });
                           },
                         ),
                       ),
@@ -627,10 +685,12 @@ class _ImageButtonState extends State<ImageButton> {
                                     ),
                                   ),
                                   Padding(
-                                    padding: EdgeInsets.symmetric(horizontal: 8),
+                                    padding:
+                                        EdgeInsets.symmetric(horizontal: 8),
                                     child: Text(
                                       '原图',
-                                      style: TextStyle(color: theme.iconColor, fontSize: 16),
+                                      style: TextStyle(
+                                          color: theme.iconColor, fontSize: 16),
                                     ),
                                   ),
                                 ],
@@ -660,29 +720,35 @@ class _ImageButtonState extends State<ImageButton> {
                         color: theme.toggleColor,
                         disabledColor: theme.disabledIconColor,
                         shape: StadiumBorder(),
-                        onPressed: snapshot.data.asset.isNotEmpty ? () async {
-                          pickedChangeController.add(PickedEntity());
-                          toolbar.closeOverlay();
-                          for (var asset in snapshot.data.asset) {
-                            final image = await toolbar.editor.imageDelegate.picked(asset, snapshot.data.isFullImage);
-                            if (image != null) {
-                              toolbar.editor.formatSelection(NotusAttribute.embed.image(image));
-                            }
-                          }
-                        } : null,
+                        onPressed: snapshot.data.asset.isNotEmpty
+                            ? () async {
+                                pickedChangeController.add(PickedEntity());
+                                toolbar.closeOverlay();
+                                for (var asset in snapshot.data.asset) {
+                                  var file = await asset.originFile;
+                                  final image = await toolbar
+                                      .editor.imageDelegate
+                                      .picked(file, snapshot.data.isFullImage);
+                                  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(
-                              '上传 ${snapshot.data.asset.isNotEmpty ? "(${snapshot.data.asset.length})" : ''}',
-                              style: TextStyle(
-                                color: Colors.white,
-                                fontSize: 14,
-                              ),
+                            '上传 ${snapshot.data.asset.isNotEmpty ? "(${snapshot.data.asset.length})" : ''}',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 14,
                             ),
                           ),
                         ),
+                      ),
                     ],
                   );
                 },
@@ -757,7 +823,7 @@ class _LinkButtonState extends State<LinkButton> {
 
   void showOverlay() {
     final toolbar = ZefyrToolbar.of(context);
-    toolbar.showOverlay(buildOverlay).whenComplete(cancelEdit);
+    toolbar.showOverlay(buildOverlay, ZefyrToolbarAction.link).whenComplete(cancelEdit);
   }
 
   void closeOverlay() {

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

@@ -310,7 +310,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
     final scope = ZefyrScope.of(context);
     var showKeyboard = true;
     if (_focusNode.consumeKeyboardToken()) {
-      showKeyboard = scope.tapHandle == null;
+      showKeyboard = scope.keepOverlay == false;
     } else {
       showKeyboard = false;
     }

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

@@ -116,7 +116,8 @@ class _ZefyrEditorState extends State<ZefyrEditor> {
 
   void _handleChange() {
     if (_scope.focusOwner == FocusOwner.none) {
-      if (_scope.tapHandle == null) {
+      if (!_scope.keepOverlay) {
+        _scope.toolbarAction = null;
         hideToolbar();
       }
     } else if (!hasToolbar) {

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

@@ -4,316 +4,317 @@ class ZefyrFont {
   ZefyrFont._();
   static const String _family = 'ZefyrFont';
   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 note_editor_emoji = IconData(0xe728, fontFamily: _family, fontPackage: _fontPackage);
+  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 , fontPackage: _fontPackage);
+      IconData(0xe715, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData list_update_complete =
-      IconData(0xe712, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe712, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData list_update_pull =
-      IconData(0xe713, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe713, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData list_update_loading =
-      IconData(0xe714, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe714, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData contact_organization =
-      IconData(0xe70d, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe70d, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData contact_outsider =
-      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);
+      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 , 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);
+      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 , fontPackage: _fontPackage);
+      IconData(0xe706, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_searchfile_next =
-      IconData(0xe707, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe707, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_notelist_more =
-      IconData(0xe705, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe705, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_notelist_folder =
-      IconData(0xe700, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe700, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_notelist_emptyfolder =
-      IconData(0xe701, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe701, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_notelist_rubbish =
-      IconData(0xe702, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe702, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_notelist_note =
-      IconData(0xe703, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe703, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_notelist_savefolder =
-      IconData(0xe704, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe704, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_more_comment =
-      IconData(0xe6f7, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f7, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_more_history =
-      IconData(0xe6f8, fontFamily: _family , fontPackage: _fontPackage);
-  static const IconData note_more_info = IconData(0xe6f9, fontFamily: _family , fontPackage: _fontPackage);
+      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 , 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);
+      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 , fontPackage: _fontPackage);
+      IconData(0xe6fd, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_more_favorite =
-      IconData(0xe6fe, fontFamily: _family , fontPackage: _fontPackage);
-  static const IconData note_more_move = IconData(0xe6ff, fontFamily: _family , fontPackage: _fontPackage);
+      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 , fontPackage: _fontPackage);
+      IconData(0xe6e4, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_code =
-      IconData(0xe6e5, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e5, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_bold =
-      IconData(0xe6e6, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e6, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_h1 =
-      IconData(0xe6e7, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e7, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_center =
-      IconData(0xe6e8, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e8, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_deleteline =
-      IconData(0xe6e9, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e9, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_left =
-      IconData(0xe6ea, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ea, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_h2 =
-      IconData(0xe6eb, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6eb, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_h3 =
-      IconData(0xe6ec, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ec, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_right =
-      IconData(0xe6ed, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ed, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_hr =
-      IconData(0xe6ee, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ee, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_h4 =
-      IconData(0xe6ef, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ef, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_underline =
-      IconData(0xe6f0, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f0, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_ul =
-      IconData(0xe6f1, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f1, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_quote =
-      IconData(0xe6f2, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f2, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_in =
-      IconData(0xe6f3, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f3, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_h5 =
-      IconData(0xe6f4, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f4, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_para =
-      IconData(0xe6f5, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f5, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text_ol =
-      IconData(0xe6f6, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6f6, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_unkeyboard =
-      IconData(0xe6dc, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6dc, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_keyboard =
-      IconData(0xe6dd, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6dd, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_redo =
-      IconData(0xe6de, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6de, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_undo =
-      IconData(0xe6df, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6df, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_text =
-      IconData(0xe6e0, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e0, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_image =
-      IconData(0xe6e1, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e1, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_link =
-      IconData(0xe6e2, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e2, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData note_editor_save =
-      IconData(0xe6e3, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6e3, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData desktop_todolist_warning =
-      IconData(0xe6d8, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d8, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData desktop_global_calender =
-      IconData(0xe6d9, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d9, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData desktop_global_repeat =
-      IconData(0xe6da, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6da, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData desktop_global_important =
-      IconData(0xe6db, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6db, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData startpage_jointeam =
-      IconData(0xe6d6, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d6, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData startpage_creatteam =
-      IconData(0xe6d7, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d7, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData staffdetails_videocall =
-      IconData(0xe6d3, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d3, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData staffdetails_voicecall =
-      IconData(0xe6d4, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d4, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData staffdetails_sendmessage =
-      IconData(0xe6d5, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d5, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData staffdetails_job =
-      IconData(0xe6d0, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d0, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData staffdetails_contact =
-      IconData(0xe6d1, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d1, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData staffdetails_basic =
-      IconData(0xe6d2, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6d2, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData selectpeople_delete =
-      IconData(0xe6cf, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6cf, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_comment_empty =
-      IconData(0xe6ce, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ce, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_filebar_download =
-      IconData(0xe6c8, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c8, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_filebar_favorite_faved =
-      IconData(0xe6c9, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c9, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_filebar_forward =
-      IconData(0xe6ca, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ca, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_filebar_comment =
-      IconData(0xe6cb, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6cb, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_filebar_delete =
-      IconData(0xe6cc, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6cc, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_filebar_favorite_unfav =
-      IconData(0xe6cd, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6cd, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_groupdetails_edit =
-      IconData(0xe6c5, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c5, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_groupdetails_member =
-      IconData(0xe6c6, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c6, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_groupdetails_robot =
-      IconData(0xe6c7, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c7, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_groupdetails_file =
-      IconData(0xe6c1, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c1, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_groupdetails_history =
-      IconData(0xe6c2, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c2, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_groupdetails_pin =
-      IconData(0xe6c3, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c3, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_groupdetails_board =
-      IconData(0xe6c4, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c4, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_list_nodisturb =
-      IconData(0xe6c0, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6c0, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_videocall_camera =
-      IconData(0xe6ba, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ba, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_voicecall_sound =
-      IconData(0xe6bb, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6bb, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_videocall_stretch =
-      IconData(0xe6bc, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6bc, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_voicecall_video =
-      IconData(0xe6bd, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6bd, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_videocall_voice =
-      IconData(0xe6be, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6be, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_voicecall_mute =
-      IconData(0xe6bf, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6bf, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_sidebar_favorite =
-      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);
+      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 , fontPackage: _fontPackage);
+      IconData(0xe6b9, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_more_voicecall =
-      IconData(0xe6af, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6af, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_more_takephoto =
-      IconData(0xe6b0, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6b0, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_more_album =
-      IconData(0xe6b1, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6b1, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_more_note =
-      IconData(0xe6b2, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6b2, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_more_task =
-      IconData(0xe6b3, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6b3, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_more_videocall =
-      IconData(0xe6b4, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6b4, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_more_project =
-      IconData(0xe6b5, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6b5, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialogebar_sendmore =
-      IconData(0xe6ac, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ac, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialogebar_sendemoji =
-      IconData(0xe6ad, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ad, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialogebar_sendvoice =
-      IconData(0xe6ae, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ae, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_voicestop =
-      IconData(0xe6a7, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6a7, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_voice =
-      IconData(0xe6a8, fontFamily: _family , fontPackage: _fontPackage);
-  static const IconData im_dialoge_pin = IconData(0xe6a9, fontFamily: _family , fontPackage: _fontPackage);
+      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 , fontPackage: _fontPackage);
+      IconData(0xe6aa, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData im_dialoge_record =
-      IconData(0xe6ab, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6ab, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_list_arrow =
-      IconData(0xe6a5, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6a5, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_list_delete =
-      IconData(0xe6a6, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6a6, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData multiselect_unselected =
-      IconData(0xe6a2, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6a2, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData multiselect_audio =
-      IconData(0xe6a3, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe6a3, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData multiselect_selected =
-      IconData(0xe6a4, fontFamily: _family , fontPackage: _fontPackage);
-  static const IconData login_dropdown = IconData(0xe6a1, fontFamily: _family , fontPackage: _fontPackage);
+      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 , fontPackage: _fontPackage);
+      IconData(0xe6a0, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_status =
-      IconData(0xe69f, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe69f, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_qrcode =
-      IconData(0xe69a, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe69a, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_teamsetting =
-      IconData(0xe69b, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe69b, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_account =
-      IconData(0xe69c, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe69c, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_noticesetting =
-      IconData(0xe69d, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe69d, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_system =
-      IconData(0xe69e, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe69e, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_notice =
-      IconData(0xe698, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe698, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_darkmode =
-      IconData(0xe699, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe699, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_lightmode =
-      IconData(0xe71c, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe71c, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_sidebar_add =
-      IconData(0xe697, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe697, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_share_more =
-      IconData(0xe691, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe691, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_share_message =
-      IconData(0xe692, fontFamily: _family , fontPackage: _fontPackage);
-  static const IconData global_share_qq = IconData(0xe693, fontFamily: _family , fontPackage: _fontPackage);
+      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 , fontPackage: _fontPackage);
+      IconData(0xe694, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_share_weibo =
-      IconData(0xe695, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe695, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_share_wechat =
-      IconData(0xe696, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe696, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_searchbox_delete =
-      IconData(0xe68f, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe68f, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_searchbox_search =
-      IconData(0xe690, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe690, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_invitecode_refresh =
-      IconData(0xe68c, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe68c, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_invitecode_link =
-      IconData(0xe68d, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe68d, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_invitecode_qrcode =
-      IconData(0xe68e, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe68e, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_invite_qrcode =
-      IconData(0xe688, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe688, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_invite_code =
-      IconData(0xe689, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe689, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_invite_wechat =
-      IconData(0xe68a, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe68a, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_invite_qq =
-      IconData(0xe68b, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe68b, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_hoverbtn_add =
-      IconData(0xe686, fontFamily: _family , fontPackage: _fontPackage);
+      IconData(0xe686, fontFamily: _family, fontPackage: _fontPackage);
   static const IconData global_hoverbtn_close =
-      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);
+      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 , 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);
+      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 , 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);
+      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/image.dart

@@ -2,6 +2,7 @@
 // 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:math' as math;
 import 'dart:ui' as ui;
 
@@ -40,7 +41,7 @@ abstract class ZefyrImageDelegate<S> {
   /// by a file hosting service like AWS S3 or Google Drive.
   Future<String> pickImage(S source);
 
-  Future<String> picked(AssetEntity list, bool isFullImage);
+  Future<String> picked(File file, bool isFullImage);
 }
 
 class ZefyrImage extends StatefulWidget {

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

@@ -10,6 +10,7 @@ import 'image.dart';
 import 'input.dart';
 import 'mode.dart';
 import 'render_context.dart';
+import 'toolbar.dart';
 import 'view.dart';
 
 /// Provides access to shared state of [ZefyrEditor] or [ZefyrView].
@@ -71,11 +72,29 @@ class ZefyrScope extends ChangeNotifier {
   InputConnectionController _input;
   InputConnectionController get input => _input;
 
-  TapHandle _tapHandle;
-  TapHandle get tapHandle => _tapHandle;
-  set tapHandle(TapHandle value) {
-    if (_tapHandle != value) {
-      _tapHandle = value;
+  bool _keepOverlay = false;
+  bool get keepOverlay => _keepOverlay;
+  set keepOverlay(bool value) {
+    if (_keepOverlay != value) {
+      _keepOverlay = value;
+      // if (value) {
+      //   _toolbarAction = null;
+      // }
+      notifyListeners();
+    }
+  }
+
+  ZefyrToolbarAction _toolbarAction;
+  ZefyrToolbarAction get toolbarAction => _toolbarAction;
+  set toolbarAction(ZefyrToolbarAction value) {
+    if (_toolbarAction != value) {
+      _toolbarAction = value;
+      if (value != null) {
+        hideKeyboard();
+      } else {
+        showKeyboard();
+        _keepOverlay = false;
+      }
       notifyListeners();
     }
   }
@@ -230,21 +249,21 @@ class ZefyrScope extends ChangeNotifier {
     assert(isEditable);
     assert(!_disposed);
     _focusNode.unfocus();
-    tapHandle = null;
+    //tapHandle = null;
   }
 
   void showKeyboard() {
     assert(isEditable);
     assert(!_disposed);
     SystemChannels.textInput.invokeMethod('TextInput.show');
-    tapHandle = null;
+    //tapHandle = null;
   }
 
   void hideKeyboard() {
     assert(isEditable);
     assert(!_disposed);
     SystemChannels.textInput.invokeMethod('TextInput.hide');
-    tapHandle = null;
+    //tapHandle = null;
   }
 
   @override

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

@@ -491,6 +491,8 @@ class ToolbarTheme {
   /// The background color of the toolbar.
   final Color color;
 
+  final Color surfaceColor;
+
   /// Color of buttons in toggled state.
   final Color toggleColor;
 
@@ -510,16 +512,18 @@ class ToolbarTheme {
     final theme = Theme.of(context);
     return ToolbarTheme._(
       color: theme.brightness == Brightness.light ? Color(0xFFFFFFFF) : Color(0xFF282828),
+      surfaceColor: Color(0xFF8C8C8C),
       toggleColor: Color(0xFF01AAFF),
       iconFillColor: theme.brightness == Brightness.light ? Color(0xFFF2F2F2) : Color(0xFF1F1F1F),
       iconColor: Color(0xFF595959),
-      disabledIconColor: theme.disabledColor,
-      dividerColor: theme.dividerColor ?? (theme.brightness == Brightness.light ? Color(0xFFF2F2F2) : Color(0xFF3B3B3B)),
+      disabledIconColor: theme.brightness == Brightness.light ? Color(0xFFBFBFBF) : Color(0xFF363636),
+      dividerColor: theme.brightness == Brightness.light ? Color(0xFFF2F2F2) : Color(0xFF3B3B3B),
     );
   }
 
   ToolbarTheme._({
     @required this.color,
+    @required this.surfaceColor,
     @required this.toggleColor,
     @required this.iconFillColor,
     @required this.iconColor,
@@ -531,6 +535,7 @@ class ToolbarTheme {
   /// been merged with the matching property from the `other` object.
   ToolbarTheme copyWith({
     Color color,
+    Color surfaceColor,
     Color toggleColor,
     Color iconFillColor,
     Color iconColor,
@@ -539,6 +544,7 @@ class ToolbarTheme {
   }) {
     return ToolbarTheme._(
       color: color ?? this.color,
+      surfaceColor: surfaceColor ?? this.surfaceColor,
       toggleColor: toggleColor ?? this.toggleColor,
       iconFillColor: iconFillColor ?? this.iconFillColor,
       iconColor: iconColor ?? this.iconColor,
@@ -553,6 +559,7 @@ class ToolbarTheme {
     if (other == null) return this;
     return copyWith(
       color: other.color ?? color,
+      surfaceColor: other.surfaceColor ?? surfaceColor,
       toggleColor: other.toggleColor ?? toggleColor,
       iconFillColor: other.iconFillColor ?? iconFillColor,
       iconColor: other.iconColor ?? iconColor,
@@ -566,14 +573,15 @@ class ToolbarTheme {
     if (other.runtimeType != runtimeType) return false;
     final ToolbarTheme otherTheme = other;
     return (otherTheme.color == color) &&
+        (otherTheme.surfaceColor == surfaceColor) &&
         (otherTheme.toggleColor == toggleColor) &&
         (otherTheme.iconFillColor == iconFillColor) &&
         (otherTheme.iconColor == iconColor) &&
-        (otherTheme.disabledIconColor == disabledIconColor);
+        (otherTheme.disabledIconColor == disabledIconColor) &&
         (otherTheme.dividerColor == dividerColor);
   }
 
   @override
   int get hashCode =>
-      hashValues(color, toggleColor, iconFillColor, iconColor, disabledIconColor, dividerColor);
+      hashValues(color, surfaceColor, toggleColor, iconFillColor, iconColor, disabledIconColor, dividerColor);
 }

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

@@ -22,6 +22,9 @@ enum ZefyrToolbarAction {
   link,
   unlink,
   emoji,
+  undo,
+  redo,
+  save,
   clipboardCopy,
   openInBrowser,
   heading,
@@ -50,6 +53,7 @@ final kZefyrToolbarAttributeActions = <ZefyrToolbarAction, NotusAttributeKey>{
   ZefyrToolbarAction.bold: NotusAttribute.bold,
   ZefyrToolbarAction.italic: NotusAttribute.italic,
   ZefyrToolbarAction.link: NotusAttribute.link,
+  // ZefyrToolbarAction.text: NotusAttribute.heading,
   ZefyrToolbarAction.heading: NotusAttribute.heading,
   ZefyrToolbarAction.headingLevel1: NotusAttribute.heading.level1,
   ZefyrToolbarAction.headingLevel2: NotusAttribute.heading.level2,
@@ -63,9 +67,12 @@ final kZefyrToolbarAttributeActions = <ZefyrToolbarAction, NotusAttributeKey>{
 
 const kDefaultButtonIcons = {
   ZefyrToolbarAction.heading: ZefyrFont.note_editor_text,
-  ZefyrToolbarAction.emoji: ZefyrFont.im_dialogebar_sendemoji,
+  ZefyrToolbarAction.emoji: ZefyrFont.note_editor_emoji,
   ZefyrToolbarAction.image: ZefyrFont.note_editor_image,
   ZefyrToolbarAction.link: ZefyrFont.note_editor_link,
+  ZefyrToolbarAction.undo: ZefyrFont.note_editor_undo,
+  ZefyrToolbarAction.redo: ZefyrFont.note_editor_redo,
+  ZefyrToolbarAction.save: ZefyrFont.note_editor_save,
   ZefyrToolbarAction.hideKeyboard: ZefyrFont.note_editor_keyboard,
   ZefyrToolbarAction.showKeyboard: ZefyrFont.note_editor_unkeyboard,
   ZefyrToolbarAction.close: Icons.close,
@@ -103,6 +110,13 @@ const kSpecialIconSizes = {
 
 const kDefaultButtonTexts = {};
 
+final kToolbarDivider = Container(
+  width: 1,
+  color: Color(0xFFE2E2E2),
+  height: 28,
+  margin: EdgeInsets.symmetric(horizontal: 10),
+);
+
 /// Allows customizing appearance of [ZefyrToolbar].
 abstract class ZefyrToolbarDelegate {
   /// Builds toolbar button for specified [action].
@@ -129,8 +143,7 @@ class ZefyrToolbarScaffold extends StatelessWidget {
   Widget build(BuildContext context) {
     final theme = ZefyrTheme.of(context).toolbarTheme;
     final toolbar = ZefyrToolbar.of(context);
-    final constraints =
-        BoxConstraints.tightFor(height: ZefyrToolbar.kToolbarHeight);
+    final constraints = BoxConstraints.tightFor(height: ZefyrToolbar.kToolbarHeight);
     final children = <Widget>[
       if (trailing != null)
         trailing
@@ -143,11 +156,18 @@ class ZefyrToolbarScaffold extends StatelessWidget {
     return Container(
       constraints: constraints,
       decoration: BoxDecoration(
-        border: Border(
-          top: BorderSide(color: theme.dividerColor, width: 1)
-        ),
+        boxShadow: [
+          BoxShadow(
+            color: Color(0x59000000),
+            offset: Offset(0, -4),
+            blurRadius: 14,
+          ),
+        ],
       ),
-      child: Material(color: theme.color, child: Row(children: children)),
+      child: Material(color: theme.color, child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 10),
+        child: Row(children: children),
+      )),
     );
   }
 }
@@ -223,9 +243,12 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
     return _delegate.buildButton(context, action, onPressed: onPressed);
   }
 
-  Future<void> showOverlay(WidgetBuilder builder) async {
-    if (hasOverlay) {
+  Future<void> showOverlay(WidgetBuilder builder, ZefyrToolbarAction action) async {
+    if (editor.toolbarAction != null) {
       closeOverlay();
+      if (editor.toolbarAction == action) {
+        return;
+      }
     }
     final completer = Completer<void>();
     setState(() {
@@ -233,7 +256,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
       _overlayCompleter = completer;
       _overlayAnimation.forward();
     });
-    editor.hideKeyboard();
+    editor.toolbarAction = action;
     return completer.future;
   }
 
@@ -245,7 +268,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
         _overlayCompleter?.complete();
         _overlayCompleter = null;
       });
-      editor.showKeyboard();
+      editor.toolbarAction = null;
     });
   }
 
@@ -291,7 +314,27 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
 
     final toolbar = ZefyrToolbarScaffold(
       key: _toolbarKey,
-      body: ZefyrButtonList(buttons: _buildButtons(context)),
+      body: Row(
+        children: [
+          kToolbarDivider,
+          Expanded(child: ListView(
+            scrollDirection: Axis.horizontal,
+            children: [
+              HeadingButton(),
+              buildButton(context, ZefyrToolbarAction.emoji),
+              if (editor.imageDelegate != null) ImageButton(),
+              // ImageButton(),
+              LinkButton(),
+            ],
+            physics: ClampingScrollPhysics(),
+          ),),
+          kToolbarDivider,
+          buildButton(context, ZefyrToolbarAction.undo),
+          buildButton(context, ZefyrToolbarAction.redo),
+          kToolbarDivider,
+          buildButton(context, ZefyrToolbarAction.save),
+        ],
+      ),
       trailing: hasOverlay ? buildButton(context, ZefyrToolbarAction.showKeyboard) : buildButton(context, ZefyrToolbarAction.hideKeyboard),
     );
     layers.add(toolbar);

packages/zefyr/pubspec.yaml

@@ -17,6 +17,7 @@ dependencies:
     path: ../notus
   meta: ^1.1.0
   quiver_hashcode: ^2.0.0
+  image_picker: ^0.6.5
   photo: 
     path: /Users/imac/Documents/flutter/projects/mutli_image_picker