diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer.dart index fa86082e74..ff33a79683 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer.dart @@ -9,6 +9,7 @@ import 'package:appflowy/workspace/presentation/home/menu/menu_shared_state.dart import 'package:appflowy/workspace/presentation/home/menu/sidebar/footer/sidebar_toast.dart'; import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart'; import 'package:easy_localization/easy_localization.dart'; +import 'package:flowy_infra/theme_extension.dart'; import 'package:flutter/material.dart'; import 'sidebar_footer_button.dart'; @@ -26,11 +27,26 @@ class SidebarFooter extends StatelessWidget { return const SidebarToast(); }, ), - const SidebarTemplateButton(), - const SidebarTrashButton(), + Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Expanded(child: SidebarTemplateButton()), + _buildVerticalDivider(context), + const Expanded(child: SidebarTrashButton()), + ], + ), ], ); } + + Widget _buildVerticalDivider(BuildContext context) { + return Container( + width: 1.0, + height: 14, + margin: const EdgeInsets.symmetric(horizontal: 4), + color: AFThemeExtension.of(context).borderColor, + ); + } } class SidebarTemplateButton extends StatelessWidget { @@ -39,12 +55,9 @@ class SidebarTemplateButton extends StatelessWidget { @override Widget build(BuildContext context) { return SidebarFooterButton( - leftIconSize: const Size.square(24.0), - leftIcon: const Padding( - padding: EdgeInsets.all(2.0), - child: FlowySvg( - FlowySvgs.icon_template_s, - ), + leftIconSize: const Size.square(18.0), + leftIcon: const FlowySvg( + FlowySvgs.icon_template_s, ), text: LocaleKeys.template_label.tr(), onTap: () => afLaunchUrlString('https://appflowy.io/templates'), @@ -61,9 +74,9 @@ class SidebarTrashButton extends StatelessWidget { valueListenable: getIt().notifier, builder: (context, value, child) { return SidebarFooterButton( - leftIconSize: const Size.square(24.0), + leftIconSize: const Size.square(18.0), leftIcon: const FlowySvg( - FlowySvgs.sidebar_footer_trash_m, + FlowySvgs.icon_delete_s, ), text: LocaleKeys.trash_text.tr(), onTap: () { diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer_button.dart index f83e1dd046..cbb969d191 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer_button.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_footer_button.dart @@ -26,11 +26,15 @@ class SidebarFooterButton extends StatelessWidget { child: FlowyButton( leftIcon: leftIcon, leftIconSize: leftIconSize, - iconPadding: 8.0, margin: const EdgeInsets.all(4.0), - text: FlowyText.regular( - text, - lineHeight: 1.15, + expandText: false, + text: Padding( + padding: const EdgeInsets.only(right: 6.0), + child: FlowyText( + text, + fontWeight: FontWeight.w400, + figmaLineHeight: 18.0, + ), ), onTap: onTap, ), diff --git a/frontend/resources/flowy_icons/16x/icon_delete.svg b/frontend/resources/flowy_icons/16x/icon_delete.svg new file mode 100644 index 0000000000..de7c3a7fc1 --- /dev/null +++ b/frontend/resources/flowy_icons/16x/icon_delete.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/icon_template.svg b/frontend/resources/flowy_icons/16x/icon_template.svg index 1b6af1bac6..84a83c63f3 100644 --- a/frontend/resources/flowy_icons/16x/icon_template.svg +++ b/frontend/resources/flowy_icons/16x/icon_template.svg @@ -1,5 +1,5 @@ - - - + + + - \ No newline at end of file +