hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: switch breadcrumb&path with focus node

Browse Source 
Signed-off-by: Kingtous <kingtous@qq.com>
This commit is contained in:
Kingtous 2022-08-16 11:46:51 +08:00
parent f89777fa92
commit d9c9365520
2 changed files with 297 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

456
flutter/lib/desktop/pages/file_manager_page.dart
View File

@ -2,6 +2,7 @@ import 'dart:io';
import 'dart:math'; import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_breadcrumb/flutter_breadcrumb.dart';
import 'package:flutter_hbb/mobile/pages/file_manager_page.dart'; import 'package:flutter_hbb/mobile/pages/file_manager_page.dart';
import 'package:flutter_hbb/models/file_model.dart'; import 'package:flutter_hbb/models/file_model.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -12,6 +13,8 @@ import '../../common.dart';
import '../../models/model.dart'; import '../../models/model.dart';
import '../../models/platform_model.dart'; import '../../models/platform_model.dart';
enum LocationStatus { bread, textField }
class FileManagerPage extends StatefulWidget { class FileManagerPage extends StatefulWidget {
FileManagerPage({Key? key, required this.id}) : super(key: key); FileManagerPage({Key? key, required this.id}) : super(key: key);
final String id; final String id;
@ -25,6 +28,17 @@ class _FileManagerPageState extends State<FileManagerPage>
final _localSelectedItems = SelectedItems(); final _localSelectedItems = SelectedItems();
final _remoteSelectedItems = SelectedItems(); final _remoteSelectedItems = SelectedItems();
final _locationStatusLocal = LocationStatus.bread.obs;
final _locationStatusRemote = LocationStatus.bread.obs;
final FocusNode _locationNodeLocal =
FocusNode(debugLabel: "locationNodeLocal");
final FocusNode _locationNodeRemote =
FocusNode(debugLabel: "locationNodeRemote");
final FocusNode _locationSearchLocal =
FocusNode(debugLabel: "locationSearchLocal");
final FocusNode _locationSearchRemote =
FocusNode(debugLabel: "locationSearchRemote");
late FFI _ffi; late FFI _ffi;
FileModel get model => _ffi.fileModel; FileModel get model => _ffi.fileModel;
@ -44,6 +58,9 @@ class _FileManagerPageState extends State<FileManagerPage>
Wakelock.enable(); Wakelock.enable();
} }
print("init success with id ${widget.id}"); print("init success with id ${widget.id}");
// register location listener
_locationNodeLocal.addListener(onLocalLocationFocusChanged);
_locationNodeRemote.addListener(onRemoteLocationFocusChanged);
} }
@override @override
@ -55,6 +72,8 @@ class _FileManagerPageState extends State<FileManagerPage>
Wakelock.disable(); Wakelock.disable();
} }
Get.delete<FFI>(tag: 'ft_${widget.id}'); Get.delete<FFI>(tag: 'ft_${widget.id}');
_locationNodeLocal.removeListener(onLocalLocationFocusChanged);
_locationNodeRemote.removeListener(onRemoteLocationFocusChanged);
super.dispose(); super.dispose();
} }
@ -129,8 +148,7 @@ class _FileManagerPageState extends State<FileManagerPage>
final sortAscending = final sortAscending =
isLocal ? model.localSortAscending : model.remoteSortAscending; isLocal ? model.localSortAscending : model.remoteSortAscending;
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(border: Border.all(color: Colors.black26)),
color: Colors.white54, border: Border.all(color: Colors.black26)),
margin: const EdgeInsets.all(16.0), margin: const EdgeInsets.all(16.0),
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@ -142,6 +160,7 @@ class _FileManagerPageState extends State<FileManagerPage>
Expanded( Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: DataTable( child: DataTable(
key: ValueKey(isLocal ? 0 : 1),
showCheckboxColumn: true, showCheckboxColumn: true,
dataRowHeight: 25, dataRowHeight: 25,
headingRowHeight: 30, headingRowHeight: 30,
@ -223,9 +242,9 @@ class _FileManagerPageState extends State<FileManagerPage>
}), }),
DataCell(Text( DataCell(Text(
entry entry
.lastModified() .lastModified()
.toString() .toString()
.replaceAll(".000", "") + .replaceAll(".000", "") +
" ", " ",
style: TextStyle( style: TextStyle(
fontSize: 12, color: MyTheme.darkGray), fontSize: 12, color: MyTheme.darkGray),
@ -355,8 +374,7 @@ class _FileManagerPageState extends State<FileManagerPage>
child: Container( child: Container(
margin: const EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0), margin: const EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
decoration: BoxDecoration( decoration: BoxDecoration(border: Border.all(color: Colors.grey)),
color: Colors.white70, border: Border.all(color: Colors.grey)),
child: Obx( child: Obx(
() => ListView.builder( () => ListView.builder(
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
@ -449,183 +467,206 @@ class _FileManagerPageState extends State<FileManagerPage>
model.goToParentDirectory(isLocal: isLocal); model.goToParentDirectory(isLocal: isLocal);
} }
Widget headTools(bool isLocal) => Container( Widget headTools(bool isLocal) {
child: Column( final _locationStatus =
children: [ isLocal ? _locationStatusLocal : _locationStatusRemote;
// symbols final _locationFocus = isLocal ? _locationNodeLocal : _locationNodeRemote;
PreferredSize( return Container(
child: Row( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ // symbols
Container( PreferredSize(
width: 50, child: Row(
height: 50, crossAxisAlignment: CrossAxisAlignment.center,
decoration: BoxDecoration(color: Colors.blue), children: [
padding: EdgeInsets.all(8.0), Container(
child: FutureBuilder<String>( width: 50,
future: bind.sessionGetPlatform( height: 50,
id: _ffi.id, isRemote: !isLocal), decoration: BoxDecoration(color: Colors.blue),
builder: (context, snapshot) { padding: EdgeInsets.all(8.0),
if (snapshot.hasData && snapshot.data!.isNotEmpty) { child: FutureBuilder<String>(
return getPlatformImage('${snapshot.data}'); future: bind.sessionGetPlatform(
} else { id: _ffi.id, isRemote: !isLocal),
return CircularProgressIndicator( builder: (context, snapshot) {
color: Colors.white, if (snapshot.hasData && snapshot.data!.isNotEmpty) {
); return getPlatformImage('${snapshot.data}');
} else {
return CircularProgressIndicator(
color: Colors.white,
);
}
})),
Text(isLocal
? translate("Local Computer")
: translate("Remote Computer"))
.marginOnly(left: 8.0)
],
),
preferredSize: Size(double.infinity, 70)),
// buttons
Row(
children: [
Row(
children: [
IconButton(
onPressed: () {
model.goHome(isLocal: isLocal);
},
icon: Icon(Icons.home_outlined)),
IconButton(
icon: Icon(Icons.arrow_upward),
onPressed: () {
goBack(isLocal: isLocal);
},
),
menu(isLocal: isLocal),
],
),
Expanded(
child: GestureDetector(
onTap: () {
_locationStatus.value =
_locationStatus.value == LocationStatus.bread
? LocationStatus.textField
: LocationStatus.bread;
Future.delayed(Duration.zero, () {
if (_locationStatus.value == LocationStatus.textField) {
_locationFocus.requestFocus();
}
});
},
child: Container(
decoration:
BoxDecoration(border: Border.all(color: Colors.black12)),
child: Row(
children: [
Expanded(
child: Obx(() =>
_locationStatus.value == LocationStatus.bread
? buildBread(isLocal)
: buildPathLocation(isLocal))),
DropdownButton<String>(
isDense: true,
underline: Offstage(),
items: [
// TODO: favourite
DropdownMenuItem(
child: Text('/'),
value: '/',
)
],
onChanged: (path) {
if (path is String && path.isNotEmpty) {
model.openDirectory(path, isLocal: isLocal);
} }
})), })
Text(isLocal ],
? translate("Local Computer") )),
: translate("Remote Computer")) )),
.marginOnly(left: 8.0) PopupMenuButton(
], itemBuilder: (context) => [
), PopupMenuItem(
preferredSize: Size(double.infinity, 70)), enabled: false,
// buttons child: ConstrainedBox(
Row( constraints: BoxConstraints(minWidth: 200),
children: [ child: TextField(
Row( decoration: InputDecoration(),
),
))
],
child: Icon(Icons.search),
),
IconButton(
onPressed: () {
model.refresh(isLocal: isLocal);
},
icon: Icon(Icons.refresh)),
],
),
Row(
textDirection: isLocal ? TextDirection.ltr : TextDirection.rtl,
children: [
Expanded(
child: Row(
mainAxisAlignment:
isLocal ? MainAxisAlignment.start : MainAxisAlignment.end,
children: [ children: [
IconButton( IconButton(
onPressed: () { onPressed: () {
model.goHome(isLocal: isLocal); final name = TextEditingController();
_ffi.dialogManager
.show((setState, close) => CustomAlertDialog(
title: Text(translate("Create Folder")),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextFormField(
decoration: InputDecoration(
labelText: translate(
"Please enter the folder name"),
),
controller: name,
),
],
),
actions: [
TextButton(
style: flatButtonStyle,
onPressed: () => close(false),
child: Text(translate("Cancel"))),
ElevatedButton(
style: flatButtonStyle,
onPressed: () {
if (name.value.text.isNotEmpty) {
model.createDir(
PathUtil.join(
model
.getCurrentDir(
isLocal)
.path,
name.value.text,
model.getCurrentIsWindows(
isLocal)),
isLocal: isLocal);
close();
}
},
child: Text(translate("OK")))
]));
}, },
icon: Icon(Icons.home_outlined)), icon: Icon(Icons.create_new_folder_outlined)),
IconButton( IconButton(
icon: Icon(Icons.arrow_upward), onPressed: () async {
onPressed: () { final items = isLocal
goBack(isLocal: isLocal); ? _localSelectedItems
}, : _remoteSelectedItems;
), await (model.removeAction(items, isLocal: isLocal));
menu(isLocal: isLocal), items.clear();
},
icon: Icon(Icons.delete_forever_outlined)),
], ],
), ),
Expanded( ),
child: Container( TextButton.icon(
decoration: BoxDecoration( onPressed: () {
border: Border.all(color: Colors.black12)), final items = getSelectedItem(isLocal);
child: TextField( model.sendFiles(items, isRemote: !isLocal);
decoration: InputDecoration( items.clear();
border: InputBorder.none, },
isDense: true, icon: Transform.rotate(
prefix: angle: isLocal ? 0 : pi,
Padding(padding: EdgeInsets.only(left: 4.0)), child: Icon(
suffix: DropdownButton<String>( Icons.send,
isDense: true,
underline: Offstage(),
items: [
// TODO: favourite
DropdownMenuItem(
child: Text('/'),
value: '/',
)
],
onChanged: (path) {
if (path is String && path.isNotEmpty) {
model.openDirectory(path, isLocal: isLocal);
}
})),
controller: TextEditingController(
text: isLocal
? model.currentLocalDir.path
: model.currentRemoteDir.path),
onSubmitted: (path) {
model.openDirectory(path, isLocal: isLocal);
},
))),
IconButton(
onPressed: () {
model.refresh(isLocal: isLocal);
},
icon: Icon(Icons.refresh))
],
),
Row(
textDirection: isLocal ? TextDirection.ltr : TextDirection.rtl,
children: [
Expanded(
child: Row(
mainAxisAlignment:
isLocal ? MainAxisAlignment.start : MainAxisAlignment.end,
children: [
IconButton(
onPressed: () {
final name = TextEditingController();
_ffi.dialogManager.show((setState, close) =>
CustomAlertDialog(
title: Text(translate("Create Folder")),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextFormField(
decoration: InputDecoration(
labelText: translate(
"Please enter the folder name"),
),
controller: name,
),
],
),
actions: [
TextButton(
style: flatButtonStyle,
onPressed: () => close(false),
child: Text(translate("Cancel"))),
ElevatedButton(
style: flatButtonStyle,
onPressed: () {
if (name.value.text.isNotEmpty) {
model.createDir(
PathUtil.join(
model
.getCurrentDir(isLocal)
.path,
name.value.text,
model.getCurrentIsWindows(
isLocal)),
isLocal: isLocal);
close();
}
},
child: Text(translate("OK")))
]));
},
icon: Icon(Icons.create_new_folder_outlined)),
IconButton(
onPressed: () async {
final items = isLocal
? _localSelectedItems
: _remoteSelectedItems;
await (model.removeAction(items, isLocal: isLocal));
items.clear();
},
icon: Icon(Icons.delete_forever_outlined)),
],
),
),
TextButton.icon(
onPressed: () {
final items = getSelectedItem(isLocal);
model.sendFiles(items, isRemote: !isLocal);
items.clear();
},
icon: Transform.rotate(
angle: isLocal ? 0 : pi,
child: Icon(
Icons.send,
color: Colors.black54,
),
), ),
label: Text( ),
isLocal ? translate('Send') : translate('Receive'), label: Text(
style: TextStyle( isLocal ? translate('Send') : translate('Receive'),
color: Colors.black54, )),
), ],
)), ).marginOnly(top: 8.0)
], ],
).marginOnly(top: 8.0) ));
], }
));
Widget listTail({bool isLocal = false}) { Widget listTail({bool isLocal = false}) {
final dir = isLocal ? model.currentLocalDir : model.currentRemoteDir; final dir = isLocal ? model.currentLocalDir : model.currentRemoteDir;
@ -663,4 +704,69 @@ class _FileManagerPageState extends State<FileManagerPage>
else if (platform != 'linux' && platform != 'android') platform = 'win'; else if (platform != 'linux' && platform != 'android') platform = 'win';
return Image.asset('assets/$platform.png', width: 25, height: 25); return Image.asset('assets/$platform.png', width: 25, height: 25);
} }
void onLocalLocationFocusChanged() {
debugPrint("focus changed on local");
if (_locationNodeLocal.hasFocus) {
// ignore
} else {
// lost focus, change to bread
_locationStatusLocal.value = LocationStatus.bread;
}
}
void onRemoteLocationFocusChanged() {
debugPrint("focus changed on remote");
if (_locationNodeRemote.hasFocus) {
// ignore
} else {
// lost focus, change to bread
_locationStatusRemote.value = LocationStatus.bread;
}
}
Widget buildBread(bool isLocal) {
final directory = model.getCurrentDir(isLocal);
print(directory.path);
return BreadCrumb(
items: getPathBreadCrumbItems(isLocal, (list) {
var path = "";
for (var item in list) {
path = PathUtil.join(path, item, model.getCurrentIsWindows(isLocal));
}
model.openDirectory(path, isLocal: isLocal);
}),
divider: Text("/").paddingSymmetric(horizontal: 4.0),
);
}
List<BreadCrumbItem> getPathBreadCrumbItems(
bool isLocal, void Function(List<String>) onPressed) {
final path = model.getCurrentDir(isLocal).path;
final list = PathUtil.split(path, model.getCurrentIsWindows(isLocal));
final breadCrumbList = List<BreadCrumbItem>.empty(growable: true);
breadCrumbList.addAll(list.asMap().entries.map((e) => BreadCrumbItem(
content: TextButton(
child: Text(e.value),
style:
ButtonStyle(minimumSize: MaterialStateProperty.all(Size(0, 0))),
onPressed: () => onPressed(list.sublist(0, e.key + 1))))));
return breadCrumbList;
}
Widget buildPathLocation(bool isLocal) {
return TextField(
focusNode: isLocal ? _locationNodeLocal : _locationNodeRemote,
decoration: InputDecoration(
border: InputBorder.none,
isDense: true,
prefix: Padding(padding: EdgeInsets.only(left: 4.0)),
),
controller:
TextEditingController(text: model.getCurrentDir(isLocal).path),
onSubmitted: (path) {
model.openDirectory(path, isLocal: isLocal);
},
);
}
} }

16
flutter/lib/models/file_model.dart
View File

@ -68,6 +68,22 @@ class FileModel extends ChangeNotifier {
return isLocal ? currentLocalDir : currentRemoteDir; return isLocal ? currentLocalDir : currentRemoteDir;
} }
String getCurrentShortPath(bool isLocal) {
final currentDir = getCurrentDir(isLocal);
final currentHome = getCurrentHome(isLocal);
if (currentDir.path.startsWith(currentHome)) {
var path = currentDir.path.replaceFirst(currentHome, "");
if (path.length == 0) return "";
if (path[0] == "/" || path[0] == "\\") {
// remove more '/' or '\'
path = path.replaceFirst(path[0], "");
}
return path;
} else {
return currentDir.path.replaceFirst(currentHome, "");
}
}
String get currentHome => _isLocal ? _localOption.home : _remoteOption.home; String get currentHome => _isLocal ? _localOption.home : _remoteOption.home;
String getCurrentHome(bool isLocal) { String getCurrentHome(bool isLocal) {