feat+fix: Add option to set default download/share file type, fix typo in filter to query string, disable unused options in document filter

This commit is contained in:
Anton Stubenbord
2023-04-28 20:45:47 +02:00
parent 14c850ece6
commit bea0ab94be
20 changed files with 337 additions and 197 deletions

View File

@@ -1,25 +1,70 @@
import 'package:flutter/material.dart';
import 'package:paperless_mobile/features/settings/view/widgets/radio_settings_dialog.dart';
import 'package:paperless_mobile/core/widgets/dialog_utils/dialog_cancel_button.dart';
import 'package:paperless_mobile/features/settings/model/file_download_type.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
class SelectFileTypeDialog extends StatelessWidget {
const SelectFileTypeDialog({super.key});
class SelectFileTypeDialog extends StatefulWidget {
final void Function(FileDownloadType downloadType) onRememberSelection;
const SelectFileTypeDialog({super.key, required this.onRememberSelection});
@override
State<SelectFileTypeDialog> createState() => _SelectFileTypeDialogState();
}
class _SelectFileTypeDialogState extends State<SelectFileTypeDialog> {
bool _rememberSelection = false;
FileDownloadType _downloadType = FileDownloadType.original;
@override
Widget build(BuildContext context) {
return RadioSettingsDialog(
titleText: S.of(context)!.chooseFiletype,
options: [
RadioOption(
value: true,
label: S.of(context)!.original,
),
RadioOption(
value: false,
label: S.of(context)!.archivedPdf,
return AlertDialog(
title: Text(S.of(context)!.chooseFiletype),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
RadioListTile(
value: FileDownloadType.original,
groupValue: _downloadType,
onChanged: (value) {
if (value != null) {
setState(() => _downloadType = value);
}
},
title: Text(S.of(context)!.original),
),
RadioListTile(
value: FileDownloadType.archived,
groupValue: _downloadType,
onChanged: (value) {
if (value != null) {
setState(() => _downloadType = value);
}
},
title: Text(S.of(context)!.archivedPdf),
),
Divider(),
CheckboxListTile(
controlAffinity: ListTileControlAffinity.leading,
value: _rememberSelection,
onChanged: (value) => setState(() => _rememberSelection = value ?? false),
title: Text(
"Remember my decision",
style: Theme.of(context).textTheme.labelMedium,
), //TODO: INTL
),
],
),
actions: [
const DialogCancelButton(),
ElevatedButton(
child: Text(S.of(context)!.select),
onPressed: () {
if (_rememberSelection) {
widget.onRememberSelection(_downloadType);
}
Navigator.of(context).pop(_downloadType == FileDownloadType.original);
},
),
],
initialValue: false,
);
}
}

View File

@@ -1,4 +1,3 @@
import 'package:badges/badges.dart' as b;
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:open_filex/open_filex.dart';

View File

@@ -1,11 +1,14 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/config/hive/hive_config.dart';
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/features/document_details/cubit/document_details_cubit.dart';
import 'package:paperless_mobile/features/document_details/view/dialogs/select_file_type_dialog.dart';
import 'package:paperless_mobile/core/database/tables/global_settings.dart';
import 'package:paperless_mobile/features/settings/model/file_download_type.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
import 'package:paperless_mobile/helpers/message_helpers.dart';
@@ -50,25 +53,46 @@ class _DocumentDownloadButtonState extends State<DocumentDownloadButton> {
Future<void> _onDownload(DocumentModel document) async {
try {
final downloadOriginal = await showDialog<bool>(
context: context,
builder: (context) => const SelectFileTypeDialog(),
);
if (downloadOriginal == null) {
// Download was cancelled
return;
final globalSettings = Hive.box<GlobalSettings>(HiveBoxes.globalSettings).getValue()!;
bool original;
switch (globalSettings.defaultDownloadType) {
case FileDownloadType.original:
original = true;
break;
case FileDownloadType.archived:
original = false;
break;
case FileDownloadType.alwaysAsk:
final isOriginal = await showDialog<bool>(
context: context,
builder: (context) => SelectFileTypeDialog(
onRememberSelection: (downloadType) {
globalSettings.defaultDownloadType = downloadType;
globalSettings.save();
},
),
);
if (isOriginal == null) {
return;
} else {
original = isOriginal;
}
break;
}
if (Platform.isAndroid && androidInfo!.version.sdkInt! <= 29) {
final isGranted = await askForPermission(Permission.storage);
if (!isGranted) {
return;
//TODO: Tell user to grant permissions
//TODO: Ask user to grant permissions
}
}
setState(() => _isDownloadPending = true);
await context.read<DocumentDetailsCubit>().downloadDocument(
downloadOriginal: downloadOriginal,
locale: context.read<GlobalSettings>().preferredLocaleSubtag,
downloadOriginal: original,
locale: globalSettings.preferredLocaleSubtag,
);
// showSnackBar(context, S.of(context)!.documentSuccessfullyDownloaded);
} on PaperlessServerException catch (error, stackTrace) {

View File

@@ -1,11 +1,15 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:hive_flutter/hive_flutter.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/constants.dart';
import 'package:paperless_mobile/core/config/hive/hive_config.dart';
import 'package:paperless_mobile/core/database/tables/global_settings.dart';
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/features/document_details/cubit/document_details_cubit.dart';
import 'package:paperless_mobile/features/document_details/view/dialogs/select_file_type_dialog.dart';
import 'package:paperless_mobile/features/settings/model/file_download_type.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
import 'package:paperless_mobile/helpers/message_helpers.dart';
import 'package:paperless_mobile/helpers/permission_helpers.dart';
@@ -39,22 +43,41 @@ class _DocumentShareButtonState extends State<DocumentShareButton> {
child: CircularProgressIndicator(),
)
: const Icon(Icons.share),
onPressed: widget.document != null && widget.enabled
? () => _onShare(widget.document!)
: null,
onPressed:
widget.document != null && widget.enabled ? () => _onShare(widget.document!) : null,
).paddedOnly(right: 4);
}
Future<void> _onShare(DocumentModel document) async {
try {
final shareOriginal = await showDialog<bool>(
context: context,
builder: (context) => const SelectFileTypeDialog(),
);
if (shareOriginal == null) {
// Download was cancelled
return;
final globalSettings = Hive.box<GlobalSettings>(HiveBoxes.globalSettings).getValue()!;
bool original;
switch (globalSettings.defaultShareType) {
case FileDownloadType.original:
original = true;
break;
case FileDownloadType.archived:
original = false;
break;
case FileDownloadType.alwaysAsk:
final isOriginal = await showDialog<bool>(
context: context,
builder: (context) => SelectFileTypeDialog(
onRememberSelection: (downloadType) {
globalSettings.defaultShareType = downloadType;
globalSettings.save();
},
),
);
if (isOriginal == null) {
return;
} else {
original = isOriginal;
}
break;
}
if (Platform.isAndroid && androidInfo!.version.sdkInt! < 30) {
final isGranted = await askForPermission(Permission.storage);
if (!isGranted) {
@@ -62,9 +85,9 @@ class _DocumentShareButtonState extends State<DocumentShareButton> {
}
}
setState(() => _isDownloadPending = true);
await context
.read<DocumentDetailsCubit>()
.shareDocument(shareOriginal: shareOriginal);
await context.read<DocumentDetailsCubit>().shareDocument(
shareOriginal: original,
);
} on PaperlessServerException catch (error, stackTrace) {
showErrorMessage(context, error, stackTrace);
} catch (error) {