mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-18 14:23:42 +00:00
feat: improve Android download directory choose (#541)
This commit is contained in:
5 files changed
+86
-19
No files matched your search
@@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
|
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:launch_at_startup/launch_at_startup.dart';
|
import 'package:launch_at_startup/launch_at_startup.dart';
|
||||||
import 'package:lecle_downloads_path_provider/lecle_downloads_path_provider.dart';
|
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
import 'package:tray_manager/tray_manager.dart';
|
import 'package:tray_manager/tray_manager.dart';
|
||||||
import 'package:uri_to_file/uri_to_file.dart';
|
import 'package:uri_to_file/uri_to_file.dart';
|
||||||
@@ -436,12 +435,8 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
if (Util.isDesktop()) {
|
if (Util.isDesktop()) {
|
||||||
config.downloadDir = (await getDownloadsDirectory())?.path ?? "./";
|
config.downloadDir = (await getDownloadsDirectory())?.path ?? "./";
|
||||||
} else if (Util.isAndroid()) {
|
} else if (Util.isAndroid()) {
|
||||||
final downloadDir = (await DownloadsPath.downloadsDirectory())?.path;
|
config.downloadDir = (await getExternalStorageDirectory())?.path ??
|
||||||
if (downloadDir != null) {
|
(await getApplicationDocumentsDirectory()).path;
|
||||||
config.downloadDir = '$downloadDir/Gopeed';
|
|
||||||
} else {
|
|
||||||
config.downloadDir = (await getApplicationDocumentsDirectory()).path;
|
|
||||||
}
|
|
||||||
} else if (Util.isIOS()) {
|
} else if (Util.isIOS()) {
|
||||||
config.downloadDir = (await getApplicationDocumentsDirectory()).path;
|
config.downloadDir = (await getApplicationDocumentsDirectory()).path;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
return DirectorySelector(
|
return DirectorySelector(
|
||||||
controller: downloadDirController,
|
controller: downloadDirController,
|
||||||
showLabel: false,
|
showLabel: false,
|
||||||
|
showAndoirdToggle: true,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
final buildMaxRunning = _buildConfigItem(
|
final buildMaxRunning = _buildConfigItem(
|
||||||
|
|||||||
@@ -1,16 +1,26 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:file_picker/file_picker.dart';
|
import 'package:file_picker/file_picker.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:lecle_downloads_path_provider/lecle_downloads_path_provider.dart';
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
import 'package:toggle_switch/toggle_switch.dart';
|
||||||
|
|
||||||
import '../../util/mac_secure_util.dart';
|
import '../../util/mac_secure_util.dart';
|
||||||
|
import '../../util/message.dart';
|
||||||
import '../../util/util.dart';
|
import '../../util/util.dart';
|
||||||
|
|
||||||
class DirectorySelector extends StatefulWidget {
|
class DirectorySelector extends StatefulWidget {
|
||||||
final TextEditingController controller;
|
final TextEditingController controller;
|
||||||
final bool showLabel;
|
final bool showLabel;
|
||||||
|
final bool showAndoirdToggle;
|
||||||
|
|
||||||
const DirectorySelector(
|
const DirectorySelector(
|
||||||
{Key? key, required this.controller, this.showLabel = true})
|
{Key? key,
|
||||||
|
required this.controller,
|
||||||
|
this.showLabel = true,
|
||||||
|
this.showAndoirdToggle = false})
|
||||||
: super(key: key);
|
: super(key: key);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -20,6 +30,68 @@ class DirectorySelector extends StatefulWidget {
|
|||||||
class _DirectorySelectorState extends State<DirectorySelector> {
|
class _DirectorySelectorState extends State<DirectorySelector> {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
Widget? buildSelectWidget() {
|
||||||
|
if (Util.isDesktop()) {
|
||||||
|
return IconButton(
|
||||||
|
icon: const Icon(Icons.folder_open),
|
||||||
|
onPressed: () async {
|
||||||
|
var dir = await FilePicker.platform.getDirectoryPath();
|
||||||
|
if (dir != null) {
|
||||||
|
widget.controller.text = dir;
|
||||||
|
MacSecureUtil.saveBookmark(dir);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// After Android 11, access to external storage is increasingly restricted, so it no longer supports selecting the download directory. However, if you do not download in external storage, all downloaded files will be deleted after the application is uninstalled.
|
||||||
|
// Fortunately, so far, most Android devices can still access the system download directory.
|
||||||
|
// For the sake of user experience, it is decided to only support selecting the application's internal directory and the system download directory. Also, a test for file write permission is performed when selecting the system download directory. If it cannot be written, selection is not allowed.
|
||||||
|
if (Util.isAndroid() && widget.showAndoirdToggle) {
|
||||||
|
final isSwitchToDownloadDir =
|
||||||
|
widget.controller.text.endsWith('/Gopeed');
|
||||||
|
|
||||||
|
return ToggleSwitch(
|
||||||
|
initialLabelIndex: isSwitchToDownloadDir ? 1 : 0,
|
||||||
|
totalSwitches: 2,
|
||||||
|
icons: const [Icons.home, Icons.download],
|
||||||
|
customWidths: const [50, 50],
|
||||||
|
onToggle: (index) async {
|
||||||
|
if (index == 0) {
|
||||||
|
widget.controller.text =
|
||||||
|
(await getExternalStorageDirectory())?.path ??
|
||||||
|
(await getApplicationDocumentsDirectory()).path;
|
||||||
|
} else {
|
||||||
|
widget.controller.text =
|
||||||
|
'${(await DownloadsPath.downloadsDirectory())!.path}/Gopeed';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
cancelToggle: (index) async {
|
||||||
|
if (index == 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// Check write permission
|
||||||
|
final downloadDir =
|
||||||
|
(await DownloadsPath.downloadsDirectory())?.path;
|
||||||
|
if (downloadDir == null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
final fileRandomeName =
|
||||||
|
"test_${DateTime.now().millisecondsSinceEpoch}.tmp";
|
||||||
|
final testFile = File('$downloadDir/Gopeed/$fileRandomeName');
|
||||||
|
try {
|
||||||
|
await testFile.create(recursive: true);
|
||||||
|
await testFile.writeAsString('test');
|
||||||
|
await testFile.delete();
|
||||||
|
return false;
|
||||||
|
} catch (e) {
|
||||||
|
showErrorMessage(e);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
).marginOnly(left: 10);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
@@ -35,17 +107,7 @@ class _DirectorySelectorState extends State<DirectorySelector> {
|
|||||||
return v!.trim().isNotEmpty ? null : 'downloadDirValid'.tr;
|
return v!.trim().isNotEmpty ? null : 'downloadDirValid'.tr;
|
||||||
},
|
},
|
||||||
)),
|
)),
|
||||||
!Util.isWeb() && !Util.isAndroid() && !Util.isIOS()
|
buildSelectWidget()
|
||||||
? IconButton(
|
|
||||||
icon: const Icon(Icons.folder_open),
|
|
||||||
onPressed: () async {
|
|
||||||
var dir = await FilePicker.platform.getDirectoryPath();
|
|
||||||
if (dir != null) {
|
|
||||||
widget.controller.text = dir;
|
|
||||||
MacSecureUtil.saveBookmark(dir);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
: null
|
|
||||||
].where((e) => e != null).map((e) => e!).toList(),
|
].where((e) => e != null).map((e) => e!).toList(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1002,6 +1002,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.1"
|
version: "1.0.1"
|
||||||
|
toggle_switch:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: toggle_switch
|
||||||
|
sha256: dca04512d7c23ed320d6c5ede1211a404f177d54d353bf785b07d15546a86ce5
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.3.0"
|
||||||
tray_manager:
|
tray_manager:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ dependencies:
|
|||||||
hive: ^2.2.3
|
hive: ^2.2.3
|
||||||
launch_at_startup: ^0.2.2
|
launch_at_startup: ^0.2.2
|
||||||
args: ^2.5.0
|
args: ^2.5.0
|
||||||
|
toggle_switch: ^2.3.0
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|||||||
Reference in new issue
Block a user