fix: Add owner to labels

2025-12-09 08:08:14 -06:00 · 2023-05-11 16:23:15 +02:00
parent f388f77d63
commit fd1c0ced35
11 changed files with 155 additions and 226 deletions
--- a/lib/features/document_details/cubit/document_details_cubit.dart
+++ b/lib/features/document_details/cubit/document_details_cubit.dart
@@ -12,6 +12,7 @@ import 'package:paperless_mobile/core/service/file_description.dart';
 import 'package:paperless_mobile/core/service/file_service.dart';
 import 'package:paperless_mobile/features/notifications/services/local_notification_service.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:cross_file/cross_file.dart';

 part 'document_details_cubit.freezed.dart';
 part 'document_details_state.dart';
--- a/lib/features/document_details/view/widgets/document_download_button.dart
+++ b/lib/features/document_details/view/widgets/document_download_button.dart
@@ -79,7 +79,7 @@ class _DocumentDownloadButtonState extends State<DocumentDownloadButton> {
          break;
      }

-      if (Platform.isAndroid && androidInfo!.version.sdkInt! <= 29) {
+      if (Platform.isAndroid && androidInfo!.version.sdkInt <= 29) {
        final isGranted = await askForPermission(Permission.storage);
        if (!isGranted) {
          return;
--- a/lib/features/document_details/view/widgets/document_share_button.dart
+++ b/lib/features/document_details/view/widgets/document_share_button.dart
@@ -78,7 +78,7 @@ class _DocumentShareButtonState extends State<DocumentShareButton> {
          break;
      }

-      if (Platform.isAndroid && androidInfo!.version.sdkInt! < 30) {
+      if (Platform.isAndroid && androidInfo!.version.sdkInt < 30) {
        final isGranted = await askForPermission(Permission.storage);
        if (!isGranted) {
          return;
--- a/lib/features/home/view/home_page.dart
+++ b/lib/features/home/view/home_page.dart
@@ -196,6 +196,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
        ),
        label: S.of(context)!.documents,
      ),
+      if (LocalUserAccount.current.paperlessUser.hasPermission(UserPermissions.addDocument))
        RouteDescription(
          icon: const Icon(Icons.document_scanner_outlined),
          selectedIcon: Icon(
@@ -234,7 +235,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
    ];
    final routes = <Widget>[
      const DocumentsPage(),
-      if (LocalUserAccount.current.paperlessUser.hasPermission(UserPermissions.changeDocument))
+      if (LocalUserAccount.current.paperlessUser.hasPermission(UserPermissions.addDocument))
        const ScannerPage(),
      const LabelsPage(),
      const InboxPage(),
--- a/packages/paperless_api/lib/src/models/labels/correspondent_model.dart
+++ b/packages/paperless_api/lib/src/models/labels/correspondent_model.dart
@@ -11,14 +11,16 @@ class Correspondent extends Label {
  final DateTime? lastCorrespondence;

  const Correspondent({
-    super.id,
+    this.lastCorrespondence,
    required super.name,
+    super.id,
    super.slug,
    super.match,
    super.matchingAlgorithm,
    super.isInsensitive,
    super.documentCount,
-    this.lastCorrespondence,
+    super.owner, 
+    super.userCanChange,
  });

  factory Correspondent.fromJson(Map<String, dynamic> json) =>
--- a/packages/paperless_api/lib/src/models/labels/document_type_model.dart
+++ b/packages/paperless_api/lib/src/models/labels/document_type_model.dart
@@ -13,10 +13,11 @@ class DocumentType extends Label {
    super.matchingAlgorithm,
    super.isInsensitive,
    super.documentCount,
+    super.owner,
+    super.userCanChange,
  });

-  factory DocumentType.fromJson(Map<String, dynamic> json) =>
-      _$DocumentTypeFromJson(json);
+  factory DocumentType.fromJson(Map<String, dynamic> json) => _$DocumentTypeFromJson(json);

  @override
  String get queryEndpoint => 'document_types';
--- a/packages/paperless_api/lib/src/models/labels/label_model.dart
+++ b/packages/paperless_api/lib/src/models/labels/label_model.dart
@@ -19,6 +19,8 @@ abstract class Label extends Equatable implements Comparable {
  final MatchingAlgorithm matchingAlgorithm;
  final bool? isInsensitive;
  final int? documentCount;
+  final int? owner;
+  final bool? userCanChange;

  const Label({
    this.id,
@@ -28,6 +30,8 @@ abstract class Label extends Equatable implements Comparable {
    this.isInsensitive = true,
    this.documentCount,
    this.slug,
+    this.owner,
+    this.userCanChange,
  });

  Label copyWith({
--- a/packages/paperless_api/lib/src/models/labels/storage_path_model.dart
+++ b/packages/paperless_api/lib/src/models/labels/storage_path_model.dart
@@ -17,10 +17,11 @@ class StoragePath extends Label {
    super.matchingAlgorithm,
    super.isInsensitive,
    super.documentCount,
+    super.owner,
+    super.userCanChange,
  });

-  factory StoragePath.fromJson(Map<String, dynamic> json) =>
-      _$StoragePathFromJson(json);
+  factory StoragePath.fromJson(Map<String, dynamic> json) => _$StoragePathFromJson(json);

  @override
  String toString() {
--- a/packages/paperless_api/lib/src/models/labels/tag_model.dart
+++ b/packages/paperless_api/lib/src/models/labels/tag_model.dart
@@ -11,71 +11,33 @@ part 'tag_model.g.dart';

@HexColorJsonConverter()
@JsonSerializable(
-    fieldRename: FieldRename.snake, explicitToJson: true, constructor: "_")
+  fieldRename: FieldRename.snake,
+  explicitToJson: true,
+)
 class Tag extends Label {
  static const colorKey = 'color';
  static const isInboxTagKey = 'is_inbox_tag';
  static const textColorKey = 'text_color';
  static const legacyColourKey = 'colour';
-
  final Color? textColor;
+  final Color? color;

  final bool isInboxTag;

-  @protected
-  @JsonKey(name: colorKey)
-  Color? colorv2;
-
-  @protected
-  @Deprecated(
-    "Alias for the field color. Deprecated since Paperless API v2. Please use the color getter to access the background color of this tag.",
-  )
-  @JsonKey(name: legacyColourKey)
-  Color? colorv1;
-
-  Color? get color => colorv2 ?? colorv1;
-
-  /// Constructor to use for serialization.
-  Tag._({
+  Tag({
    super.id,
    required super.name,
    super.documentCount,
-    super.isInsensitive = true,
+    super.isInsensitive,
    super.match,
-    super.matchingAlgorithm,
+    super.matchingAlgorithm = MatchingAlgorithm.defaultValue,
    super.slug,
-    this.colorv1,
-    this.colorv2,
+    this.color,
    this.textColor,
    this.isInboxTag = false,
-  }) {
-    colorv1 ??= colorv2;
-    colorv2 ??= colorv1;
-  }
-
-  Tag({
-    int? id,
-    required String name,
-    int? documentCount,
-    bool? isInsensitive,
-    String? match,
-    MatchingAlgorithm matchingAlgorithm = MatchingAlgorithm.defaultValue,
-    String? slug,
-    Color? color,
-    Color? textColor,
-    bool? isInboxTag,
-  }) : this._(
-          id: id,
-          name: name,
-          documentCount: documentCount,
-          isInsensitive: isInsensitive,
-          match: match,
-          matchingAlgorithm: matchingAlgorithm,
-          slug: slug,
-          textColor: textColor,
-          colorv1: color,
-          colorv2: color,
-        );
+    super.owner,
+    super.userCanChange,
+  });

  @override
  String toString() => name;
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -61,10 +61,10 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
  auto_route:
    dependency: transitive
    description:
@@ -97,6 +97,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.2.3"
+  bidi:
+    dependency: transitive
+    description:
+      name: bidi
+      sha256: dc00274c7edabae2ab30c676e736ea1eb0b1b7a1b436cb5fe372e431ccb39ab0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.6"
  bloc:
    dependency: transitive
    description:
@@ -213,10 +221,10 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
  checked_yaml:
    dependency: transitive
    description:
@@ -245,18 +253,18 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
  connectivity_plus:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: "8875e8ed511a49f030e313656154e4bbbcef18d68dfd32eb853fac10bce48e96"
+      sha256: "45262924896ff72a8cd92b722bb7e3d5020f9e0724531a3e10e22ddae2005991"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "4.0.0"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
@@ -349,50 +357,18 @@ packages:
    dependency: "direct main"
    description:
      name: device_info_plus
-      sha256: b809c4ed5f7fcdb325ccc70b80ad934677dc4e2aa414bf46859a42bfdfafcbb6
+      sha256: f52ab3b76b36ede4d135aab80194df8925b553686f0fa12226b4e2d658e45903
      url: "https://pub.dev"
    source: hosted
-    version: "4.1.3"
-  device_info_plus_linux:
-    dependency: transitive
-    description:
-      name: device_info_plus_linux
-      sha256: "77a8b3c4af06bc46507f89304d9f49dfc64b4ae004b994532ed23b34adeae4b3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  device_info_plus_macos:
-    dependency: transitive
-    description:
-      name: device_info_plus_macos
-      sha256: "37961762fbd46d3620c7b69ca606671014db55fc1b7a11e696fd90ed2e8fe03d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
+    version: "8.2.2"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
      name: device_info_plus_platform_interface
-      sha256: "83fdba24fcf6846d3b10f10dfdc8b6c6d7ada5f8ed21d62ea2909c2dfa043773"
+      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0"
-  device_info_plus_web:
-    dependency: transitive
-    description:
-      name: device_info_plus_web
-      sha256: "5890f6094df108181c7a29720bc23d0fd6159f17d82787fac093d1fefcaf6325"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  device_info_plus_windows:
-    dependency: transitive
-    description:
-      name: device_info_plus_windows
-      sha256: "23a2874af0e23ee6e3a2a0ebcecec3a9da13241f2cb93a93a44c8764df123dd7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
+    version: "7.0.0"
  diff_match_patch:
    dependency: transitive
    description:
@@ -442,14 +418,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.5"
-  extension:
-    dependency: transitive
-    description:
-      name: extension
-      sha256: "7df1ee2de6ccd05fd3e4d63acb194ae97e6525a2e8da067161c0cccb6a0a5305"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.0"
  fake_async:
    dependency: transitive
    description:
@@ -478,10 +446,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_picker
-      sha256: d090ae03df98b0247b82e5928f44d1b959867049d18d73635e2e0bc3f49542b9
+      sha256: c7a8e25ca60e7f331b153b0cb3d405828f18d3e72a6fa1d9440c86556fffc877
      url: "https://pub.dev"
    source: hosted
-    version: "5.2.5"
+    version: "5.3.0"
  fixnum:
    dependency: transitive
    description:
@@ -544,10 +512,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_form_builder
-      sha256: "9551c7379adc01a3a3a1100057396407c9534ea8adc937d14a0edd96fcd9e1dc"
+      sha256: "236c96dad143a0e67c0f11522606d6b17b6510e97530cb73af355b018ded7c10"
      url: "https://pub.dev"
    source: hosted
-    version: "7.8.0"
+    version: "8.0.0"
  flutter_html:
    dependency: "direct main"
    description:
@@ -645,18 +613,18 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_native_splash
-      sha256: "6777a3abb974021a39b5fdd2d46a03ca390e03903b6351f21d10e7ecc969f12d"
+      sha256: e301ae206ff0fb09b67d3716009c6c28c2da57a0ad164827b178421bb9d601f7
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.16"
+    version: "2.2.18"
  flutter_plugin_android_lifecycle:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
+      sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.7"
+    version: "2.0.14"
  flutter_secure_storage:
    dependency: "direct main"
    description:
@@ -860,10 +828,10 @@ packages:
    dependency: "direct main"
    description:
      name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
      url: "https://pub.dev"
    source: hosted
-    version: "3.3.0"
+    version: "4.0.17"
  integration_test:
    dependency: "direct dev"
    description: flutter
@@ -873,10 +841,10 @@ packages:
    dependency: "direct main"
    description:
      name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
      url: "https://pub.dev"
    source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
  introduction_screen:
    dependency: "direct main"
    description:
@@ -905,10 +873,10 @@ packages:
    dependency: transitive
    description:
      name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
  json_annotation:
    dependency: "direct main"
    description:
@@ -985,10 +953,10 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
  material_color_utilities:
    dependency: transitive
    description:
@@ -1001,10 +969,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
  mime:
    dependency: transitive
    description:
@@ -1089,50 +1057,18 @@ packages:
    dependency: "direct main"
    description:
      name: package_info_plus
-      sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
+      sha256: d39e8fbff4c5aef4592737e25ad6ac500df006ce7a7a8e1f838ce1256e167542
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.3+1"
-  package_info_plus_linux:
-    dependency: transitive
-    description:
-      name: package_info_plus_linux
-      sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.5"
-  package_info_plus_macos:
-    dependency: transitive
-    description:
-      name: package_info_plus_macos
-      sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
+    version: "4.0.0"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
      name: package_info_plus_platform_interface
-      sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.2"
-  package_info_plus_web:
-    dependency: transitive
-    description:
-      name: package_info_plus_web
-      sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
-  package_info_plus_windows:
-    dependency: transitive
-    description:
-      name: package_info_plus_windows
-      sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
+    version: "2.0.1"
  paperless_api:
    dependency: "direct main"
    description:
@@ -1144,10 +1080,10 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
  path_drawing:
    dependency: transitive
    description:
@@ -1208,26 +1144,18 @@ packages:
    dependency: transitive
    description:
      name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.6"
  pdf:
    dependency: "direct main"
    description:
      name: pdf
-      sha256: "10659b915e65832b106f6d1d213e09b789cc1f24bf282ee911e49db35b96be4d"
+      sha256: "70d84154dc5b6ddf28eee6c012510a4cbbebb3a1879c0957e05364a95e8f3832"
      url: "https://pub.dev"
    source: hosted
-    version: "3.8.4"
-  pdfx:
-    dependency: "direct main"
-    description:
-      name: pdfx
-      sha256: cad7eab6358a89922c8ea592b738891b3984edab43300558d25dc9b15a94a35e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
+    version: "3.10.3"
  pedantic:
    dependency: transitive
    description:
@@ -1280,10 +1208,10 @@ packages:
    dependency: transitive
    description:
      name: petitparser
-      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
      url: "https://pub.dev"
    source: hosted
-    version: "5.1.0"
+    version: "5.4.0"
  photo_view:
    dependency: "direct main"
    description:
@@ -1304,10 +1232,10 @@ packages:
    dependency: transitive
    description:
      name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
  pool:
    dependency: transitive
    description:
@@ -1400,10 +1328,26 @@ packages:
    dependency: "direct main"
    description:
      name: share_plus
-      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
+      sha256: f582d5741930f3ad1bf0211d358eddc0508cc346e5b4b248bd1e569c995ebb7a
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.1"
+    version: "4.5.3"
+  share_plus_linux:
+    dependency: transitive
+    description:
+      name: share_plus_linux
+      sha256: dc32bf9f1151b9864bb86a997c61a487967a08f2e0b4feaa9a10538712224da4
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  share_plus_macos:
+    dependency: transitive
+    description:
+      name: share_plus_macos
+      sha256: "44daa946f2845045ecd7abb3569b61cd9a55ae9cc4cbec9895b2067b270697ae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
  share_plus_platform_interface:
    dependency: transitive
    description:
@@ -1412,6 +1356,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.2.0"
+  share_plus_web:
+    dependency: transitive
+    description:
+      name: share_plus_web
+      sha256: eaef05fa8548b372253e772837dd1fbe4ce3aca30ea330765c945d7d4f7c9935
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  share_plus_windows:
+    dependency: transitive
+    description:
+      name: share_plus_windows
+      sha256: "3a21515ae7d46988d42130cd53294849e280a5de6ace24bae6912a1bffd757d4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
  shelf:
    dependency: transitive
    description:
@@ -1573,26 +1533,26 @@ packages:
    dependency: transitive
    description:
      name: test
-      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
+      sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
      url: "https://pub.dev"
    source: hosted
-    version: "1.22.0"
+    version: "1.24.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
+      sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.20"
+    version: "0.5.1"
  timezone:
    dependency: transitive
    description:
@@ -1621,18 +1581,10 @@ packages:
    dependency: transitive
    description:
      name: universal_io
-      sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef"
+      sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.4"
-  universal_platform:
-    dependency: transitive
-    description:
-      name: universal_platform
-      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0+1"
+    version: "2.2.0"
  url_launcher:
    dependency: "direct main"
    description:
@@ -1717,10 +1669,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
+      sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
      url: "https://pub.dev"
    source: hosted
-    version: "9.4.0"
+    version: "11.3.0"
  watcher:
    dependency: transitive
    description:
@@ -1741,10 +1693,10 @@ packages:
    dependency: transitive
    description:
      name: webdriver
-      sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841
+      sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  webkit_inspection_protocol:
    dependency: transitive
    description:
@@ -1757,10 +1709,10 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.3"
+    version: "4.1.4"
  xdg_directories:
    dependency: transitive
    description:
@@ -1773,10 +1725,10 @@ packages:
    dependency: transitive
    description:
      name: xml
-      sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
+      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
      url: "https://pub.dev"
    source: hosted
-    version: "6.2.2"
+    version: "6.3.0"
  yaml:
    dependency: transitive
    description:
@@ -1786,5 +1738,5 @@ packages:
    source: hosted
    version: "3.1.1"
 sdks:
-  dart: ">2.19.0 <3.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
  flutter: ">=3.7.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,14 +34,17 @@ dependencies:
  flutter_localizations:
    sdk: flutter
  permission_handler: ^10.2.0
-  pdf: ^3.8.1
-  pdfx: ^2.3.0
+  pdf: ^3.10.2
+  # pdfx:
+  #   git:
+  #     url: "https://github.com/ScerIO/packages.flutter"
+  #     path: packages/pdfx
  edge_detection:
    git:
      url: https://github.com/sawankumarbundelkhandi/edge_detection
      ref: master
  path_provider: ^2.0.10
-  image: ^3.1.3
+  image: ^4.0.17
  photo_view: ^0.14.0
  intl: any #^0.18.0
  flutter_svg: ^1.0.3
@@ -54,14 +57,13 @@ dependencies:
  shimmer: ^2.0.0
  flutter_bloc: ^8.1.1
  equatable: ^2.0.3
-  flutter_form_builder: ^7.5.0
-  #form_builder_validators: ^8.4.0
-  package_info_plus: ^1.4.3+1
+  flutter_form_builder: ^8.0.0 
+  package_info_plus: ^4.0.0
  font_awesome_flutter: ^10.1.0
  local_auth: ^2.1.2
-  connectivity_plus: ^3.0.3
+  connectivity_plus: ^4.0.0
  flutter_native_splash: ^2.2.11
-  share_plus: ^6.2.0
+  share_plus: ^4.5.3
  introduction_screen: ^3.0.2
  receive_sharing_intent: ^1.4.5
  uuid: ^3.0.6
@@ -79,7 +81,7 @@ dependencies:
  json_annotation: ^4.7.0
  pretty_dio_logger: ^1.2.0-beta-1
  collection: ^1.17.0
-  device_info_plus: ^4.1.3
+  device_info_plus: ^8.0.0
  flutter_local_notifications: ^13.0.0
  responsive_builder: ^0.4.3
  open_filex: ^4.3.2
@@ -91,6 +93,9 @@ dependencies:
  hive_flutter: ^1.1.0
  flutter_secure_storage: ^8.0.0

+dependency_overrides:
+  intl: ^0.18.0
+
 dev_dependencies:
  integration_test:
    sdk: flutter