Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: improve popup menu color (#5725)

Browse Source 
* chore: improve popup menu color

* fix: 100％ text wrap into a new line in checklist cell
This commit is contained in:
Lucas.Xu 2024-07-12 15:23:22 +08:00 committed by GitHub
parent 8833df1740
commit a2336f5bf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_progress_bar.dart
View File

@ -1,7 +1,7 @@
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:flowy_infra/theme_extension.dart'; import 'package:flowy_infra/theme_extension.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:percent_indicator/percent_indicator.dart'; import 'package:percent_indicator/percent_indicator.dart';
import '../../application/cell/bloc/checklist_cell_bloc.dart'; import '../../application/cell/bloc/checklist_cell_bloc.dart';
class ChecklistProgressBar extends StatefulWidget { class ChecklistProgressBar extends StatefulWidget {
@ -68,7 +68,7 @@ class _ChecklistProgressBarState extends State<ChecklistProgressBar> {
), ),
), ),
SizedBox( SizedBox(
width: PlatformExtension.isDesktop ? 36 : 45, width: 45,
child: Align( child: Align(
alignment: AlignmentDirectional.centerEnd, alignment: AlignmentDirectional.centerEnd,
child: Text( child: Text(

20
frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
View File

@ -1,5 +1,6 @@
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/util/theme_extension.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.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/sidebar/space/space_bloc.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart'; import 'package:appflowy/workspace/application/view/view_bloc.dart';
@ -268,6 +269,22 @@ enum ConfirmPopupStyle {
cancelAndOk, 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 { class ConfirmPopup extends StatefulWidget {
const ConfirmPopup({ const ConfirmPopup({
super.key, super.key,
@ -328,6 +345,7 @@ class _ConfirmPopupState extends State<ConfirmPopup> {
widget.title, widget.title,
fontSize: 14.0, fontSize: 14.0,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
color: ConfirmPopupColor.titleColor(context),
), ),
), ),
const HSpace(6.0), const HSpace(6.0),
@ -344,7 +362,7 @@ class _ConfirmPopupState extends State<ConfirmPopup> {
return FlowyText.regular( return FlowyText.regular(
widget.description, widget.description,
fontSize: 12.0, fontSize: 12.0,
color: Theme.of(context).hintColor, color: ConfirmPopupColor.descriptionColor(context),
maxLines: 3, maxLines: 3,
lineHeight: 1.4, lineHeight: 1.4,
); );