From 3155d40f80c839b4387b9ba6178688040d954ce0 Mon Sep 17 00:00:00 2001
From: csf <csf@breakbeat.cn>
Date: Tue, 23 Aug 2022 20:22:31 +0800
Subject: [PATCH] fix file_manager_page.dart conflict

---
 .../lib/desktop/pages/file_manager_page.dart  | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart
index e07fadf28..4a2f11553 100644
--- a/flutter/lib/desktop/pages/file_manager_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_page.dart
@@ -87,27 +87,6 @@ class _FileManagerPageState extends State<FileManagerPage>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return ChangeNotifierProvider.value(
-        value: _ffi.fileModel,
-        child: Consumer<FileModel>(builder: (_context, _model, _child) {
-          return WillPopScope(
-              onWillPop: () async {
-                if (model.selectMode) {
-                  model.toggleSelectMode();
-                }
-                return false;
-              },
-              child: Scaffold(
-                backgroundColor: MyTheme.color(context).bg,
-                body: Row(
-                  children: [
-                    Flexible(flex: 3, child: body(isLocal: true)),
-                    Flexible(flex: 3, child: body(isLocal: false)),
-                    Flexible(flex: 2, child: statusList())
-                  ],
-                ),
-              ));
-        }));
     return Overlay(initialEntries: [
       OverlayEntry(builder: (context) {
         _ffi.dialogManager.setOverlayState(Overlay.of(context));
@@ -122,6 +101,7 @@ class _FileManagerPageState extends State<FileManagerPage>
                     return false;
                   },
                   child: Scaffold(
+                    backgroundColor: MyTheme.color(context).bg,
                     body: Row(
                       children: [
                         Flexible(flex: 3, child: body(isLocal: true)),