xevion/paperless-mobile
1
0
Fork 0
mirror of https://github.com/Xevion/paperless-mobile.git synced 2025-12-08 16:07:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improved error handling, added multithreading for fromJson calls, made receive sharing intent more robust

Browse Source
This commit is contained in:
Anton Stubenbord
2022-11-13 14:41:42 +01:00
parent afbd4bddb4
commit 1cafd5d246
43 changed files with 644 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/features/labels/correspondent/bloc/correspondents_cubit.dart
View File

@@ -4,7 +4,7 @@ import 'package:injectable/injectable.dart';
@singleton
class CorrespondentCubit extends LabelCubit<Correspondent> {
CorrespondentCubit(super.metaDataService, super.errorCubit);
CorrespondentCubit(super.metaDataService);
@override
Future<void> initialize() async {

27
lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart
View File

@@ -18,21 +18,28 @@ class EditCorrespondentPage extends StatelessWidget {
return EditLabelPage<Correspondent>(
label: correspondent,
onSubmit: BlocProvider.of<CorrespondentCubit>(context).replace,
onDelete: (correspondent) => _onDelete(correspondent, context),
onDelete: (correspondent) => _onDelete(context, correspondent),
fromJson: Correspondent.fromJson,
);
}
Future<void> _onDelete(
Correspondent correspondent, BuildContext context) async {
await BlocProvider.of<CorrespondentCubit>(context).remove(correspondent);
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.correspondent.id == correspondent.id) {
cubit.updateFilter(
filter: cubit.state.filter
.copyWith(correspondent: const CorrespondentQuery.unset()),
);
BuildContext context,
Correspondent correspondent,
) async {
try {
await BlocProvider.of<CorrespondentCubit>(context).remove(correspondent);
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.correspondent.id == correspondent.id) {
await cubit.updateCurrentFilter(
(filter) => filter.copyWith(
correspondent: const CorrespondentQuery.unset(),
),
);
}
Navigator.pop(context);
} on ErrorMessage catch (error) {
showError(context, error);
}
Navigator.pop(context);
}
}

28
lib/features/labels/correspondent/view/widgets/correspondent_widget.dart
View File

@@ -1,10 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
import 'package:paperless_mobile/di_initializer.dart';
import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart';
import 'package:paperless_mobile/util.dart';
class CorrespondentWidget extends StatelessWidget {
final int? correspondentId;
@@ -44,17 +46,21 @@ class CorrespondentWidget extends StatelessWidget {
void _addCorrespondentToFilter(BuildContext context) {
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.correspondent.id == correspondentId) {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(correspondent: const CorrespondentQuery.unset()),
);
} else {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
correspondent: CorrespondentQuery.fromId(correspondentId)),
);
try {
if (cubit.state.filter.correspondent.id == correspondentId) {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(correspondent: const CorrespondentQuery.unset()),
);
} else {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
correspondent: CorrespondentQuery.fromId(correspondentId)),
);
}
afterSelected?.call();
} on ErrorMessage catch (error) {
showError(context, error);
}
afterSelected?.call();
}
}

2
lib/features/labels/document_type/bloc/document_type_cubit.dart
View File

@@ -5,7 +5,7 @@ import 'package:injectable/injectable.dart';
@singleton
class DocumentTypeCubit extends LabelCubit<DocumentType> {
DocumentTypeCubit(super.metaDataService, super.errorCubit);
DocumentTypeCubit(super.metaDataService);
@override
Future<void> initialize() async {

28
lib/features/labels/document_type/view/widgets/document_type_widget.dart
View File

@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart';
import 'package:paperless_mobile/util.dart';
class DocumentTypeWidget extends StatelessWidget {
final int? documentTypeId;
@@ -39,17 +41,21 @@ class DocumentTypeWidget extends StatelessWidget {
void _addDocumentTypeToFilter(BuildContext context) {
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.documentType.id == documentTypeId) {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(documentType: const DocumentTypeQuery.unset()),
);
} else {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
documentType: DocumentTypeQuery.fromId(documentTypeId)),
);
try {
if (cubit.state.filter.documentType.id == documentTypeId) {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(documentType: const DocumentTypeQuery.unset()),
);
} else {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
documentType: DocumentTypeQuery.fromId(documentTypeId)),
);
}
afterSelected?.call();
} on ErrorMessage catch (error) {
showError(context, error);
}
afterSelected?.call();
}
}

2
lib/features/labels/storage_path/bloc/storage_path_cubit.dart
View File

@@ -4,7 +4,7 @@ import 'package:paperless_mobile/features/labels/storage_path/model/storage_path
@singleton
class StoragePathCubit extends LabelCubit<StoragePath> {
StoragePathCubit(super.metaDataService, super.errorCubit);
StoragePathCubit(super.metaDataService);
@override
Future<void> initialize() async {

20
lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart
View File

@@ -32,13 +32,19 @@ class EditStoragePathPage extends StatelessWidget {
}
Future<void> _onDelete(StoragePath path, BuildContext context) async {
await BlocProvider.of<StoragePathCubit>(context).remove(path);
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.storagePath.id == path.id) {
cubit.updateFilter(
filter: cubit.state.filter
.copyWith(storagePath: const StoragePathQuery.unset()));
try {
await BlocProvider.of<StoragePathCubit>(context).remove(path);
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.storagePath.id == path.id) {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
storagePath: const StoragePathQuery.unset(),
),
);
}
Navigator.pop(context);
} on ErrorMessage catch (error) {
showError(context, error);
}
Navigator.pop(context);
}
}

28
lib/features/labels/storage_path/view/widgets/storage_path_widget.dart
View File

@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart';
import 'package:paperless_mobile/util.dart';
class StoragePathWidget extends StatelessWidget {
final int? pathId;
@@ -43,17 +45,21 @@ class StoragePathWidget extends StatelessWidget {
void _addStoragePathToFilter(BuildContext context) {
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.correspondent.id == pathId) {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(storagePath: const StoragePathQuery.unset()),
);
} else {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(storagePath: StoragePathQuery.fromId(pathId)),
);
try {
if (cubit.state.filter.correspondent.id == pathId) {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(storagePath: const StoragePathQuery.unset()),
);
} else {
cubit.updateCurrentFilter(
(filter) =>
filter.copyWith(storagePath: StoragePathQuery.fromId(pathId)),
);
}
afterSelected?.call();
} on ErrorMessage catch (error) {
showError(context, error);
}
afterSelected?.call();
}
}

2
lib/features/labels/tags/bloc/tags_cubit.dart
View File

@@ -4,7 +4,7 @@ import 'package:injectable/injectable.dart';
@singleton
class TagCubit extends LabelCubit<Tag> {
TagCubit(super.metaDataService, super.errorCubit);
TagCubit(super.metaDataService);
@override
Future<void> initialize() async {

28
lib/features/labels/tags/view/pages/edit_tag_page.dart
View File

@@ -43,18 +43,22 @@ class EditTagPage extends StatelessWidget {
}
Future<void> _onDelete(Tag tag, BuildContext context) async {
await BlocProvider.of<TagCubit>(context).remove(tag);
final cubit = BlocProvider.of<DocumentsCubit>(context);
final currentFilter = cubit.state.filter;
late DocumentFilter updatedFilter = currentFilter;
if (currentFilter.tags.ids.contains(tag.id)) {
updatedFilter = currentFilter.copyWith(
tags: TagsQuery.fromIds(
currentFilter.tags.ids.where((tagId) => tagId != tag.id).toList(),
),
);
try {
await BlocProvider.of<TagCubit>(context).remove(tag);
final cubit = BlocProvider.of<DocumentsCubit>(context);
final currentFilter = cubit.state.filter;
late DocumentFilter updatedFilter = currentFilter;
if (currentFilter.tags.ids.contains(tag.id)) {
updatedFilter = currentFilter.copyWith(
tags: TagsQuery.fromIds(
currentFilter.tags.ids.where((tagId) => tagId != tag.id).toList(),
),
);
}
cubit.updateFilter(filter: updatedFilter);
Navigator.pop(context);
} on ErrorMessage catch (error) {
showError(context, error);
}
cubit.updateFilter(filter: updatedFilter);
Navigator.pop(context);
}
}

37
lib/features/labels/tags/view/widgets/tag_widget.dart
View File

@@ -38,22 +38,27 @@ class TagWidget extends StatelessWidget {
void _addTagToFilter(BuildContext context) {
final cubit = BlocProvider.of<DocumentsCubit>(context);
if (cubit.state.filter.tags.ids.contains(tag.id)) {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
tags: TagsQuery.fromIds(
cubit.state.filter.tags.ids.where((id) => id != tag.id).toList()),
),
);
} else {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
tags: TagsQuery.fromIds([...cubit.state.filter.tags.ids, tag.id!]),
),
);
}
if (afterTagTapped != null) {
afterTagTapped!();
try {
if (cubit.state.filter.tags.ids.contains(tag.id)) {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
tags: TagsQuery.fromIds(cubit.state.filter.tags.ids
.where((id) => id != tag.id)
.toList()),
),
);
} else {
cubit.updateCurrentFilter(
(filter) => filter.copyWith(
tags: TagsQuery.fromIds([...cubit.state.filter.tags.ids, tag.id!]),
),
);
}
if (afterTagTapped != null) {
afterTagTapped!();
}
} on ErrorMessage catch (error) {
showError(context, error);
}
}
}

4
lib/features/labels/view/pages/edit_label_page.dart
View File

@@ -3,11 +3,13 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
import 'package:paperless_mobile/core/type/types.dart';
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
import 'package:paperless_mobile/features/labels/model/label.model.dart';
import 'package:paperless_mobile/generated/l10n.dart';
import 'package:paperless_mobile/util.dart';
class EditLabelPage<T extends Label> extends StatefulWidget {
final T label;
@@ -144,6 +146,8 @@ class _EditLabelPageState<T extends Label> extends State<EditLabelPage<T>> {
Navigator.pop(context);
} on PaperlessValidationErrors catch (errorMessages) {
setState(() => _errors = errorMessages);
} on ErrorMessage catch (error) {
showError(context, error);
}
}
}

8
lib/features/labels/view/widgets/label_item.dart
View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_mobile/core/bloc/global_error_cubit.dart';
import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
@@ -53,10 +52,9 @@ class LabelItem<T extends Label> extends StatelessWidget {
MaterialPageRoute(
builder: (context) => LabelBlocProvider(
child: BlocProvider(
create: (context) => DocumentsCubit(
getIt<DocumentRepository>(),
getIt<GlobalErrorCubit>())
..updateFilter(filter: filter),
create: (context) =>
DocumentsCubit(getIt<DocumentRepository>())
..updateFilter(filter: filter),
child: LinkedDocumentsPreview(filter: filter),
),
),