From 6033e128f07e7b1973c5f8c88de08b0a6b596416 Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Fri, 28 Jun 2024 13:33:39 +0800 Subject: [PATCH] chore: refactor share menu colors --- .../document/presentation/share/export_tab.dart | 6 +++++- .../presentation/share/pubish_color_extension.dart | 11 +++++++++++ .../document/presentation/share/publish_tab.dart | 8 +++++--- .../flowy_infra_ui/lib/style_widget/text_field.dart | 5 ++++- 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 frontend/appflowy_flutter/lib/plugins/document/presentation/share/pubish_color_extension.dart diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/share/export_tab.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/export_tab.dart index 2443bd0819..ab9669f8e8 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/share/export_tab.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/export_tab.dart @@ -4,6 +4,7 @@ import 'package:appflowy/plugins/document/application/document_share_bloc.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart'; import 'package:appflowy/startup/startup.dart'; import 'package:appflowy/util/string_extension.dart'; +import 'package:appflowy/util/theme_extension.dart'; import 'package:appflowy/workspace/application/export/document_exporter.dart'; import 'package:appflowy/workspace/presentation/home/toast.dart'; import 'package:easy_localization/easy_localization.dart'; @@ -100,13 +101,16 @@ class _ExportButton extends StatelessWidget { @override Widget build(BuildContext context) { + final color = Theme.of(context).isLightMode + ? const Color(0x1E14171B) + : Colors.white.withOpacity(0.1); final radius = BorderRadius.circular(10.0); return FlowyButton( margin: const EdgeInsets.symmetric(vertical: 10, horizontal: 14), iconPadding: 12, decoration: BoxDecoration( border: Border.all( - color: const Color(0x1E14171B), + color: color, ), borderRadius: radius, ), diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/share/pubish_color_extension.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/pubish_color_extension.dart new file mode 100644 index 0000000000..960f59b07d --- /dev/null +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/pubish_color_extension.dart @@ -0,0 +1,11 @@ +import 'package:appflowy/util/theme_extension.dart'; +import 'package:flutter/material.dart'; + +class ShareMenuColors { + static Color borderColor(BuildContext context) { + final borderColor = Theme.of(context).isLightMode + ? const Color(0x1E14171B) + : Colors.white.withOpacity(0.1); + return borderColor; + } +} diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/share/publish_tab.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/publish_tab.dart index 9b43f91316..e007675262 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/share/publish_tab.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/publish_tab.dart @@ -1,6 +1,7 @@ import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/plugins/document/application/document_share_bloc.dart'; +import 'package:appflowy/plugins/document/presentation/share/pubish_color_extension.dart'; import 'package:appflowy/plugins/document/presentation/share/publish_name_generator.dart'; import 'package:appflowy/util/theme_extension.dart'; import 'package:appflowy/workspace/presentation/home/toast.dart'; @@ -110,7 +111,7 @@ class _PublishedWidgetState extends State<_PublishedWidget> { _buildButton( context, name: LocaleKeys.shareAction_unPublish.tr(), - borderColor: const Color(0x1E14171B), + borderColor: ShareMenuColors.borderColor(context), onTap: widget.onUnPublish, ), const Spacer(), @@ -235,12 +236,13 @@ class _PublishUrl extends StatelessWidget { readOnly: true, autoFocus: false, controller: controller, - suffixIcon: _buildCopyLinkIcon(), + enableBorderColor: ShareMenuColors.borderColor(context), + suffixIcon: _buildCopyLinkIcon(context), ), ); } - Widget _buildCopyLinkIcon() { + Widget _buildCopyLinkIcon(BuildContext context) { return MouseRegion( cursor: SystemMouseCursors.click, child: GestureDetector( diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart index c70b38420e..8feb67e332 100644 --- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart +++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart @@ -37,6 +37,7 @@ class FlowyTextField extends StatefulWidget { final bool obscureText; final bool isDense; final bool readOnly; + final Color? enableBorderColor; const FlowyTextField({ super.key, @@ -72,6 +73,7 @@ class FlowyTextField extends StatefulWidget { this.obscureText = false, this.isDense = true, this.readOnly = false, + this.enableBorderColor, }); @override @@ -180,7 +182,8 @@ class FlowyTextFieldState extends State { enabledBorder: OutlineInputBorder( borderRadius: Corners.s8Border, borderSide: BorderSide( - color: Theme.of(context).colorScheme.outline, + color: widget.enableBorderColor ?? + Theme.of(context).colorScheme.outline, ), ), isDense: false,