Merge branch 'refs/heads/master' into dev

This commit is contained in:
2024-11-10 16:01:45 +08:00
7 changed files with 168 additions and 17 deletions

View File

@@ -24,8 +24,12 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
bool searchMode = false;
bool multiSelectMode = false;
Map<LocalComic, bool> selectedComics = {};
void update() {
if(keyword.isEmpty) {
if (keyword.isEmpty) {
setState(() {
comics = LocalManager().getComics(sortType);
});
@@ -95,8 +99,7 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
actions: [
FilledButton(
onPressed: () {
appdata.implicitData["local_sort"] =
sortType.value;
appdata.implicitData["local_sort"] =sortType.value;
appdata.writeImplicitData();
Navigator.pop(context);
update();
@@ -115,7 +118,7 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
return Scaffold(
body: SmoothCustomScrollView(
slivers: [
if(!searchMode)
if (!searchMode && !multiSelectMode)
SliverAppbar(
title: Text("Local".tl),
actions: [
@@ -145,10 +148,38 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
showPopUpWidget(context, const DownloadingPage());
},
),
)
),
Tooltip(
message: multiSelectMode
? "Exit Multi-Select".tl
: "Multi-Select".tl,
child: IconButton(
icon: const Icon(Icons.checklist),
onPressed: () {
setState(() {
multiSelectMode = !multiSelectMode;
});
},
),
),
],
)
else
else if (multiSelectMode)
SliverAppbar(
title: Text("Selected ${selectedComics.length} comics"),
actions: [
IconButton(
icon: const Icon(Icons.close),
onPressed: () {
setState(() {
multiSelectMode = false;
selectedComics.clear();
});
},
),
],
)
else if (searchMode)
SliverAppbar(
title: TextField(
autofocus: true,
@@ -176,16 +207,42 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
),
SliverGridComics(
comics: comics,
onTap: (c) {
(c as LocalComic).read();
},
onTap: multiSelectMode
? (c) {
setState(() {
if (selectedComics.containsKey(c as LocalComic)) {
selectedComics.remove(c as LocalComic);
} else {
selectedComics[c as LocalComic] = true;
}
});
}
: (c) {
(c as LocalComic).read();
},
menuBuilder: (c) {
return [
MenuEntry(
icon: Icons.delete,
text: "Delete".tl,
onClick: () {
LocalManager().deleteComic(c as LocalComic);
if (multiSelectMode) {
showConfirmDialog(
context: context,
title: "Delete".tl,
content: "Delete selected comics?".tl,
onConfirm: () {
for (var comic in selectedComics.keys) {
LocalManager().deleteComic(comic);
}
setState(() {
selectedComics.clear();
});
},
);
} else {
LocalManager().deleteComic(c as LocalComic);
}
}),
MenuEntry(
icon: Icons.outbox_outlined,
@@ -196,9 +253,20 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
allowCancel: false,
);
try {
var file = await CBZ.export(c as LocalComic);
await saveFile(filename: file.name, file: file);
await file.delete();
if (multiSelectMode) {
for (var comic in selectedComics.keys) {
var file = await CBZ.export(comic);
await saveFile(filename: file.name, file: file);
await file.delete();
}
setState(() {
selectedComics.clear();
});
} else {
var file = await CBZ.export(c as LocalComic);
await saveFile(filename: file.name, file: file);
await file.delete();
}
} catch (e) {
context.showMessage(message: e.toString());
}

View File

@@ -20,16 +20,28 @@ class _AppSettingsState extends State<AppSettings> {
ListTile(
title: Text("Storage Path for local comics".tl),
subtitle: Text(LocalManager().path, softWrap: false),
trailing: IconButton(
icon: const Icon(Icons.copy),
onPressed: () {
Clipboard.setData(ClipboardData(text: LocalManager().path));
context.showMessage(message: "Path copied to clipboard".tl);
},
),
).toSliver(),
_CallbackSetting(
title: "Set New Storage Path".tl,
actionTitle: "Set".tl,
callback: () async {
if (App.isMobile) {
var result;
if (App.isAndroid) {
context.showMessage(message: "Not supported".tl);
return;
}
var result = await selectDirectory();
else if (App.isIOS) {
result = await selectDirectoryIOS();
} else {
result = await selectDirectory();
}
if (result == null) return;
var loadingDialog = showLoadingDialog(
App.rootContext,

View File

@@ -160,6 +160,22 @@ class DirectoryPicker {
}
}
class IOSDirectoryPicker {
static const MethodChannel _channel = MethodChannel("venera/method_channel");
// 调用 iOS 目录选择方法
static Future<String?> selectDirectory() async {
try {
final String? path = await _channel.invokeMethod('selectDirectory');
return path;
} catch (e) {
print("Error selecting directory: $e");
// 返回报错信息
return e.toString();
}
}
}
Future<file_selector.XFile?> selectFile({required List<String> ext}) async {
file_selector.XTypeGroup typeGroup = file_selector.XTypeGroup(
label: 'files',
@@ -181,6 +197,11 @@ Future<String?> selectDirectory() async {
return path;
}
// selectDirectoryIOS
Future<String?> selectDirectoryIOS() async {
return IOSDirectoryPicker.selectDirectory();
}
Future<void> saveFile(
{Uint8List? data, required String filename, File? file}) async {
if (data == null && file == null) {