chore: refactor share menu colors

This commit is contained in:
Lucas.Xu 2024-06-28 13:33:39 +08:00
parent eab1519c3e
commit 6033e128f0
4 changed files with 25 additions and 5 deletions

View File

@ -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/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';
import 'package:appflowy/startup/startup.dart'; import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/util/string_extension.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/application/export/document_exporter.dart';
import 'package:appflowy/workspace/presentation/home/toast.dart'; import 'package:appflowy/workspace/presentation/home/toast.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
@ -100,13 +101,16 @@ class _ExportButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final color = Theme.of(context).isLightMode
? const Color(0x1E14171B)
: Colors.white.withOpacity(0.1);
final radius = BorderRadius.circular(10.0); final radius = BorderRadius.circular(10.0);
return FlowyButton( return FlowyButton(
margin: const EdgeInsets.symmetric(vertical: 10, horizontal: 14), margin: const EdgeInsets.symmetric(vertical: 10, horizontal: 14),
iconPadding: 12, iconPadding: 12,
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: const Color(0x1E14171B), color: color,
), ),
borderRadius: radius, borderRadius: radius,
), ),

View File

@ -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;
}
}

View File

@ -1,6 +1,7 @@
import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.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/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/plugins/document/presentation/share/publish_name_generator.dart';
import 'package:appflowy/util/theme_extension.dart'; import 'package:appflowy/util/theme_extension.dart';
import 'package:appflowy/workspace/presentation/home/toast.dart'; import 'package:appflowy/workspace/presentation/home/toast.dart';
@ -110,7 +111,7 @@ class _PublishedWidgetState extends State<_PublishedWidget> {
_buildButton( _buildButton(
context, context,
name: LocaleKeys.shareAction_unPublish.tr(), name: LocaleKeys.shareAction_unPublish.tr(),
borderColor: const Color(0x1E14171B), borderColor: ShareMenuColors.borderColor(context),
onTap: widget.onUnPublish, onTap: widget.onUnPublish,
), ),
const Spacer(), const Spacer(),
@ -235,12 +236,13 @@ class _PublishUrl extends StatelessWidget {
readOnly: true, readOnly: true,
autoFocus: false, autoFocus: false,
controller: controller, controller: controller,
suffixIcon: _buildCopyLinkIcon(), enableBorderColor: ShareMenuColors.borderColor(context),
suffixIcon: _buildCopyLinkIcon(context),
), ),
); );
} }
Widget _buildCopyLinkIcon() { Widget _buildCopyLinkIcon(BuildContext context) {
return MouseRegion( return MouseRegion(
cursor: SystemMouseCursors.click, cursor: SystemMouseCursors.click,
child: GestureDetector( child: GestureDetector(

View File

@ -37,6 +37,7 @@ class FlowyTextField extends StatefulWidget {
final bool obscureText; final bool obscureText;
final bool isDense; final bool isDense;
final bool readOnly; final bool readOnly;
final Color? enableBorderColor;
const FlowyTextField({ const FlowyTextField({
super.key, super.key,
@ -72,6 +73,7 @@ class FlowyTextField extends StatefulWidget {
this.obscureText = false, this.obscureText = false,
this.isDense = true, this.isDense = true,
this.readOnly = false, this.readOnly = false,
this.enableBorderColor,
}); });
@override @override
@ -180,7 +182,8 @@ class FlowyTextFieldState extends State<FlowyTextField> {
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: Corners.s8Border, borderRadius: Corners.s8Border,
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context).colorScheme.outline, color: widget.enableBorderColor ??
Theme.of(context).colorScheme.outline,
), ),
), ),
isDense: false, isDense: false,