瀏覽代碼

fix trash_page display issues on dark mode

appflowy 3 年之前
父節點
當前提交
beb844da17

+ 1 - 1
frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart

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

+ 2 - 2
frontend/app_flowy/lib/workspace/presentation/stack_page/trash/trash_page.dart

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

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