diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_progress_bar.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_progress_bar.dart index b51f662930..dd831282cd 100644 --- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_progress_bar.dart +++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_progress_bar.dart @@ -1,7 +1,7 @@ -import 'package:appflowy_editor/appflowy_editor.dart'; import 'package:flowy_infra/theme_extension.dart'; import 'package:flutter/material.dart'; import 'package:percent_indicator/percent_indicator.dart'; + import '../../application/cell/bloc/checklist_cell_bloc.dart'; class ChecklistProgressBar extends StatefulWidget { @@ -68,7 +68,7 @@ class _ChecklistProgressBarState extends State { ), ), SizedBox( - width: PlatformExtension.isDesktop ? 36 : 45, + width: 45, child: Align( alignment: AlignmentDirectional.centerEnd, child: Text( diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart index 4dd950c766..efd98647af 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart @@ -1,5 +1,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; +import 'package:appflowy/util/theme_extension.dart'; import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart'; import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart'; import 'package:appflowy/workspace/application/view/view_bloc.dart'; @@ -268,6 +269,22 @@ enum ConfirmPopupStyle { cancelAndOk, } +class ConfirmPopupColor { + static Color titleColor(BuildContext context) { + if (Theme.of(context).isLightMode) { + return const Color(0xFF171717).withOpacity(0.8); + } + return const Color(0xFFffffff).withOpacity(0.8); + } + + static Color descriptionColor(BuildContext context) { + if (Theme.of(context).isLightMode) { + return const Color(0xFF171717).withOpacity(0.8); + } + return const Color(0xFFffffff).withOpacity(0.72); + } +} + class ConfirmPopup extends StatefulWidget { const ConfirmPopup({ super.key, @@ -328,6 +345,7 @@ class _ConfirmPopupState extends State { widget.title, fontSize: 14.0, overflow: TextOverflow.ellipsis, + color: ConfirmPopupColor.titleColor(context), ), ), const HSpace(6.0), @@ -344,7 +362,7 @@ class _ConfirmPopupState extends State { return FlowyText.regular( widget.description, fontSize: 12.0, - color: Theme.of(context).hintColor, + color: ConfirmPopupColor.descriptionColor(context), maxLines: 3, lineHeight: 1.4, );