Externalized API and models as own package

lib/features/documents/bloc/documents_cubit.dart

@@ -2,21 +2,17 @@ import 'dart:typed_data';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:injectable/injectable.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/bulk_edit.model.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 
 @singleton
 class DocumentsCubit extends Cubit<DocumentsState> {
-  final DocumentRepository documentRepository;
+  final PaperlessDocumentsApi _api;
 
-  DocumentsCubit(this.documentRepository) : super(DocumentsState.initial);
+  DocumentsCubit(this._api) : super(DocumentsState.initial);
 
   Future<void> bulkRemove(List<DocumentModel> documents) async {
-    await documentRepository.bulkAction(
+    await _api.bulkAction(
       BulkDeleteAction(documents.map((doc) => doc.id)),
     );
     await reload();
@@ -27,7 +23,7 @@ class DocumentsCubit extends Cubit<DocumentsState> {
     Iterable<int> addTags = const [],
     Iterable<int> removeTags = const [],
   }) async {
-    await documentRepository.bulkAction(BulkModifyTagsAction(
+    await _api.bulkAction(BulkModifyTagsAction(
       documents.map((doc) => doc.id),
       addTags: addTags,
       removeTags: removeTags,
@@ -40,13 +36,13 @@ class DocumentsCubit extends Cubit<DocumentsState> {
     bool updateRemote = true,
   ]) async {
     if (updateRemote) {
-      await documentRepository.update(document);
+      await _api.update(document);
     }
     await reload();
   }
 
   Future<void> load() async {
-    final result = await documentRepository.find(state.filter);
+    final result = await _api.find(state.filter);
     emit(DocumentsState(
       isLoaded: true,
       value: [...state.value, result],
@@ -60,15 +56,14 @@ class DocumentsCubit extends Cubit<DocumentsState> {
     }
     var newPages = <PagedSearchResult>[];
     for (final page in state.value) {
-      final result = await documentRepository
-          .find(state.filter.copyWith(page: page.pageKey));
+      final result = await _api.find(state.filter.copyWith(page: page.pageKey));
       newPages.add(result);
     }
     emit(DocumentsState(isLoaded: true, value: newPages, filter: state.filter));
   }
 
   Future<void> _bulkReloadDocuments() async {
-    final result = await documentRepository
+    final result = await _api
         .find(state.filter.copyWith(page: 1, pageSize: state.documents.length));
     emit(DocumentsState(isLoaded: true, value: [result], filter: state.filter));
   }
@@ -78,7 +73,7 @@ class DocumentsCubit extends Cubit<DocumentsState> {
       return;
     }
     final newFilter = state.filter.copyWith(page: state.filter.page + 1);
-    final result = await documentRepository.find(newFilter);
+    final result = await _api.find(newFilter);
     emit(
       DocumentsState(
           isLoaded: true, value: [...state.value, result], filter: newFilter),
@@ -91,7 +86,7 @@ class DocumentsCubit extends Cubit<DocumentsState> {
   Future<void> updateFilter({
     final DocumentFilter filter = DocumentFilter.initial,
   }) async {
-    final result = await documentRepository.find(filter.copyWith(page: 1));
+    final result = await _api.find(filter.copyWith(page: 1));
     emit(DocumentsState(filter: filter, value: [result], isLoaded: true));
   }
 

lib/features/documents/bloc/documents_state.dart

@@ -1,7 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_api/paperless_api.dart';
 
 class DocumentsState extends Equatable {
   final bool isLoaded;

lib/features/documents/model/bulk_edit.model.dart

@@ -1,52 +0,0 @@
-import 'package:paperless_mobile/core/type/types.dart';
-
-abstract class BulkAction {
-  final Iterable<int> documentIds;
-
-  BulkAction(this.documentIds);
-
-  JSON toJson();
-}
-
-class BulkDeleteAction extends BulkAction {
-  BulkDeleteAction(super.documents);
-
-  @override
-  JSON toJson() {
-    return {
-      'documents': documentIds.toList(),
-      'method': 'delete',
-      'parameters': {},
-    };
-  }
-}
-
-class BulkModifyTagsAction extends BulkAction {
-  final Iterable<int> removeTags;
-  final Iterable<int> addTags;
-
-  BulkModifyTagsAction(
-    super.documents, {
-    this.removeTags = const [],
-    this.addTags = const [],
-  });
-
-  BulkModifyTagsAction.addTags(super.documents, this.addTags)
-      : removeTags = const [];
-
-  BulkModifyTagsAction.removeTags(super.documents, Iterable<int> tags)
-      : addTags = const [],
-        removeTags = tags;
-
-  @override
-  JSON toJson() {
-    return {
-      'documents': documentIds.toList(),
-      'method': 'modify_tags',
-      'parameters': {
-        'add_tags': addTags.toList(),
-        'remove_tags': removeTags.toList(),
-      }
-    };
-  }
-}

lib/features/documents/model/document.model.dart

@@ -1,137 +0,0 @@
-// ignore_for_file: non_constant_identifier_names
-
-import 'package:equatable/equatable.dart';
-import 'package:paperless_mobile/core/type/types.dart';
-
-class DocumentModel extends Equatable {
-  static const idKey = 'id';
-  static const titleKey = 'title';
-  static const contentKey = 'content';
-  static const archivedFileNameKey = 'archived_file_name';
-  static const asnKey = 'archive_serial_number';
-  static const createdKey = 'created';
-  static const modifiedKey = 'modified';
-  static const addedKey = 'added';
-  static const correspondentKey = 'correspondent';
-  static const originalFileNameKey = 'original_file_name';
-  static const documentTypeKey = 'document_type';
-  static const tagsKey = 'tags';
-  static const storagePathKey = 'storage_path';
-
-  final int id;
-  final String title;
-  final String? content;
-  final Iterable<int> tags;
-  final int? documentType;
-  final int? correspondent;
-  final int? storagePath;
-  final DateTime created;
-  final DateTime modified;
-  final DateTime added;
-  final int? archiveSerialNumber;
-  final String originalFileName;
-  final String? archivedFileName;
-
-  const DocumentModel({
-    required this.id,
-    required this.title,
-    this.content,
-    this.tags = const <int>[],
-    required this.documentType,
-    required this.correspondent,
-    required this.created,
-    required this.modified,
-    required this.added,
-    this.archiveSerialNumber,
-    required this.originalFileName,
-    this.archivedFileName,
-    this.storagePath,
-  });
-
-  DocumentModel.fromJson(JSON json)
-      : id = json[idKey],
-        title = json[titleKey],
-        content = json[contentKey],
-        created = DateTime.parse(json[createdKey]),
-        modified = DateTime.parse(json[modifiedKey]),
-        added = DateTime.parse(json[addedKey]),
-        archiveSerialNumber = json[asnKey],
-        originalFileName = json[originalFileNameKey],
-        archivedFileName = json[archivedFileNameKey],
-        tags = (json[tagsKey] as List<dynamic>).cast<int>(),
-        correspondent = json[correspondentKey],
-        documentType = json[documentTypeKey],
-        storagePath = json[storagePathKey];
-
-  JSON toJson() {
-    return {
-      idKey: id,
-      titleKey: title,
-      asnKey: archiveSerialNumber,
-      archivedFileNameKey: archivedFileName,
-      contentKey: content,
-      correspondentKey: correspondent,
-      documentTypeKey: documentType,
-      createdKey: created.toUtc().toIso8601String(),
-      modifiedKey: modified.toUtc().toIso8601String(),
-      addedKey: added.toUtc().toIso8601String(),
-      originalFileNameKey: originalFileName,
-      tagsKey: tags.toList(),
-      storagePathKey: storagePath,
-    };
-  }
-
-  DocumentModel copyWith({
-    String? title,
-    String? content,
-    bool overwriteTags = false,
-    Iterable<int>? tags,
-    bool overwriteDocumentType = false,
-    int? documentType,
-    bool overwriteCorrespondent = false,
-    int? correspondent,
-    bool overwriteStoragePath = false,
-    int? storagePath,
-    DateTime? created,
-    DateTime? modified,
-    DateTime? added,
-    int? archiveSerialNumber,
-    String? originalFileName,
-    String? archivedFileName,
-  }) {
-    return DocumentModel(
-      id: id,
-      title: title ?? this.title,
-      content: content ?? this.content,
-      documentType: overwriteDocumentType ? documentType : this.documentType,
-      correspondent:
-          overwriteCorrespondent ? correspondent : this.correspondent,
-      storagePath: overwriteDocumentType ? storagePath : this.storagePath,
-      tags: overwriteTags ? tags ?? [] : this.tags,
-      created: created ?? this.created,
-      modified: modified ?? this.modified,
-      added: added ?? this.added,
-      originalFileName: originalFileName ?? this.originalFileName,
-      archiveSerialNumber: archiveSerialNumber ?? this.archiveSerialNumber,
-      archivedFileName: archivedFileName ?? this.archivedFileName,
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-        id,
-        title,
-        content.hashCode,
-        tags,
-        documentType,
-        storagePath,
-        correspondent,
-        created,
-        modified,
-        added,
-        archiveSerialNumber,
-        originalFileName,
-        archivedFileName,
-        storagePath
-      ];
-}

lib/features/documents/model/document_filter.dart

@@ -1,174 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/asn_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:paperless_mobile/util.dart';
-
-class DocumentFilter with EquatableMixin {
-  static const _oneDay = Duration(days: 1);
-  static const DocumentFilter initial = DocumentFilter();
-
-  static const DocumentFilter latestDocument = DocumentFilter(
-    sortField: SortField.added,
-    sortOrder: SortOrder.descending,
-    pageSize: 1,
-    page: 1,
-  );
-
-  final int pageSize;
-  final int page;
-  final DocumentTypeQuery documentType;
-  final CorrespondentQuery correspondent;
-  final StoragePathQuery storagePath;
-  final AsnQuery asn;
-  final TagsQuery tags;
-  final SortField sortField;
-  final SortOrder sortOrder;
-  final DateTime? addedDateAfter;
-  final DateTime? addedDateBefore;
-  final DateTime? createdDateAfter;
-  final DateTime? createdDateBefore;
-  final QueryType queryType;
-  final String? queryText;
-
-  const DocumentFilter({
-    this.createdDateAfter,
-    this.createdDateBefore,
-    this.documentType = const DocumentTypeQuery.unset(),
-    this.correspondent = const CorrespondentQuery.unset(),
-    this.storagePath = const StoragePathQuery.unset(),
-    this.asn = const AsnQuery.unset(),
-    this.tags = const IdsTagsQuery(),
-    this.sortField = SortField.created,
-    this.sortOrder = SortOrder.descending,
-    this.page = 1,
-    this.pageSize = 25,
-    this.addedDateAfter,
-    this.addedDateBefore,
-    this.queryType = QueryType.titleAndContent,
-    this.queryText,
-  });
-
-  String toQueryString() {
-    final StringBuffer sb = StringBuffer("page=$page&page_size=$pageSize");
-    sb.write(documentType.toQueryParameter());
-    sb.write(correspondent.toQueryParameter());
-    sb.write(tags.toQueryParameter());
-    sb.write(storagePath.toQueryParameter());
-    sb.write(asn.toQueryParameter());
-
-    if (queryText?.isNotEmpty ?? false) {
-      sb.write("&${queryType.queryParam}=$queryText");
-    }
-
-    sb.write("&ordering=${sortOrder.queryString}${sortField.queryString}");
-
-    // Add/subtract one day in the following because paperless uses gt/lt not gte/lte
-    if (addedDateAfter != null) {
-      sb.write(
-          "&added__date__gt=${dateFormat.format(addedDateAfter!.subtract(_oneDay))}");
-    }
-
-    if (addedDateBefore != null) {
-      sb.write(
-          "&added__date__lt=${dateFormat.format(addedDateBefore!.add(_oneDay))}");
-    }
-
-    if (createdDateAfter != null) {
-      sb.write(
-          "&created__date__gt=${dateFormat.format(createdDateAfter!.subtract(_oneDay))}");
-    }
-
-    if (createdDateBefore != null) {
-      sb.write(
-          "&created__date__lt=${dateFormat.format(createdDateBefore!.add(_oneDay))}");
-    }
-
-    return sb.toString();
-  }
-
-  @override
-  String toString() {
-    return toQueryString();
-  }
-
-  DocumentFilter copyWith({
-    int? pageSize,
-    int? page,
-    bool? onlyNoDocumentType,
-    DocumentTypeQuery? documentType,
-    CorrespondentQuery? correspondent,
-    StoragePathQuery? storagePath,
-    TagsQuery? tags,
-    SortField? sortField,
-    SortOrder? sortOrder,
-    DateTime? addedDateAfter,
-    DateTime? addedDateBefore,
-    DateTime? createdDateBefore,
-    DateTime? createdDateAfter,
-    QueryType? queryType,
-    String? queryText,
-  }) {
-    return DocumentFilter(
-      pageSize: pageSize ?? this.pageSize,
-      page: page ?? this.page,
-      documentType: documentType ?? this.documentType,
-      correspondent: correspondent ?? this.correspondent,
-      storagePath: storagePath ?? this.storagePath,
-      tags: tags ?? this.tags,
-      sortField: sortField ?? this.sortField,
-      sortOrder: sortOrder ?? this.sortOrder,
-      addedDateAfter: addedDateAfter ?? this.addedDateAfter,
-      addedDateBefore: addedDateBefore ?? this.addedDateBefore,
-      queryType: queryType ?? this.queryType,
-      queryText: queryText ?? this.queryText,
-      createdDateBefore: createdDateBefore ?? this.createdDateBefore,
-      createdDateAfter: createdDateAfter ?? this.createdDateAfter,
-    );
-  }
-
-  String? get titleOnlyMatchString {
-    if (queryType == QueryType.title) {
-      return queryText?.isEmpty ?? true ? null : queryText;
-    }
-    return null;
-  }
-
-  String? get titleAndContentMatchString {
-    if (queryType == QueryType.titleAndContent) {
-      return queryText?.isEmpty ?? true ? null : queryText;
-    }
-    return null;
-  }
-
-  String? get extendedMatchString {
-    if (queryType == QueryType.extended) {
-      return queryText?.isEmpty ?? true ? null : queryText;
-    }
-    return null;
-  }
-
-  @override
-  List<Object?> get props => [
-        pageSize,
-        page,
-        documentType,
-        correspondent,
-        storagePath,
-        asn,
-        tags,
-        sortField,
-        sortOrder,
-        addedDateAfter,
-        addedDateBefore,
-        createdDateAfter,
-        createdDateBefore,
-        queryType,
-        queryText,
-      ];
-}

lib/features/documents/model/document_meta_data.model.dart

@@ -1,40 +0,0 @@
-class DocumentMetaData {
-  String originalChecksum;
-  int originalSize;
-  String originalMimeType;
-  String mediaFilename;
-  bool hasArchiveVersion;
-  String? archiveChecksum;
-  int? archiveSize;
-
-  DocumentMetaData({
-    required this.originalChecksum,
-    required this.originalSize,
-    required this.originalMimeType,
-    required this.mediaFilename,
-    required this.hasArchiveVersion,
-    this.archiveChecksum,
-    this.archiveSize,
-  });
-
-  DocumentMetaData.fromJson(Map<String, dynamic> json)
-      : originalChecksum = json['original_checksum'],
-        originalSize = json['original_size'],
-        originalMimeType = json['original_mime_type'],
-        mediaFilename = json['media_filename'],
-        hasArchiveVersion = json['has_archive_version'],
-        archiveChecksum = json['archive_checksum'],
-        archiveSize = json['archive_size'];
-
-  Map<String, dynamic> toJson() {
-    final data = <String, dynamic>{};
-    data['original_checksum'] = originalChecksum;
-    data['original_size'] = originalSize;
-    data['original_mime_type'] = originalMimeType;
-    data['media_filename'] = mediaFilename;
-    data['has_archive_version'] = hasArchiveVersion;
-    data['archive_checksum'] = archiveChecksum;
-    data['archive_size'] = archiveSize;
-    return data;
-  }
-}

lib/features/documents/model/filter_rule.model.dart

@@ -1,204 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:paperless_mobile/core/type/types.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:paperless_mobile/util.dart';
-
-class FilterRule with EquatableMixin {
-  static const int titleRule = 0;
-  static const int asnRule = 2;
-  static const int correspondentRule = 3;
-  static const int documentTypeRule = 4;
-  static const int includeTagsRule = 6;
-  static const int hasAnyTag = 7; // true = any tag, false = not assigned
-  static const int createdBeforeRule = 8;
-  static const int createdAfterRule = 9;
-  static const int addedBeforeRule = 13;
-  static const int addedAfterRule = 14;
-  static const int excludeTagsRule = 17;
-  static const int titleAndContentRule = 19;
-  static const int extendedRule = 20;
-  static const int storagePathRule = 25;
-  // Currently unsupported view options:
-  static const int _content = 1;
-  static const int _isInInbox = 5;
-  static const int _createdYearIs = 10;
-  static const int _createdMonthIs = 11;
-  static const int _createdDayIs = 12;
-  static const int _modifiedBefore = 15;
-  static const int _modifiedAfter = 16;
-  static const int _doesNotHaveAsn = 18;
-  static const int _moreLikeThis = 21;
-  static const int _hasTagsIn = 22;
-  static const int _asnGreaterThan = 23;
-  static const int _asnLessThan = 24;
-
-  final int ruleType;
-  final String? value;
-
-  FilterRule(this.ruleType, this.value);
-
-  FilterRule.fromJson(JSON json)
-      : ruleType = json['rule_type'],
-        value = json['value'];
-
-  JSON toJson() {
-    return {
-      'rule_type': ruleType,
-      'value': value,
-    };
-  }
-
-  DocumentFilter applyToFilter(final DocumentFilter filter) {
-    //TODO: Check in profiling mode if this is inefficient enough to cause stutters...
-    switch (ruleType) {
-      case titleRule:
-        return filter.copyWith(queryText: value, queryType: QueryType.title);
-      case documentTypeRule:
-        return filter.copyWith(
-          documentType: value == null
-              ? const DocumentTypeQuery.notAssigned()
-              : DocumentTypeQuery.fromId(int.parse(value!)),
-        );
-      case correspondentRule:
-        return filter.copyWith(
-          correspondent: value == null
-              ? const CorrespondentQuery.notAssigned()
-              : CorrespondentQuery.fromId(int.parse(value!)),
-        );
-      case storagePathRule:
-        return filter.copyWith(
-          storagePath: value == null
-              ? const StoragePathQuery.notAssigned()
-              : StoragePathQuery.fromId(int.parse(value!)),
-        );
-      case hasAnyTag:
-        return filter.copyWith(
-          tags: value == "true"
-              ? const AnyAssignedTagsQuery()
-              : const OnlyNotAssignedTagsQuery(),
-        );
-      case includeTagsRule:
-        assert(filter.tags is IdsTagsQuery);
-        return filter.copyWith(
-          tags: (filter.tags as IdsTagsQuery)
-              .withIdQueriesAdded([IncludeTagIdQuery(int.parse(value!))]),
-        );
-      case excludeTagsRule:
-        assert(filter.tags is IdsTagsQuery);
-        return filter.copyWith(
-          tags: (filter.tags as IdsTagsQuery)
-              .withIdQueriesAdded([ExcludeTagIdQuery(int.parse(value!))]),
-        );
-      case createdBeforeRule:
-        return filter.copyWith(
-          createdDateBefore: value == null ? null : DateTime.parse(value!),
-        );
-      case createdAfterRule:
-        return filter.copyWith(
-          createdDateAfter: value == null ? null : DateTime.parse(value!),
-        );
-      case addedBeforeRule:
-        return filter.copyWith(
-          addedDateBefore: value == null ? null : DateTime.parse(value!),
-        );
-      case addedAfterRule:
-        return filter.copyWith(
-          addedDateAfter: value == null ? null : DateTime.parse(value!),
-        );
-      case titleAndContentRule:
-        return filter.copyWith(
-          queryText: value,
-          queryType: QueryType.titleAndContent,
-        );
-      case extendedRule:
-        return filter.copyWith(queryText: value, queryType: QueryType.extended);
-      //TODO: Add currently unused rules
-      default:
-        return filter;
-    }
-  }
-
-  ///
-  /// Converts a [DocumentFilter] to a list of [FilterRule]s.
-  ///
-  static List<FilterRule> fromFilter(final DocumentFilter filter) {
-    List<FilterRule> filterRules = [];
-    if (filter.correspondent.onlyNotAssigned) {
-      filterRules.add(FilterRule(correspondentRule, null));
-    }
-    if (filter.correspondent.isSet) {
-      filterRules.add(
-          FilterRule(correspondentRule, filter.correspondent.id!.toString()));
-    }
-    if (filter.documentType.onlyNotAssigned) {
-      filterRules.add(FilterRule(documentTypeRule, null));
-    }
-    if (filter.documentType.isSet) {
-      filterRules.add(
-          FilterRule(documentTypeRule, filter.documentType.id!.toString()));
-    }
-    if (filter.storagePath.onlyNotAssigned) {
-      filterRules.add(FilterRule(storagePathRule, null));
-    }
-    if (filter.storagePath.isSet) {
-      filterRules
-          .add(FilterRule(storagePathRule, filter.storagePath.id!.toString()));
-    }
-    if (filter.tags is OnlyNotAssignedTagsQuery) {
-      filterRules.add(FilterRule(hasAnyTag, false.toString()));
-    }
-    if (filter.tags is AnyAssignedTagsQuery) {
-      filterRules.add(FilterRule(hasAnyTag, true.toString()));
-    }
-    if (filter.tags is IdsTagsQuery) {
-      filterRules.addAll((filter.tags as IdsTagsQuery)
-          .includedIds
-          .map((id) => FilterRule(includeTagsRule, id.toString())));
-      filterRules.addAll((filter.tags as IdsTagsQuery)
-          .excludedIds
-          .map((id) => FilterRule(excludeTagsRule, id.toString())));
-    }
-
-    if (filter.queryText != null) {
-      switch (filter.queryType) {
-        case QueryType.title:
-          filterRules.add(FilterRule(titleRule, filter.queryText!));
-          break;
-        case QueryType.titleAndContent:
-          filterRules.add(FilterRule(titleAndContentRule, filter.queryText!));
-          break;
-        case QueryType.extended:
-          filterRules.add(FilterRule(extendedRule, filter.queryText!));
-          break;
-        case QueryType.asn:
-          filterRules.add(FilterRule(asnRule, filter.queryText!));
-          break;
-      }
-    }
-    if (filter.createdDateAfter != null) {
-      filterRules.add(FilterRule(
-          createdAfterRule, dateFormat.format(filter.createdDateAfter!)));
-    }
-    if (filter.createdDateBefore != null) {
-      filterRules.add(FilterRule(
-          createdBeforeRule, dateFormat.format(filter.createdDateBefore!)));
-    }
-    if (filter.addedDateAfter != null) {
-      filterRules.add(FilterRule(
-          addedAfterRule, dateFormat.format(filter.addedDateAfter!)));
-    }
-    if (filter.addedDateBefore != null) {
-      filterRules.add(FilterRule(
-          addedBeforeRule, dateFormat.format(filter.addedDateBefore!)));
-    }
-    return filterRules;
-  }
-
-  @override
-  List<Object?> get props => [ruleType, value];
-}

lib/features/documents/model/paged_search_result.dart

@@ -1,94 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:paperless_mobile/core/type/types.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-
-const pageRegex = r".*page=(\d+).*";
-
-class PagedSearchResultJsonSerializer<T> {
-  final JSON json;
-  final T Function(JSON) fromJson;
-
-  PagedSearchResultJsonSerializer(this.json, this.fromJson);
-}
-
-class PagedSearchResult<T> extends Equatable {
-  /// Total number of available items
-  final int count;
-
-  /// Link to next page
-  final String? next;
-
-  /// Link to previous page
-  final String? previous;
-
-  /// Actual items
-  final List<T> results;
-
-  int get pageKey {
-    if (next != null) {
-      final matches = RegExp(pageRegex).allMatches(next!);
-      final group = matches.first.group(1)!;
-      final nextPageKey = int.parse(group);
-      return nextPageKey - 1;
-    }
-    if (previous != null) {
-      // This is only executed if it's the last page or there is no data.
-      final matches = RegExp(pageRegex).allMatches(previous!);
-      if (matches.isEmpty) {
-        //In case there is a match but a page is not explicitly set, the page is 1 per default. Therefore, if the previous page is 1, this page is 1+1=2
-        return 2;
-      }
-      final group = matches.first.group(1)!;
-      final previousPageKey = int.parse(group);
-      return previousPageKey + 1;
-    }
-    return 1;
-  }
-
-  const PagedSearchResult({
-    required this.count,
-    required this.next,
-    required this.previous,
-    required this.results,
-  });
-
-  factory PagedSearchResult.fromJson(
-      PagedSearchResultJsonSerializer<T> serializer) {
-    return PagedSearchResult(
-      count: serializer.json['count'],
-      next: serializer.json['next'],
-      previous: serializer.json['previous'],
-      results: List<JSON>.from(serializer.json['results'])
-          .map<T>(serializer.fromJson)
-          .toList(),
-    );
-  }
-
-  PagedSearchResult copyWith({
-    int? count,
-    String? next,
-    String? previous,
-    List<DocumentModel>? results,
-  }) {
-    return PagedSearchResult(
-      count: count ?? this.count,
-      next: next ?? this.next,
-      previous: previous ?? this.previous,
-      results: results ?? this.results,
-    );
-  }
-
-  ///
-  /// Returns the number of pages based on the given [pageSize]. The last page
-  /// might not exhaust its capacity.
-  ///
-  int inferPageCount({required int pageSize}) {
-    if (pageSize == 0) {
-      return 0;
-    }
-    return (count / pageSize).round() + 1;
-  }
-
-  @override
-  List<Object?> get props => [count, next, previous, results];
-}

lib/features/documents/model/query_parameters/asn_query.dart

@@ -1,11 +0,0 @@
-import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-
-class AsnQuery extends IdQueryParameter {
-  const AsnQuery.fromId(super.id) : super.fromId();
-  const AsnQuery.unset() : super.unset();
-  const AsnQuery.notAssigned() : super.notAssigned();
-  const AsnQuery.anyAssigned() : super.anyAssigned();
-
-  @override
-  String get queryParameterKey => 'archive_serial_number';
-}

lib/features/documents/model/query_parameters/correspondent_query.dart

@@ -1,11 +0,0 @@
-import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-
-class CorrespondentQuery extends IdQueryParameter {
-  const CorrespondentQuery.fromId(super.id) : super.fromId();
-  const CorrespondentQuery.unset() : super.unset();
-  const CorrespondentQuery.notAssigned() : super.notAssigned();
-  const CorrespondentQuery.anyAssigned() : super.anyAssigned();
-
-  @override
-  String get queryParameterKey => 'correspondent';
-}

lib/features/documents/model/query_parameters/document_type_query.dart

@@ -1,11 +0,0 @@
-import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-
-class DocumentTypeQuery extends IdQueryParameter {
-  const DocumentTypeQuery.fromId(super.id) : super.fromId();
-  const DocumentTypeQuery.unset() : super.unset();
-  const DocumentTypeQuery.notAssigned() : super.notAssigned();
-  const DocumentTypeQuery.anyAssigned() : super.anyAssigned();
-
-  @override
-  String get queryParameterKey => 'document_type';
-}

lib/features/documents/model/query_parameters/id_query_parameter.dart

@@ -1,47 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter/widgets.dart';
-
-abstract class IdQueryParameter extends Equatable {
-  final int? _assignmentStatus;
-  final int? _id;
-
-  const IdQueryParameter.notAssigned()
-      : _assignmentStatus = 1,
-        _id = null;
-
-  const IdQueryParameter.anyAssigned()
-      : _assignmentStatus = 0,
-        _id = null;
-
-  const IdQueryParameter.fromId(int? id)
-      : _assignmentStatus = null,
-        _id = id;
-
-  const IdQueryParameter.unset() : this.fromId(null);
-
-  bool get isUnset => _id == null && _assignmentStatus == null;
-
-  bool get isSet => _id != null && _assignmentStatus == null;
-
-  bool get onlyNotAssigned => _assignmentStatus == 1;
-
-  bool get onlyAssigned => _assignmentStatus == 0;
-
-  int? get id => _id;
-
-  @protected
-  String get queryParameterKey;
-
-  String toQueryParameter() {
-    if (onlyNotAssigned || onlyAssigned) {
-      return "&${queryParameterKey}__isnull=$_assignmentStatus";
-    }
-    if (isSet) {
-      return "&${queryParameterKey}__id=$id";
-    }
-    return "";
-  }
-
-  @override
-  List<Object?> get props => [_assignmentStatus, _id];
-}

lib/features/documents/model/query_parameters/query_type.dart

@@ -1,9 +0,0 @@
-enum QueryType {
-  title('title__icontains'),
-  titleAndContent('title_content'),
-  extended('query'),
-  asn('asn');
-
-  final String queryParam;
-  const QueryType(this.queryParam);
-}

lib/features/documents/model/query_parameters/sort_field.dart

@@ -1,18 +0,0 @@
-enum SortField {
-  archiveSerialNumber("archive_serial_number"),
-  correspondentName("correspondent__name"),
-  title("title"),
-  documentType("document_type__name"),
-  created("created"),
-  added("added"),
-  modified("modified");
-
-  final String queryString;
-
-  const SortField(this.queryString);
-
-  @override
-  String toString() {
-    return name.toLowerCase();
-  }
-}

lib/features/documents/model/query_parameters/sort_order.dart

@@ -1,11 +0,0 @@
-enum SortOrder {
-  ascending(""),
-  descending("-");
-
-  final String queryString;
-  const SortOrder(this.queryString);
-
-  SortOrder toggle() {
-    return this == ascending ? descending : ascending;
-  }
-}

lib/features/documents/model/query_parameters/storage_path_query.dart

@@ -1,11 +0,0 @@
-import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-
-class StoragePathQuery extends IdQueryParameter {
-  const StoragePathQuery.fromId(super.id) : super.fromId();
-  const StoragePathQuery.unset() : super.unset();
-  const StoragePathQuery.notAssigned() : super.notAssigned();
-  const StoragePathQuery.anyAssigned() : super.anyAssigned();
-
-  @override
-  String get queryParameterKey => 'storage_path';
-}

lib/features/documents/model/query_parameters/tags_query.dart

@@ -1,141 +0,0 @@
-import 'package:equatable/equatable.dart';
-
-abstract class TagsQuery with EquatableMixin {
-  const TagsQuery();
-  String toQueryParameter();
-}
-
-class OnlyNotAssignedTagsQuery extends TagsQuery {
-  const OnlyNotAssignedTagsQuery();
-  @override
-  List<Object?> get props => [];
-
-  @override
-  String toQueryParameter() {
-    return '&is_tagged=0';
-  }
-}
-
-class AnyAssignedTagsQuery extends TagsQuery {
-  final Iterable<int> tagIds;
-
-  const AnyAssignedTagsQuery({
-    this.tagIds = const [],
-  });
-  @override
-  List<Object?> get props => [];
-
-  @override
-  String toQueryParameter() {
-    if (tagIds.isEmpty) {
-      return '&is_tagged=1';
-    }
-    return '&tags__id__in=${tagIds.join(',')}';
-  }
-}
-
-class IdsTagsQuery extends TagsQuery {
-  final Iterable<TagIdQuery> _idQueries;
-
-  const IdsTagsQuery([this._idQueries = const []]);
-
-  IdsTagsQuery.included(Iterable<int> ids)
-      : _idQueries = ids.map((id) => IncludeTagIdQuery(id));
-
-  IdsTagsQuery.fromIds(Iterable<int> ids) : this.included(ids);
-
-  IdsTagsQuery.excluded(Iterable<int> ids)
-      : _idQueries = ids.map((id) => ExcludeTagIdQuery(id));
-
-  IdsTagsQuery withIdQueriesAdded(Iterable<TagIdQuery> idQueries) {
-    final intersection = idQueries
-        .map((idQ) => idQ.id)
-        .toSet()
-        .intersection(_idQueries.map((idQ) => idQ.id).toSet());
-    final res = IdsTagsQuery(
-      [...withIdsRemoved(intersection).queries, ...idQueries],
-    );
-    return res;
-  }
-
-  IdsTagsQuery withIdsRemoved(Iterable<int> ids) {
-    return IdsTagsQuery(
-      _idQueries.where((idQuery) => !ids.contains(idQuery.id)),
-    );
-  }
-
-  Iterable<TagIdQuery> get queries => _idQueries;
-
-  Iterable<int> get includedIds {
-    return _idQueries.whereType<IncludeTagIdQuery>().map((e) => e.id);
-  }
-
-  Iterable<int> get excludedIds {
-    return _idQueries.whereType<ExcludeTagIdQuery>().map((e) => e.id);
-  }
-
-  ///
-  /// Returns a new instance with the type of the given [id] toggled.
-  /// E.g. if the provided [id] is currently registered as a [IncludeTagIdQuery],
-  /// then the new isntance will contain a [ExcludeTagIdQuery] with given id.
-  ///
-  IdsTagsQuery withIdQueryToggled(int id) {
-    return IdsTagsQuery(
-      _idQueries.map((idQ) => idQ.id == id ? idQ.toggle() : idQ),
-    );
-  }
-
-  Iterable<int> get ids => [...includedIds, ...excludedIds];
-
-  @override
-  String toQueryParameter() {
-    final StringBuffer sb = StringBuffer("");
-    if (includedIds.isNotEmpty) {
-      sb.write('&tags__id__all=${includedIds.join(',')}');
-    }
-    if (excludedIds.isNotEmpty) {
-      sb.write('&tags__id__none=${excludedIds.join(',')}');
-    }
-    return sb.toString();
-  }
-
-  @override
-  List<Object?> get props => [_idQueries];
-}
-
-abstract class TagIdQuery with EquatableMixin {
-  final int id;
-
-  TagIdQuery(this.id);
-
-  String get methodName;
-
-  @override
-  List<Object?> get props => [id, methodName];
-
-  TagIdQuery toggle();
-}
-
-class IncludeTagIdQuery extends TagIdQuery {
-  IncludeTagIdQuery(super.id);
-
-  @override
-  String get methodName => 'include';
-
-  @override
-  TagIdQuery toggle() {
-    return ExcludeTagIdQuery(id);
-  }
-}
-
-class ExcludeTagIdQuery extends TagIdQuery {
-  ExcludeTagIdQuery(super.id);
-
-  @override
-  String get methodName => 'exclude';
-
-  @override
-  TagIdQuery toggle() {
-    return IncludeTagIdQuery(id);
-  }
-}

lib/features/documents/model/saved_view.model.dart

@@ -1,97 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:paperless_mobile/core/type/types.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/filter_rule.model.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
-
-class SavedView with EquatableMixin {
-  final int? id;
-  final String name;
-
-  final bool showOnDashboard;
-  final bool showInSidebar;
-
-  final SortField sortField;
-  final bool sortReverse;
-  final List<FilterRule> filterRules;
-
-  SavedView({
-    this.id,
-    required this.name,
-    required this.showOnDashboard,
-    required this.showInSidebar,
-    required this.sortField,
-    required this.sortReverse,
-    required this.filterRules,
-  }) {
-    filterRules.sort(
-      (a, b) => (a.ruleType.compareTo(b.ruleType) != 0
-          ? a.ruleType.compareTo(b.ruleType)
-          : a.value?.compareTo(b.value ?? "") ?? -1),
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-        name,
-        showOnDashboard,
-        showInSidebar,
-        sortField,
-        sortReverse,
-        filterRules
-      ];
-
-  SavedView.fromJson(JSON json)
-      : this(
-          id: json['id'],
-          name: json['name'],
-          showOnDashboard: json['show_on_dashboard'],
-          showInSidebar: json['show_in_sidebar'],
-          sortField: SortField.values
-              .where((order) => order.queryString == json['sort_field'])
-              .first,
-          sortReverse: json['sort_reverse'],
-          filterRules: (json['filter_rules'] as List)
-              .cast<JSON>()
-              .map(FilterRule.fromJson)
-              .toList(),
-        );
-
-  DocumentFilter toDocumentFilter() {
-    return filterRules.fold(
-      DocumentFilter(
-        sortOrder: sortReverse ? SortOrder.descending : SortOrder.ascending,
-        sortField: sortField,
-      ),
-      (filter, filterRule) => filterRule.applyToFilter(filter),
-    );
-  }
-
-  SavedView.fromDocumentFilter(
-    DocumentFilter filter, {
-    required String name,
-    required bool showInSidebar,
-    required bool showOnDashboard,
-  }) : this(
-          id: null,
-          name: name,
-          filterRules: FilterRule.fromFilter(filter),
-          sortField: filter.sortField,
-          showInSidebar: showInSidebar,
-          showOnDashboard: showOnDashboard,
-          sortReverse: filter.sortOrder == SortOrder.descending,
-        );
-
-  JSON toJson() {
-    return {
-      'id': id,
-      'name': name,
-      'show_on_dashboard': showOnDashboard,
-      'show_in_sidebar': showInSidebar,
-      'sort_reverse': sortReverse,
-      'sort_field': sortField.queryString,
-      'filter_rules': filterRules.map((rule) => rule.toJson()).toList(),
-    };
-  }
-}

lib/features/documents/model/similar_document.model.dart

@@ -1,59 +0,0 @@
-import 'package:paperless_mobile/core/type/types.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-
-class SimilarDocumentModel extends DocumentModel {
-  final SearchHit searchHit;
-
-  const SimilarDocumentModel({
-    required super.id,
-    required super.title,
-    required super.documentType,
-    required super.correspondent,
-    required super.created,
-    required super.modified,
-    required super.added,
-    required super.originalFileName,
-    required this.searchHit,
-    super.archiveSerialNumber,
-    super.archivedFileName,
-    super.content,
-    super.storagePath,
-    super.tags,
-  });
-
-  @override
-  JSON toJson() {
-    final json = super.toJson();
-    json['__search_hit__'] = searchHit.toJson();
-    return json;
-  }
-
-  SimilarDocumentModel.fromJson(JSON json)
-      : searchHit = SearchHit.fromJson(json),
-        super.fromJson(json);
-}
-
-class SearchHit {
-  final double? score;
-  final String? highlights;
-  final int? rank;
-
-  SearchHit({
-    this.score,
-    required this.highlights,
-    required this.rank,
-  });
-
-  JSON toJson() {
-    return {
-      'score': score,
-      'highlights': highlights,
-      'rank': rank,
-    };
-  }
-
-  SearchHit.fromJson(JSON json)
-      : score = json['score'],
-        highlights = json['highlights'],
-        rank = json['rank'];
-}

lib/features/documents/repository/document_repository.dart

@@ -1,35 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:paperless_mobile/features/documents/model/bulk_edit.model.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/document_meta_data.model.dart';
-import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:paperless_mobile/features/documents/model/similar_document.model.dart';
-import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
-
-abstract class DocumentRepository {
-  Future<void> create(
-    Uint8List documentBytes,
-    String filename, {
-    required String title,
-    int? documentType,
-    int? correspondent,
-    Iterable<int> tags = const [],
-    DateTime? createdAt,
-  });
-  Future<DocumentModel> update(DocumentModel doc);
-  Future<int> findNextAsn();
-  Future<PagedSearchResult<DocumentModel>> find(DocumentFilter filter);
-  Future<List<SimilarDocumentModel>> findSimilar(int docId);
-  Future<int> delete(DocumentModel doc);
-  Future<DocumentMetaData> getMetaData(DocumentModel document);
-  Future<Iterable<int>> bulkAction(BulkAction action);
-  Future<Uint8List> getPreview(int docId);
-  String getThumbnailUrl(int docId);
-  Future<DocumentModel> waitForConsumptionFinished(
-      String filename, String title);
-  Future<Uint8List> download(DocumentModel document);
-
-  Future<List<String>> autocomplete(String query, [int limit = 10]);
-}

lib/features/documents/repository/document_repository_impl.dart

@@ -1,298 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'dart:math';
-import 'dart:typed_data';
-
-import 'package:flutter/foundation.dart';
-import 'package:http/http.dart';
-import 'package:http/src/boundary_characters.dart'; //TODO: remove once there is either a paperless API update or there is a better solution...
-import 'package:injectable/injectable.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
-import 'package:paperless_mobile/core/store/local_vault.dart';
-import 'package:paperless_mobile/core/type/types.dart';
-import 'package:paperless_mobile/core/util.dart';
-import 'package:paperless_mobile/di_initializer.dart';
-import 'package:paperless_mobile/extensions/dart_extensions.dart';
-import 'package:paperless_mobile/features/documents/model/bulk_edit.model.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/document_meta_data.model.dart';
-import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/asn_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
-import 'package:paperless_mobile/features/documents/model/similar_document.model.dart';
-import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:paperless_mobile/util.dart';
-
-@Injectable(as: DocumentRepository)
-class DocumentRepositoryImpl implements DocumentRepository {
-  ////
-  //final StatusService statusService;
-  final LocalVault localStorage;
-  final BaseClient httpClient;
-
-  DocumentRepositoryImpl(
-    //this.statusService,
-    this.localStorage,
-    @Named("timeoutClient") this.httpClient,
-  );
-  @override
-  Future<void> create(
-    Uint8List documentBytes,
-    String filename, {
-    required String title,
-    int? documentType,
-    int? correspondent,
-    Iterable<int> tags = const [],
-    DateTime? createdAt,
-  }) async {
-    final auth = await localStorage.loadAuthenticationInformation();
-
-    if (auth == null) {
-      throw const ErrorMessage(ErrorCode.notAuthenticated);
-    }
-
-    // The multipart request has to be generated from scratch as the http library does
-    // not allow the same key (tags) to be added multiple times. However, this is what the
-    // paperless api expects, i.e. one block for each tag.
-    final request = await getIt<HttpClient>().postUrl(
-      Uri.parse("${auth.serverUrl}/api/documents/post_document/"),
-    );
-
-    final boundary = _boundaryString();
-
-    StringBuffer bodyBuffer = StringBuffer();
-
-    var fields = <String, String>{};
-
-    fields.tryPutIfAbsent('title', () => title);
-    fields.tryPutIfAbsent('created', () => formatDateNullable(createdAt));
-    fields.tryPutIfAbsent('correspondent',
-        () => correspondent == null ? null : json.encode(correspondent));
-    fields.tryPutIfAbsent('document_type',
-        () => documentType == null ? null : json.encode(documentType));
-
-    for (final key in fields.keys) {
-      bodyBuffer.write(_buildMultipartField(key, fields[key]!, boundary));
-    }
-
-    for (final tag in tags) {
-      bodyBuffer.write(_buildMultipartField('tags', tag.toString(), boundary));
-    }
-
-    bodyBuffer.write("--$boundary"
-        '\r\nContent-Disposition: form-data; name="document"; filename="$filename"'
-        "\r\nContent-type: application/octet-stream"
-        "\r\n\r\n");
-
-    final closing = "\r\n--" + boundary + "--\r\n";
-
-    // Set headers
-    request.headers.set(HttpHeaders.contentTypeHeader,
-        "multipart/form-data; boundary=" + boundary);
-    request.headers.set(HttpHeaders.contentLengthHeader,
-        "${bodyBuffer.length + closing.length + documentBytes.lengthInBytes}");
-    request.headers.set(HttpHeaders.authorizationHeader, "Token ${auth.token}");
-
-    //Write fields to request
-    request.write(bodyBuffer.toString());
-    //Stream file
-    await request.addStream(Stream.fromIterable(documentBytes.map((e) => [e])));
-    // Write closing boundary to request
-    request.write(closing);
-
-    final response = await request.close();
-
-    if (response.statusCode != 200) {
-      throw ErrorMessage(ErrorCode.documentUploadFailed,
-          httpStatusCode: response.statusCode);
-    }
-  }
-
-  String _buildMultipartField(String fieldName, String value, String boundary) {
-    return '--$boundary'
-            '\r\nContent-Disposition: form-data; name="$fieldName"'
-            '\r\nContent-type: text/plain'
-            '\r\n\r\n' +
-        value +
-        '\r\n';
-  }
-
-  String _boundaryString() {
-    Random _random = Random();
-    var prefix = 'dart-http-boundary-';
-    var list = List<int>.generate(
-      70 - prefix.length,
-      (index) => boundaryCharacters[_random.nextInt(boundaryCharacters.length)],
-      growable: false,
-    );
-    return '$prefix${String.fromCharCodes(list)}';
-  }
-
-  @override
-  Future<DocumentModel> update(DocumentModel doc) async {
-    final response = await httpClient.put(
-      Uri.parse("/api/documents/${doc.id}/"),
-      body: json.encode(doc.toJson()),
-      headers: {"Content-Type": "application/json"},
-    );
-    if (response.statusCode == 200) {
-      return DocumentModel.fromJson(
-        jsonDecode(utf8.decode(response.bodyBytes)) as JSON,
-      );
-    } else {
-      throw const ErrorMessage(ErrorCode.documentUpdateFailed);
-    }
-  }
-
-  @override
-  Future<PagedSearchResult<DocumentModel>> find(DocumentFilter filter) async {
-    final filterParams = filter.toQueryString();
-    final response = await httpClient.get(
-      Uri.parse("/api/documents/?$filterParams"),
-    );
-    if (response.statusCode == 200) {
-      return compute(
-        PagedSearchResult.fromJson,
-        PagedSearchResultJsonSerializer<DocumentModel>(
-          jsonDecode(utf8.decode(response.bodyBytes)),
-          DocumentModel.fromJson,
-        ),
-      );
-    } else {
-      throw const ErrorMessage(ErrorCode.documentLoadFailed);
-    }
-  }
-
-  @override
-  Future<int> delete(DocumentModel doc) async {
-    final response =
-        await httpClient.delete(Uri.parse("/api/documents/${doc.id}/"));
-
-    if (response.statusCode == 204) {
-      return Future.value(doc.id);
-    }
-    throw const ErrorMessage(ErrorCode.documentDeleteFailed);
-  }
-
-  @override
-  String getThumbnailUrl(int documentId) {
-    return "/api/documents/$documentId/thumb/";
-  }
-
-  String getPreviewUrl(int documentId) {
-    return "/api/documents/$documentId/preview/";
-  }
-
-  @override
-  Future<Uint8List> getPreview(int documentId) async {
-    final response = await httpClient.get(Uri.parse(getPreviewUrl(documentId)));
-    if (response.statusCode == 200) {
-      return response.bodyBytes;
-    }
-    throw const ErrorMessage(ErrorCode.documentPreviewFailed);
-  }
-
-  @override
-  Future<int> findNextAsn() async {
-    const DocumentFilter asnQueryFilter = DocumentFilter(
-      sortField: SortField.archiveSerialNumber,
-      sortOrder: SortOrder.descending,
-      asn: AsnQuery.anyAssigned(),
-      page: 1,
-      pageSize: 1,
-    );
-    try {
-      final result = await find(asnQueryFilter);
-      return result.results
-              .map((e) => e.archiveSerialNumber)
-              .firstWhere((asn) => asn != null, orElse: () => 0)! +
-          1;
-    } on ErrorMessage catch (_) {
-      throw const ErrorMessage(ErrorCode.documentAsnQueryFailed);
-    }
-  }
-
-  @override
-  Future<Iterable<int>> bulkAction(BulkAction action) async {
-    final response = await httpClient.post(
-      Uri.parse("/api/documents/bulk_edit/"),
-      body: json.encode(action.toJson()),
-      headers: {'Content-Type': 'application/json'},
-    );
-    if (response.statusCode == 200) {
-      return action.documentIds;
-    } else {
-      throw const ErrorMessage(ErrorCode.documentBulkActionFailed);
-    }
-  }
-
-  @override
-  Future<DocumentModel> waitForConsumptionFinished(
-      String fileName, String title) async {
-    // Always wait 5 seconds, processing usually takes longer...
-    //await Future.delayed(const Duration(seconds: 5));
-    PagedSearchResult<DocumentModel> results =
-        await find(DocumentFilter.latestDocument);
-
-    while ((results.results.isEmpty ||
-        (results.results[0].originalFileName != fileName &&
-            results.results[0].title != title))) {
-      //TODO: maybe implement more intelligent retry logic or find workaround for websocket authentication...
-      await Future.delayed(const Duration(seconds: 2));
-      results = await find(DocumentFilter.latestDocument);
-    }
-    try {
-      return results.results.first;
-    } on StateError {
-      throw const ErrorMessage(ErrorCode.documentUploadFailed);
-    }
-  }
-
-  @override
-  Future<Uint8List> download(DocumentModel document) async {
-    //TODO: Check if this works...
-    final response = await httpClient
-        .get(Uri.parse("/api/documents/${document.id}/download/"));
-    return response.bodyBytes;
-  }
-
-  @override
-  Future<DocumentMetaData> getMetaData(DocumentModel document) async {
-    final response = await httpClient
-        .get(Uri.parse("/api/documents/${document.id}/metadata/"));
-    return compute(
-      DocumentMetaData.fromJson,
-      jsonDecode(utf8.decode(response.bodyBytes)) as JSON,
-    );
-  }
-
-  @override
-  Future<List<String>> autocomplete(String query, [int limit = 10]) async {
-    final response = await httpClient
-        .get(Uri.parse("/api/search/autocomplete/?query=$query&limit=$limit}"));
-    if (response.statusCode == 200) {
-      return jsonDecode(utf8.decode(response.bodyBytes)) as List<String>;
-    }
-    throw const ErrorMessage(ErrorCode.autocompleteQueryError);
-  }
-
-  @override
-  Future<List<SimilarDocumentModel>> findSimilar(int docId) async {
-    final response = await httpClient
-        .get(Uri.parse("/api/documents/?more_like=$docId&pageSize=10"));
-    if (response.statusCode == 200) {
-      return (await compute(
-        PagedSearchResult<SimilarDocumentModel>.fromJson,
-        PagedSearchResultJsonSerializer(
-          jsonDecode(utf8.decode(response.bodyBytes)),
-          SimilarDocumentModel.fromJson,
-        ),
-      ))
-          .results;
-    }
-    throw const ErrorMessage(ErrorCode.similarQueryError);
-  }
-}

lib/features/documents/repository/saved_views_repository.dart

@@ -1,56 +0,0 @@
-import 'dart:convert';
-
-import 'package:paperless_mobile/core/model/error_message.dart';
-import 'package:paperless_mobile/core/util.dart';
-import 'package:paperless_mobile/di_initializer.dart';
-import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:http/http.dart';
-import 'package:injectable/injectable.dart';
-
-abstract class SavedViewsRepository {
-  Future<List<SavedView>> getAll();
-
-  Future<SavedView> save(SavedView view);
-  Future<int> delete(SavedView view);
-}
-
-@Injectable(as: SavedViewsRepository)
-class SavedViewRepositoryImpl implements SavedViewsRepository {
-  final BaseClient httpClient;
-
-  SavedViewRepositoryImpl(@Named("timeoutClient") this.httpClient);
-
-  @override
-  Future<List<SavedView>> getAll() {
-    return getCollection(
-      "/api/saved_views/",
-      SavedView.fromJson,
-      ErrorCode.loadSavedViewsError,
-    );
-  }
-
-  @override
-  Future<SavedView> save(SavedView view) async {
-    final response = await httpClient.post(
-      Uri.parse("/api/saved_views/"),
-      body: jsonEncode(view.toJson()),
-      headers: {'Content-Type': 'application/json'},
-    );
-    if (response.statusCode == 201) {
-      return SavedView.fromJson(jsonDecode(utf8.decode(response.bodyBytes)));
-    }
-    throw ErrorMessage(ErrorCode.createSavedViewError,
-        httpStatusCode: response.statusCode);
-  }
-
-  @override
-  Future<int> delete(SavedView view) async {
-    final response =
-        await httpClient.delete(Uri.parse("/api/saved_views/${view.id}/"));
-    if (response.statusCode == 204) {
-      return view.id!;
-    }
-    throw ErrorMessage(ErrorCode.deleteSavedViewError,
-        httpStatusCode: response.statusCode);
-  }
-}

lib/features/documents/view/pages/document_edit_page.dart

@@ -6,26 +6,15 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:intl/intl.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:paperless_mobile/features/documents/repository/document_repository.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/features/labels/correspondent/view/pages/add_correspondent_page.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/features/labels/document_type/view/pages/add_document_type_page.dart';
-import 'package:paperless_mobile/features/labels/model/label_state.dart';
+import 'package:paperless_mobile/features/labels/bloc/label_state.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/features/labels/storage_path/view/pages/add_storage_path_page.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
 import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.dart';
@@ -62,7 +51,8 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
   @override
   void initState() {
     super.initState();
-    documentBytes = getIt<DocumentRepository>().getPreview(widget.document.id);
+    documentBytes =
+        getIt<PaperlessDocumentsApi>().getPreview(widget.document.id);
   }
 
   @override
@@ -92,7 +82,7 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
             try {
               await widget.onEdit(updatedDocument);
               showSnackBar(context, S.of(context).documentUpdateSuccessMessage);
-            } on ErrorMessage catch (error, stackTrace) {
+            } on PaperlessServerException catch (error, stackTrace) {
               showErrorMessage(context, error, stackTrace);
             } finally {
               setState(() {

lib/features/documents/view/pages/document_view.dart

@@ -1,8 +1,5 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:paperless_mobile/di_initializer.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:pdfx/pdfx.dart';
 

lib/features/documents/view/pages/documents_page.dart

@@ -1,16 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/features/document_details/bloc/document_details_cubit.dart';
 import 'package:paperless_mobile/features/document_details/view/pages/document_details_page.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
-import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/documents_empty_state.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/grid/document_grid.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/list/document_list.dart';
@@ -48,7 +45,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
     super.initState();
     try {
       BlocProvider.of<DocumentsCubit>(context).load();
-    } on ErrorMessage catch (error, stackTrace) {
+    } on PaperlessServerException catch (error, stackTrace) {
       showErrorMessage(context, error, stackTrace);
     }
     _pagingController.addPageRequestListener(_loadNewPage);
@@ -69,7 +66,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
     }
     try {
       await documentsCubit.loadMore();
-    } on ErrorMessage catch (error, stackTrace) {
+    } on PaperlessServerException catch (error, stackTrace) {
       showErrorMessage(context, error, stackTrace);
     }
   }
@@ -83,7 +80,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
       await BlocProvider.of<DocumentsCubit>(context).updateCurrentFilter(
         (filter) => filter.copyWith(page: 1),
       );
-    } on ErrorMessage catch (error, stackTrace) {
+    } on PaperlessServerException catch (error, stackTrace) {
       showErrorMessage(context, error, stackTrace);
     }
   }
@@ -254,7 +251,8 @@ class _DocumentsPageState extends State<DocumentsPage> {
             value: BlocProvider.of<StoragePathCubit>(context),
           ),
           BlocProvider.value(
-            value: DocumentDetailsCubit(getIt<DocumentRepository>(), document),
+            value:
+                DocumentDetailsCubit(getIt<PaperlessDocumentsApi>(), document),
           ),
         ],
         child: const DocumentDetailsPage(),
@@ -281,7 +279,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
           ),
         );
       }
-    } on ErrorMessage catch (error, stackTrace) {
+    } on PaperlessServerException catch (error, stackTrace) {
       showErrorMessage(context, error, stackTrace);
     }
   }

lib/features/documents/view/widgets/delete_document_confirmation_dialog.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 
 class DeleteDocumentConfirmationDialog extends StatelessWidget {

lib/features/documents/view/widgets/document_preview.dart

@@ -1,8 +1,8 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/di_initializer.dart';
-import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 import 'package:shimmer/shimmer.dart';
 
 class DocumentPreview extends StatelessWidget {
@@ -30,7 +30,7 @@ class DocumentPreview extends StatelessWidget {
         fit: fit,
         alignment: Alignment.topCenter,
         cacheKey: "thumb_$id",
-        imageUrl: getIt<DocumentRepository>().getThumbnailUrl(id),
+        imageUrl: getIt<PaperlessDocumentsApi>().getThumbnailUrl(id),
         errorWidget: (ctxt, msg, __) => Text(msg),
         placeholder: (context, value) => Shimmer.fromColors(
           baseColor: Colors.grey[300]!,

lib/features/documents/view/widgets/documents_empty_state.dart

@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/widgets/empty_state.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
 import 'package:paperless_mobile/features/saved_view/bloc/saved_view_cubit.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:paperless_mobile/util.dart';
 
 class DocumentsEmptyState extends StatelessWidget {
   final DocumentsState state;

lib/features/documents/view/widgets/grid/document_grid.dart

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/widgets/documents_list_loading_widget.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/grid/document_grid_item.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 

lib/features/documents/view/widgets/grid/document_grid_item.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
 import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
 import 'package:paperless_mobile/features/labels/document_type/view/widgets/document_type_widget.dart';

lib/features/documents/view/widgets/list/document_list.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/widgets/documents_list_loading_widget.dart';
 import 'package:paperless_mobile/core/widgets/offline_widget.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/list/document_list_item.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
-import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 
 class DocumentListView extends StatelessWidget {
   final void Function(DocumentModel) onTap;

lib/features/documents/view/widgets/list/document_list_item.dart

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/document_preview.dart';
 import 'package:paperless_mobile/features/labels/correspondent/view/widgets/correspondent_widget.dart';
-import 'package:paperless_mobile/features/labels/tags/model/tag.model.dart';
 import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
 
 class DocumentListItem extends StatelessWidget {

lib/features/documents/view/widgets/order_by_dropdown.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
+import 'package:paperless_api/paperless_api.dart';
 
 class OrderByDropdown extends StatefulWidget {
   static const fkOrderBy = "orderBy";

lib/features/documents/view/widgets/search/document_filter_panel.dart

@@ -1,25 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/search/query_type_form_field.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/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/features/labels/model/label_state.dart';
+import 'package:paperless_mobile/features/labels/bloc/label_state.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/features/labels/tags/view/widgets/tags_form_field.dart';
 import 'package:paperless_mobile/features/labels/view/widgets/label_form_field.dart';
 import 'package:paperless_mobile/features/saved_view/bloc/saved_view_cubit.dart';
@@ -468,7 +458,7 @@ class _DocumentFilterPanelState extends State<DocumentFilterPanel> {
         BlocProvider.of<SavedViewCubit>(context).resetSelection();
         FocusScope.of(context).unfocus();
         widget.panelController.close();
-      } on ErrorMessage catch (error, stackTrace) {
+      } on PaperlessServerException catch (error, stackTrace) {
         showErrorMessage(context, error, stackTrace);
       }
     }

lib/features/documents/view/widgets/search/query_type_form_field.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/query_type.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 
 class QueryTypeFormField extends StatelessWidget {

lib/features/documents/view/widgets/search/sort_field_selection_bottom_sheet.dart

@@ -1,12 +1,9 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 
@@ -20,16 +17,6 @@ class SortFieldSelectionBottomSheet extends StatefulWidget {
 
 class _SortFieldSelectionBottomSheetState
     extends State<SortFieldSelectionBottomSheet> {
-  static const _sortFields = [
-    SortField.created,
-    SortField.added,
-    SortField.modified,
-    SortField.title,
-    SortField.correspondentName,
-    SortField.documentType,
-    SortField.archiveSerialNumber
-  ];
-
   SortField? _selectedFieldLoading;
   SortOrder? _selectedOrderLoading;
 
@@ -49,7 +36,7 @@ class _SortFieldSelectionBottomSheetState
               ).padded(
                   const EdgeInsets.symmetric(horizontal: 16, vertical: 16)),
               Column(
-                children: _sortFields
+                children: SortField.values
                     .map(
                       (e) => _buildSortOption(
                         e,

lib/features/documents/view/widgets/selection/add_saved_view_page.dart

@@ -1,86 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:form_builder_validators/form_builder_validators.dart';
-
-class AddSavedViewPage extends StatefulWidget {
-  final DocumentFilter currentFilter;
-  const AddSavedViewPage({super.key, required this.currentFilter});
-
-  @override
-  State<AddSavedViewPage> createState() => _AddSavedViewPageState();
-}
-
-class _AddSavedViewPageState extends State<AddSavedViewPage> {
-  static const fkName = 'name';
-  static const fkShowOnDashboard = 'show_on_dashboard';
-  static const fkShowInSidebar = 'show_in_sidebar';
-
-  final GlobalKey<FormBuilderState> _formKey = GlobalKey();
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(S.of(context).savedViewCreateNewLabel),
-        actions: [
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Tooltip(
-              child: const Icon(Icons.info_outline),
-              message: S.of(context).savedViewCreateTooltipText,
-            ),
-          ),
-        ],
-      ),
-      floatingActionButton: FloatingActionButton.extended(
-        icon: const Icon(Icons.add),
-        onPressed: () => _onCreate(context),
-        label: Text(S.of(context).genericActionCreateLabel),
-      ),
-      body: Padding(
-        padding: const EdgeInsets.all(8.0),
-        child: FormBuilder(
-          key: _formKey,
-          child: ListView(
-            children: [
-              FormBuilderTextField(
-                name: fkName,
-                validator: FormBuilderValidators.required(),
-                decoration: InputDecoration(
-                  label: Text(S.of(context).savedViewNameLabel),
-                ),
-              ),
-              FormBuilderCheckbox(
-                name: fkShowOnDashboard,
-                initialValue: false,
-                title: Text(S.of(context).savedViewShowOnDashboardLabel),
-              ),
-              FormBuilderCheckbox(
-                name: fkShowInSidebar,
-                initialValue: false,
-                title: Text(S.of(context).savedViewShowInSidebarLabel),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  void _onCreate(BuildContext context) {
-    if (_formKey.currentState?.saveAndValidate() ?? false) {
-      Navigator.pop(
-        context,
-        SavedView.fromDocumentFilter(
-          widget.currentFilter,
-          name: _formKey.currentState?.value[fkName] as String,
-          showOnDashboard:
-              _formKey.currentState?.value[fkShowOnDashboard] as bool,
-          showInSidebar: _formKey.currentState?.value[fkShowInSidebar] as bool,
-        ),
-      );
-    }
-  }
-}

lib/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/document.model.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 
 class BulkDeleteConfirmationDialog extends StatelessWidget {

lib/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 
 class ConfirmDeleteSavedViewDialog extends StatelessWidget {

lib/features/documents/view/widgets/selection/documents_page_app_bar.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart';
-import 'package:paperless_mobile/features/documents/view/widgets/selection/saved_view_selection_widget.dart';
-import 'package:paperless_mobile/features/documents/view/widgets/sort_documents_button.dart';
+import 'package:paperless_mobile/features/saved_view/view/saved_view_selection_widget.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:paperless_mobile/util.dart';
 
@@ -104,7 +102,7 @@ class _DocumentsPageAppBarState extends State<DocumentsPageAppBar> {
           context,
           S.of(context).documentsPageBulkDeleteSuccessfulText,
         );
-      } on ErrorMessage catch (error, stackTrace) {
+      } on PaperlessServerException catch (error, stackTrace) {
         showErrorMessage(context, error, stackTrace);
       }
     }

lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart

@@ -1,128 +0,0 @@
-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/saved_view.model.dart';
-import 'package:paperless_mobile/features/documents/view/widgets/selection/add_saved_view_page.dart';
-import 'package:paperless_mobile/features/documents/view/widgets/selection/confirm_delete_saved_view_dialog.dart';
-import 'package:paperless_mobile/features/saved_view/bloc/saved_view_cubit.dart';
-import 'package:paperless_mobile/features/saved_view/bloc/saved_view_state.dart';
-import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:paperless_mobile/util.dart';
-
-class SavedViewSelectionWidget extends StatelessWidget {
-  const SavedViewSelectionWidget({
-    Key? key,
-    required this.height,
-    required this.enabled,
-  }) : super(key: key);
-
-  final double height;
-  final bool enabled;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.end,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        BlocBuilder<SavedViewCubit, SavedViewState>(
-          builder: (context, state) {
-            if (state.value.isEmpty) {
-              return Text(S.of(context).savedViewsEmptyStateText);
-            }
-            return SizedBox(
-              height: height,
-              child: ListView.separated(
-                itemCount: state.value.length,
-                scrollDirection: Axis.horizontal,
-                itemBuilder: (context, index) {
-                  final view = state.value.values.elementAt(index);
-                  return GestureDetector(
-                    onLongPress: () => _onDelete(context, view),
-                    child: FilterChip(
-                      label: Text(state.value.values.toList()[index].name),
-                      selected: view.id == state.selectedSavedViewId,
-                      onSelected: enabled
-                          ? (isSelected) =>
-                              _onSelected(isSelected, context, view)
-                          : null,
-                    ),
-                  );
-                },
-                separatorBuilder: (context, index) => const SizedBox(
-                  width: 8.0,
-                ),
-              ),
-            );
-          },
-        ),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text(
-              S.of(context).savedViewsLabel,
-              style: Theme.of(context).textTheme.titleSmall,
-            ),
-            TextButton.icon(
-              icon: const Icon(Icons.add),
-              onPressed: enabled ? () => _onCreatePressed(context) : null,
-              label: Text(S.of(context).savedViewCreateNewLabel),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  void _onCreatePressed(BuildContext context) async {
-    final newView = await Navigator.of(context).push<SavedView?>(
-      MaterialPageRoute(
-        builder: (context) => AddSavedViewPage(
-          currentFilter: getIt<DocumentsCubit>().state.filter,
-        ),
-      ),
-    );
-    if (newView != null) {
-      try {
-        await BlocProvider.of<SavedViewCubit>(context).add(newView);
-      } on ErrorMessage catch (error, stackTrace) {
-        showErrorMessage(context, error, stackTrace);
-      }
-    }
-  }
-
-  void _onSelected(
-      bool isSelected, BuildContext context, SavedView view) async {
-    try {
-      if (isSelected) {
-        BlocProvider.of<DocumentsCubit>(context)
-            .updateFilter(filter: view.toDocumentFilter());
-        BlocProvider.of<SavedViewCubit>(context).selectView(view);
-      } else {
-        BlocProvider.of<DocumentsCubit>(context).updateFilter();
-        BlocProvider.of<SavedViewCubit>(context).selectView(null);
-      }
-    } on ErrorMessage catch (error, stackTrace) {
-      showErrorMessage(context, error, stackTrace);
-    }
-  }
-
-  void _onDelete(BuildContext context, SavedView view) async {
-    {
-      final delete = await showDialog<bool>(
-            context: context,
-            builder: (context) => ConfirmDeleteSavedViewDialog(view: view),
-          ) ??
-          false;
-      if (delete) {
-        try {
-          BlocProvider.of<SavedViewCubit>(context).remove(view);
-        } on ErrorMessage catch (error, stackTrace) {
-          showErrorMessage(context, error, stackTrace);
-        }
-      }
-    }
-  }
-}

lib/features/documents/view/widgets/sort_documents_button.dart

@@ -1,18 +1,8 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:paperless_mobile/core/logic/error_code_localization_mapper.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/bloc/documents_state.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_field.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/sort_order.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:paperless_mobile/features/documents/view/widgets/search/sort_field_selection_bottom_sheet.dart';
-import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:paperless_mobile/util.dart';
 
 class SortDocumentsButton extends StatefulWidget {
   const SortDocumentsButton({