Skip to content

Add folder move functionality to browse tab #1610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tnswo561412 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add folder move functionality to browse tab #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aabe6aa
Add folder move functionality to browse tab
tnswo561412 Dec 14, 2025
dffbc52
Fix code formatting
tnswo561412 Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions lib/components/home/grid_folders.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart' show CupertinoIcons;
import 'package:flutter/material.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
import 'package:saber/components/home/delete_folder_button.dart';
import 'package:saber/components/home/move_folder_button.dart';
import 'package:saber/components/home/new_folder_dialog.dart';
import 'package:saber/components/home/rename_folder_button.dart';
import 'package:saber/components/theming/adaptive_icon.dart';
Expand All @@ -20,6 +21,8 @@ class GridFolders extends StatelessWidget {
required this.deleteFolder,
required this.doesFolderExist,
required this.folders,
this.currentFolderPath,
this.moveFolder,
});

final bool isAtRoot;
Expand All @@ -32,6 +35,12 @@ class GridFolders extends StatelessWidget {
final Future<bool> Function(String) isFolderEmpty;
final Future<void> Function(String) deleteFolder;

/// The current folder path (with trailing slash), used for move operation.
final String? currentFolderPath;

/// Callback when a folder is moved. If null, move button won't be shown.
final Future<void> Function(String folderName)? moveFolder;

final List<String> folders;

@override
Expand Down Expand Up @@ -61,6 +70,8 @@ class GridFolders extends StatelessWidget {
renameFolder: renameFolder,
isFolderEmpty: isFolderEmpty,
deleteFolder: deleteFolder,
currentFolderPath: currentFolderPath,
moveFolder: moveFolder,
onTap: onTap,
);
},
Expand All @@ -81,6 +92,8 @@ class _GridFolder extends StatefulWidget {
required this.isFolderEmpty,
required this.deleteFolder,
required this.onTap,
this.currentFolderPath,
this.moveFolder,
}) : assert(
(folderName == null) ^ (cardType == .realFolder),
'Real folders must specify a folder name',
Expand All @@ -93,6 +106,8 @@ class _GridFolder extends StatefulWidget {
final Future<void> Function(String oldName, String newName) renameFolder;
final Future<bool> Function(String) isFolderEmpty;
final Future<void> Function(String) deleteFolder;
final String? currentFolderPath;
final Future<void> Function(String folderName)? moveFolder;
final Function(String) onTap;

@override
Expand Down Expand Up @@ -210,6 +225,19 @@ class _GridFolderState extends State<_GridFolder> {
expanded.value = false;
},
),
if (widget.moveFolder != null &&
widget.currentFolderPath != null)
MoveFolderButton(
folderName: widget.folderName!,
currentFolder:
widget.currentFolderPath!,
onMoved: () async {
await widget.moveFolder!(
widget.folderName!,
);
expanded.value = false;
},
),
DeleteFolderButton(
folderName: widget.folderName!,
deleteFolder: (String folderName) async {
Expand Down
234 changes: 234 additions & 0 deletions lib/components/home/move_folder_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:saber/components/home/grid_folders.dart';
import 'package:saber/components/theming/adaptive_alert_dialog.dart';
import 'package:saber/data/file_manager/file_manager.dart';
import 'package:saber/i18n/strings.g.dart';

class MoveFolderButton extends StatelessWidget {
const MoveFolderButton({
super.key,
required this.folderName,
required this.currentFolder,
required this.onMoved,
});

final String folderName;
final String currentFolder;
final void Function() onMoved;

@override
Widget build(BuildContext context) {
return IconButton(
padding: EdgeInsets.zero,
tooltip: t.home.moveFolder.moveFolder,
onPressed: () {
showDialog(
context: context,
builder: (BuildContext context) {
return _MoveFolderDialog(
folderName: folderName,
currentFolder: currentFolder,
onMoved: onMoved,
);
},
);
},
icon: const Icon(Icons.drive_file_move),
);
}
}

class _MoveFolderDialog extends StatefulWidget {
const _MoveFolderDialog({
required this.folderName,
required this.currentFolder,
required this.onMoved,
});

final String folderName;
final String currentFolder;
final void Function() onMoved;

@override
State<_MoveFolderDialog> createState() => _MoveFolderDialogState();
}

class _MoveFolderDialogState extends State<_MoveFolderDialog> {
/// The full path of the folder being moved
late final sourceFolderPath = '${widget.currentFolder}${widget.folderName}';

late String _destinationFolder;

/// The current folder browsed to in the dialog (destination parent folder).
String get destinationFolder => _destinationFolder;
set destinationFolder(String folder) {
_destinationFolder = folder;
destinationFolderChildren = null;
findChildrenOfDestinationFolder();
}

/// The children of [destinationFolder].
DirectoryChildren? destinationFolderChildren;

/// The final folder name at the destination (might be renamed if conflict).
String? newFolderName;

/// Whether the folder will be renamed due to conflict.
bool get willBeRenamed =>
newFolderName != null && newFolderName != widget.folderName;

/// Whether moving to the destination is invalid (moving into itself).
bool get isInvalidDestination {
final destinationPath = '$destinationFolder${widget.folderName}';
// Cannot move a folder into itself or its subdirectory
return destinationPath.startsWith('$sourceFolderPath/') ||
destinationPath == sourceFolderPath;
}

Future findChildrenOfDestinationFolder() async {
destinationFolderChildren = await FileManager.getChildrenOfDirectory(
destinationFolder,
);

// Check if folder name conflicts with existing directory
if (destinationFolderChildren?.directories.contains(widget.folderName) ??
false) {
// Find a unique name
int i = 2;
String candidateName = '${widget.folderName} ($i)';
while (destinationFolderChildren?.directories.contains(candidateName) ??
false) {
i++;
candidateName = '${widget.folderName} ($i)';
}
newFolderName = candidateName;
} else {
newFolderName = widget.folderName;
}

if (!mounted) return;
setState(() {});
}

Future<void> createFolder(String folderName) async {
final folderPath = '$destinationFolder$folderName';
await FileManager.createFolder(folderPath);
findChildrenOfDestinationFolder();
}

@override
void initState() {
// Start at the parent of the folder's current location
destinationFolder = widget.currentFolder;
if (!destinationFolder.startsWith('/')) {
destinationFolder = '/$destinationFolder';
}
super.initState();

findChildrenOfDestinationFolder();
}

@override
Widget build(BuildContext context) {
return AdaptiveAlertDialog(
title: Text(t.home.moveFolder.moveName(f: widget.folderName)),
content: SizedBox(
width: 300,
height: 300,
child: Column(
children: [
Text(destinationFolder),
Expanded(
child: CustomScrollView(
shrinkWrap: true,
slivers: [
GridFolders(
isAtRoot: destinationFolder == '/',
crossAxisCount: 3,
onTap: (String folder) {
setState(() {
if (folder == '..') {
destinationFolder = destinationFolder.substring(
0,
destinationFolder.lastIndexOf(
'/',
destinationFolder.length - 2,
) +
1,
);
} else {
destinationFolder = '$destinationFolder$folder/';
}
});
},
createFolder: createFolder,
doesFolderExist: (String folderName) {
return destinationFolderChildren?.directories.contains(
folderName,
) ??
false;
},
renameFolder: (String oldName, String newName) async {
final oldPath = '$destinationFolder$oldName';
await FileManager.renameDirectory(oldPath, newName);
findChildrenOfDestinationFolder();
},
isFolderEmpty: (String folderName) async {
final folderPath = '$destinationFolder$folderName';
final children = await FileManager.getChildrenOfDirectory(
folderPath,
);
return children?.isEmpty ?? true;
},
deleteFolder: (String folderName) async {
final folderPath = '$destinationFolder$folderName';
await FileManager.deleteDirectory(folderPath);
findChildrenOfDestinationFolder();
},
folders: [
for (final directoryPath
in destinationFolderChildren?.directories ?? const [])
directoryPath,
],
),
],
),
),
if (isInvalidDestination)
Text(
t.home.moveFolder.cantMoveHere,
style: TextStyle(color: Theme.of(context).colorScheme.error),
)
else if (willBeRenamed)
Text(t.home.moveFolder.renamedTo(newName: newFolderName!)),
],
),
),
actions: [
CupertinoDialogAction(
onPressed: () {
Navigator.of(context).pop();
},
child: Text(t.common.cancel),
),
CupertinoDialogAction(
onPressed: isInvalidDestination
? null
: () async {
final destinationPath =
'$destinationFolder${widget.folderName}';
await FileManager.moveDirectory(
sourceFolderPath,
destinationPath,
);
widget.onMoved();
if (!context.mounted) return;
Navigator.of(context).pop();
},
child: Text(t.home.moveFolder.move),
),
],
);
}
}
Loading