From 393850ae4bfa014d8d62a16a8ba9398cc16835f2 Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Fri, 2 Aug 2024 22:00:28 +0800 Subject: [PATCH] chore: expand inline menu width (#5867) --- .../presentation/home/mobile_home_page_header.dart | 3 ++- .../handlers/inline_page_reference.dart | 12 ++++++------ .../widgets/inline_actions_handler.dart | 13 ++++++++----- .../widgets/inline_actions_menu_group.dart | 9 +++++++-- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart index 01f43ca87b..480b56f4f4 100644 --- a/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart +++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart @@ -51,9 +51,10 @@ class MobileHomePageHeader extends StatelessWidget { ), child: const Padding( padding: EdgeInsets.all(8.0), - child: FlowySvg(FlowySvgs.m_setting_m), + child: FlowySvg(FlowySvgs.m_notification_settings_s), ), ), + const HSpace(8.0), ], ), ); diff --git a/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart b/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart index fdb157974f..0dabe397bc 100644 --- a/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart +++ b/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:appflowy/generated/locale_keys.g.dart'; -import 'package:appflowy/plugins/base/emoji/emoji_text.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/base/insert_page_command.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_block.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart'; @@ -17,6 +16,7 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart'; import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart'; import 'package:appflowy_editor/appflowy_editor.dart'; import 'package:easy_localization/easy_localization.dart'; +import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/widget/dialog/styled_dialogs.dart'; import 'package:flowy_infra_ui/widget/error_page.dart'; import 'package:flutter/material.dart'; @@ -228,11 +228,11 @@ class InlinePageReferenceService extends InlineActionsDelegate { keywords: [view.name.toLowerCase()], label: view.name, icon: (onSelected) => view.icon.value.isNotEmpty - ? EmojiText( - emoji: view.icon.value, - fontSize: 12, - textAlign: TextAlign.center, - lineHeight: 1.3, + ? FlowyText.emoji( + view.icon.value, + fontSize: 14, + figmaLineHeight: 18.0, + // optimizeEmojiAlign: true, ) : view.defaultIcon(), onSelected: (context, editorState, menu, replace) => insertPage diff --git a/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_handler.dart b/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_handler.dart index 7f2c3de8f3..edf34a3dc1 100644 --- a/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_handler.dart +++ b/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_handler.dart @@ -1,8 +1,5 @@ import 'dart:async'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; - import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/plugins/inline_actions/inline_actions_menu.dart'; import 'package:appflowy/plugins/inline_actions/inline_actions_result.dart'; @@ -12,13 +9,16 @@ import 'package:appflowy_editor/appflowy_editor.dart'; import 'package:collection/collection.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_infra_ui/style_widget/text.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; /// All heights are in physical pixels const double _groupTextHeight = 14; // 12 height + 2 bottom spacing const double _groupBottomSpacing = 6; const double _itemHeight = 30; // 26 height + 4 vertical spacing (2*2) -const double _menuHeight = 300; +const double kInlineMenuHeight = 300; +const double kInlineMenuWidth = 400; const double _contentHeight = 260; extension _StartWithsSort on List { @@ -152,7 +152,10 @@ class _InlineActionsHandlerState extends State { focusNode: _focusNode, onKeyEvent: onKeyEvent, child: Container( - constraints: BoxConstraints.loose(const Size(200, _menuHeight)), + constraints: const BoxConstraints( + maxHeight: kInlineMenuHeight, + minWidth: kInlineMenuWidth, + ), decoration: BoxDecoration( color: widget.style.backgroundColor, borderRadius: BorderRadius.circular(6.0), diff --git a/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_menu_group.dart b/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_menu_group.dart index 1392dd9b21..8e72415309 100644 --- a/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_menu_group.dart +++ b/frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_menu_group.dart @@ -1,5 +1,6 @@ import 'package:appflowy/plugins/inline_actions/inline_actions_menu.dart'; import 'package:appflowy/plugins/inline_actions/inline_actions_result.dart'; +import 'package:appflowy/plugins/inline_actions/widgets/inline_actions_handler.dart'; import 'package:appflowy_editor/appflowy_editor.dart'; import 'package:collection/collection.dart'; import 'package:flowy_infra_ui/style_widget/button.dart'; @@ -92,11 +93,15 @@ class _InlineActionsWidgetState extends State { return Padding( padding: const EdgeInsets.symmetric(vertical: 2), child: SizedBox( - width: 200, + width: kInlineMenuWidth, child: FlowyButton( + expand: true, isSelected: widget.isSelected, leftIcon: widget.item.icon?.call(widget.isSelected), - text: FlowyText.regular(widget.item.label), + text: FlowyText.regular( + widget.item.label, + figmaLineHeight: 18, + ), onTap: _onPressed, ), ),