diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart index 4883cd0bec..52b85e108e 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart @@ -41,7 +41,7 @@ class _DocPageState extends State { child: BlocBuilder(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) { diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart index 472f548d68..e005bca21d 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart @@ -124,7 +124,7 @@ class _TrashStackPageState extends State { 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().add(const TrashEvent.restoreAll()), ), @@ -134,7 +134,7 @@ class _TrashStackPageState extends State { 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().add(const TrashEvent.deleteAll()), ), diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart index eed9e8c0fa..4ba52edfe1 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart @@ -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(); 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), ), ], );