diff --git a/lib/app.dart b/lib/app.dart index fcd492e..4b08f81 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -59,7 +59,7 @@ class _AppState extends State { final CartonSizeModel cartonSizeModel = new CartonSizeModel(); final ProcessingModel processingModel = new ProcessingModel(); - AppTranslationsDelegate _newLocaleDelegate; + late AppTranslationsDelegate _newLocaleDelegate; @override void initState() { @@ -81,7 +81,8 @@ class _AppState extends State { ..addModel(cartonSizeModel) ..addModel(processingModel); - _newLocaleDelegate = AppTranslationsDelegate(newLocale: null); + _newLocaleDelegate = AppTranslationsDelegate( + newLocale: Translation().supportedLocales().first); Translation().onLocaleChanged = onLocaleChange; } diff --git a/lib/config.dart b/lib/config.dart index 41fa63f..2f17034 100644 --- a/lib/config.dart +++ b/lib/config.dart @@ -1,11 +1,16 @@ import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; -enum Flavor { DEV, STAGING, PRODUCTION, LOCAL } -const FlavorNames = ["Development", "Staging", "Production", "Local"]; +enum Flavor { UNSET, DEV, STAGING, PRODUCTION, LOCAL } +const FlavorNames = ["Unset", "Development", "Staging", "Production", "Local"]; class Config { - static Config _instance; + static Config _instance = Config( + flavor: Flavor.UNSET, + apiURL: "", + bucketName: "", + reportProjectID: "", + reportURL: ""); final Flavor flavor; final String name; @@ -17,14 +22,14 @@ class Config { final String bucketName; factory Config( - {@required Flavor flavor, - @required String apiURL, - @required String reportURL, - @required String reportProjectID, - @required String bucketName, + {required Flavor flavor, + required String apiURL, + required String reportURL, + required String reportProjectID, + required String bucketName, Color color: Colors.blue, Level level: Level.SEVERE}) { - _instance ??= Config._internal(flavor, FlavorNames[flavor.index], color, + _instance = Config._internal(flavor, FlavorNames[flavor.index], color, apiURL, reportURL, level, reportProjectID, bucketName); Logger.root.level = level; diff --git a/lib/localization/app_translations_delegate.dart b/lib/localization/app_translations_delegate.dart index f2b3aa1..010d1ac 100644 --- a/lib/localization/app_translations_delegate.dart +++ b/lib/localization/app_translations_delegate.dart @@ -6,7 +6,7 @@ import 'transalation.dart'; class AppTranslationsDelegate extends LocalizationsDelegate { final Locale newLocale; - const AppTranslationsDelegate({this.newLocale}); + const AppTranslationsDelegate({required this.newLocale}); @override bool isSupported(Locale locale) { @@ -22,4 +22,4 @@ class AppTranslationsDelegate extends LocalizationsDelegate { bool shouldReload(LocalizationsDelegate old) { return true; } -} \ No newline at end of file +} diff --git a/lib/localization/transalation.dart b/lib/localization/transalation.dart index 3ab2f99..634ae80 100644 --- a/lib/localization/transalation.dart +++ b/lib/localization/transalation.dart @@ -23,5 +23,5 @@ class Translation { supportedLanguagesCodes.map((language) => Locale(language, "")); //function to be invoked when changing the language - LocaleChangeCallback onLocaleChanged; + LocaleChangeCallback? onLocaleChanged; } diff --git a/lib/pagination/paginator_listener.dart b/lib/pagination/paginator_listener.dart index 9907930..f2e0f1f 100644 --- a/lib/pagination/paginator_listener.dart +++ b/lib/pagination/paginator_listener.dart @@ -16,22 +16,22 @@ class PaginatorListener { List ids = []; List data = []; - DocumentSnapshot prev; + DocumentSnapshot? prev; int rowPerLoad = 10; bool ended = false; bool isLoading = false; bool insertNewByListener = false; ToObj toObj; - CallBack onChange; + CallBack? onChange; - StreamSubscription listener; - Query listeningQuery; - Query pageQuery; + StreamSubscription? listener; + Query? listeningQuery; + Query? pageQuery; PaginatorListener(this.toObj, {this.onChange, this.rowPerLoad = 10, this.insertNewByListener = false}); - Future refresh({Query listeningQuery, Query pageQuery}) { + Future refresh({Query? listeningQuery, Query? pageQuery}) { this.listeningQuery = listeningQuery ?? this.listeningQuery; this.pageQuery = pageQuery ?? this.pageQuery; _clearState(); @@ -45,7 +45,7 @@ class PaginatorListener { data = []; ended = false; isLoading = false; - if (listener != null) listener.cancel(); + if (listener != null) listener!.cancel(); listener = null; } @@ -58,35 +58,39 @@ class PaginatorListener { final String isDeletedField = 'is_deleted'; void _initListener() { Query _query = - listeningQuery.orderBy(updateTimeField, descending: true).limit(1); - _query.getDocuments(source: Source.server).then((QuerySnapshot snapshot) { - int count = snapshot.documents.length; + listeningQuery!.orderBy(updateTimeField, descending: true).limit(1); + _query + .get(GetOptions(source: Source.server)) + .then((QuerySnapshot snapshot) { + int count = snapshot.docs.length; int updateTime = 0; if (count == 1) { - updateTime = snapshot.documents[0].data[updateTimeField]; + Map data = + snapshot.docs[0].data()! as Map; + updateTime = data[updateTimeField]; } - Query _queryListener = listeningQuery + Query _queryListener = listeningQuery! .where(updateTimeField, isGreaterThan: updateTime) .orderBy(updateTimeField, descending: true); - if (listener != null) listener.cancel(); + if (listener != null) listener!.cancel(); listener = _queryListener.snapshots(includeMetadataChanges: true).listen((qs) { - qs.documentChanges.forEach((c) { + qs.docChanges.forEach((c) { switch (c.type) { case DocumentChangeType.added: - _update(c.document.documentID, c.document.data); + _update(c.doc.id, c.doc.data() as Map); break; case DocumentChangeType.modified: - _update(c.document.documentID, c.document.data); + _update(c.doc.id, c.doc.data() as Map); break; case DocumentChangeType.removed: - _remove(c.document.documentID, c.document.data); + _remove(c.doc.id, c.doc.data() as Map); break; default: } - if (onChange != null) onChange(); + if (onChange != null) onChange!(); }); }); }); @@ -129,26 +133,26 @@ class PaginatorListener { return this._load(); } - Future _load({CallBack onStarted, CallBack onFinished}) async { + Future _load({CallBack? onStarted, CallBack? onFinished}) async { if (ended) return ended; Query _query = - prev != null ? pageQuery.startAfterDocument(prev) : pageQuery; + prev != null ? pageQuery!.startAfterDocument(prev!) : pageQuery!; try { isLoading = true; if (onStarted != null) { onStarted(); } - if (onChange != null) onChange(); + if (onChange != null) onChange!(); await _query .where(isDeletedField, isEqualTo: false) .limit(rowPerLoad) - .getDocuments(source: Source.server) + .get(GetOptions(source: Source.server)) .then((QuerySnapshot snapshot) { - int count = snapshot.documents.length; + int count = snapshot.docs.length; ended = count < rowPerLoad; - prev = count > 0 ? snapshot.documents[count - 1] : prev; - snapshot.documents.forEach((e) { - _add(e.documentID, e.data); + prev = count > 0 ? snapshot.docs[count - 1] : prev; + snapshot.docs.forEach((e) { + _add(e.id, e.data() as Map); }); }); } catch (e) { @@ -156,7 +160,7 @@ class PaginatorListener { } finally { isLoading = false; if (onFinished != null) onFinished(); - if (onChange != null) onChange(); + if (onChange != null) onChange!(); } return ended; } diff --git a/lib/pagination/paginator_listview.dart b/lib/pagination/paginator_listview.dart index f0a7d39..b5ee134 100644 --- a/lib/pagination/paginator_listview.dart +++ b/lib/pagination/paginator_listview.dart @@ -10,19 +10,17 @@ typedef OnScroll = void Function(bool down); class PaginatorListView extends StatelessWidget { final PaginatorListener paginatorListener; final RowBuilder rowBuilder; - final OnScroll onScroll; + final OnScroll? onScroll; final ScrollController _scrollController; final Color color; PaginatorListView( - {Key key, - this.paginatorListener, - this.rowBuilder, + {Key? key, + required this.paginatorListener, + required this.rowBuilder, this.onScroll, this.color = Colors.blueAccent}) : _scrollController = ScrollController(), - assert(paginatorListener != null), - assert(rowBuilder != null), super(key: key) { _scrollController.addListener(() async { if (_scrollController.position.pixels == @@ -32,7 +30,7 @@ class PaginatorListView extends StatelessWidget { if (onScroll != null) { var down = _scrollController.position.userScrollDirection == ScrollDirection.forward; - onScroll(down); + onScroll!(down); } }); } diff --git a/pubspec.lock b/pubspec.lock index 79a1f02..a551a79 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,287 +7,322 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "12.0.0" + version: "22.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.40.6" + version: "1.7.1" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.6.0" + version: "2.2.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety.1" - barcode_scan: + version: "2.6.1" + barcode_scan2: dependency: "direct main" description: - name: barcode_scan + name: barcode_scan2 url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "4.1.4" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" cached_network_image: dependency: "direct main" description: name: cached_network_image url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "3.1.0" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" camera: dependency: "direct main" description: name: camera url: "https://pub.dartlang.org" source: hosted - version: "0.4.3+2" + version: "0.9.0" + camera_platform_interface: + dependency: transitive + description: + name: camera_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" cli_util: dependency: transitive description: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.3.3" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" cloud_firestore: dependency: "direct main" description: name: cloud_firestore url: "https://pub.dartlang.org" source: hosted - version: "0.13.7" + version: "2.5.0" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "5.4.0" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.1+2" + version: "2.4.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0" connectivity: dependency: "direct main" description: name: connectivity url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.6" connectivity_for_web: dependency: transitive description: name: connectivity_for_web url: "https://pub.dartlang.org" source: hosted - version: "0.3.1+2" + version: "0.4.0+1" connectivity_macos: dependency: transitive description: name: connectivity_macos url: "https://pub.dartlang.org" source: hosted - version: "0.1.0+4" + version: "0.2.1+2" connectivity_platform_interface: dependency: transitive description: name: connectivity_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.6" + version: "2.0.1" convert: dependency: transitive description: name: convert url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.1" country_code_picker: dependency: "direct main" description: name: country_code_picker url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "2.0.2" country_icons: dependency: "direct main" description: name: country_icons url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "2.0.2" coverage: dependency: transitive description: name: coverage url: "https://pub.dartlang.org" source: hosted - version: "0.14.2" + version: "1.0.3" + cross_file: + dependency: transitive + description: + name: cross_file + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.1+4" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "3.0.1" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "1.0.3" device_info: dependency: "direct main" description: name: device_info url: "https://pub.dartlang.org" source: hosted - version: "0.4.2+7" + version: "2.0.2" device_info_platform_interface: dependency: transitive description: name: device_info_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "2.0.1" dio: dependency: "direct main" description: name: dio url: "https://pub.dartlang.org" source: hosted - version: "3.0.10" + version: "4.0.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" ffi: dependency: transitive description: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "1.1.2" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "5.2.1" - firebase: - dependency: transitive - description: - name: firebase - url: "https://pub.dartlang.org" - source: hosted - version: "7.3.3" + version: "6.1.2" firebase_auth: dependency: "direct main" description: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "0.16.1" + version: "3.0.2" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "6.0.1" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.3+1" + version: "3.0.1" firebase_core: dependency: "direct main" description: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.5" + version: "1.5.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "4.0.1" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.1+2" - firebase_messaging: - dependency: "direct main" - description: - name: firebase_messaging - url: "https://pub.dartlang.org" - source: hosted - version: "6.0.16" + version: "1.1.0" firebase_storage: dependency: "direct main" description: name: firebase_storage url: "https://pub.dartlang.org" source: hosted - version: "3.1.6" + version: "10.0.2" + firebase_storage_platform_interface: + dependency: transitive + description: + name: firebase_storage_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.1" + firebase_storage_web: + dependency: transitive + description: + name: firebase_storage_web + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" flutter: dependency: "direct main" description: flutter @@ -299,42 +334,21 @@ packages: name: flutter_blurhash url: "https://pub.dartlang.org" source: hosted - version: "0.5.0" + version: "0.6.0" flutter_cache_manager: dependency: "direct main" description: name: flutter_cache_manager url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "3.1.2" flutter_datetime_picker: dependency: "direct main" description: name: flutter_datetime_picker url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" - flutter_icons: - dependency: "direct main" - description: - name: flutter_icons - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - flutter_local_notifications: - dependency: "direct main" - description: - name: flutter_local_notifications - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.4+4" - flutter_local_notifications_platform_interface: - dependency: transitive - description: - name: flutter_local_notifications_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" + version: "1.5.1" flutter_localizations: dependency: "direct main" description: flutter @@ -346,14 +360,14 @@ packages: name: flutter_pdfview url: "https://pub.dartlang.org" source: hosted - version: "1.0.3+3" + version: "1.2.1" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "1.0.8" + version: "2.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -370,385 +384,378 @@ packages: name: font_awesome_flutter url: "https://pub.dartlang.org" source: hosted - version: "8.9.0" + version: "9.1.0" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "2.0.1" google_api_availability: dependency: "direct main" description: name: google_api_availability url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "3.0.1" http: dependency: transitive description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.12.2" + version: "0.13.3" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "3.0.1" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.4" + version: "4.0.0" image_picker: dependency: "direct main" description: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.6.7+7" + version: "0.8.3+3" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "2.3.0" intl: dependency: "direct main" description: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.16.1" + version: "0.17.0" io: dependency: transitive description: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.4" + version: "1.0.3" js: dependency: transitive description: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3-nullsafety.2" + version: "0.6.3" logging: dependency: "direct main" description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "0.11.4" + version: "1.0.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" mime: dependency: transitive description: name: mime url: "https://pub.dartlang.org" source: hosted - version: "0.9.7" + version: "1.0.0" + modal_bottom_sheet: + dependency: transitive + description: + name: modal_bottom_sheet + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" nested: dependency: transitive description: name: nested url: "https://pub.dartlang.org" source: hosted - version: "0.0.4" - node_interop: - dependency: transitive - description: - name: node_interop - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.1" - node_io: - dependency: transitive - description: - name: node_io - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.0.0" node_preamble: dependency: transitive description: name: node_preamble url: "https://pub.dartlang.org" source: hosted - version: "1.4.12" - notus: - dependency: transitive - description: - name: notus - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.5" + version: "2.0.1" octo_image: dependency: transitive description: name: octo_image url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "1.0.0+1" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "2.0.0" package_info: dependency: "direct main" description: name: package_info url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "2.0.2" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0" path_provider: dependency: "direct main" description: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "1.6.22" + version: "2.0.2" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+2" + version: "2.0.2" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.4+3" + version: "2.0.2" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "2.0.1" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "0.0.4+1" + version: "2.0.3" pedantic: dependency: transitive description: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.2" + version: "1.11.1" permission_handler: dependency: "direct main" description: name: permission_handler url: "https://pub.dartlang.org" source: hosted - version: "4.4.0+hotfix.4" + version: "8.1.4+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "3.6.1" photo_view: dependency: "direct main" description: name: photo_view url: "https://pub.dartlang.org" source: hosted - version: "0.9.2" + version: "0.12.0" pin_input_text_field: dependency: "direct main" description: name: pin_input_text_field url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" + version: "4.1.0" platform: dependency: transitive description: name: platform url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" + version: "3.0.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "2.0.1" pool: dependency: transitive description: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.5.0-nullsafety.2" + version: "1.5.0" process: dependency: transitive description: name: process url: "https://pub.dartlang.org" source: hosted - version: "3.0.13" + version: "4.2.3" progress: dependency: "direct main" description: - path: "../flutter/packages/progress" + path: "../mokkon-flutter/packages/progress" relative: true source: path version: "0.0.1" + protobuf: + dependency: transitive + description: + name: protobuf + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" provider: dependency: "direct main" description: name: provider url: "https://pub.dartlang.org" source: hosted - version: "4.3.2+1" + version: "6.0.0" pub_semver: dependency: transitive description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "1.4.4" - quill_delta: - dependency: transitive - description: - name: quill_delta - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" + version: "2.0.0" quiver: dependency: transitive description: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" - quiver_hashcode: - dependency: transitive - description: - name: quiver_hashcode - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" + version: "3.0.1" rxdart: dependency: transitive description: name: rxdart url: "https://pub.dartlang.org" source: hosted - version: "0.24.1" + version: "0.27.1" share: dependency: "direct main" description: name: share url: "https://pub.dartlang.org" source: hosted - version: "0.6.5+4" + version: "2.0.4" shared_preferences: dependency: "direct main" description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.10" + version: "2.0.7" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "0.0.2+2" + version: "2.0.2" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+10" + version: "2.0.2" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.0.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.2+7" + version: "2.0.2" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.9" + version: "1.2.0" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "3.0.0" shelf_static: dependency: transitive description: name: shelf_static url: "https://pub.dartlang.org" source: hosted - version: "0.2.9+1" + version: "1.1.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.3" + version: "1.0.1" sky_engine: dependency: transitive description: flutter @@ -760,91 +767,98 @@ packages: name: source_map_stack_trace url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" source_maps: dependency: transitive description: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.10-nullsafety.2" + version: "0.10.10" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.1" sqflite: dependency: transitive description: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "1.3.1+1" + version: "2.0.0+4" sqflite_common: dependency: transitive description: name: sqflite_common url: "https://pub.dartlang.org" source: hosted - version: "1.0.2+1" + version: "2.0.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" + stream_transform: + dependency: transitive + description: + name: stream_transform + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" synchronized: dependency: transitive description: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "2.2.0+2" + version: "3.0.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" test: dependency: "direct dev" description: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.16.0-nullsafety.5" + version: "1.16.8" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.3.0" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.12-nullsafety.5" + version: "0.3.19" timeline_list: dependency: "direct main" description: @@ -858,119 +872,119 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" + universal_platform: + dependency: transitive + description: + name: universal_platform + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0+1" url_launcher: dependency: "direct main" description: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "5.7.10" + version: "6.0.9" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+1" + version: "2.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+7" + version: "2.0.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.9" + version: "2.0.4" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.5+1" + version: "2.0.4" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+3" + version: "2.0.2" uuid: dependency: "direct main" description: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "3.0.4" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" vm_service: dependency: transitive description: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "5.5.0" + version: "6.2.0" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+15" + version: "1.0.0" web_socket_channel: dependency: transitive description: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "2.1.0" webkit_inspection_protocol: dependency: transitive description: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "0.7.4" + version: "1.0.0" win32: dependency: transitive description: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "1.7.3" + version: "2.2.6" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.2.0" yaml: dependency: transitive description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" - zefyr: - dependency: "direct main" - description: - name: zefyr - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.0" + version: "3.1.0" sdks: - dart: ">=2.10.0-110 <2.11.0" - flutter: ">=1.22.0 <2.0.0" + dart: ">=2.13.0 <3.0.0" + flutter: ">=2.2.0" diff --git a/pubspec.yaml b/pubspec.yaml index 424aa2d..6d589fb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,58 +1,58 @@ name: fcs description: FCS Logistics -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -version: 1.0.6+9 +publish_to: 'none' +version: 1.0.6+10 environment: - sdk: ">=2.7.0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.3 flutter_localizations: sdk: flutter - firebase_core: ^0.4.3+2 - cloud_firestore: ^0.13.0+1 - firebase_storage: ^3.1.0 - firebase_auth: ^0.16.1 - #firebase_auth: ^0.15.5+3 - firebase_messaging: ^6.0.15 - provider: ^4.3.2+1 - image_picker: ^0.6.0+9 - shared_preferences: ^0.5.7+3 + cupertino_icons: ^1.0.3 + firebase_core: ^1.5.0 + cloud_firestore: ^2.5.0 + firebase_storage: ^10.0.2 + firebase_auth: "^3.0.2" + # firebase_messaging: ^6.0.15 + + provider: ^6.0.0 + image_picker: ^0.8.3+3 + shared_preferences: ^2.0.7 progress: path: - ../flutter/packages/progress - flutter_datetime_picker: ^1.3.8 - dio: ^3.0.9 - package_info: ^0.4.0+6 - google_api_availability: ^2.0.1 - intl: ^0.16.0 - font_awesome_flutter: ^8.0.1 - photo_view: ^0.9.0 - uuid: ^2.0.4 - zefyr: - path_provider: ^1.6.11 - camera: ^0.4.2 - url_launcher: ^5.7.10 - device_info: ^0.4.1+4 - connectivity: ^2.0.2 - logging: ^0.11.4 - permission_handler: ^4.0.0 - country_code_picker: ^1.3.12 - pin_input_text_field: - flutter_icons: ^1.1.0 - country_icons: ^1.1.1 + ../mokkon-flutter/packages/progress + flutter_datetime_picker: ^1.5.1 + dio: ^4.0.0 + package_info: ^2.0.2 + google_api_availability: ^3.0.1 + intl: ^0.17.0 + font_awesome_flutter: ^9.1.0 + photo_view: ^0.12.0 + uuid: ^3.0.4 + # zefyr: + path_provider: ^2.0.2 + camera: ^0.9.0 + url_launcher: ^6.0.9 + device_info: ^2.0.2 + connectivity: ^3.0.6 + logging: ^1.0.1 + permission_handler: ^8.1.4+2 + country_code_picker: ^2.0.2 + pin_input_text_field: ^4.1.0 + # flutter_icons: ^1.1.0 + country_icons: ^2.0.2 timeline_list: ^0.0.5 - barcode_scan: ^2.0.2 - flutter_pdfview: ^1.0.3 - flutter_local_notifications: ^1.4.4+4 - share: '>=0.6.5+4 <2.0.0' - cached_network_image: ^2.3.2+1 - flutter_cache_manager: ^2.0.0 + # barcode_scan: ^2.0.2 + barcode_scan2: ^4.1.4 + flutter_pdfview: ^1.2.1 + # flutter_local_notifications: ^8.1.1+1 + share: ^2.0.4 + cached_network_image: ^3.1.0 + flutter_cache_manager: ^3.1.2 dev_dependencies: flutter_test: