fix(ui): make download file deletion explicit in task dialog (#1622) (#1638)

This commit is contained in:
Codess authored and GitHub committed 2026-11-03 09:27:30 +08:00
1 parent d69874e13e
commit ebfd113360
29 files changed
+44 -39

No files matched your search

@@ -222,7 +222,7 @@ class ExtraConfig {
this.themeMode = '', this.themeMode = '',
this.themeColor = 'green', this.themeColor = 'green',
this.locale = '', this.locale = '',
this.lastDeleteTaskKeep = false, this.lastDeleteTaskKeep = true,
this.defaultDirectDownload = false, this.defaultDirectDownload = false,
this.defaultBtClient = true, this.defaultBtClient = true,
this.notifyWhenNewVersion = true, this.notifyWhenNewVersion = true,
@@ -186,7 +186,7 @@ ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig(
themeMode: json['themeMode'] as String? ?? '', themeMode: json['themeMode'] as String? ?? '',
themeColor: json['themeColor'] as String? ?? 'green', themeColor: json['themeColor'] as String? ?? 'green',
locale: json['locale'] as String? ?? '', locale: json['locale'] as String? ?? '',
lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false, lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? true,
defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false, defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false,
defaultBtClient: json['defaultBtClient'] as bool? ?? true, defaultBtClient: json['defaultBtClient'] as bool? ?? true,
notifyWhenNewVersion: json['notifyWhenNewVersion'] as bool? ?? true, notifyWhenNewVersion: json['notifyWhenNewVersion'] as bool? ?? true,
@@ -541,7 +541,7 @@ class _HomePageState extends ConsumerState<HomePage> {
fileCount: !hasGroups fileCount: !hasGroups
? null ? null
: selected.fold<int>(0, (total, task) => total + (task.files.isEmpty ? 1 : task.files.length)), : selected.fold<int>(0, (total, task) => total + (task.files.isEmpty ? 1 : task.files.length)),
keepFiles: config?.extra.lastDeleteTaskKeep ?? false, keepFiles: config?.extra.lastDeleteTaskKeep ?? true,
); );
if (keepFiles == null || !mounted) return; if (keepFiles == null || !mounted) return;
@@ -12,7 +12,7 @@ Future<bool?> showTaskDeleteDialog(
int? memberCount, int? memberCount,
int? fileCount, int? fileCount,
}) async { }) async {
var currentKeepFiles = keepFiles; var deleteFiles = !keepFiles;
final dialog = const DialogOverlayHandler().show<bool>( final dialog = const DialogOverlayHandler().show<bool>(
context: context, context: context,
alignment: Alignment.center, alignment: Alignment.center,
@@ -47,16 +47,16 @@ Future<bool?> showTaskDeleteDialog(
const SizedBox(height: AppDesignTokens.space16), const SizedBox(height: AppDesignTokens.space16),
], ],
AnimatedContainer( AnimatedContainer(
key: const ValueKey('task-delete-keep-files-option'), key: const ValueKey('task-delete-files-option'),
duration: const Duration(milliseconds: 160), duration: const Duration(milliseconds: 160),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: AppDesignTokens.space16, horizontal: AppDesignTokens.space16,
vertical: AppDesignTokens.space12, vertical: AppDesignTokens.space12,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: currentKeepFiles ? palette.brandSoft : palette.surfaceSoft, color: deleteFiles ? palette.error.withValues(alpha: 0.08) : palette.surfaceSoft,
border: Border.all( border: Border.all(
color: currentKeepFiles ? palette.brand.withValues(alpha: 0.45) : palette.border, color: deleteFiles ? palette.error.withValues(alpha: 0.35) : palette.border,
), ),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
@@ -70,9 +70,9 @@ Future<bool?> showTaskDeleteDialog(
), ),
const SizedBox(width: AppDesignTokens.space16), const SizedBox(width: AppDesignTokens.space16),
Switch( Switch(
key: const ValueKey('task-delete-keep-files-switch'), key: const ValueKey('task-delete-files-switch'),
value: currentKeepFiles, value: deleteFiles,
onChanged: (value) => setDialogState(() => currentKeepFiles = value), onChanged: (value) => setDialogState(() => deleteFiles = value),
), ),
], ],
), ),
@@ -83,7 +83,7 @@ Future<bool?> showTaskDeleteDialog(
actions: [ actions: [
SecondaryButton(onPressed: () => closeOverlay(dialogContext), child: Text(dialogContext.l10n.cancel)), SecondaryButton(onPressed: () => closeOverlay(dialogContext), child: Text(dialogContext.l10n.cancel)),
DestructiveButton( DestructiveButton(
onPressed: () => closeOverlay(dialogContext, currentKeepFiles), onPressed: () => closeOverlay(dialogContext, !deleteFiles),
child: Text(dialogContext.l10n.delete), child: Text(dialogContext.l10n.delete),
), ),
], ],
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "بدء الكل", "startAll": "بدء الكل",
"pauseAll": "إيقاف الكل مؤقتاً", "pauseAll": "إيقاف الكل مؤقتاً",
"deleteTask": "حذف @count مهمة", "deleteTask": "حذف @count مهمة",
"deleteTaskTip": "الاحتفاظ بالملفات التي تم تحميلها", "deleteTaskTip": "حذف الملفات التي تم تنزيلها",
"delete": "حذف", "delete": "حذف",
"add": "إضافة", "add": "إضافة",
"edit": "تعديل", "edit": "تعديل",
+1 -1
View File
@@ -105,7 +105,7 @@
"startAll": "Hamısını Başlat", "startAll": "Hamısını Başlat",
"pauseAll": "Hamısına Fasilə Ver", "pauseAll": "Hamısına Fasilə Ver",
"deleteTask": "@count tapşırığı sil", "deleteTask": "@count tapşırığı sil",
"deleteTaskTip": "Endirilmiş faylları saxla", "deleteTaskTip": "Endirilmiş faylları sil",
"delete": "Sil", "delete": "Sil",
"add": "Əlavə et", "add": "Əlavə et",
"edit": "Redaktə et", "edit": "Redaktə et",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Inicia-ho tot", "startAll": "Inicia-ho tot",
"pauseAll": "Pausa-ho tot", "pauseAll": "Pausa-ho tot",
"deleteTask": "Suprimeix @count tasques", "deleteTask": "Suprimeix @count tasques",
"deleteTaskTip": "Mantén els fitxers baixats", "deleteTaskTip": "Suprimeix els fitxers baixats",
"delete": "Suprimeix", "delete": "Suprimeix",
"add": "Afegeix", "add": "Afegeix",
"edit": "Edita", "edit": "Edita",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Alles starten", "startAll": "Alles starten",
"pauseAll": "Alle pausieren", "pauseAll": "Alle pausieren",
"deleteTask": "@count Aufgaben löschen", "deleteTask": "@count Aufgaben löschen",
"deleteTaskTip": "Heruntergeladene Dateien behalten", "deleteTaskTip": "Heruntergeladene Dateien löschen",
"delete": "Löschen", "delete": "Löschen",
"add": "Hinzugefügt", "add": "Hinzugefügt",
"edit": "Bearbeiten", "edit": "Bearbeiten",
+1 -1
View File
@@ -105,7 +105,7 @@
"startAll": "Start All", "startAll": "Start All",
"pauseAll": "Pause All", "pauseAll": "Pause All",
"deleteTask": "Delete @count tasks", "deleteTask": "Delete @count tasks",
"deleteTaskTip": "Keep downloaded files", "deleteTaskTip": "Delete downloaded files",
"delete": "Delete", "delete": "Delete",
"add": "Add", "add": "Add",
"edit": "Edit", "edit": "Edit",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Iniciar Todo", "startAll": "Iniciar Todo",
"pauseAll": "Pausar Todo", "pauseAll": "Pausar Todo",
"deleteTask": "Eliminar @count tareas", "deleteTask": "Eliminar @count tareas",
"deleteTaskTip": "Mantener archivos descargados", "deleteTaskTip": "Eliminar archivos descargados",
"delete": "Eliminar", "delete": "Eliminar",
"add": "Añadir", "add": "Añadir",
"edit": "Editar", "edit": "Editar",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "شروع همه", "startAll": "شروع همه",
"pauseAll": "توقف همه", "pauseAll": "توقف همه",
"deleteTask": "حذف @count کار", "deleteTask": "حذف @count کار",
"deleteTaskTip": "فایل های دانلود شده را نگه دارد", "deleteTaskTip": "حذف فایل‌های دانلودشده",
"delete": "پاک کردن", "delete": "پاک کردن",
"add": "افزودن", "add": "افزودن",
"edit": "ویرایش", "edit": "ویرایش",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Tout démarrer", "startAll": "Tout démarrer",
"pauseAll": "Tout suspendre", "pauseAll": "Tout suspendre",
"deleteTask": "Supprimer @count tâches", "deleteTask": "Supprimer @count tâches",
"deleteTaskTip": "Conserver les fichiers téléchargés", "deleteTaskTip": "Supprimer les fichiers téléchargés",
"delete": "Supprimer", "delete": "Supprimer",
"add": "Ajouter", "add": "Ajouter",
"edit": "Modifier", "edit": "Modifier",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Összes indítása", "startAll": "Összes indítása",
"pauseAll": "Összes szüneteltetése", "pauseAll": "Összes szüneteltetése",
"deleteTask": "@count feladat törlése", "deleteTask": "@count feladat törlése",
"deleteTaskTip": "Letöltött fájlok megőrzése", "deleteTaskTip": "Letöltött fájlok törlése",
"delete": "Törlés", "delete": "Törlés",
"add": "Hozzáad", "add": "Hozzáad",
"edit": "Szerk", "edit": "Szerk",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Mulai Semua", "startAll": "Mulai Semua",
"pauseAll": "Jeda Semua", "pauseAll": "Jeda Semua",
"deleteTask": "Hapus @count Tugas", "deleteTask": "Hapus @count Tugas",
"deleteTaskTip": "Simpan file yang terunduh", "deleteTaskTip": "Hapus berkas yang diunduh",
"delete": "Hapus", "delete": "Hapus",
"add": "Tambah", "add": "Tambah",
"edit": "Sunting", "edit": "Sunting",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Avvia tutti", "startAll": "Avvia tutti",
"pauseAll": "Mtti in pausa tutti", "pauseAll": "Mtti in pausa tutti",
"deleteTask": "Elimina @count attività", "deleteTask": "Elimina @count attività",
"deleteTaskTip": "Conserva i file scaricati", "deleteTaskTip": "Elimina i file scaricati",
"delete": "Elimina", "delete": "Elimina",
"add": "Aggiungi", "add": "Aggiungi",
"edit": "Modifica", "edit": "Modifica",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "すべてを開始", "startAll": "すべてを開始",
"pauseAll": "すべてを一時停止", "pauseAll": "すべてを一時停止",
"deleteTask": "@count タスクを削除", "deleteTask": "@count タスクを削除",
"deleteTaskTip": "ダウンロードしたファイルを保持", "deleteTaskTip": "ダウンロードしたファイルを削除",
"delete": "削除", "delete": "削除",
"add": "追加", "add": "追加",
"edit": "編集", "edit": "編集",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "전체 시작", "startAll": "전체 시작",
"pauseAll": "전체 일시정지", "pauseAll": "전체 일시정지",
"deleteTask": "작업 @count개 삭제", "deleteTask": "작업 @count개 삭제",
"deleteTaskTip": "다운로드된 파일은 유지", "deleteTaskTip": "다운로드한 파일 삭제",
"delete": "삭제", "delete": "삭제",
"add": "추가", "add": "추가",
"edit": "편집", "edit": "편집",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Zacznij wszystkie", "startAll": "Zacznij wszystkie",
"pauseAll": "Zatrzymaj wszystkie", "pauseAll": "Zatrzymaj wszystkie",
"deleteTask": "Usuń @count zadania", "deleteTask": "Usuń @count zadania",
"deleteTaskTip": "Zachowaj pobrane pliki", "deleteTaskTip": "Usuń pobrane pliki",
"delete": "Usuń", "delete": "Usuń",
"add": "Dodaj", "add": "Dodaj",
"edit": "Edycja", "edit": "Edycja",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Iniciar Tudo", "startAll": "Iniciar Tudo",
"pauseAll": "Pausar Tudo", "pauseAll": "Pausar Tudo",
"deleteTask": "Excluir @count tarefas", "deleteTask": "Excluir @count tarefas",
"deleteTaskTip": "Manter arquivos baixados", "deleteTaskTip": "Excluir arquivos baixados",
"delete": "Excluir", "delete": "Excluir",
"add": "Adicionar", "add": "Adicionar",
"edit": "Editar", "edit": "Editar",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Запустить все", "startAll": "Запустить все",
"pauseAll": "Приостановить все", "pauseAll": "Приостановить все",
"deleteTask": "Удалить @count задач", "deleteTask": "Удалить @count задач",
"deleteTaskTip": "Сохранить загруженные файлы", "deleteTaskTip": "Удалить загруженные файлы",
"delete": "Удалить", "delete": "Удалить",
"add": "Добавить", "add": "Добавить",
"edit": "Редактировать", "edit": "Редактировать",
+1 -1
View File
@@ -105,7 +105,7 @@
"startAll": "Spustiť všetko", "startAll": "Spustiť všetko",
"pauseAll": "Pozastaviť všetko", "pauseAll": "Pozastaviť všetko",
"deleteTask": "Odstrániť @count úloh", "deleteTask": "Odstrániť @count úloh",
"deleteTaskTip": "Zachovať stiahnuté súbory", "deleteTaskTip": "Odstrániť stiahnuté súbory",
"delete": "Odstrániť", "delete": "Odstrániť",
"add": "Pridať", "add": "Pridať",
"edit": "Upraviť", "edit": "Upraviť",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "அனைத்தையும் தொடங்கு", "startAll": "அனைத்தையும் தொடங்கு",
"pauseAll": "அனைத்தையும் நிறுத்திவை", "pauseAll": "அனைத்தையும் நிறுத்திவை",
"deleteTask": "பணிகளை நீக்கு @count", "deleteTask": "பணிகளை நீக்கு @count",
"deleteTaskTip": "பதிவிறக்கம் செய்யப்பட்ட கோப்புகளை வைத்திரு", "deleteTaskTip": "பதிவிறக்கிய கோப்புகளை நீக்கு",
"delete": "நீக்கு", "delete": "நீக்கு",
"add": "சேர்", "add": "சேர்",
"edit": "திருத்துக", "edit": "திருத்துக",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Tümünü Başlat", "startAll": "Tümünü Başlat",
"pauseAll": "Tümünü Duraklat", "pauseAll": "Tümünü Duraklat",
"deleteTask": "@count işlemi sil", "deleteTask": "@count işlemi sil",
"deleteTaskTip": "İndirilen dosyaları sakla", "deleteTaskTip": "İndirilen dosyaları sil",
"delete": "Sil", "delete": "Sil",
"add": "Ekle", "add": "Ekle",
"edit": "Düzenle", "edit": "Düzenle",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Запустити все", "startAll": "Запустити все",
"pauseAll": "Зупинити все", "pauseAll": "Зупинити все",
"deleteTask": "Видалити @count завдань", "deleteTask": "Видалити @count завдань",
"deleteTaskTip": "Зберегти завантажені файли", "deleteTaskTip": "Видалити завантажені файли",
"delete": "Видалити", "delete": "Видалити",
"add": "Додати", "add": "Додати",
"edit": "Редагування", "edit": "Редагування",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "Bắt đầu tất cả", "startAll": "Bắt đầu tất cả",
"pauseAll": "Tạm dừng tất cả", "pauseAll": "Tạm dừng tất cả",
"deleteTask": "Xóa @count nhiệm vụ", "deleteTask": "Xóa @count nhiệm vụ",
"deleteTaskTip": "Giữ các tệp đã tải về", "deleteTaskTip": "Xóa các tệp đã tải xuống",
"delete": "Xóa", "delete": "Xóa",
"add": "Thêm", "add": "Thêm",
"edit": "Sửa", "edit": "Sửa",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "全部开始", "startAll": "全部开始",
"pauseAll": "全部暂停", "pauseAll": "全部暂停",
"deleteTask": "删除 @count 个任务", "deleteTask": "删除 @count 个任务",
"deleteTaskTip": "保留已下载的文件", "deleteTaskTip": "删除已下载的文件",
"delete": "删除", "delete": "删除",
"add": "添加", "add": "添加",
"edit": "编辑", "edit": "编辑",
+1 -1
View File
@@ -98,7 +98,7 @@
"startAll": "全部開始", "startAll": "全部開始",
"pauseAll": "全部暫停", "pauseAll": "全部暫停",
"deleteTask": "刪除 @count 個任務", "deleteTask": "刪除 @count 個任務",
"deleteTaskTip": "保留已下載的檔案", "deleteTaskTip": "刪除已下載的檔案",
"delete": "刪除", "delete": "刪除",
"add": "新增", "add": "新增",
"edit": "編輯", "edit": "編輯",
@@ -35,6 +35,8 @@ void main() {
await tester.tap(find.text('Open delete dialog')); await tester.tap(find.text('Open delete dialog'));
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('Affects 65 downloads and 65 files.'), findsOneWidget); expect(find.text('Affects 65 downloads and 65 files.'), findsOneWidget);
final deleteFilesSwitch = find.byKey(const ValueKey('task-delete-files-switch'));
expect(tester.widget<shad.Switch>(deleteFilesSwitch).value, isFalse);
expect(keepFiles, isNull); expect(keepFiles, isNull);
await tester.tap(find.text('Delete')); await tester.tap(find.text('Delete'));
await tester.pumpAndSettle(); await tester.pumpAndSettle();
+8 -5
View File
@@ -5361,7 +5361,7 @@ void main() {
expect(tester.takeException(), isNull); expect(tester.takeException(), isNull);
}); });
testWidgets('delete dialog returns keep-files switch value', (WidgetTester tester) async { testWidgets('delete dialog only removes downloaded files when requested', (WidgetTester tester) async {
await _setTestSize(tester, const Size(520, 620)); await _setTestSize(tester, const Size(520, 620));
bool? keepFiles; bool? keepFiles;
await tester.pumpWidget( await tester.pumpWidget(
@@ -5384,11 +5384,14 @@ void main() {
expect(find.text('Delete 2 tasks?'), findsOneWidget); expect(find.text('Delete 2 tasks?'), findsOneWidget);
expect(find.text('Only remove the task record from Gopeed'), findsNothing); expect(find.text('Only remove the task record from Gopeed'), findsNothing);
expect(find.byKey(const ValueKey('task-delete-dialog-icon')), findsOneWidget); expect(find.byKey(const ValueKey('task-delete-dialog-icon')), findsOneWidget);
expect(find.byKey(const ValueKey('task-delete-keep-files-option')), findsOneWidget); expect(find.byKey(const ValueKey('task-delete-files-option')), findsOneWidget);
final keepFilesSwitch = find.byKey(const ValueKey('task-delete-keep-files-switch')); final deleteFilesSwitch = find.byKey(const ValueKey('task-delete-files-switch'));
expect(tester.widget<shad.Switch>(keepFilesSwitch).value, isTrue); expect(find.text('Delete downloaded files'), findsOneWidget);
expect(tester.widget<shad.Switch>(deleteFilesSwitch).value, isFalse);
await tester.tap(keepFilesSwitch); await tester.tap(deleteFilesSwitch);
await tester.pumpAndSettle();
expect(tester.widget<shad.Switch>(deleteFilesSwitch).value, isTrue);
await tester.pumpAndSettle(); await tester.pumpAndSettle();
await tester.tap(find.text('Delete')); await tester.tap(find.text('Delete'));
await tester.pumpAndSettle(); await tester.pumpAndSettle();