fix file_manager_page.dart conflict
This commit is contained in:
parent
3b63dea6fe
commit
3155d40f80
@ -87,27 +87,6 @@ class _FileManagerPageState extends State<FileManagerPage>
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
super.build(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: [
|
return Overlay(initialEntries: [
|
||||||
OverlayEntry(builder: (context) {
|
OverlayEntry(builder: (context) {
|
||||||
_ffi.dialogManager.setOverlayState(Overlay.of(context));
|
_ffi.dialogManager.setOverlayState(Overlay.of(context));
|
||||||
@ -122,6 +101,7 @@ class _FileManagerPageState extends State<FileManagerPage>
|
|||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
|
backgroundColor: MyTheme.color(context).bg,
|
||||||
body: Row(
|
body: Row(
|
||||||
children: [
|
children: [
|
||||||
Flexible(flex: 3, child: body(isLocal: true)),
|
Flexible(flex: 3, child: body(isLocal: true)),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user