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

fix trash_page display issues on dark mode

Browse Source
This commit is contained in:
appflowy
2022-01-28 21:38:19 +08:00
parent ef8624e87c
commit beb844da17
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart
View File

@ -41,7 +41,7 @@ class _DocPageState extends State<DocPage> {
child: BlocBuilder<DocBloc, DocState>(builder: (context, state) {
return state.loadState.map(
// loading: (_) => const FlowyProgressIndicator(),
loading: (_) => SizedBox.expand(child: Container(color: Colors.white)),
loading: (_) => SizedBox.expand(child: Container(color: Colors.transparent)),
finish: (result) => result.successOrFail.fold(
(_) {
if (state.forceClose) {

4
frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart
View File

@ -124,7 +124,7 @@ class _TrashStackPageState extends State<TrashStackPage> {
size: const Size(102, 30),
child: FlowyButton(
text: FlowyText.medium(LocaleKeys.trash_restoreAll.tr(), fontSize: 12),
icon: svg('editor/restore'),
icon: svg('editor/restore', color: theme.iconColor),
hoverColor: theme.hover,
onTap: () => context.read<TrashBloc>().add(const TrashEvent.restoreAll()),
),
@ -134,7 +134,7 @@ class _TrashStackPageState extends State<TrashStackPage> {
size: const Size(102, 30),
child: FlowyButton(
text: FlowyText.medium(LocaleKeys.trash_deleteAll.tr(), fontSize: 12),
icon: svg('editor/delete'),
icon: svg('editor/delete', color: theme.iconColor),
hoverColor: theme.hover,
onTap: () => context.read<TrashBloc>().add(const TrashEvent.deleteAll()),
),

7
frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart
View File

@ -1,4 +1,5 @@
import 'package:flowy_infra/image.dart';
import 'package:flowy_infra/theme.dart';
import 'package:flowy_infra_ui/style_widget/icon_button.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
@ -6,6 +7,7 @@ import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:fixnum/fixnum.dart' as $fixnum;
import 'package:provider/provider.dart';
import 'sizes.dart';
@ -17,6 +19,7 @@ class TrashCell extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = context.watch<AppTheme>();
return Row(
children: [
SizedBox(width: TrashSizes.fileNameWidth, child: FlowyText(object.name, fontSize: 12)),
@ -26,13 +29,13 @@ class TrashCell extends StatelessWidget {
FlowyIconButton(
width: 16,
onPressed: onRestore,
icon: svg("editor/restore"),
icon: svg("editor/restore", color: theme.iconColor),
),
const HSpace(20),
FlowyIconButton(
width: 16,
onPressed: onDelete,
icon: svg("editor/delete"),
icon: svg("editor/delete", color: theme.iconColor),
),
],
);