Added ios support for receive_sharing_intent, some consistency fixes and bug fixes

2025-12-10 18:07:59 -06:00 · 2022-11-21 23:47:27 +01:00
parent 2a545dba7c
commit a7295fb739
34 changed files with 865 additions and 71 deletions
--- a/lib/features/documents/view/pages/document_details_page.dart
+++ b/lib/features/documents/view/pages/document_details_page.dart
@@ -235,7 +235,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
    try {
      await BlocProvider.of<DocumentsCubit>(context).assignAsn(document);
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }

@@ -410,7 +410,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
        await BlocProvider.of<DocumentsCubit>(context).removeDocument(document);
        showSnackBar(context, S.of(context).documentDeleteSuccessMessage);
      } on ErrorMessage catch (error, stackTrace) {
-        showError(context, error, stackTrace);
+        showErrorMessage(context, error, stackTrace);
      } finally {
        Navigator.pop(context);
      }
--- a/lib/features/documents/view/pages/document_edit_page.dart
+++ b/lib/features/documents/view/pages/document_edit_page.dart
@@ -84,7 +84,7 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
              await getIt<DocumentsCubit>().updateDocument(updatedDocument);
              showSnackBar(context, S.of(context).documentUpdateErrorMessage);
            } on ErrorMessage catch (error, stackTrace) {
-              showError(context, error, stackTrace);
+              showErrorMessage(context, error, stackTrace);
            } finally {
              Navigator.pop(context);
            }
--- a/lib/features/documents/view/pages/documents_page.dart
+++ b/lib/features/documents/view/pages/documents_page.dart
@@ -53,7 +53,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
    try {
      BlocProvider.of<DocumentsCubit>(context).loadDocuments();
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }

@@ -73,7 +73,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
    try {
      await documentsCubit.loadMore();
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }

@@ -87,7 +87,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
        (filter) => filter.copyWith(page: 1),
      );
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }

--- a/lib/features/documents/view/widgets/search/document_filter_panel.dart
+++ b/lib/features/documents/view/widgets/search/document_filter_panel.dart
@@ -476,7 +476,7 @@ class _DocumentFilterPanelState extends State<DocumentFilterPanel> {
        FocusScope.of(context).unfocus();
        widget.panelController.close();
      } on ErrorMessage catch (error, stackTrace) {
-        showError(context, error, stackTrace);
+        showErrorMessage(context, error, stackTrace);
      }
    }
  }
--- a/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart
+++ b/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart
@@ -105,7 +105,7 @@ class _DocumentsPageAppBarState extends State<DocumentsPageAppBar> {
          S.of(context).documentsPageBulkDeleteSuccessfulText,
        );
      } on ErrorMessage catch (error, stackTrace) {
-        showError(context, error, stackTrace);
+        showErrorMessage(context, error, stackTrace);
      }
    }
  }
--- a/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart
+++ b/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart
@@ -88,7 +88,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
      try {
        await BlocProvider.of<SavedViewCubit>(context).add(newView);
      } on ErrorMessage catch (error, stackTrace) {
-        showError(context, error, stackTrace);
+        showErrorMessage(context, error, stackTrace);
      }
    }
  }
@@ -105,7 +105,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
        BlocProvider.of<SavedViewCubit>(context).selectView(null);
      }
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }

@@ -120,7 +120,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
        try {
          BlocProvider.of<SavedViewCubit>(context).remove(view);
        } on ErrorMessage catch (error, stackTrace) {
-          showError(context, error, stackTrace);
+          showErrorMessage(context, error, stackTrace);
        }
      }
    }
--- a/lib/features/home/view/home_page.dart
+++ b/lib/features/home/view/home_page.dart
@@ -83,7 +83,7 @@ class _HomePageState extends State<HomePage> {
      BlocProvider.of<StoragePathCubit>(context).initialize();
      BlocProvider.of<SavedViewCubit>(context).initialize();
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/home/view/widget/bottom_navigation_bar.dart
+++ b/lib/features/home/view/widget/bottom_navigation_bar.dart
@@ -19,7 +19,7 @@ class BottomNavBar extends StatelessWidget {
      selectedIndex: selectedIndex,
      destinations: [
        NavigationDestination(
-          icon: const Icon(Icons.description),
+          icon: const Icon(Icons.description_outlined),
          selectedIcon: Icon(
            Icons.description,
            color: Theme.of(context).colorScheme.primary,
@@ -27,7 +27,7 @@ class BottomNavBar extends StatelessWidget {
          label: S.of(context).bottomNavDocumentsPageLabel,
        ),
        NavigationDestination(
-          icon: const Icon(Icons.document_scanner),
+          icon: const Icon(Icons.document_scanner_outlined),
          selectedIcon: Icon(
            Icons.document_scanner,
            color: Theme.of(context).colorScheme.primary,
@@ -35,9 +35,7 @@ class BottomNavBar extends StatelessWidget {
          label: S.of(context).bottomNavScannerPageLabel,
        ),
        NavigationDestination(
-          icon: const Icon(
-            Icons.sell,
-          ),
+          icon: const Icon(Icons.sell_outlined),
          selectedIcon: Icon(
            Icons.sell,
            color: Theme.of(context).colorScheme.primary,
--- a/lib/features/home/view/widget/info_drawer.dart
+++ b/lib/features/home/view/widget/info_drawer.dart
@@ -191,7 +191,7 @@ class InfoDrawer extends StatelessWidget {
                  getIt<TagCubit>().reset();
                  getIt<DocumentScannerCubit>().reset();
                } on ErrorMessage catch (error, stackTrace) {
-                  showError(context, error, stackTrace);
+                  showErrorMessage(context, error, stackTrace);
                }
              },
            ),
--- a/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart
+++ b/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart
@@ -39,7 +39,7 @@ class EditCorrespondentPage extends StatelessWidget {
      }
      Navigator.pop(context);
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart
+++ b/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart
@@ -60,7 +60,7 @@ class CorrespondentWidget extends StatelessWidget {
      }
      afterSelected?.call();
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/labels/document_type/view/widgets/document_type_widget.dart
+++ b/lib/features/labels/document_type/view/widgets/document_type_widget.dart
@@ -55,7 +55,7 @@ class DocumentTypeWidget extends StatelessWidget {
      }
      afterSelected?.call();
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart
+++ b/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart
@@ -44,7 +44,7 @@ class EditStoragePathPage extends StatelessWidget {
      }
      Navigator.pop(context);
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart
+++ b/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart
@@ -59,7 +59,7 @@ class StoragePathWidget extends StatelessWidget {
      }
      afterSelected?.call();
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/labels/tags/view/pages/edit_tag_page.dart
+++ b/lib/features/labels/tags/view/pages/edit_tag_page.dart
@@ -60,7 +60,7 @@ class EditTagPage extends StatelessWidget {
      cubit.updateFilter(filter: updatedFilter);
      Navigator.pop(context);
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/labels/tags/view/widgets/tag_widget.dart
+++ b/lib/features/labels/tags/view/widgets/tag_widget.dart
@@ -65,7 +65,7 @@ class TagWidget extends StatelessWidget {
        afterTagTapped!();
      }
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }
 }
--- a/lib/features/labels/view/pages/edit_label_page.dart
+++ b/lib/features/labels/view/pages/edit_label_page.dart
@@ -147,7 +147,7 @@ class _EditLabelPageState<T extends Label> extends State<EditLabelPage<T>> {
      } on PaperlessValidationErrors catch (errorMessages) {
        setState(() => _errors = errorMessages);
      } on ErrorMessage catch (error, stackTrace) {
-        showError(context, error, stackTrace);
+        showErrorMessage(context, error, stackTrace);
      }
    }
  }
--- a/lib/features/login/view/login_page.dart
+++ b/lib/features/login/view/login_page.dart
@@ -98,9 +98,11 @@ class _LoginPageState extends State<LoginPage> {
              form[ClientCertificateFormField.fkClientCertificate],
        );
      } on ErrorMessage catch (error, stackTrace) {
-        showError(context, error, stackTrace);
+        showErrorMessage(context, error, stackTrace);
+      } on Map<String, dynamic> catch (error, stackTrace) {
+        showGenericError(context, error.values.first, stackTrace);
      } catch (unknownError, stackTrace) {
-        showError(context, ErrorMessage.unknown(), stackTrace);
+        showErrorMessage(context, ErrorMessage.unknown(), stackTrace);
      } finally {
        setState(() => _isLoginLoading = false);
      }
--- a/lib/features/scan/view/document_upload_page.dart
+++ b/lib/features/scan/view/document_upload_page.dart
@@ -30,11 +30,16 @@ import 'package:intl/intl.dart';

 class DocumentUploadPage extends StatefulWidget {
  final Uint8List fileBytes;
+  final String? title;
+  final String? filename;
  final void Function()? afterUpload;
+
  const DocumentUploadPage({
    Key? key,
    required this.fileBytes,
    this.afterUpload,
+    this.title,
+    this.filename,
  }) : super(key: key);

  @override
@@ -42,18 +47,21 @@ class DocumentUploadPage extends StatefulWidget {
 }

 class _DocumentUploadPageState extends State<DocumentUploadPage> {
-  static const fkFileName = "fileName";
-
+  static const fkFileName = "filename";
  static final fileNameDateFormat = DateFormat("yyyy_MM_ddTHH_mm_ss");
+
  final GlobalKey<FormBuilderState> _formKey = GlobalKey();

  PaperlessValidationErrors _errors = {};
  bool _isUploadLoading = false;
+  late bool _syncTitleAndFilename;
+  final _now = DateTime.now();

  @override
  void initState() {
    super.initState();
-    initializeDateFormatting(); //TODO: INTL (has to do with intl below)
+    _syncTitleAndFilename = widget.filename == null && widget.title == null;
+    initializeDateFormatting();
  }

  @override
@@ -83,7 +91,8 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
            FormBuilderTextField(
              autovalidateMode: AutovalidateMode.always,
              name: DocumentModel.titleKey,
-              initialValue: "scan_${fileNameDateFormat.format(DateTime.now())}",
+              initialValue:
+                  widget.title ?? "scan_${fileNameDateFormat.format(_now)}",
              validator: FormBuilderValidators.required(),
              decoration: InputDecoration(
                labelText: S.of(context).documentTitlePropertyLabel,
@@ -92,29 +101,58 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
                  onPressed: () {
                    _formKey.currentState?.fields[DocumentModel.titleKey]
                        ?.didChange("");
-                    _formKey.currentState?.fields[fkFileName]
-                        ?.didChange(".pdf");
+                    if (_syncTitleAndFilename) {
+                      _formKey.currentState?.fields[fkFileName]?.didChange("");
+                    }
                  },
                ),
                errorText: _errors[DocumentModel.titleKey],
              ),
              onChanged: (value) {
-                final String? transformedValue =
-                    value?.replaceAll(RegExp(r"[\W_]"), "_");
-                _formKey.currentState?.fields[fkFileName]
-                    ?.didChange("${transformedValue ?? ''}.pdf");
+                final String transformedValue = _formatFilename(value ?? '');
+                if (_syncTitleAndFilename) {
+                  _formKey.currentState?.fields[fkFileName]
+                      ?.didChange(transformedValue);
+                }
              },
            ),
            FormBuilderTextField(
              autovalidateMode: AutovalidateMode.always,
-              readOnly: true,
-              enabled: false,
+              readOnly: _syncTitleAndFilename,
+              enabled: !_syncTitleAndFilename,
              name: fkFileName,
              decoration: InputDecoration(
                labelText: S.of(context).documentUploadFileNameLabel,
+                suffixText: ".pdf",
+                suffixIcon: IconButton(
+                  icon: const Icon(Icons.clear),
+                  onPressed: () =>
+                      _formKey.currentState?.fields[fkFileName]?.didChange(''),
+                ),
              ),
              initialValue:
-                  "scan_${fileNameDateFormat.format(DateTime.now())}.pdf",
+                  widget.filename ?? "scan_${fileNameDateFormat.format(_now)}",
+            ),
+            SwitchListTile(
+              value: _syncTitleAndFilename,
+              onChanged: (value) {
+                setState(
+                  () => _syncTitleAndFilename = value,
+                );
+                if (_syncTitleAndFilename) {
+                  final String transformedValue = _formatFilename(_formKey
+                      .currentState
+                      ?.fields[DocumentModel.titleKey]
+                      ?.value as String);
+                  if (_syncTitleAndFilename) {
+                    _formKey.currentState?.fields[fkFileName]
+                        ?.didChange(transformedValue);
+                  }
+                }
+              },
+              title: Text(S
+                  .of(context)
+                  .documentUploadPageSynchronizeTitleAndFilenameLabel), //TODO: INTL
            ),
            FormBuilderDateTimePicker(
              autovalidateMode: AutovalidateMode.always,
@@ -202,7 +240,7 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
            fv[DocumentModel.correspondentKey] as IdQueryParameter;
        await BlocProvider.of<DocumentsCubit>(context).addDocument(
          widget.fileBytes,
-          _formKey.currentState?.value[fkFileName],
+          _padWithPdfExtension(_formKey.currentState?.value[fkFileName]),
          onConsumptionFinished: _onConsumptionFinished,
          title: title,
          documentType: docType.id,
@@ -215,11 +253,11 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
        Navigator.pop(context);
        widget.afterUpload?.call();
      } on ErrorMessage catch (error, stackTrace) {
-        showError(context, error, stackTrace);
+        showErrorMessage(context, error, stackTrace);
      } on PaperlessValidationErrors catch (errorMessages) {
        setState(() => _errors = errorMessages);
      } catch (unknownError, stackTrace) {
-        showError(context, ErrorMessage.unknown(), stackTrace);
+        showErrorMessage(context, ErrorMessage.unknown(), stackTrace);
      } finally {
        setState(() {
          _isUploadLoading = false;
@@ -228,6 +266,14 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
    }
  }

+  String _padWithPdfExtension(String source) {
+    return source.endsWith(".pdf") ? source : '$source.pdf';
+  }
+
+  String _formatFilename(String source) {
+    return source.replaceAll(RegExp(r"[\W_]"), "_");
+  }
+
  void _onConsumptionFinished(document) {
    ScaffoldMessenger.of(rootScaffoldKey.currentContext!).showSnackBar(
      SnackBar(
@@ -236,7 +282,7 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
            try {
              getIt<DocumentsCubit>().reloadDocuments();
            } on ErrorMessage catch (error, stackTrace) {
-              showError(context, error, stackTrace);
+              showErrorMessage(context, error, stackTrace);
            }
          },
          label:
--- a/lib/features/scan/view/scanner_page.dart
+++ b/lib/features/scan/view/scanner_page.dart
@@ -192,7 +192,7 @@ class _ScannerPageState extends State<ScannerPage>
                BlocProvider.of<DocumentScannerCubit>(context)
                    .removeScan(index);
              } on ErrorMessage catch (error, stackTrace) {
-                showError(context, error, stackTrace);
+                showErrorMessage(context, error, stackTrace);
              }
            },
            index: index,
@@ -205,7 +205,7 @@ class _ScannerPageState extends State<ScannerPage>
    try {
      BlocProvider.of<DocumentScannerCubit>(context).reset();
    } on ErrorMessage catch (error, stackTrace) {
-      showError(context, error, stackTrace);
+      showErrorMessage(context, error, stackTrace);
    }
  }

@@ -224,10 +224,16 @@ class _ScannerPageState extends State<ScannerPage>
    );
    if (result?.files.single.path != null) {
      File file = File(result!.files.single.path!);
-      if (!supportedFileExtensions.contains(file.path.split('.').last)) {
-        //TODO: Show error message;
+      if (!supportedFileExtensions.contains(
+        file.path.split('.').last.toLowerCase(),
+      )) {
+        showErrorMessage(
+          context,
+          const ErrorMessage(ErrorCode.unsupportedFileFormat),
+        );
        return;
      }
+      final filename = extractFilenameFromPath(file.path);
      final mimeType = lookupMimeType(file.path) ?? '';
      late Uint8List fileBytes;
      if (mimeType.startsWith('image')) {
@@ -244,6 +250,7 @@ class _ScannerPageState extends State<ScannerPage>
            value: getIt<DocumentsCubit>(),
            child: LabelBlocProvider(
              child: DocumentUploadPage(
+                filename: filename,
                fileBytes: fileBytes,
              ),
            ),