diff --git a/.gitignore b/.gitignore
index 9e5fafc..34bba21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ android/key.properties
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
.vscode/
+*.code-workspace
# Flutter/Dart/Pub related
**/doc/api/
diff --git a/README.md b/README.md
index 9381d68..8866661 100644
--- a/README.md
+++ b/README.md
@@ -227,3 +227,6 @@ Here are some impressions from the app!
Made with [contrib.rocks](https://contrib.rocks).
+## Troubleshooting
+#### Suggestions are not selectable in any of the label form fields
+This is a known issue and it has to do with accessibility features of Android. Password managers such as Bitwarden often caused this issue to occur. Luckily, this can be resolved by turning off the accessibility features in these apps.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c7a26c2..20e446a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -68,11 +68,11 @@ android {
storePassword keystoreProperties['storePassword']
}
}
- buildTypes {
- release {
- signingConfig signingConfigs.release
- }
- }
+ buildTypes {
+ release {
+ signingConfig signingConfigs.release
+ }
+ }
}
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 842ea55..2c66854 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -35,7 +35,7 @@ PODS:
- DKPhotoGallery/Resource (0.0.17):
- SDWebImage
- SwiftyGif
- - edge_detection (1.0.9):
+ - edge_detection (1.1.1):
- Flutter
- WeScan
- file_picker (0.0.1):
@@ -44,6 +44,8 @@ PODS:
- Flutter (1.0.0)
- flutter_keyboard_visibility (0.0.1):
- Flutter
+ - flutter_local_notifications (0.0.1):
+ - Flutter
- flutter_native_splash (0.0.1):
- Flutter
- fluttertoast (0.0.2):
@@ -56,10 +58,13 @@ PODS:
- Flutter
- local_auth_ios (0.0.1):
- Flutter
+ - open_filex (0.0.2):
+ - Flutter
- package_info_plus (0.4.5):
- Flutter
- - path_provider_ios (0.0.1):
+ - path_provider_foundation (0.0.1):
- Flutter
+ - FlutterMacOS
- pdfx (1.0.0):
- Flutter
- permission_handler_apple (9.0.4):
@@ -72,8 +77,9 @@ PODS:
- SDWebImage/Core (5.13.5)
- share_plus (0.0.1):
- Flutter
- - shared_preferences_ios (0.0.1):
+ - shared_preferences_foundation (0.0.1):
- Flutter
+ - FlutterMacOS
- sqflite (0.0.2):
- Flutter
- FMDB (>= 2.7.5)
@@ -90,17 +96,19 @@ DEPENDENCIES:
- file_picker (from `.symlinks/plugins/file_picker/ios`)
- Flutter (from `Flutter`)
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
+ - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
+ - open_filex (from `.symlinks/plugins/open_filex/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+ - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- pdfx (from `.symlinks/plugins/pdfx/ios`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
+ - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -128,6 +136,8 @@ EXTERNAL SOURCES:
:path: Flutter
flutter_keyboard_visibility:
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
+ flutter_local_notifications:
+ :path: ".symlinks/plugins/flutter_local_notifications/ios"
flutter_native_splash:
:path: ".symlinks/plugins/flutter_native_splash/ios"
fluttertoast:
@@ -136,10 +146,12 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/integration_test/ios"
local_auth_ios:
:path: ".symlinks/plugins/local_auth_ios/ios"
+ open_filex:
+ :path: ".symlinks/plugins/open_filex/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
- path_provider_ios:
- :path: ".symlinks/plugins/path_provider_ios/ios"
+ path_provider_foundation:
+ :path: ".symlinks/plugins/path_provider_foundation/darwin"
pdfx:
:path: ".symlinks/plugins/pdfx/ios"
permission_handler_apple:
@@ -148,8 +160,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/receive_sharing_intent/ios"
share_plus:
:path: ".symlinks/plugins/share_plus/ios"
- shared_preferences_ios:
- :path: ".symlinks/plugins/shared_preferences_ios/ios"
+ shared_preferences_foundation:
+ :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
url_launcher_ios:
@@ -160,28 +172,30 @@ SPEC CHECKSUMS:
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
- edge_detection: 9bc5ee35073b5a17c0b3b679908f01017ce3062a
- file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
+ edge_detection: fa02aa120e00d87ada0ca2430b6c6087a501b1e9
+ file_picker: ce3938a0df3cc1ef404671531facef740d03f920
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
+ flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
- fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b
+ fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
local_auth_ios: 0d333dde7780f669e66f19d2ff6005f3ea84008d
+ open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
- path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+ path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
pdfx: 7b876b09de8b7a0bf444a4f82b439ffcff4ee1ec
permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
SDWebImage: 23d714cd599354ee7906dbae26dff89b421c4370
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
- shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
+ shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
- url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+ url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
WeScan: fed582f6c38014d529afb5aa9ffd1bad38fc72b7
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 664648c..1653b15 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 51;
+ objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -321,10 +321,12 @@
};
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
+ "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
@@ -335,6 +337,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 6cb665f..a837d1a 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -65,5 +65,7 @@
CADisableMinimumFrameDurationOnPhone
-
+ UIApplicationSupportsIndirectInputEvents
+
+
diff --git a/lib/constants.dart b/lib/constants.dart
new file mode 100644
index 0000000..2a86892
--- /dev/null
+++ b/lib/constants.dart
@@ -0,0 +1,7 @@
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+
+// Globally accessible variables which are definitely initialized after main().
+late final PackageInfo packageInfo;
+late final AndroidDeviceInfo? androidInfo;
+late final IosDeviceInfo? iosInfo;
diff --git a/lib/core/bloc/paperless_server_information_cubit.dart b/lib/core/bloc/paperless_server_information_cubit.dart
index 3c48eca..3067d8f 100644
--- a/lib/core/bloc/paperless_server_information_cubit.dart
+++ b/lib/core/bloc/paperless_server_information_cubit.dart
@@ -1,7 +1,6 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/bloc/paperless_server_information_state.dart';
-import 'package:paperless_mobile/core/security/session_manager.dart';
class PaperlessServerInformationCubit
extends Cubit {
diff --git a/lib/core/model/paperless_statistics_state.dart b/lib/core/model/paperless_statistics_state.dart
deleted file mode 100644
index 12fede2..0000000
--- a/lib/core/model/paperless_statistics_state.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:paperless_api/paperless_api.dart';
-
-class PaperlessStatisticsState {
- final bool isLoaded;
- final PaperlessServerStatisticsModel? statistics;
-
- PaperlessStatisticsState({
- required this.isLoaded,
- this.statistics,
- });
-}
diff --git a/lib/core/notifier/document_changed_notifier.dart b/lib/core/notifier/document_changed_notifier.dart
new file mode 100644
index 0000000..c53dedc
--- /dev/null
+++ b/lib/core/notifier/document_changed_notifier.dart
@@ -0,0 +1,54 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:flutter/foundation.dart';
+import 'package:paperless_api/paperless_api.dart';
+import 'package:rxdart/subjects.dart';
+
+typedef DocumentChangedCallback = void Function(DocumentModel document);
+
+class DocumentChangedNotifier {
+ final Subject _updated = PublishSubject();
+ final Subject _deleted = PublishSubject();
+
+ final Map> _subscribers = {};
+
+ void notifyUpdated(DocumentModel updated) {
+ debugPrint("Notifying updated document ${updated.id}");
+ _updated.add(updated);
+ }
+
+ void notifyDeleted(DocumentModel deleted) {
+ debugPrint("Notifying deleted document ${deleted.id}");
+ _deleted.add(deleted);
+ }
+
+ void subscribe(
+ dynamic subscriber, {
+ DocumentChangedCallback? onUpdated,
+ DocumentChangedCallback? onDeleted,
+ }) {
+ _subscribers.putIfAbsent(
+ subscriber,
+ () => [
+ _updated.listen((value) {
+ onUpdated?.call(value);
+ }),
+ _deleted.listen((value) {
+ onDeleted?.call(value);
+ }),
+ ],
+ );
+ }
+
+ void unsubscribe(dynamic subscriber) {
+ _subscribers[subscriber]?.forEach((element) {
+ element.cancel();
+ });
+ }
+
+ void close() {
+ _updated.close();
+ _deleted.close();
+ }
+}
diff --git a/lib/core/repository/base_repository.dart b/lib/core/repository/base_repository.dart
index f0c4589..1eb57c4 100644
--- a/lib/core/repository/base_repository.dart
+++ b/lib/core/repository/base_repository.dart
@@ -1,30 +1,30 @@
import 'package:hydrated_bloc/hydrated_bloc.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
import 'package:rxdart/subjects.dart';
///
/// Base repository class which all repositories should implement
///
-abstract class BaseRepository
- extends Cubit with HydratedMixin {
- final State _initialState;
+abstract class BaseRepository extends Cubit>
+ with HydratedMixin {
+ final IndexedRepositoryState _initialState;
BaseRepository(this._initialState) : super(_initialState) {
hydrate();
}
- Stream get values =>
+ Stream?> get values =>
BehaviorSubject.seeded(state)..addStream(super.stream);
- State? get current => state;
+ IndexedRepositoryState? get current => state;
bool get isInitialized => state.hasLoaded;
- Future create(Type object);
- Future find(int id);
- Future> findAll([Iterable? ids]);
- Future update(Type object);
- Future delete(Type object);
+ Future create(T object);
+ Future find(int id);
+ Future> findAll([Iterable? ids]);
+ Future update(T object);
+ Future delete(T object);
@override
Future clear() async {
diff --git a/lib/core/repository/impl/correspondent_repository_impl.dart b/lib/core/repository/impl/correspondent_repository_impl.dart
index 4b676ac..7227c58 100644
--- a/lib/core/repository/impl/correspondent_repository_impl.dart
+++ b/lib/core/repository/impl/correspondent_repository_impl.dart
@@ -3,10 +3,8 @@ import 'dart:async';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/repository/label_repository.dart';
import 'package:paperless_mobile/core/repository/state/impl/correspondent_repository_state.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
-class CorrespondentRepositoryImpl
- extends LabelRepository {
+class CorrespondentRepositoryImpl extends LabelRepository {
final PaperlessLabelsApi _api;
CorrespondentRepositoryImpl(this._api)
@@ -15,7 +13,7 @@ class CorrespondentRepositoryImpl
@override
Future create(Correspondent correspondent) async {
final created = await _api.saveCorrespondent(correspondent);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..putIfAbsent(created.id!, () => created);
emit(CorrespondentRepositoryState(values: updatedState, hasLoaded: true));
return created;
@@ -24,7 +22,7 @@ class CorrespondentRepositoryImpl
@override
Future delete(Correspondent correspondent) async {
await _api.deleteCorrespondent(correspondent);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..removeWhere((k, v) => k == correspondent.id);
emit(CorrespondentRepositoryState(values: updatedState, hasLoaded: true));
return correspondent.id!;
@@ -34,7 +32,7 @@ class CorrespondentRepositoryImpl
Future find(int id) async {
final correspondent = await _api.getCorrespondent(id);
if (correspondent != null) {
- final updatedState = {...state.values}..[id] = correspondent;
+ final updatedState = {...state.values ?? {}}..[id] = correspondent;
emit(CorrespondentRepositoryState(values: updatedState, hasLoaded: true));
return correspondent;
}
@@ -44,7 +42,7 @@ class CorrespondentRepositoryImpl
@override
Future> findAll([Iterable? ids]) async {
final correspondents = await _api.getCorrespondents(ids);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..addEntries(correspondents.map((e) => MapEntry(e.id!, e)));
emit(CorrespondentRepositoryState(values: updatedState, hasLoaded: true));
return correspondents;
@@ -53,7 +51,8 @@ class CorrespondentRepositoryImpl
@override
Future update(Correspondent correspondent) async {
final updated = await _api.updateCorrespondent(correspondent);
- final updatedState = {...state.values}..update(updated.id!, (_) => updated);
+ final updatedState = {...state.values ?? {}}
+ ..update(updated.id!, (_) => updated);
emit(CorrespondentRepositoryState(values: updatedState, hasLoaded: true));
return updated;
}
@@ -64,7 +63,7 @@ class CorrespondentRepositoryImpl
}
@override
- Map toJson(CorrespondentRepositoryState state) {
+ Map toJson(covariant CorrespondentRepositoryState state) {
return state.toJson();
}
}
diff --git a/lib/core/repository/impl/document_type_repository_impl.dart b/lib/core/repository/impl/document_type_repository_impl.dart
index 1e1ae92..5fd7a87 100644
--- a/lib/core/repository/impl/document_type_repository_impl.dart
+++ b/lib/core/repository/impl/document_type_repository_impl.dart
@@ -1,10 +1,8 @@
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/repository/label_repository.dart';
import 'package:paperless_mobile/core/repository/state/impl/document_type_repository_state.dart';
-import 'package:rxdart/rxdart.dart' show BehaviorSubject;
-class DocumentTypeRepositoryImpl
- extends LabelRepository {
+class DocumentTypeRepositoryImpl extends LabelRepository {
final PaperlessLabelsApi _api;
DocumentTypeRepositoryImpl(this._api)
@@ -13,7 +11,7 @@ class DocumentTypeRepositoryImpl
@override
Future create(DocumentType documentType) async {
final created = await _api.saveDocumentType(documentType);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..putIfAbsent(created.id!, () => created);
emit(DocumentTypeRepositoryState(values: updatedState, hasLoaded: true));
return created;
@@ -22,7 +20,7 @@ class DocumentTypeRepositoryImpl
@override
Future delete(DocumentType documentType) async {
await _api.deleteDocumentType(documentType);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..removeWhere((k, v) => k == documentType.id);
emit(DocumentTypeRepositoryState(values: updatedState, hasLoaded: true));
return documentType.id!;
@@ -32,7 +30,7 @@ class DocumentTypeRepositoryImpl
Future find(int id) async {
final documentType = await _api.getDocumentType(id);
if (documentType != null) {
- final updatedState = {...state.values}..[id] = documentType;
+ final updatedState = {...state.values ?? {}}..[id] = documentType;
emit(DocumentTypeRepositoryState(values: updatedState, hasLoaded: true));
return documentType;
}
@@ -42,7 +40,7 @@ class DocumentTypeRepositoryImpl
@override
Future> findAll([Iterable? ids]) async {
final documentTypes = await _api.getDocumentTypes(ids);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..addEntries(documentTypes.map((e) => MapEntry(e.id!, e)));
emit(DocumentTypeRepositoryState(values: updatedState, hasLoaded: true));
return documentTypes;
@@ -51,7 +49,8 @@ class DocumentTypeRepositoryImpl
@override
Future update(DocumentType documentType) async {
final updated = await _api.updateDocumentType(documentType);
- final updatedState = {...state.values}..update(updated.id!, (_) => updated);
+ final updatedState = {...state.values ?? {}}
+ ..update(updated.id!, (_) => updated);
emit(DocumentTypeRepositoryState(values: updatedState, hasLoaded: true));
return updated;
}
@@ -62,7 +61,7 @@ class DocumentTypeRepositoryImpl
}
@override
- Map toJson(DocumentTypeRepositoryState state) {
+ Map toJson(covariant DocumentTypeRepositoryState state) {
return state.toJson();
}
}
diff --git a/lib/core/repository/impl/saved_view_repository_impl.dart b/lib/core/repository/impl/saved_view_repository_impl.dart
index b5e03aa..18eceed 100644
--- a/lib/core/repository/impl/saved_view_repository_impl.dart
+++ b/lib/core/repository/impl/saved_view_repository_impl.dart
@@ -10,7 +10,7 @@ class SavedViewRepositoryImpl extends SavedViewRepository {
@override
Future create(SavedView object) async {
final created = await _api.save(object);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..putIfAbsent(created.id!, () => created);
emit(SavedViewRepositoryState(values: updatedState, hasLoaded: true));
return created;
@@ -19,7 +19,7 @@ class SavedViewRepositoryImpl extends SavedViewRepository {
@override
Future delete(SavedView view) async {
await _api.delete(view);
- final updatedState = {...state.values}..remove(view.id);
+ final updatedState = {...state.values ?? {}}..remove(view.id);
emit(SavedViewRepositoryState(values: updatedState, hasLoaded: true));
return view.id!;
}
@@ -27,7 +27,7 @@ class SavedViewRepositoryImpl extends SavedViewRepository {
@override
Future find(int id) async {
final found = await _api.find(id);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..update(id, (_) => found, ifAbsent: () => found);
emit(SavedViewRepositoryState(values: updatedState, hasLoaded: true));
return found;
@@ -37,7 +37,7 @@ class SavedViewRepositoryImpl extends SavedViewRepository {
Future> findAll([Iterable? ids]) async {
final found = await _api.findAll(ids);
final updatedState = {
- ...state.values,
+ ...state.values ?? {},
...{for (final view in found) view.id!: view},
};
emit(SavedViewRepositoryState(values: updatedState, hasLoaded: true));
@@ -56,7 +56,7 @@ class SavedViewRepositoryImpl extends SavedViewRepository {
}
@override
- Map toJson(SavedViewRepositoryState state) {
+ Map toJson(covariant SavedViewRepositoryState state) {
return state.toJson();
}
}
diff --git a/lib/core/repository/impl/storage_path_repository_impl.dart b/lib/core/repository/impl/storage_path_repository_impl.dart
index b738827..1fb54ea 100644
--- a/lib/core/repository/impl/storage_path_repository_impl.dart
+++ b/lib/core/repository/impl/storage_path_repository_impl.dart
@@ -3,8 +3,7 @@ import 'package:paperless_mobile/core/repository/label_repository.dart';
import 'package:paperless_mobile/core/repository/state/impl/storage_path_repository_state.dart';
import 'package:rxdart/rxdart.dart' show BehaviorSubject;
-class StoragePathRepositoryImpl
- extends LabelRepository {
+class StoragePathRepositoryImpl extends LabelRepository {
final PaperlessLabelsApi _api;
StoragePathRepositoryImpl(this._api)
@@ -13,7 +12,7 @@ class StoragePathRepositoryImpl
@override
Future create(StoragePath storagePath) async {
final created = await _api.saveStoragePath(storagePath);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..putIfAbsent(created.id!, () => created);
emit(StoragePathRepositoryState(values: updatedState, hasLoaded: true));
return created;
@@ -22,7 +21,7 @@ class StoragePathRepositoryImpl
@override
Future delete(StoragePath storagePath) async {
await _api.deleteStoragePath(storagePath);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..removeWhere((k, v) => k == storagePath.id);
emit(StoragePathRepositoryState(values: updatedState, hasLoaded: true));
return storagePath.id!;
@@ -32,7 +31,7 @@ class StoragePathRepositoryImpl
Future find(int id) async {
final storagePath = await _api.getStoragePath(id);
if (storagePath != null) {
- final updatedState = {...state.values}..[id] = storagePath;
+ final updatedState = {...state.values ?? {}}..[id] = storagePath;
emit(StoragePathRepositoryState(values: updatedState, hasLoaded: true));
return storagePath;
}
@@ -42,7 +41,7 @@ class StoragePathRepositoryImpl
@override
Future> findAll([Iterable? ids]) async {
final storagePaths = await _api.getStoragePaths(ids);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..addEntries(storagePaths.map((e) => MapEntry(e.id!, e)));
emit(StoragePathRepositoryState(values: updatedState, hasLoaded: true));
return storagePaths;
@@ -51,7 +50,8 @@ class StoragePathRepositoryImpl
@override
Future update(StoragePath storagePath) async {
final updated = await _api.updateStoragePath(storagePath);
- final updatedState = {...state.values}..update(updated.id!, (_) => updated);
+ final updatedState = {...state.values ?? {}}
+ ..update(updated.id!, (_) => updated);
emit(StoragePathRepositoryState(values: updatedState, hasLoaded: true));
return updated;
}
@@ -62,7 +62,7 @@ class StoragePathRepositoryImpl
}
@override
- Map toJson(StoragePathRepositoryState state) {
+ Map toJson(covariant StoragePathRepositoryState state) {
return state.toJson();
}
}
diff --git a/lib/core/repository/impl/tag_repository_impl.dart b/lib/core/repository/impl/tag_repository_impl.dart
index 09f6061..a39a77b 100644
--- a/lib/core/repository/impl/tag_repository_impl.dart
+++ b/lib/core/repository/impl/tag_repository_impl.dart
@@ -1,10 +1,8 @@
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/repository/label_repository.dart';
-import 'package:paperless_mobile/core/repository/state/impl/correspondent_repository_state.dart';
import 'package:paperless_mobile/core/repository/state/impl/tag_repository_state.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
-class TagRepositoryImpl extends LabelRepository {
+class TagRepositoryImpl extends LabelRepository {
final PaperlessLabelsApi _api;
TagRepositoryImpl(this._api) : super(const TagRepositoryState());
@@ -12,7 +10,7 @@ class TagRepositoryImpl extends LabelRepository {
@override
Future create(Tag object) async {
final created = await _api.saveTag(object);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..putIfAbsent(created.id!, () => created);
emit(TagRepositoryState(values: updatedState, hasLoaded: true));
return created;
@@ -21,7 +19,8 @@ class TagRepositoryImpl extends LabelRepository {
@override
Future delete(Tag tag) async {
await _api.deleteTag(tag);
- final updatedState = {...state.values}..removeWhere((k, v) => k == tag.id);
+ final updatedState = {...state.values ?? {}}
+ ..removeWhere((k, v) => k == tag.id);
emit(TagRepositoryState(values: updatedState, hasLoaded: true));
return tag.id!;
}
@@ -30,7 +29,7 @@ class TagRepositoryImpl extends LabelRepository {
Future find(int id) async {
final tag = await _api.getTag(id);
if (tag != null) {
- final updatedState = {...state.values}..[id] = tag;
+ final updatedState = {...state.values ?? {}}..[id] = tag;
emit(TagRepositoryState(values: updatedState, hasLoaded: true));
return tag;
}
@@ -40,7 +39,7 @@ class TagRepositoryImpl extends LabelRepository {
@override
Future> findAll([Iterable? ids]) async {
final tags = await _api.getTags(ids);
- final updatedState = {...state.values}
+ final updatedState = {...state.values ?? {}}
..addEntries(tags.map((e) => MapEntry(e.id!, e)));
emit(TagRepositoryState(values: updatedState, hasLoaded: true));
return tags;
@@ -49,7 +48,8 @@ class TagRepositoryImpl extends LabelRepository {
@override
Future update(Tag tag) async {
final updated = await _api.updateTag(tag);
- final updatedState = {...state.values}..update(updated.id!, (_) => updated);
+ final updatedState = {...state.values ?? {}}
+ ..update(updated.id!, (_) => updated);
emit(TagRepositoryState(values: updatedState, hasLoaded: true));
return updated;
}
@@ -60,7 +60,7 @@ class TagRepositoryImpl extends LabelRepository {
}
@override
- Map? toJson(TagRepositoryState state) {
+ Map? toJson(covariant TagRepositoryState state) {
return state.toJson();
}
}
diff --git a/lib/core/repository/label_repository.dart b/lib/core/repository/label_repository.dart
index c2aa3bc..8fe3458 100644
--- a/lib/core/repository/label_repository.dart
+++ b/lib/core/repository/label_repository.dart
@@ -1,8 +1,7 @@
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/repository/base_repository.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
-abstract class LabelRepository
- extends BaseRepository {
- LabelRepository(State initial) : super(initial);
+abstract class LabelRepository extends BaseRepository {
+ LabelRepository(IndexedRepositoryState initial) : super(initial);
}
diff --git a/lib/core/repository/provider/label_repositories_provider.dart b/lib/core/repository/provider/label_repositories_provider.dart
index d45c792..e9634be 100644
--- a/lib/core/repository/provider/label_repositories_provider.dart
+++ b/lib/core/repository/provider/label_repositories_provider.dart
@@ -17,20 +17,16 @@ class LabelRepositoriesProvider extends StatelessWidget {
return MultiRepositoryProvider(
providers: [
RepositoryProvider(
- create: (context) => context.read<
- LabelRepository>(),
+ create: (context) => context.read>(),
),
RepositoryProvider(
- create: (context) => context.read<
- LabelRepository>(),
+ create: (context) => context.read>(),
),
RepositoryProvider(
- create: (context) => context
- .read>(),
+ create: (context) => context.read>(),
),
RepositoryProvider(
- create: (context) =>
- context.read>(),
+ create: (context) => context.read>(),
),
],
child: child,
diff --git a/lib/core/repository/saved_view_repository.dart b/lib/core/repository/saved_view_repository.dart
index 644f367..bb1c4e3 100644
--- a/lib/core/repository/saved_view_repository.dart
+++ b/lib/core/repository/saved_view_repository.dart
@@ -1,8 +1,8 @@
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/repository/base_repository.dart';
import 'package:paperless_mobile/core/repository/state/impl/saved_view_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
-abstract class SavedViewRepository
- extends BaseRepository {
+abstract class SavedViewRepository extends BaseRepository {
SavedViewRepository(super.initialState);
}
diff --git a/lib/core/repository/state/impl/correspondent_repository_state.dart b/lib/core/repository/state/impl/correspondent_repository_state.dart
index 5fb88ee..fce9efb 100644
--- a/lib/core/repository/state/impl/correspondent_repository_state.dart
+++ b/lib/core/repository/state/impl/correspondent_repository_state.dart
@@ -1,13 +1,13 @@
import 'package:flutter/foundation.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
part 'correspondent_repository_state.g.dart';
@JsonSerializable()
class CorrespondentRepositoryState
- extends RepositoryState> {
+ extends IndexedRepositoryState {
const CorrespondentRepositoryState({
super.values = const {},
super.hasLoaded,
diff --git a/lib/core/repository/state/impl/correspondent_repository_state.g.dart b/lib/core/repository/state/impl/correspondent_repository_state.g.dart
index 08e2976..405f4ff 100644
--- a/lib/core/repository/state/impl/correspondent_repository_state.g.dart
+++ b/lib/core/repository/state/impl/correspondent_repository_state.g.dart
@@ -20,6 +20,6 @@ CorrespondentRepositoryState _$CorrespondentRepositoryStateFromJson(
Map _$CorrespondentRepositoryStateToJson(
CorrespondentRepositoryState instance) =>
{
- 'values': instance.values.map((k, e) => MapEntry(k.toString(), e)),
+ 'values': instance.values?.map((k, e) => MapEntry(k.toString(), e)),
'hasLoaded': instance.hasLoaded,
};
diff --git a/lib/core/repository/state/impl/document_type_repository_state.dart b/lib/core/repository/state/impl/document_type_repository_state.dart
index 7ce5188..4a4ab1f 100644
--- a/lib/core/repository/state/impl/document_type_repository_state.dart
+++ b/lib/core/repository/state/impl/document_type_repository_state.dart
@@ -1,20 +1,21 @@
import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
import 'package:json_annotation/json_annotation.dart';
part 'document_type_repository_state.g.dart';
@JsonSerializable()
-class DocumentTypeRepositoryState
- extends RepositoryState> {
+class DocumentTypeRepositoryState extends IndexedRepositoryState {
const DocumentTypeRepositoryState({
super.values = const {},
super.hasLoaded,
});
@override
- DocumentTypeRepositoryState copyWith(
- {Map? values, bool? hasLoaded}) {
+ DocumentTypeRepositoryState copyWith({
+ Map? values,
+ bool? hasLoaded,
+ }) {
return DocumentTypeRepositoryState(
values: values ?? this.values,
hasLoaded: hasLoaded ?? this.hasLoaded,
diff --git a/lib/core/repository/state/impl/document_type_repository_state.g.dart b/lib/core/repository/state/impl/document_type_repository_state.g.dart
index 6868bd6..3528b96 100644
--- a/lib/core/repository/state/impl/document_type_repository_state.g.dart
+++ b/lib/core/repository/state/impl/document_type_repository_state.g.dart
@@ -20,6 +20,6 @@ DocumentTypeRepositoryState _$DocumentTypeRepositoryStateFromJson(
Map _$DocumentTypeRepositoryStateToJson(
DocumentTypeRepositoryState instance) =>
{
- 'values': instance.values.map((k, e) => MapEntry(k.toString(), e)),
+ 'values': instance.values?.map((k, e) => MapEntry(k.toString(), e)),
'hasLoaded': instance.hasLoaded,
};
diff --git a/lib/core/repository/state/impl/saved_view_repository_state.dart b/lib/core/repository/state/impl/saved_view_repository_state.dart
index ecd9e49..9cd7672 100644
--- a/lib/core/repository/state/impl/saved_view_repository_state.dart
+++ b/lib/core/repository/state/impl/saved_view_repository_state.dart
@@ -1,11 +1,11 @@
import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
import 'package:json_annotation/json_annotation.dart';
part 'saved_view_repository_state.g.dart';
@JsonSerializable()
-class SavedViewRepositoryState extends RepositoryState> {
+class SavedViewRepositoryState extends IndexedRepositoryState {
const SavedViewRepositoryState({
super.values = const {},
super.hasLoaded = false,
diff --git a/lib/core/repository/state/impl/saved_view_repository_state.g.dart b/lib/core/repository/state/impl/saved_view_repository_state.g.dart
index 4cc61b9..bfcc949 100644
--- a/lib/core/repository/state/impl/saved_view_repository_state.g.dart
+++ b/lib/core/repository/state/impl/saved_view_repository_state.g.dart
@@ -20,6 +20,6 @@ SavedViewRepositoryState _$SavedViewRepositoryStateFromJson(
Map _$SavedViewRepositoryStateToJson(
SavedViewRepositoryState instance) =>
{
- 'values': instance.values.map((k, e) => MapEntry(k.toString(), e)),
+ 'values': instance.values?.map((k, e) => MapEntry(k.toString(), e)),
'hasLoaded': instance.hasLoaded,
};
diff --git a/lib/core/repository/state/impl/storage_path_repository_state.dart b/lib/core/repository/state/impl/storage_path_repository_state.dart
index 366db8e..b9ed856 100644
--- a/lib/core/repository/state/impl/storage_path_repository_state.dart
+++ b/lib/core/repository/state/impl/storage_path_repository_state.dart
@@ -1,20 +1,21 @@
import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
import 'package:json_annotation/json_annotation.dart';
part 'storage_path_repository_state.g.dart';
@JsonSerializable()
-class StoragePathRepositoryState
- extends RepositoryState> {
+class StoragePathRepositoryState extends IndexedRepositoryState {
const StoragePathRepositoryState({
super.values = const {},
super.hasLoaded = false,
});
@override
- StoragePathRepositoryState copyWith(
- {Map? values, bool? hasLoaded}) {
+ StoragePathRepositoryState copyWith({
+ Map? values,
+ bool? hasLoaded,
+ }) {
return StoragePathRepositoryState(
values: values ?? this.values,
hasLoaded: hasLoaded ?? this.hasLoaded,
diff --git a/lib/core/repository/state/impl/storage_path_repository_state.g.dart b/lib/core/repository/state/impl/storage_path_repository_state.g.dart
index 4be8ad5..75ac365 100644
--- a/lib/core/repository/state/impl/storage_path_repository_state.g.dart
+++ b/lib/core/repository/state/impl/storage_path_repository_state.g.dart
@@ -20,6 +20,6 @@ StoragePathRepositoryState _$StoragePathRepositoryStateFromJson(
Map _$StoragePathRepositoryStateToJson(
StoragePathRepositoryState instance) =>
{
- 'values': instance.values.map((k, e) => MapEntry(k.toString(), e)),
+ 'values': instance.values?.map((k, e) => MapEntry(k.toString(), e)),
'hasLoaded': instance.hasLoaded,
};
diff --git a/lib/core/repository/state/impl/tag_repository_state.dart b/lib/core/repository/state/impl/tag_repository_state.dart
index 6e0e261..4558bfe 100644
--- a/lib/core/repository/state/impl/tag_repository_state.dart
+++ b/lib/core/repository/state/impl/tag_repository_state.dart
@@ -1,18 +1,21 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/state/repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/indexed_repository_state.dart';
part 'tag_repository_state.g.dart';
@JsonSerializable()
-class TagRepositoryState extends RepositoryState> {
+class TagRepositoryState extends IndexedRepositoryState {
const TagRepositoryState({
super.values = const {},
super.hasLoaded = false,
});
@override
- TagRepositoryState copyWith({Map? values, bool? hasLoaded}) {
+ TagRepositoryState copyWith({
+ Map? values,
+ bool? hasLoaded,
+ }) {
return TagRepositoryState(
values: values ?? this.values,
hasLoaded: hasLoaded ?? this.hasLoaded,
diff --git a/lib/core/repository/state/impl/tag_repository_state.g.dart b/lib/core/repository/state/impl/tag_repository_state.g.dart
index 02e8bd0..09e04ee 100644
--- a/lib/core/repository/state/impl/tag_repository_state.g.dart
+++ b/lib/core/repository/state/impl/tag_repository_state.g.dart
@@ -18,6 +18,6 @@ TagRepositoryState _$TagRepositoryStateFromJson(Map json) =>
Map _$TagRepositoryStateToJson(TagRepositoryState instance) =>
{
- 'values': instance.values.map((k, e) => MapEntry(k.toString(), e)),
+ 'values': instance.values?.map((k, e) => MapEntry(k.toString(), e)),
'hasLoaded': instance.hasLoaded,
};
diff --git a/lib/core/repository/state/indexed_repository_state.dart b/lib/core/repository/state/indexed_repository_state.dart
new file mode 100644
index 0000000..d3caee5
--- /dev/null
+++ b/lib/core/repository/state/indexed_repository_state.dart
@@ -0,0 +1,16 @@
+abstract class IndexedRepositoryState {
+ final Map? values;
+ final bool hasLoaded;
+
+ const IndexedRepositoryState({
+ required this.values,
+ this.hasLoaded = false,
+ }) : assert(!(values == null) || !hasLoaded);
+
+ IndexedRepositoryState.loaded(this.values) : hasLoaded = true;
+
+ IndexedRepositoryState copyWith({
+ Map? values,
+ bool? hasLoaded,
+ });
+}
diff --git a/lib/core/repository/state/repository_state.dart b/lib/core/repository/state/repository_state.dart
deleted file mode 100644
index 7498a33..0000000
--- a/lib/core/repository/state/repository_state.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-abstract class RepositoryState {
- final T values;
- final bool hasLoaded;
-
- const RepositoryState({
- required this.values,
- this.hasLoaded = false,
- });
-
- RepositoryState.loaded(this.values) : hasLoaded = true;
-
- RepositoryState copyWith({
- T? values,
- bool? hasLoaded,
- });
-}
diff --git a/lib/core/security/security_context_utils.dart b/lib/core/security/security_context_utils.dart
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/core/service/github_issue_service.dart b/lib/core/service/github_issue_service.dart
index 38568b9..b4e1d79 100644
--- a/lib/core/service/github_issue_service.dart
+++ b/lib/core/service/github_issue_service.dart
@@ -27,7 +27,7 @@ class GithubIssueService {
..tryPutIfAbsent('assignees', () => assignees?.join(','))
..tryPutIfAbsent('project', () => project),
);
- log("[GitHubIssueService] Creating GitHub issue: " + uri.toString());
+ debugPrint("[GitHubIssueService] Creating GitHub issue: " + uri.toString());
launchUrl(
uri,
mode: LaunchMode.externalApplication,
diff --git a/lib/core/service/status_service.dart b/lib/core/service/status_service.dart
index 76b2428..dce014d 100644
--- a/lib/core/service/status_service.dart
+++ b/lib/core/service/status_service.dart
@@ -8,7 +8,7 @@ import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/bloc/document_status_cubit.dart';
import 'package:paperless_mobile/core/model/document_processing_status.dart';
import 'package:paperless_mobile/features/login/model/authentication_information.dart';
-import 'package:paperless_mobile/util.dart';
+import 'package:paperless_mobile/constants.dart';
import 'package:web_socket_channel/io.dart';
abstract class StatusService {
diff --git a/lib/core/store/local_vault.dart b/lib/core/store/local_vault.dart
deleted file mode 100644
index 9859e8f..0000000
--- a/lib/core/store/local_vault.dart
+++ /dev/null
@@ -1,77 +0,0 @@
-import 'dart:convert';
-
-import 'package:encrypted_shared_preferences/encrypted_shared_preferences.dart';
-import 'package:flutter/foundation.dart';
-import 'package:paperless_mobile/core/type/types.dart';
-import 'package:paperless_mobile/features/login/model/authentication_information.dart';
-import 'package:paperless_mobile/features/login/model/client_certificate.dart';
-import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
-
-abstract class LocalVault {
- Future storeAuthenticationInformation(AuthenticationInformation auth);
- Future loadAuthenticationInformation();
- Future loadCertificate();
- Future storeApplicationSettings(ApplicationSettingsState settings);
- Future loadApplicationSettings();
- Future clear();
-}
-
-class LocalVaultImpl implements LocalVault {
- static const applicationSettingsKey = "applicationSettings";
- static const authenticationKey = "authentication";
-
- final EncryptedSharedPreferences sharedPreferences;
-
- LocalVaultImpl(this.sharedPreferences);
-
- @override
- Future storeAuthenticationInformation(
- AuthenticationInformation auth,
- ) async {
- await sharedPreferences.setString(
- authenticationKey,
- jsonEncode(auth.toJson()),
- );
- }
-
- @override
- Future loadAuthenticationInformation() async {
- if ((await sharedPreferences.getString(authenticationKey)).isEmpty) {
- return null;
- }
- return AuthenticationInformation.fromJson(
- jsonDecode(await sharedPreferences.getString(authenticationKey)),
- );
- }
-
- @override
- Future loadCertificate() async {
- return loadAuthenticationInformation()
- .then((value) => value?.clientCertificate);
- }
-
- @override
- Future storeApplicationSettings(ApplicationSettingsState settings) {
- return sharedPreferences.setString(
- applicationSettingsKey,
- jsonEncode(settings.toJson()),
- );
- }
-
- @override
- Future loadApplicationSettings() async {
- final settings = await sharedPreferences.getString(applicationSettingsKey);
- if (settings.isEmpty) {
- return null;
- }
- return compute(
- ApplicationSettingsState.fromJson,
- jsonDecode(settings) as JSON,
- );
- }
-
- @override
- Future clear() {
- return sharedPreferences.clear();
- }
-}
diff --git a/lib/core/translation/color_scheme_option_localization_mapper.dart b/lib/core/translation/color_scheme_option_localization_mapper.dart
new file mode 100644
index 0000000..c4b3f76
--- /dev/null
+++ b/lib/core/translation/color_scheme_option_localization_mapper.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:paperless_mobile/features/settings/model/color_scheme_option.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+
+String translateColorSchemeOption(
+ BuildContext context, ColorSchemeOption option) {
+ switch (option) {
+ case ColorSchemeOption.classic:
+ return S.of(context).colorSchemeOptionClassic;
+ case ColorSchemeOption.dynamic:
+ return S.of(context).colorSchemeOptionDynamic;
+ }
+}
diff --git a/lib/core/translation/sort_field_localization_mapper.dart b/lib/core/translation/sort_field_localization_mapper.dart
new file mode 100644
index 0000000..e707b6e
--- /dev/null
+++ b/lib/core/translation/sort_field_localization_mapper.dart
@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+
+String translateSortField(BuildContext context, SortField? sortField) {
+ switch (sortField) {
+ case SortField.archiveSerialNumber:
+ return S.of(context).documentArchiveSerialNumberPropertyShortLabel;
+ case SortField.correspondentName:
+ return S.of(context).documentCorrespondentPropertyLabel;
+ case SortField.title:
+ return S.of(context).documentTitlePropertyLabel;
+ case SortField.documentType:
+ return S.of(context).documentDocumentTypePropertyLabel;
+ case SortField.created:
+ return S.of(context).documentCreatedPropertyLabel;
+ case SortField.added:
+ return S.of(context).documentAddedPropertyLabel;
+ case SortField.modified:
+ return S.of(context).documentModifiedPropertyLabel;
+ default:
+ return '';
+ }
+}
diff --git a/lib/core/type/types.dart b/lib/core/type/types.dart
index 3ed65fa..a133cbf 100644
--- a/lib/core/type/types.dart
+++ b/lib/core/type/types.dart
@@ -1,3 +1,6 @@
+import 'package:paperless_api/paperless_api.dart';
+import 'package:rxdart/subjects.dart';
+
typedef JSON = Map;
typedef PaperlessValidationErrors = Map;
typedef PaperlessLocalizedErrorMessage = String;
diff --git a/lib/core/widgets/app_options_popup_menu.dart b/lib/core/widgets/app_options_popup_menu.dart
new file mode 100644
index 0000000..f02feb5
--- /dev/null
+++ b/lib/core/widgets/app_options_popup_menu.dart
@@ -0,0 +1,217 @@
+// import 'package:flutter/material.dart';
+// import 'package:flutter_bloc/flutter_bloc.dart';
+// import 'package:paperless_mobile/constants.dart';
+// import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+// import 'package:paperless_mobile/features/settings/bloc/application_settings_state.dart';
+// import 'package:paperless_mobile/features/settings/model/view_type.dart';
+// import 'package:paperless_mobile/features/settings/view/settings_page.dart';
+// import 'package:paperless_mobile/generated/l10n.dart';
+// import 'package:url_launcher/link.dart';
+// import 'package:url_launcher/url_launcher_string.dart';
+
+// /// Declares selectable actions in menu.
+// enum AppPopupMenuEntries {
+// // Documents preview
+// documentsSelectListView,
+// documentsSelectGridView,
+// // Generic actions
+// openAboutThisAppDialog,
+// reportBug,
+// openSettings,
+// // Adds a divider
+// divider;
+// }
+
+// class AppOptionsPopupMenu extends StatelessWidget {
+// final List displayedActions;
+// const AppOptionsPopupMenu({
+// super.key,
+// required this.displayedActions,
+// });
+
+// @override
+// Widget build(BuildContext context) {
+// return PopupMenuButton(
+// position: PopupMenuPosition.under,
+// icon: const Icon(Icons.more_vert),
+// onSelected: (action) {
+// switch (action) {
+// case AppPopupMenuEntries.documentsSelectListView:
+// context.read().setViewType(ViewType.list);
+// break;
+// case AppPopupMenuEntries.documentsSelectGridView:
+// context.read().setViewType(ViewType.grid);
+// break;
+// case AppPopupMenuEntries.openAboutThisAppDialog:
+// _showAboutDialog(context);
+// break;
+// case AppPopupMenuEntries.openSettings:
+// Navigator.of(context).push(
+// MaterialPageRoute(
+// builder: (context) => BlocProvider.value(
+// value: context.read(),
+// child: const SettingsPage(),
+// ),
+// ),
+// );
+// break;
+// case AppPopupMenuEntries.reportBug:
+// launchUrlString(
+// 'https://github.com/astubenbord/paperless-mobile/issues/new',
+// );
+// break;
+// default:
+// break;
+// }
+// },
+// itemBuilder: _buildEntries,
+// );
+// }
+
+// PopupMenuItem _buildReportBugTile(BuildContext context) {
+// return PopupMenuItem(
+// value: AppPopupMenuEntries.reportBug,
+// padding: EdgeInsets.zero,
+// child: ListTile(
+// leading: const Icon(Icons.bug_report),
+// title: Text(S.of(context).appDrawerReportBugLabel),
+// ),
+// );
+// }
+
+// PopupMenuItem _buildSettingsTile(BuildContext context) {
+// return PopupMenuItem(
+// padding: EdgeInsets.zero,
+// value: AppPopupMenuEntries.openSettings,
+// child: ListTile(
+// leading: const Icon(Icons.settings_outlined),
+// title: Text(S.of(context).appDrawerSettingsLabel),
+// ),
+// );
+// }
+
+// PopupMenuItem _buildAboutTile(BuildContext context) {
+// return PopupMenuItem(
+// padding: EdgeInsets.zero,
+// value: AppPopupMenuEntries.openAboutThisAppDialog,
+// child: ListTile(
+// leading: const Icon(Icons.info_outline),
+// title: Text(S.of(context).appDrawerAboutLabel),
+// ),
+// );
+// }
+
+// PopupMenuItem _buildListViewTile() {
+// return PopupMenuItem(
+// padding: EdgeInsets.zero,
+// child: BlocBuilder(
+// builder: (context, state) {
+// return ListTile(
+// leading: const Icon(Icons.list),
+// title: const Text("List"),
+// trailing: state.preferredViewType == ViewType.list
+// ? const Icon(Icons.check)
+// : null,
+// );
+// },
+// ),
+// value: AppPopupMenuEntries.documentsSelectListView,
+// );
+// }
+
+// PopupMenuItem _buildGridViewTile() {
+// return PopupMenuItem(
+// value: AppPopupMenuEntries.documentsSelectGridView,
+// padding: EdgeInsets.zero,
+// child: BlocBuilder(
+// builder: (context, state) {
+// return ListTile(
+// leading: const Icon(Icons.grid_view_rounded),
+// title: const Text("Grid"),
+// trailing: state.preferredViewType == ViewType.grid
+// ? const Icon(Icons.check)
+// : null,
+// );
+// },
+// ),
+// );
+// }
+
+// void _showAboutDialog(BuildContext context) {
+// showAboutDialog(
+// context: context,
+// applicationIcon: const ImageIcon(
+// AssetImage('assets/logos/paperless_logo_green.png'),
+// ),
+// applicationName: 'Paperless Mobile',
+// applicationVersion: packageInfo.version + '+' + packageInfo.buildNumber,
+// children: [
+// Text(S.of(context).aboutDialogDevelopedByText('Anton Stubenbord')),
+// Link(
+// uri: Uri.parse('https://github.com/astubenbord/paperless-mobile'),
+// builder: (context, followLink) => GestureDetector(
+// onTap: followLink,
+// child: Text(
+// 'https://github.com/astubenbord/paperless-mobile',
+// style: TextStyle(color: Theme.of(context).colorScheme.tertiary),
+// ),
+// ),
+// ),
+// const SizedBox(height: 16),
+// Text(
+// 'Credits',
+// style: Theme.of(context).textTheme.titleMedium,
+// ),
+// _buildOnboardingImageCredits(),
+// ],
+// );
+// }
+
+// Widget _buildOnboardingImageCredits() {
+// return Link(
+// uri: Uri.parse(
+// 'https://www.freepik.com/free-vector/business-team-working-cogwheel-mechanism-together_8270974.htm#query=setting&position=4&from_view=author'),
+// builder: (context, followLink) => Wrap(
+// children: [
+// const Text('Onboarding images by '),
+// GestureDetector(
+// onTap: followLink,
+// child: Text(
+// 'pch.vector',
+// style: TextStyle(color: Theme.of(context).colorScheme.tertiary),
+// ),
+// ),
+// const Text(' on Freepik.')
+// ],
+// ),
+// );
+// }
+
+// List> _buildEntries(
+// BuildContext context) {
+// List> items = [];
+// for (final entry in displayedActions) {
+// switch (entry) {
+// case AppPopupMenuEntries.documentsSelectListView:
+// items.add(_buildListViewTile());
+// break;
+// case AppPopupMenuEntries.documentsSelectGridView:
+// items.add(_buildGridViewTile());
+// break;
+// case AppPopupMenuEntries.openAboutThisAppDialog:
+// items.add(_buildAboutTile(context));
+// break;
+// case AppPopupMenuEntries.reportBug:
+// items.add(_buildReportBugTile(context));
+// break;
+// case AppPopupMenuEntries.openSettings:
+// items.add(_buildSettingsTile(context));
+// break;
+// case AppPopupMenuEntries.divider:
+// items.add(const PopupMenuDivider());
+// break;
+// }
+// }
+// return items;
+// }
+// }
diff --git a/lib/core/widgets/documents_list_loading_widget.dart b/lib/core/widgets/documents_list_loading_widget.dart
deleted file mode 100644
index 6f0f920..0000000
--- a/lib/core/widgets/documents_list_loading_widget.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:shimmer/shimmer.dart';
-
-class DocumentsListLoadingWidget extends StatelessWidget {
- final List above;
- final List below;
- static const tags = [" ", " ", " "];
- static const titleLengths = [double.infinity, 150.0, 200.0];
- static const correspondentLengths = [200.0, 300.0, 150.0];
- static const fontSize = 16.0;
-
- const DocumentsListLoadingWidget({
- super.key,
- this.above = const [],
- this.below = const [],
- });
-
- @override
- Widget build(BuildContext context) {
- return ListView(
- children: [
- ...above,
- ...List.generate(25, (idx) {
- final r = Random(idx);
- final tagCount = r.nextInt(tags.length + 1);
- final correspondentLength =
- correspondentLengths[r.nextInt(correspondentLengths.length - 1)];
- final titleLength = titleLengths[r.nextInt(titleLengths.length - 1)];
- return Shimmer.fromColors(
- baseColor: Theme.of(context).brightness == Brightness.light
- ? Colors.grey[300]!
- : Colors.grey[900]!,
- highlightColor: Theme.of(context).brightness == Brightness.light
- ? Colors.grey[100]!
- : Colors.grey[600]!,
- child: ListTile(
- contentPadding: const EdgeInsets.all(8),
- dense: true,
- isThreeLine: true,
- leading: ClipRRect(
- borderRadius: BorderRadius.circular(8),
- child: Container(
- color: Colors.white,
- height: 50,
- width: 35,
- ),
- ),
- title: Container(
- padding: const EdgeInsets.symmetric(vertical: 2.0),
- width: correspondentLength,
- height: fontSize,
- color: Colors.white,
- ),
- subtitle: Padding(
- padding: const EdgeInsets.symmetric(vertical: 2.0),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Container(
- padding: const EdgeInsets.symmetric(vertical: 2.0),
- height: fontSize,
- width: titleLength,
- color: Colors.white,
- ),
- Wrap(
- spacing: 2.0,
- children: List.generate(
- tagCount,
- (index) => InputChip(
- label: Text(tags[r.nextInt(tags.length)]),
- ),
- ),
- ).paddedOnly(top: 4),
- ],
- ),
- ),
- ),
- );
- }).toList(),
- ...below,
- ],
- );
- }
-}
diff --git a/lib/core/widgets/hint_card.dart b/lib/core/widgets/hint_card.dart
index 27b6ddb..03a5120 100644
--- a/lib/core/widgets/hint_card.dart
+++ b/lib/core/widgets/hint_card.dart
@@ -6,6 +6,7 @@ import 'package:paperless_mobile/generated/l10n.dart';
class HintCard extends StatelessWidget {
final String hintText;
final double elevation;
+ final IconData hintIcon;
final VoidCallback? onHintAcknowledged;
final bool show;
const HintCard({
@@ -13,7 +14,8 @@ class HintCard extends StatelessWidget {
required this.hintText,
this.onHintAcknowledged,
this.elevation = 1,
- required this.show,
+ this.show = true,
+ this.hintIcon = Icons.tips_and_updates_outlined,
});
@override
@@ -31,16 +33,19 @@ class HintCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(
- Icons.tips_and_updates_outlined,
+ hintIcon,
color: Theme.of(context).hintColor,
).padded(),
- Align(
- alignment: Alignment.center,
- child: Text(
- hintText,
- softWrap: true,
- textAlign: TextAlign.center,
- style: Theme.of(context).textTheme.bodySmall,
+ Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Align(
+ alignment: Alignment.center,
+ child: Text(
+ hintText,
+ softWrap: true,
+ textAlign: TextAlign.center,
+ style: Theme.of(context).textTheme.bodySmall,
+ ),
),
),
if (onHintAcknowledged != null)
@@ -52,7 +57,7 @@ class HintCard extends StatelessWidget {
),
)
else
- Padding(padding: EdgeInsets.only(bottom: 24)),
+ const Padding(padding: EdgeInsets.only(bottom: 24)),
],
).padded(),
).padded(),
diff --git a/lib/core/widgets/material/search/m3_search.dart b/lib/core/widgets/material/search/m3_search.dart
new file mode 100644
index 0000000..dc01985
--- /dev/null
+++ b/lib/core/widgets/material/search/m3_search.dart
@@ -0,0 +1,602 @@
+//TODO: REMOVE THIS WHEN NATIVE MATERIAL FLUTTER SEARCH IS RELEASED
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+/// Shows a full screen search page and returns the search result selected by
+/// the user when the page is closed.
+///
+/// The search page consists of an app bar with a search field and a body which
+/// can either show suggested search queries or the search results.
+///
+/// The appearance of the search page is determined by the provided
+/// `delegate`. The initial query string is given by `query`, which defaults
+/// to the empty string. When `query` is set to null, `delegate.query` will
+/// be used as the initial query.
+///
+/// This method returns the selected search result, which can be set in the
+/// [SearchDelegate.close] call. If the search page is closed with the system
+/// back button, it returns null.
+///
+/// A given [SearchDelegate] can only be associated with one active [showMaterial3Search]
+/// call. Call [SearchDelegate.close] before re-using the same delegate instance
+/// for another [showMaterial3Search] call.
+///
+/// The `useRootNavigator` argument is used to determine whether to push the
+/// search page to the [Navigator] furthest from or nearest to the given
+/// `context`. By default, `useRootNavigator` is `false` and the search page
+/// route created by this method is pushed to the nearest navigator to the
+/// given `context`. It can not be `null`.
+///
+/// The transition to the search page triggered by this method looks best if the
+/// screen triggering the transition contains an [AppBar] at the top and the
+/// transition is called from an [IconButton] that's part of [AppBar.actions].
+/// The animation provided by [SearchDelegate.transitionAnimation] can be used
+/// to trigger additional animations in the underlying page while the search
+/// page fades in or out. This is commonly used to animate an [AnimatedIcon] in
+/// the [AppBar.leading] position e.g. from the hamburger menu to the back arrow
+/// used to exit the search page.
+///
+/// ## Handling emojis and other complex characters
+/// {@macro flutter.widgets.EditableText.onChanged}
+///
+/// See also:
+///
+/// * [SearchDelegate] to define the content of the search page.
+Future showMaterial3Search({
+ required BuildContext context,
+ required SearchDelegate delegate,
+ String? query = '',
+ bool useRootNavigator = false,
+}) {
+ delegate.query = query ?? delegate.query;
+ delegate._currentBody = _SearchBody.suggestions;
+ return Navigator.of(context, rootNavigator: useRootNavigator)
+ .push(_SearchPageRoute(
+ delegate: delegate,
+ ));
+}
+
+/// Delegate for [showMaterial3Search] to define the content of the search page.
+///
+/// The search page always shows an [AppBar] at the top where users can
+/// enter their search queries. The buttons shown before and after the search
+/// query text field can be customized via [SearchDelegate.buildLeading]
+/// and [SearchDelegate.buildActions]. Additionally, a widget can be placed
+/// across the bottom of the [AppBar] via [SearchDelegate.buildBottom].
+///
+/// The body below the [AppBar] can either show suggested queries (returned by
+/// [SearchDelegate.buildSuggestions]) or - once the user submits a search - the
+/// results of the search as returned by [SearchDelegate.buildResults].
+///
+/// [SearchDelegate.query] always contains the current query entered by the user
+/// and should be used to build the suggestions and results.
+///
+/// The results can be brought on screen by calling [SearchDelegate.showResults]
+/// and you can go back to showing the suggestions by calling
+/// [SearchDelegate.showSuggestions].
+///
+/// Once the user has selected a search result, [SearchDelegate.close] should be
+/// called to remove the search page from the top of the navigation stack and
+/// to notify the caller of [showMaterial3Search] about the selected search result.
+///
+/// A given [SearchDelegate] can only be associated with one active [showMaterial3Search]
+/// call. Call [SearchDelegate.close] before re-using the same delegate instance
+/// for another [showMaterial3Search] call.
+///
+/// ## Handling emojis and other complex characters
+/// {@macro flutter.widgets.EditableText.onChanged}
+abstract class SearchDelegate {
+ /// Constructor to be called by subclasses which may specify
+ /// [searchFieldLabel], either [searchFieldStyle] or [searchFieldDecorationTheme],
+ /// [keyboardType] and/or [textInputAction]. Only one of [searchFieldLabel]
+ /// and [searchFieldDecorationTheme] may be non-null.
+ ///
+ /// {@tool snippet}
+ /// ```dart
+ /// class CustomSearchHintDelegate extends SearchDelegate {
+ /// CustomSearchHintDelegate({
+ /// required String hintText,
+ /// }) : super(
+ /// searchFieldLabel: hintText,
+ /// keyboardType: TextInputType.text,
+ /// textInputAction: TextInputAction.search,
+ /// );
+ ///
+ /// @override
+ /// Widget buildLeading(BuildContext context) => const Text('leading');
+ ///
+ /// @override
+ /// PreferredSizeWidget buildBottom(BuildContext context) {
+ /// return const PreferredSize(
+ /// preferredSize: Size.fromHeight(56.0),
+ /// child: Text('bottom'));
+ /// }
+ ///
+ /// @override
+ /// Widget buildSuggestions(BuildContext context) => const Text('suggestions');
+ ///
+ /// @override
+ /// Widget buildResults(BuildContext context) => const Text('results');
+ ///
+ /// @override
+ /// List buildActions(BuildContext context) => [];
+ /// }
+ /// ```
+ /// {@end-tool}
+ SearchDelegate({
+ this.searchFieldLabel,
+ this.searchFieldStyle,
+ this.searchFieldDecorationTheme,
+ this.keyboardType,
+ this.textInputAction = TextInputAction.search,
+ }) : assert(searchFieldStyle == null || searchFieldDecorationTheme == null);
+
+ /// Suggestions shown in the body of the search page while the user types a
+ /// query into the search field.
+ ///
+ /// The delegate method is called whenever the content of [query] changes.
+ /// The suggestions should be based on the current [query] string. If the query
+ /// string is empty, it is good practice to show suggested queries based on
+ /// past queries or the current context.
+ ///
+ /// Usually, this method will return a [ListView] with one [ListTile] per
+ /// suggestion. When [ListTile.onTap] is called, [query] should be updated
+ /// with the corresponding suggestion and the results page should be shown
+ /// by calling [showResults].
+ Widget buildSuggestions(BuildContext context);
+
+ /// The results shown after the user submits a search from the search page.
+ ///
+ /// The current value of [query] can be used to determine what the user
+ /// searched for.
+ ///
+ /// This method might be applied more than once to the same query.
+ /// If your [buildResults] method is computationally expensive, you may want
+ /// to cache the search results for one or more queries.
+ ///
+ /// Typically, this method returns a [ListView] with the search results.
+ /// When the user taps on a particular search result, [close] should be called
+ /// with the selected result as argument. This will close the search page and
+ /// communicate the result back to the initial caller of [showMaterial3Search].
+ Widget buildResults(BuildContext context);
+
+ /// A widget to display before the current query in the [AppBar].
+ ///
+ /// Typically an [IconButton] configured with a [BackButtonIcon] that exits
+ /// the search with [close]. One can also use an [AnimatedIcon] driven by
+ /// [transitionAnimation], which animates from e.g. a hamburger menu to the
+ /// back button as the search overlay fades in.
+ ///
+ /// Returns null if no widget should be shown.
+ ///
+ /// See also:
+ ///
+ /// * [AppBar.leading], the intended use for the return value of this method.
+ Widget? buildLeading(BuildContext context);
+
+ /// Widgets to display after the search query in the [AppBar].
+ ///
+ /// If the [query] is not empty, this should typically contain a button to
+ /// clear the query and show the suggestions again (via [showSuggestions]) if
+ /// the results are currently shown.
+ ///
+ /// Returns null if no widget should be shown.
+ ///
+ /// See also:
+ ///
+ /// * [AppBar.actions], the intended use for the return value of this method.
+ List? buildActions(BuildContext context);
+
+ /// Widget to display across the bottom of the [AppBar].
+ ///
+ /// Returns null by default, i.e. a bottom widget is not included.
+ ///
+ /// See also:
+ ///
+ /// * [AppBar.bottom], the intended use for the return value of this method.
+ ///
+ PreferredSizeWidget? buildBottom(BuildContext context) => null;
+
+ /// The theme used to configure the search page.
+ ///
+ /// The returned [ThemeData] will be used to wrap the entire search page,
+ /// so it can be used to configure any of its components with the appropriate
+ /// theme properties.
+ ///
+ /// Unless overridden, the default theme will configure the AppBar containing
+ /// the search input text field with a white background and black text on light
+ /// themes. For dark themes the default is a dark grey background with light
+ /// color text.
+ ///
+ /// See also:
+ ///
+ /// * [AppBarTheme], which configures the AppBar's appearance.
+ /// * [InputDecorationTheme], which configures the appearance of the search
+ /// text field.
+ ThemeData appBarTheme(BuildContext context) {
+ final ThemeData theme = Theme.of(context);
+ final ColorScheme colorScheme = theme.colorScheme;
+ return theme.copyWith(
+ appBarTheme: AppBarTheme(
+ systemOverlayStyle: colorScheme.brightness == Brightness.light
+ ? SystemUiOverlayStyle.light
+ : SystemUiOverlayStyle.dark,
+ backgroundColor: colorScheme.brightness == Brightness.dark
+ ? Colors.grey[900]
+ : Colors.white,
+ iconTheme: theme.primaryIconTheme.copyWith(color: Colors.grey),
+ ),
+ inputDecorationTheme: searchFieldDecorationTheme ??
+ InputDecorationTheme(
+ hintStyle: searchFieldStyle ?? theme.inputDecorationTheme.hintStyle,
+ border: InputBorder.none,
+ ),
+ );
+ }
+
+ /// The current query string shown in the [AppBar].
+ ///
+ /// The user manipulates this string via the keyboard.
+ ///
+ /// If the user taps on a suggestion provided by [buildSuggestions] this
+ /// string should be updated to that suggestion via the setter.
+ String get query => _queryTextController.text;
+
+ /// Changes the current query string.
+ ///
+ /// Setting the query string programmatically moves the cursor to the end of the text field.
+ set query(String value) {
+ assert(query != null);
+ _queryTextController.text = value;
+ if (_queryTextController.text.isNotEmpty) {
+ _queryTextController.selection = TextSelection.fromPosition(
+ TextPosition(offset: _queryTextController.text.length));
+ }
+ }
+
+ /// Transition from the suggestions returned by [buildSuggestions] to the
+ /// [query] results returned by [buildResults].
+ ///
+ /// If the user taps on a suggestion provided by [buildSuggestions] the
+ /// screen should typically transition to the page showing the search
+ /// results for the suggested query. This transition can be triggered
+ /// by calling this method.
+ ///
+ /// See also:
+ ///
+ /// * [showSuggestions] to show the search suggestions again.
+ void showResults(BuildContext context) {
+ _focusNode?.unfocus();
+ _currentBody = _SearchBody.results;
+ }
+
+ /// Transition from showing the results returned by [buildResults] to showing
+ /// the suggestions returned by [buildSuggestions].
+ ///
+ /// Calling this method will also put the input focus back into the search
+ /// field of the [AppBar].
+ ///
+ /// If the results are currently shown this method can be used to go back
+ /// to showing the search suggestions.
+ ///
+ /// See also:
+ ///
+ /// * [showResults] to show the search results.
+ void showSuggestions(BuildContext context) {
+ assert(_focusNode != null,
+ '_focusNode must be set by route before showSuggestions is called.');
+ _focusNode!.requestFocus();
+ _currentBody = _SearchBody.suggestions;
+ }
+
+ /// Closes the search page and returns to the underlying route.
+ ///
+ /// The value provided for `result` is used as the return value of the call
+ /// to [showMaterial3Search] that launched the search initially.
+ void close(BuildContext context, T result) {
+ _currentBody = null;
+ _focusNode?.unfocus();
+ Navigator.of(context)
+ ..popUntil((Route route) => route == _route)
+ ..pop(result);
+ }
+
+ /// The hint text that is shown in the search field when it is empty.
+ ///
+ /// If this value is set to null, the value of
+ /// `MaterialLocalizations.of(context).searchFieldLabel` will be used instead.
+ final String? searchFieldLabel;
+
+ /// The style of the [searchFieldLabel].
+ ///
+ /// If this value is set to null, the value of the ambient [Theme]'s
+ /// [InputDecorationTheme.hintStyle] will be used instead.
+ ///
+ /// Only one of [searchFieldStyle] or [searchFieldDecorationTheme] can
+ /// be non-null.
+ final TextStyle? searchFieldStyle;
+
+ /// The [InputDecorationTheme] used to configure the search field's visuals.
+ ///
+ /// Only one of [searchFieldStyle] or [searchFieldDecorationTheme] can
+ /// be non-null.
+ final InputDecorationTheme? searchFieldDecorationTheme;
+
+ /// The type of action button to use for the keyboard.
+ ///
+ /// Defaults to the default value specified in [TextField].
+ final TextInputType? keyboardType;
+
+ /// The text input action configuring the soft keyboard to a particular action
+ /// button.
+ ///
+ /// Defaults to [TextInputAction.search].
+ final TextInputAction textInputAction;
+
+ /// [Animation] triggered when the search pages fades in or out.
+ ///
+ /// This animation is commonly used to animate [AnimatedIcon]s of
+ /// [IconButton]s returned by [buildLeading] or [buildActions]. It can also be
+ /// used to animate [IconButton]s contained within the route below the search
+ /// page.
+ Animation get transitionAnimation => _proxyAnimation;
+
+ // The focus node to use for manipulating focus on the search page. This is
+ // managed, owned, and set by the _SearchPageRoute using this delegate.
+ FocusNode? _focusNode;
+
+ final TextEditingController _queryTextController = TextEditingController();
+
+ final ProxyAnimation _proxyAnimation =
+ ProxyAnimation(kAlwaysDismissedAnimation);
+
+ final ValueNotifier<_SearchBody?> _currentBodyNotifier =
+ ValueNotifier<_SearchBody?>(null);
+
+ _SearchBody? get _currentBody => _currentBodyNotifier.value;
+ set _currentBody(_SearchBody? value) {
+ _currentBodyNotifier.value = value;
+ }
+
+ _SearchPageRoute? _route;
+}
+
+/// Describes the body that is currently shown under the [AppBar] in the
+/// search page.
+enum _SearchBody {
+ /// Suggested queries are shown in the body.
+ ///
+ /// The suggested queries are generated by [SearchDelegate.buildSuggestions].
+ suggestions,
+
+ /// Search results are currently shown in the body.
+ ///
+ /// The search results are generated by [SearchDelegate.buildResults].
+ results,
+}
+
+class _SearchPageRoute extends PageRoute {
+ _SearchPageRoute({
+ required this.delegate,
+ }) {
+ assert(
+ delegate._route == null,
+ 'The ${delegate.runtimeType} instance is currently used by another active '
+ 'search. Please close that search by calling close() on the SearchDelegate '
+ 'before opening another search with the same delegate instance.',
+ );
+ delegate._route = this;
+ }
+
+ final SearchDelegate delegate;
+
+ @override
+ Color? get barrierColor => null;
+
+ @override
+ String? get barrierLabel => null;
+
+ @override
+ Duration get transitionDuration => const Duration(milliseconds: 300);
+
+ @override
+ bool get maintainState => false;
+
+ @override
+ Widget buildTransitions(
+ BuildContext context,
+ Animation animation,
+ Animation secondaryAnimation,
+ Widget child,
+ ) {
+ return FadeTransition(
+ opacity: animation,
+ child: child,
+ );
+ }
+
+ @override
+ Animation createAnimation() {
+ final Animation animation = super.createAnimation();
+ delegate._proxyAnimation.parent = animation;
+ return animation;
+ }
+
+ @override
+ Widget buildPage(
+ BuildContext context,
+ Animation animation,
+ Animation secondaryAnimation,
+ ) {
+ return _SearchPage(
+ delegate: delegate,
+ animation: animation,
+ );
+ }
+
+ @override
+ void didComplete(T? result) {
+ super.didComplete(result);
+ assert(delegate._route == this);
+ delegate._route = null;
+ delegate._currentBody = null;
+ }
+}
+
+class _SearchPage extends StatefulWidget {
+ const _SearchPage({
+ required this.delegate,
+ required this.animation,
+ });
+
+ final SearchDelegate delegate;
+ final Animation animation;
+
+ @override
+ State createState() => _SearchPageState();
+}
+
+class _SearchPageState extends State<_SearchPage> {
+ // This node is owned, but not hosted by, the search page. Hosting is done by
+ // the text field.
+ FocusNode focusNode = FocusNode();
+
+ @override
+ void initState() {
+ super.initState();
+ widget.delegate._queryTextController.addListener(_onQueryChanged);
+ widget.animation.addStatusListener(_onAnimationStatusChanged);
+ widget.delegate._currentBodyNotifier.addListener(_onSearchBodyChanged);
+ focusNode.addListener(_onFocusChanged);
+ widget.delegate._focusNode = focusNode;
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ widget.delegate._queryTextController.removeListener(_onQueryChanged);
+ widget.animation.removeStatusListener(_onAnimationStatusChanged);
+ widget.delegate._currentBodyNotifier.removeListener(_onSearchBodyChanged);
+ widget.delegate._focusNode = null;
+ focusNode.dispose();
+ }
+
+ void _onAnimationStatusChanged(AnimationStatus status) {
+ if (status != AnimationStatus.completed) {
+ return;
+ }
+ widget.animation.removeStatusListener(_onAnimationStatusChanged);
+ if (widget.delegate._currentBody == _SearchBody.suggestions) {
+ focusNode.requestFocus();
+ }
+ }
+
+ @override
+ void didUpdateWidget(_SearchPage oldWidget) {
+ super.didUpdateWidget(oldWidget);
+ if (widget.delegate != oldWidget.delegate) {
+ oldWidget.delegate._queryTextController.removeListener(_onQueryChanged);
+ widget.delegate._queryTextController.addListener(_onQueryChanged);
+ oldWidget.delegate._currentBodyNotifier
+ .removeListener(_onSearchBodyChanged);
+ widget.delegate._currentBodyNotifier.addListener(_onSearchBodyChanged);
+ oldWidget.delegate._focusNode = null;
+ widget.delegate._focusNode = focusNode;
+ }
+ }
+
+ void _onFocusChanged() {
+ if (focusNode.hasFocus &&
+ widget.delegate._currentBody != _SearchBody.suggestions) {
+ widget.delegate.showSuggestions(context);
+ }
+ }
+
+ void _onQueryChanged() {
+ setState(() {
+ // rebuild ourselves because query changed.
+ });
+ }
+
+ void _onSearchBodyChanged() {
+ setState(() {
+ // rebuild ourselves because search body changed.
+ });
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ assert(debugCheckHasMaterialLocalizations(context));
+ final ThemeData theme = widget.delegate.appBarTheme(context);
+ final String searchFieldLabel = widget.delegate.searchFieldLabel ??
+ MaterialLocalizations.of(context).searchFieldLabel;
+ Widget? body;
+ switch (widget.delegate._currentBody) {
+ case _SearchBody.suggestions:
+ body = KeyedSubtree(
+ key: const ValueKey<_SearchBody>(_SearchBody.suggestions),
+ child: widget.delegate.buildSuggestions(context),
+ );
+ break;
+ case _SearchBody.results:
+ body = KeyedSubtree(
+ key: const ValueKey<_SearchBody>(_SearchBody.results),
+ child: widget.delegate.buildResults(context),
+ );
+ break;
+ case null:
+ break;
+ }
+
+ late final String routeName;
+ switch (theme.platform) {
+ case TargetPlatform.iOS:
+ case TargetPlatform.macOS:
+ routeName = '';
+ break;
+ case TargetPlatform.android:
+ case TargetPlatform.fuchsia:
+ case TargetPlatform.linux:
+ case TargetPlatform.windows:
+ routeName = searchFieldLabel;
+ }
+
+ return Semantics(
+ explicitChildNodes: true,
+ scopesRoute: true,
+ namesRoute: true,
+ label: routeName,
+ child: Theme(
+ data: theme,
+ child: Scaffold(
+ appBar: AppBar(
+ toolbarHeight: 72,
+ leading: widget.delegate.buildLeading(context),
+ title: TextField(
+ controller: widget.delegate._queryTextController,
+ focusNode: focusNode,
+ style: widget.delegate.searchFieldStyle ??
+ theme.textTheme.titleLarge,
+ textInputAction: widget.delegate.textInputAction,
+ keyboardType: widget.delegate.keyboardType,
+ onSubmitted: (String _) {
+ widget.delegate.showResults(context);
+ },
+ decoration: InputDecoration(hintText: searchFieldLabel),
+ ),
+ actions: widget.delegate.buildActions(context),
+ bottom: widget.delegate.buildBottom(context),
+ ),
+ body: AnimatedSwitcher(
+ duration: const Duration(milliseconds: 300),
+ child: body,
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/core/widgets/material/search/m3_search_bar.dart b/lib/core/widgets/material/search/m3_search_bar.dart
new file mode 100644
index 0000000..dafcea1
--- /dev/null
+++ b/lib/core/widgets/material/search/m3_search_bar.dart
@@ -0,0 +1,79 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+
+class SearchBar extends StatelessWidget {
+ const SearchBar({
+ Key? key,
+ this.height = 56,
+ required this.leadingIcon,
+ this.trailingIcon,
+ required this.supportingText,
+ required this.onTap,
+ }) : super(key: key);
+
+ final double height;
+ double get effectiveHeight {
+ return max(height, 48);
+ }
+
+ final VoidCallback onTap;
+ final Widget leadingIcon;
+ final Widget? trailingIcon;
+
+ final String supportingText;
+
+ @override
+ Widget build(BuildContext context) {
+ final ColorScheme colorScheme = Theme.of(context).colorScheme;
+ final TextTheme textTheme = Theme.of(context).textTheme;
+
+ return Container(
+ constraints: const BoxConstraints(minWidth: 360, maxWidth: 720),
+ width: double.infinity,
+ height: effectiveHeight,
+ child: Material(
+ elevation: 1,
+ color: colorScheme.surface,
+ shadowColor: colorScheme.shadow,
+ surfaceTintColor: colorScheme.surfaceTint,
+ borderRadius: BorderRadius.circular(effectiveHeight / 2),
+ child: InkWell(
+ onTap: onTap,
+ borderRadius: BorderRadius.circular(effectiveHeight / 2),
+ highlightColor: Colors.transparent,
+ splashFactory: InkRipple.splashFactory,
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 8),
+ child: Row(children: [
+ leadingIcon,
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.only(right: 8),
+ child: TextField(
+ onTap: onTap,
+ readOnly: true,
+ enabled: false,
+ cursorColor: colorScheme.primary,
+ style: textTheme.bodyLarge,
+ textAlignVertical: TextAlignVertical.center,
+ decoration: InputDecoration(
+ isCollapsed: true,
+ border: InputBorder.none,
+ contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+ hintText: supportingText,
+ hintStyle: textTheme.bodyLarge?.apply(
+ color: colorScheme.onSurfaceVariant,
+ ),
+ ),
+ ),
+ ),
+ ),
+ if (trailingIcon != null) trailingIcon!,
+ ]),
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/core/widgets/paperless_logo.dart b/lib/core/widgets/paperless_logo.dart
index 1f5b08b..38e3b0e 100644
--- a/lib/core/widgets/paperless_logo.dart
+++ b/lib/core/widgets/paperless_logo.dart
@@ -2,18 +2,25 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
class PaperlessLogo extends StatelessWidget {
+ static const _paperlessGreen = Color(0xFF18541F);
final double? height;
final double? width;
- final String _path;
+ final Color _color;
- const PaperlessLogo.white({super.key, this.height, this.width})
- : _path = "assets/logos/paperless_logo_white.svg";
+ const PaperlessLogo.white({
+ super.key,
+ this.height,
+ this.width,
+ }) : _color = Colors.white;
const PaperlessLogo.green({super.key, this.height, this.width})
- : _path = "assets/logos/paperless_logo_green.svg";
+ : _color = _paperlessGreen;
const PaperlessLogo.black({super.key, this.height, this.width})
- : _path = "assets/logos/paperless_logo_black.svg";
+ : _color = Colors.black;
+
+ const PaperlessLogo.colored(Color color, {super.key, this.height, this.width})
+ : _color = color;
@override
Widget build(BuildContext context) {
@@ -24,7 +31,8 @@ class PaperlessLogo extends StatelessWidget {
),
padding: const EdgeInsets.only(right: 8),
child: SvgPicture.asset(
- _path,
+ "assets/logos/paperless_logo_white.svg",
+ color: _color,
),
);
}
diff --git a/lib/core/widgets/shimmer_placeholder.dart b/lib/core/widgets/shimmer_placeholder.dart
new file mode 100644
index 0000000..d3b41be
--- /dev/null
+++ b/lib/core/widgets/shimmer_placeholder.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:shimmer/shimmer.dart';
+
+class ShimmerPlaceholder extends StatelessWidget {
+ final Widget child;
+
+ const ShimmerPlaceholder({super.key, required this.child});
+
+ @override
+ Widget build(BuildContext context) {
+ return Shimmer.fromColors(
+ baseColor: Theme.of(context).brightness == Brightness.light
+ ? Colors.grey[300]!
+ : Colors.grey[900]!,
+ highlightColor: Theme.of(context).brightness == Brightness.light
+ ? Colors.grey[100]!
+ : Colors.grey[600]!,
+ child: child,
+ );
+ }
+}
diff --git a/lib/extensions/date_time_extensions.dart b/lib/extensions/date_time_extensions.dart
deleted file mode 100644
index 657c071..0000000
--- a/lib/extensions/date_time_extensions.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-extension DateComparisons on DateTime {
- bool isEqualToIgnoringDate(DateTime other) {
- return day == other.day && month == other.month && year == other.year;
- }
-}
diff --git a/lib/extensions/hydrated_storage_extension.dart b/lib/extensions/hydrated_storage_extension.dart
index ef241e1..96ba2da 100644
--- a/lib/extensions/hydrated_storage_extension.dart
+++ b/lib/extensions/hydrated_storage_extension.dart
@@ -1,7 +1,6 @@
import 'package:hydrated_bloc/hydrated_bloc.dart';
import 'package:paperless_mobile/features/login/bloc/authentication_state.dart';
-import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_state.dart';
extension AddressableHydratedStorage on Storage {
ApplicationSettingsState get settings {
diff --git a/lib/extensions/security_context_extension.dart b/lib/extensions/security_context_extension.dart
deleted file mode 100644
index 26e7789..0000000
--- a/lib/extensions/security_context_extension.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-import 'dart:io';
-
-import 'package:paperless_mobile/features/login/model/client_certificate.dart';
-
-extension ClientCertificateHandlingSecurityContext on SecurityContext {
- SecurityContext withClientCertificate(ClientCertificate? clientCertificate) {
- if (clientCertificate == null) return this;
- return this
- ..usePrivateKeyBytes(
- clientCertificate.bytes,
- password: clientCertificate.passphrase,
- )
- ..useCertificateChainBytes(
- clientCertificate.bytes,
- password: clientCertificate.passphrase,
- )
- ..setTrustedCertificatesBytes(
- clientCertificate.bytes,
- password: clientCertificate.passphrase,
- );
- }
-}
diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart
deleted file mode 100644
index 9e5a9b6..0000000
--- a/lib/extensions/string_extensions.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-extension SizeLimitedString on String {
- String withLengthLimitedTo(int length, [String overflow = "..."]) {
- return this.length > length
- ? '${substring(0, length - overflow.length)}$overflow'
- : this;
- }
-}
diff --git a/lib/features/app_drawer/view/app_drawer.dart b/lib/features/app_drawer/view/app_drawer.dart
new file mode 100644
index 0000000..0aae097
--- /dev/null
+++ b/lib/features/app_drawer/view/app_drawer.dart
@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:paperless_mobile/constants.dart';
+import 'package:paperless_mobile/core/widgets/paperless_logo.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/view/settings_page.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
+import 'package:url_launcher/link.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class AppDrawer extends StatelessWidget {
+ const AppDrawer({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return SafeArea(
+ top: true,
+ child: Drawer(
+ child: Column(
+ children: [
+ Row(
+ children: [
+ const PaperlessLogo.green(),
+ Text(
+ "Paperless Mobile",
+ style: Theme.of(context).textTheme.titleMedium,
+ ),
+ ],
+ ).padded(),
+ const Divider(),
+ ListTile(
+ dense: true,
+ title: Text(S.of(context).appDrawerAboutLabel),
+ leading: const Icon(Icons.info_outline),
+ onTap: () => _showAboutDialog(context),
+ ),
+ ListTile(
+ dense: true,
+ leading: const Icon(Icons.bug_report_outlined),
+ title: Text(S.of(context).appDrawerReportBugLabel),
+ onTap: () {
+ launchUrlString(
+ 'https://github.com/astubenbord/paperless-mobile/issues/new');
+ },
+ ),
+ ListTile(
+ dense: true,
+ leading: const Icon(Icons.settings_outlined),
+ title: Text(
+ S.of(context).appDrawerSettingsLabel,
+ ),
+ onTap: () => Navigator.of(context).push(
+ MaterialPageRoute(
+ builder: (context) => BlocProvider.value(
+ value: context.read(),
+ child: const SettingsPage(),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+
+ void _showAboutDialog(BuildContext context) {
+ showAboutDialog(
+ context: context,
+ applicationIcon: const ImageIcon(
+ AssetImage('assets/logos/paperless_logo_green.png'),
+ ),
+ applicationName: 'Paperless Mobile',
+ applicationVersion: packageInfo.version + '+' + packageInfo.buildNumber,
+ children: [
+ Text(S.of(context).aboutDialogDevelopedByText('Anton Stubenbord')),
+ Link(
+ uri: Uri.parse('https://github.com/astubenbord/paperless-mobile'),
+ builder: (context, followLink) => GestureDetector(
+ onTap: followLink,
+ child: Text(
+ 'https://github.com/astubenbord/paperless-mobile',
+ style: TextStyle(color: Theme.of(context).colorScheme.tertiary),
+ ),
+ ),
+ ),
+ const SizedBox(height: 16),
+ Text(
+ 'Credits',
+ style: Theme.of(context).textTheme.titleMedium,
+ ),
+ _buildOnboardingImageCredits(),
+ ],
+ );
+ }
+
+ Widget _buildOnboardingImageCredits() {
+ return Link(
+ uri: Uri.parse(
+ 'https://www.freepik.com/free-vector/business-team-working-cogwheel-mechanism-together_8270974.htm#query=setting&position=4&from_view=author'),
+ builder: (context, followLink) => Wrap(
+ children: [
+ const Text('Onboarding images by '),
+ GestureDetector(
+ onTap: followLink,
+ child: Text(
+ 'pch.vector',
+ style: TextStyle(color: Theme.of(context).colorScheme.tertiary),
+ ),
+ ),
+ const Text(' on Freepik.')
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/features/app_intro/widgets/welcome_intro_slide.dart b/lib/features/app_intro/widgets/welcome_intro_slide.dart
deleted file mode 100644
index a1fc625..0000000
--- a/lib/features/app_intro/widgets/welcome_intro_slide.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'package:flutter/material.dart';
-
-class WelcomeIntroSlide extends StatelessWidget {
- const WelcomeIntroSlide({super.key});
-
- @override
- Widget build(BuildContext context) {
- return Column(
- children: [
- Text(
- "Welcome to Paperless Mobile!",
- textAlign: TextAlign.center,
- style: Theme.of(context).textTheme.titleLarge,
- ),
- Padding(
- padding: const EdgeInsets.all(16),
- child: Text(
- "Manage, share and create documents on the go without any compromises!",
- textAlign: TextAlign.center,
- style: TextStyle(color: Theme.of(context).hintColor),
- ),
- ),
- Align(child: Image.asset("assets/logos/paperless_logo_green.png")),
- ],
- );
- }
-}
diff --git a/lib/features/document_details/bloc/document_details_cubit.dart b/lib/features/document_details/bloc/document_details_cubit.dart
index 7f504bd..eaed8d2 100644
--- a/lib/features/document_details/bloc/document_details_cubit.dart
+++ b/lib/features/document_details/bloc/document_details_cubit.dart
@@ -1,26 +1,32 @@
-import 'dart:developer';
+import 'dart:async';
import 'dart:io';
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
-import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/service/file_service.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:url_launcher/url_launcher_string.dart';
import 'package:open_filex/open_filex.dart';
+import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/notifier/document_changed_notifier.dart';
+import 'package:paperless_mobile/core/service/file_service.dart';
part 'document_details_state.dart';
class DocumentDetailsCubit extends Cubit {
final PaperlessDocumentsApi _api;
+ final DocumentChangedNotifier _notifier;
- DocumentDetailsCubit(this._api, DocumentModel initialDocument)
- : super(DocumentDetailsState(document: initialDocument)) {
+ final List _subscriptions = [];
+ DocumentDetailsCubit(
+ this._api,
+ this._notifier, {
+ required DocumentModel initialDocument,
+ }) : super(DocumentDetailsState(document: initialDocument)) {
+ _notifier.subscribe(this, onUpdated: replace);
loadSuggestions();
}
Future delete(DocumentModel document) async {
await _api.delete(document);
+ _notifier.notifyDeleted(document);
}
Future loadSuggestions() async {
@@ -44,21 +50,35 @@ class DocumentDetailsCubit extends Cubit {
final int asn = await _api.findNextAsn();
final updatedDocument =
await _api.update(document.copyWith(archiveSerialNumber: asn));
- emit(state.copyWith(document: updatedDocument));
+ _notifier.notifyUpdated(updatedDocument);
}
}
Future openDocumentInSystemViewer() async {
- final downloadDir = await FileService.temporaryDirectory;
+ final cacheDir = await FileService.temporaryDirectory;
+
final metaData = await _api.getMetaData(state.document);
- final docBytes = await _api.download(state.document);
- File f = File('${downloadDir.path}/${metaData.mediaFilename}');
- f.writeAsBytes(docBytes);
- return OpenFilex.open(f.path, type: "application/pdf")
- .then((value) => value.type);
+ final bytes = await _api.download(state.document);
+
+ final file = File('${cacheDir.path}/${metaData.mediaFilename}')
+ ..createSync(recursive: true)
+ ..writeAsBytesSync(bytes);
+
+ return OpenFilex.open(file.path, type: "application/pdf").then(
+ (value) => value.type,
+ );
}
- void replaceDocument(DocumentModel document) {
+ void replace(DocumentModel document) {
emit(state.copyWith(document: document));
}
+
+ @override
+ Future close() {
+ for (final element in _subscriptions) {
+ element.cancel();
+ }
+ _notifier.unsubscribe(this);
+ return super.close();
+ }
}
diff --git a/lib/features/document_details/view/pages/document_details_page.dart b/lib/features/document_details/view/pages/document_details_page.dart
index 17270e5..648d70a 100644
--- a/lib/features/document_details/view/pages/document_details_page.dart
+++ b/lib/features/document_details/view/pages/document_details_page.dart
@@ -1,6 +1,6 @@
import 'dart:io';
-import 'dart:math';
+import 'package:badges/badges.dart' as b;
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -8,7 +8,6 @@ import 'package:intl/intl.dart';
import 'package:open_filex/open_filex.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
-import 'package:paperless_mobile/core/repository/state/impl/correspondent_repository_state.dart';
import 'package:paperless_mobile/core/translation/error_code_localization_mapper.dart';
import 'package:paperless_mobile/core/widgets/highlighted_text.dart';
import 'package:paperless_mobile/core/widgets/offline_widget.dart';
@@ -23,14 +22,15 @@ import 'package:paperless_mobile/features/edit_document/cubit/edit_document_cubi
import 'package:paperless_mobile/features/labels/storage_path/view/widgets/storage_path_widget.dart';
import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_widget.dart';
import 'package:paperless_mobile/features/labels/view/widgets/label_text.dart';
+import 'package:paperless_mobile/features/similar_documents/cubit/similar_documents_cubit.dart';
import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:paperless_mobile/util.dart';
+import 'package:paperless_mobile/helpers/format_helpers.dart';
+import 'package:paperless_mobile/helpers/message_helpers.dart';
import 'package:path_provider/path_provider.dart';
import 'package:share_plus/share_plus.dart';
-import 'package:badges/badges.dart' as b;
-
-import '../../../../core/repository/state/impl/document_type_repository_state.dart';
+import 'package:paperless_mobile/features/similar_documents/view/similar_documents_view.dart';
+//TODO: Refactor this into several widgets
class DocumentDetailsPage extends StatefulWidget {
final bool allowEdit;
final bool isLabelClickable;
@@ -48,6 +48,16 @@ class DocumentDetailsPage extends StatefulWidget {
}
class _DocumentDetailsPageState extends State {
+ late Future _metaData;
+
+ @override
+ void initState() {
+ super.initState();
+ _metaData = context
+ .read()
+ .getMetaData(context.read().state.document);
+ }
+
@override
Widget build(BuildContext context) {
return WillPopScope(
@@ -57,115 +67,15 @@ class _DocumentDetailsPageState extends State {
return false;
},
child: DefaultTabController(
- length: 3,
+ length: 4,
child: Scaffold(
floatingActionButtonLocation: FloatingActionButtonLocation.endDocked,
- floatingActionButton: widget.allowEdit
- ? BlocBuilder(
- builder: (context, state) {
- final _filteredSuggestions =
- state.suggestions.documentDifference(state.document);
- return BlocBuilder(
- builder: (context, connectivityState) {
- if (!connectivityState.isConnected) {
- return Container();
- }
- return b.Badge(
- position: b.BadgePosition.topEnd(top: -12, end: -6),
- showBadge: _filteredSuggestions.hasSuggestions,
- child: Tooltip(
- message:
- S.of(context).documentDetailsPageEditTooltip,
- preferBelow: false,
- verticalOffset: 40,
- child: FloatingActionButton(
- child: const Icon(Icons.edit),
- onPressed: () => _onEdit(state.document),
- ),
- ),
- badgeContent: Text(
- '${_filteredSuggestions.suggestionsCount}',
- style: const TextStyle(
- color: Colors.white,
- ),
- ),
- badgeColor: Colors.red,
- );
- },
- );
- },
- )
- : null,
- bottomNavigationBar:
- BlocBuilder(
- builder: (context, state) {
- return BottomAppBar(
- child: BlocBuilder(
- builder: (context, connectivityState) {
- final isConnected = connectivityState.isConnected;
- return Row(
- mainAxisAlignment: MainAxisAlignment.start,
- children: [
- IconButton(
- tooltip:
- S.of(context).documentDetailsPageDeleteTooltip,
- icon: const Icon(Icons.delete),
- onPressed: widget.allowEdit && isConnected
- ? () => _onDelete(state.document)
- : null,
- ).paddedSymmetrically(horizontal: 4),
- Tooltip(
- message:
- S.of(context).documentDetailsPageDownloadTooltip,
- child: DocumentDownloadButton(
- document: state.document,
- enabled: isConnected,
- ),
- ),
- IconButton(
- tooltip:
- S.of(context).documentDetailsPagePreviewTooltip,
- icon: const Icon(Icons.visibility),
- onPressed: isConnected
- ? () => _onOpen(state.document)
- : null,
- ).paddedOnly(right: 4.0),
- IconButton(
- tooltip: S
- .of(context)
- .documentDetailsPageOpenInSystemViewerTooltip,
- icon: const Icon(Icons.open_in_new),
- onPressed:
- isConnected ? _onOpenFileInSystemViewer : null,
- ).paddedOnly(right: 4.0),
- IconButton(
- tooltip:
- S.of(context).documentDetailsPageShareTooltip,
- icon: const Icon(Icons.share),
- onPressed: isConnected
- ? () => _onShare(state.document)
- : null,
- ),
- ],
- );
- },
- ),
- );
- },
- ),
+ floatingActionButton: widget.allowEdit ? _buildAppBar() : null,
+ bottomNavigationBar: _buildBottomAppBar(),
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverAppBar(
- leading: IconButton(
- icon: const Icon(
- Icons.arrow_back,
- color: Colors
- .black, //TODO: check if there is a way to dynamically determine color...
- ),
- onPressed: () => Navigator.of(context).pop(
- context.read().state.document,
- ),
- ),
+ leading: const BackButton(),
floating: true,
pinned: true,
expandedHeight: 200.0,
@@ -180,6 +90,7 @@ class _DocumentDetailsPageState extends State {
backgroundColor:
Theme.of(context).colorScheme.primaryContainer,
tabBar: TabBar(
+ isScrollable: true,
tabs: [
Tab(
child: Text(
@@ -208,6 +119,18 @@ class _DocumentDetailsPageState extends State {
.onPrimaryContainer),
),
),
+ Tab(
+ child: Text(
+ S
+ .of(context)
+ .documentDetailsPageTabSimilarDocumentsLabel,
+ style: TextStyle(
+ color: Theme.of(context)
+ .colorScheme
+ .onPrimaryContainer,
+ ),
+ ),
+ ),
],
),
),
@@ -215,19 +138,27 @@ class _DocumentDetailsPageState extends State {
],
body: BlocBuilder(
builder: (context, state) {
- return TabBarView(
- children: [
- _buildDocumentOverview(
- state.document,
- ),
- _buildDocumentContentView(
- state.document,
- state,
- ),
- _buildDocumentMetaDataView(
- state.document,
- ),
- ],
+ return BlocProvider(
+ create: (context) => SimilarDocumentsCubit(
+ context.read(),
+ context.read(),
+ documentId: state.document.id,
+ ),
+ child: TabBarView(
+ children: [
+ _buildDocumentOverview(
+ state.document,
+ ),
+ _buildDocumentContentView(
+ state.document,
+ state,
+ ),
+ _buildDocumentMetaDataView(
+ state.document,
+ ),
+ const SimilarDocumentsView(),
+ ],
+ ),
).paddedSymmetrically(horizontal: 8);
},
),
@@ -237,6 +168,94 @@ class _DocumentDetailsPageState extends State {
);
}
+ BlocBuilder _buildAppBar() {
+ return BlocBuilder(
+ builder: (context, state) {
+ final _filteredSuggestions =
+ state.suggestions.documentDifference(state.document);
+ return BlocBuilder(
+ builder: (context, connectivityState) {
+ if (!connectivityState.isConnected) {
+ return Container();
+ }
+ return b.Badge(
+ position: b.BadgePosition.topEnd(top: -12, end: -6),
+ showBadge: _filteredSuggestions.hasSuggestions,
+ child: Tooltip(
+ message: S.of(context).documentDetailsPageEditTooltip,
+ preferBelow: false,
+ verticalOffset: 40,
+ child: FloatingActionButton(
+ child: const Icon(Icons.edit),
+ onPressed: () => _onEdit(state.document),
+ ),
+ ),
+ badgeContent: Text(
+ '${_filteredSuggestions.suggestionsCount}',
+ style: const TextStyle(
+ color: Colors.white,
+ ),
+ ),
+ badgeColor: Colors.red,
+ );
+ },
+ );
+ },
+ );
+ }
+
+ BlocBuilder _buildBottomAppBar() {
+ return BlocBuilder(
+ builder: (context, state) {
+ return BottomAppBar(
+ child: BlocBuilder(
+ builder: (context, connectivityState) {
+ final isConnected = connectivityState.isConnected;
+ return Row(
+ mainAxisAlignment: MainAxisAlignment.start,
+ children: [
+ IconButton(
+ tooltip: S.of(context).documentDetailsPageDeleteTooltip,
+ icon: const Icon(Icons.delete),
+ onPressed: widget.allowEdit && isConnected
+ ? () => _onDelete(state.document)
+ : null,
+ ).paddedSymmetrically(horizontal: 4),
+ Tooltip(
+ message: S.of(context).documentDetailsPageDownloadTooltip,
+ child: DocumentDownloadButton(
+ document: state.document,
+ enabled: isConnected,
+ ),
+ ),
+ IconButton(
+ tooltip: S.of(context).documentDetailsPagePreviewTooltip,
+ icon: const Icon(Icons.visibility),
+ onPressed:
+ isConnected ? () => _onOpen(state.document) : null,
+ ).paddedOnly(right: 4.0),
+ IconButton(
+ tooltip: S
+ .of(context)
+ .documentDetailsPageOpenInSystemViewerTooltip,
+ icon: const Icon(Icons.open_in_new),
+ onPressed: isConnected ? _onOpenFileInSystemViewer : null,
+ ).paddedOnly(right: 4.0),
+ IconButton(
+ tooltip: S.of(context).documentDetailsPageShareTooltip,
+ icon: const Icon(Icons.share),
+ onPressed:
+ isConnected ? () => _onShare(state.document) : null,
+ ),
+ ],
+ );
+ },
+ ),
+ );
+ },
+ );
+ }
+
Future _onEdit(DocumentModel document) async {
{
final cubit = context.read();
@@ -253,6 +272,7 @@ class _DocumentDetailsPageState extends State {
documentTypeRepository: context.read(),
storagePathRepository: context.read(),
tagRepository: context.read(),
+ notifier: context.read(),
),
),
BlocProvider.value(
@@ -263,7 +283,7 @@ class _DocumentDetailsPageState extends State {
listenWhen: (previous, current) =>
previous.document != current.document,
listener: (context, state) {
- cubit.replaceDocument(state.document);
+ cubit.replace(state.document);
},
child: BlocBuilder(
builder: (context, state) {
@@ -306,7 +326,7 @@ class _DocumentDetailsPageState extends State {
);
}
return FutureBuilder(
- future: context.read().getMetaData(document),
+ future: _metaData,
builder: (context, snapshot) {
if (!snapshot.hasData) {
return const Center(child: CircularProgressIndicator());
@@ -430,7 +450,7 @@ class _DocumentDetailsPageState extends State {
visible: document.documentType != null,
child: _DetailsItem(
label: S.of(context).documentDocumentTypePropertyLabel,
- content: LabelText(
+ content: LabelText(
style: Theme.of(context).textTheme.bodyLarge,
id: document.documentType,
),
@@ -440,7 +460,7 @@ class _DocumentDetailsPageState extends State {
visible: document.correspondent != null,
child: _DetailsItem(
label: S.of(context).documentCorrespondentPropertyLabel,
- content: LabelText(
+ content: LabelText(
style: Theme.of(context).textTheme.bodyLarge,
id: document.correspondent,
),
@@ -451,7 +471,6 @@ class _DocumentDetailsPageState extends State {
child: _DetailsItem(
label: S.of(context).documentStoragePathPropertyLabel,
content: StoragePathWidget(
- isClickable: widget.isLabelClickable,
pathId: document.storagePath,
),
).paddedSymmetrically(vertical: 16),
@@ -465,34 +484,10 @@ class _DocumentDetailsPageState extends State {
child: TagsWidget(
isClickable: widget.isLabelClickable,
tagIds: document.tags,
- onTagSelected: (int tagId) {},
),
),
).paddedSymmetrically(vertical: 16),
),
- // _separator(),
- // FutureBuilder>(
- // future: getIt().findSimilar(document.id),
- // builder: (context, snapshot) {
- // if (!snapshot.hasData) {
- // return CircularProgressIndicator();
- // }
- // return ExpansionTile(
- // tilePadding: const EdgeInsets.symmetric(horizontal: 8.0),
- // title: Text(
- // S.of(context).documentDetailsPageSimilarDocumentsLabel,
- // style:
- // Theme.of(context).textTheme.headline5?.copyWith(fontWeight: FontWeight.bold),
- // ),
- // children: snapshot.data!
- // .map((e) => DocumentListItem(
- // document: e,
- // onTap: (doc) {},
- // isSelected: false,
- // isAtLeastOneSelected: false))
- // .toList(),
- // );
- // }),
],
);
}
@@ -549,15 +544,6 @@ class _DocumentDetailsPageState extends State {
),
);
}
-
- static String formatBytes(int bytes, int decimals) {
- if (bytes <= 0) return "0 B";
- const suffixes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
- var i = (log(bytes) / log(1024)).floor();
- return ((bytes / pow(1024, i)).toStringAsFixed(decimals)) +
- ' ' +
- suffixes[i];
- }
}
class _DetailsItem extends StatelessWidget {
diff --git a/lib/features/document_details/view/widgets/document_download_button.dart b/lib/features/document_details/view/widgets/document_download_button.dart
index 8e91de1..ccaf894 100644
--- a/lib/features/document_details/view/widgets/document_download_button.dart
+++ b/lib/features/document_details/view/widgets/document_download_button.dart
@@ -5,7 +5,8 @@ import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/service/file_service.dart';
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:paperless_mobile/util.dart';
+import 'package:paperless_mobile/helpers/message_helpers.dart';
+import 'package:paperless_mobile/constants.dart';
import 'package:provider/provider.dart';
class DocumentDownloadButton extends StatefulWidget {
@@ -47,20 +48,24 @@ class _DocumentDownloadButtonState extends State {
return;
}
setState(() => _isDownloadPending = true);
+ final service = context.read();
try {
- final bytes =
- await context.read().download(document);
+ final bytes = await service.download(document);
+ final meta = await service.getMetaData(document);
final Directory dir = await FileService.downloadsDirectory;
- String filePath = "${dir.path}/${document.originalFileName}";
- //TODO: Add replacement mechanism here (ask user if file should be replaced if exists)
- await File(filePath).writeAsBytes(bytes);
+ String filePath = "${dir.path}/${meta.mediaFilename}";
+ final createdFile = File(filePath);
+ createdFile.createSync(recursive: true);
+ createdFile.writeAsBytesSync(bytes);
showSnackBar(context, S.of(context).documentDownloadSuccessMessage);
} on PaperlessServerException catch (error, stackTrace) {
showErrorMessage(context, error, stackTrace);
} catch (error) {
showGenericError(context, error);
} finally {
- setState(() => _isDownloadPending = false);
+ if (mounted) {
+ setState(() => _isDownloadPending = false);
+ }
}
}
}
diff --git a/lib/features/document_search/cubit/document_search_cubit.dart b/lib/features/document_search/cubit/document_search_cubit.dart
new file mode 100644
index 0000000..616d46f
--- /dev/null
+++ b/lib/features/document_search/cubit/document_search_cubit.dart
@@ -0,0 +1,85 @@
+import 'package:collection/collection.dart';
+import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/notifier/document_changed_notifier.dart';
+import 'package:paperless_mobile/features/document_search/cubit/document_search_state.dart';
+import 'package:paperless_mobile/features/paged_document_view/paged_documents_mixin.dart';
+
+class DocumentSearchCubit extends HydratedCubit
+ with PagedDocumentsMixin {
+ @override
+ final PaperlessDocumentsApi api;
+ @override
+ final DocumentChangedNotifier notifier;
+
+ DocumentSearchCubit(this.api, this.notifier)
+ : super(const DocumentSearchState()) {
+ notifier.subscribe(
+ this,
+ onDeleted: remove,
+ onUpdated: replace,
+ );
+ }
+
+ Future search(String query) async {
+ emit(state.copyWith(
+ isLoading: true,
+ suggestions: [],
+ view: SearchView.results,
+ ));
+ final searchFilter = DocumentFilter(
+ query: TextQuery.titleAndContent(query),
+ );
+
+ await updateFilter(filter: searchFilter);
+ emit(
+ state.copyWith(
+ searchHistory: [
+ query,
+ ...state.searchHistory
+ .whereNot((previousQuery) => previousQuery == query)
+ ],
+ ),
+ );
+ }
+
+ Future suggest(String query) async {
+ emit(
+ state.copyWith(
+ isLoading: true,
+ view: SearchView.suggestions,
+ value: [],
+ suggestions: [],
+ ),
+ );
+ final suggestions = await api.autocomplete(query);
+ emit(state.copyWith(
+ suggestions: suggestions,
+ isLoading: false,
+ ));
+ }
+
+ void reset() {
+ emit(state.copyWith(
+ view: SearchView.suggestions,
+ suggestions: [],
+ isLoading: false,
+ ));
+ }
+
+ @override
+ Future close() {
+ notifier.unsubscribe(this);
+ return super.close();
+ }
+
+ @override
+ DocumentSearchState? fromJson(Map json) {
+ return DocumentSearchState.fromJson(json);
+ }
+
+ @override
+ Map? toJson(DocumentSearchState state) {
+ return state.toJson();
+ }
+}
diff --git a/lib/features/document_search/cubit/document_search_state.dart b/lib/features/document_search/cubit/document_search_state.dart
new file mode 100644
index 0000000..231405d
--- /dev/null
+++ b/lib/features/document_search/cubit/document_search_state.dart
@@ -0,0 +1,76 @@
+import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/features/paged_document_view/model/paged_documents_state.dart';
+
+part 'document_search_state.g.dart';
+
+enum SearchView {
+ suggestions,
+ results;
+}
+
+@JsonSerializable(ignoreUnannotated: true)
+class DocumentSearchState extends PagedDocumentsState {
+ @JsonKey()
+ final List searchHistory;
+ final SearchView view;
+ final List suggestions;
+ const DocumentSearchState({
+ this.view = SearchView.suggestions,
+ this.searchHistory = const [],
+ this.suggestions = const [],
+ super.filter,
+ super.hasLoaded,
+ super.isLoading,
+ super.value,
+ });
+
+ @override
+ List get props => [
+ ...super.props,
+ searchHistory,
+ suggestions,
+ view,
+ ];
+
+ @override
+ DocumentSearchState copyWithPaged({
+ bool? hasLoaded,
+ bool? isLoading,
+ List>? value,
+ DocumentFilter? filter,
+ }) {
+ return copyWith(
+ hasLoaded: hasLoaded,
+ isLoading: isLoading,
+ filter: filter,
+ value: value,
+ );
+ }
+
+ DocumentSearchState copyWith({
+ List? searchHistory,
+ bool? hasLoaded,
+ bool? isLoading,
+ List>? value,
+ DocumentFilter? filter,
+ List