From c9539bc44969d94797343bd752ea388c0146dad5 Mon Sep 17 00:00:00 2001 From: Muhammad Osama Noor Date: Wed, 24 Apr 2024 00:13:11 +0500 Subject: [PATCH 1/5] updates --- lib/main.dart | 2 +- lib/project/app_pages/calendar.dart | 2 +- lib/project/app_pages/input.dart | 46 +- lib/project/app_pages/report.dart | 32 +- .../shared_preferences_services.dart | 3 +- pubspec.lock | 733 +++++++++++------- pubspec.yaml | 54 +- 7 files changed, 555 insertions(+), 317 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 9baa22c..aa84a06 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -// @dart=2.9 +//// @dart=2.9 import 'package:money_assistant_2608/project/real_main.dart'; diff --git a/lib/project/app_pages/calendar.dart b/lib/project/app_pages/calendar.dart index 7a18c6e..66aa725 100644 --- a/lib/project/app_pages/calendar.dart +++ b/lib/project/app_pages/calendar.dart @@ -101,7 +101,7 @@ class _CalendarBodyState extends State { }, child: SwipeActionCell( key: ObjectKey(transactions[int]), - performsFirstActionWithFullSwipe: true, + // performsFirstActionWithFullSwipe: true, trailingActions: [ SwipeAction( title: getTranslated(context, 'Delete') ?? 'Delete', diff --git a/lib/project/app_pages/input.dart b/lib/project/app_pages/input.dart index 035d3d9..8447152 100644 --- a/lib/project/app_pages/input.dart +++ b/lib/project/app_pages/input.dart @@ -647,9 +647,8 @@ class _DateCardState extends State { ), ), Text( - DateFormat(sharedPrefs.dateFormat).format( - DateFormat('dd/MM/yyyy').parse( - model.date!)), + DateFormat(sharedPrefs.dateFormat) + .format(DateFormat('dd/MM/yyyy').parse(model.date!)), style: GoogleFonts.aBeeZee( fontSize: 21.5.sp, ), @@ -666,19 +665,22 @@ class _DateCardState extends State { } Navigator.of(context).push( showPicker( - cancelText: getTranslated(context, 'Cancel') ?? 'Cancel', - okText: getTranslated(context, 'Ok') ?? 'Ok', - unselectedColor: grey, - dialogInsetPadding: EdgeInsets.symmetric( - horizontal: 50.w, vertical: 30.0.h), - elevation: 12, - context: context, - value: selectedTime, - is24HrFormat: true, - onChange: (value) => setState(() { - selectedTime = value; - model.time = value.format(context); - })), + cancelText: getTranslated(context, 'Cancel') ?? 'Cancel', + okText: getTranslated(context, 'Ok') ?? 'Ok', + unselectedColor: grey, + dialogInsetPadding: + EdgeInsets.symmetric(horizontal: 50.w, vertical: 30.0.h), + elevation: 12, + context: context, + value: timeOfDayToTime( + selectedTime), // Convert TimeOfDay to Time + is24HrFormat: true, + onChange: (value) => setState(() { + selectedTime = + TimeOfDay(hour: value.hour, minute: value.minute); + model.time = selectedTime.format(context); + }), + ), ); }, child: Text( @@ -694,6 +696,13 @@ class _DateCardState extends State { } } +Time timeOfDayToTime(TimeOfDay timeOfDay) { + return Time( + hour: timeOfDay.hour, + minute: timeOfDay.minute, + ); +} + void saveInputFunc(BuildContext context, bool saveFunction) { model.amount = _amountController.text.isEmpty ? 0 @@ -709,7 +718,10 @@ void saveInputFunc(BuildContext context, bool saveFunction) { } else { DB.update(model); Navigator.pop(context); - customToast(context, getTranslated(context, 'Transaction has been updated') ?? 'Transaction has been updated'); + customToast( + context, + getTranslated(context, 'Transaction has been updated') ?? + 'Transaction has been updated'); } } diff --git a/lib/project/app_pages/report.dart b/lib/project/app_pages/report.dart index 4913475..7ddbfc5 100644 --- a/lib/project/app_pages/report.dart +++ b/lib/project/app_pages/report.dart @@ -21,7 +21,7 @@ import 'dart:io' show Platform; import 'package:syncfusion_flutter_charts/charts.dart'; import 'edit.dart'; - +import 'dart:io'; var year = todayDT.year; class Report extends StatefulWidget { @@ -36,6 +36,7 @@ class Report extends StatefulWidget { required this.icon, }); + @override _ReportState createState() => _ReportState(); } @@ -93,13 +94,26 @@ class ReportBody extends StatefulWidget { final String selectedDate; final Color color; final IconData icon; - ReportBody( - this.type, this.category, this.selectedDate, this.color, this.icon); + + ReportBody(this.type, this.category, this.selectedDate, this.color, + this.icon); + @override _ReportBodyState createState() => _ReportBodyState(); + + List> _getGradientAreaSeries(String type, + List monthAmountList) { + return >[ + SplineAreaSeries( + dataSource: monthAmountList, + xValueMapper: (MonthAmount monthAmount, _) => monthAmount.month, + yValueMapper: (MonthAmount monthAmount, _) => monthAmount.amount, + ), + ]; + } } -class _ReportBodyState extends State { + class _ReportBodyState extends State { @override Widget build(BuildContext context) { return ChangeNotifierProvider( @@ -211,6 +225,8 @@ class _ReportBodyState extends State { } } + + return Column( children: [ Padding( @@ -240,8 +256,8 @@ class _ReportBodyState extends State { width: 4.h, ), majorTickLines: MajorTickLines(size: 5.sp)), - series: _getGradientAreaSeries( - this.widget.type, monthBasedTransactionList), + // series: _getGradientAreaSeries( + // this.widget.type, monthBasedTransactionList), onMarkerRender: (MarkerRenderArgs args) { if (this.widget.type == 'Income') { if (args.pointIndex == 0) { @@ -432,8 +448,8 @@ class _ReportBodyState extends State { key: ObjectKey( selectedTransactions[ int]), - performsFirstActionWithFullSwipe: - true, + // performsFirstActionWithFullSwipe: + // true, trailingActions: < SwipeAction>[ SwipeAction( diff --git a/lib/project/database_management/shared_preferences_services.dart b/lib/project/database_management/shared_preferences_services.dart index 0148868..0222e9d 100644 --- a/lib/project/database_management/shared_preferences_services.dart +++ b/lib/project/database_management/shared_preferences_services.dart @@ -191,9 +191,10 @@ class SharedPrefs { categoryItem(MdiIcons.dogService, 'Pets'), categoryItem(MdiIcons.tableChair, 'Furnishings'), categoryItem(MdiIcons.autoFix, 'Home Services'), - categoryItem(MdiIcons.homeCurrencyUsd, 'Mortgage & Rent'), + categoryItem(MdiIcons.currencyUsd, 'Mortgage & Rent'), ]); + saveItems('Utility Bills', [ categoryItem(FontAwesomeIcons.fileInvoiceDollar, 'Utility Bills'), categoryItem(IcoFontIcons.lightBulb, 'Electricity'), diff --git a/pubspec.lock b/pubspec.lock index b64440b..79df2c3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,184 +5,234 @@ packages: dependency: transitive description: name: _flutterfire_internals - url: "https://pub.dartlang.org" + sha256: "1639d96851f9e9e215dd39c9baad56846488aef3df392cb3221f37f70beac686" + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.3.31" another_flushbar: dependency: transitive description: name: another_flushbar - url: "https://pub.dartlang.org" + sha256: fa09f8a4ca582c417669b7b1d0e85ce65bd074d80bb0dcbb1302ad1b22bdc3ef + url: "https://pub.dev" source: hosted version: "1.12.29" another_transformer_page_view: dependency: transitive description: name: another_transformer_page_view - url: "https://pub.dartlang.org" + sha256: a7cd46ede62d621c5abe7e58c7cb2745abe67b3bfec64f59b8889c93d7be7a8e + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.0.1" + ansicolor: + dependency: transitive + description: + name: ansicolor + sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880" + url: "https://pub.dev" + source: hosted + version: "2.0.2" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: "20071638cbe4e5964a427cfa0e86dce55d060bc7d82d56f3554095d7239a8765" + url: "https://pub.dev" source: hosted - version: "3.3.5" + version: "3.4.2" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.5.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" - cloud_firestore_platform_interface: - dependency: transitive - description: - name: cloud_firestore_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "5.7.7" - cloud_firestore_web: - dependency: transitive - description: - name: cloud_firestore_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.10" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.18.0" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" + url: "https://pub.dev" + source: hosted + version: "0.3.4+1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted version: "3.0.2" + csslib: + dependency: transitive + description: + name: csslib + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + url: "https://pub.dev" + source: hosted + version: "1.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.8" day_night_time_picker: dependency: "direct main" description: name: day_night_time_picker - url: "https://pub.dartlang.org" + sha256: "085563dee6f64961c47abb1d444dbb923fda2f6fed0df452fcc221ae38a58898" + url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.3.1" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted version: "6.1.4" file_picker: dependency: transitive description: name: file_picker - url: "https://pub.dartlang.org" + sha256: be325344c1f3070354a1d84a231a1ba75ea85d413774ec4bdf444c023342e030 + url: "https://pub.dev" source: hosted - version: "5.2.4" + version: "5.5.0" firebase_auth: dependency: "direct main" description: name: firebase_auth - url: "https://pub.dartlang.org" + sha256: "6c3b28d13d1960d9e3fb36ebae7ae5732af41410ade8ac0d546ced3ae34dd7cc" + url: "https://pub.dev" source: hosted - version: "3.11.2" + version: "4.19.3" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - url: "https://pub.dartlang.org" + sha256: "23232537407e009e88d6b1c028c684cab1ef6511a87f7d42b340c7284e6dbcbb" + url: "https://pub.dev" source: hosted - version: "6.10.1" + version: "7.2.4" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - url: "https://pub.dartlang.org" + sha256: "2eda928d76768847fd2e7c438ecf871a93d7fe95197b928d2de510846d07d2e5" + url: "https://pub.dev" source: hosted - version: "4.6.1" + version: "5.11.3" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "4aef2a23d0f3265545807d68fbc2f76a6b994ca3c778d88453b99325abd63284" + url: "https://pub.dev" source: hosted - version: "1.24.0" + version: "2.30.1" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 + url: "https://pub.dev" source: hosted - version: "4.5.2" + version: "5.0.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "67f2fcc600fc78c2f731c370a3a5e6c87ee862e3a2fba6f951eca6d5dafe5c29" + url: "https://pub.dev" source: hosted - version: "1.7.3" + version: "2.16.0" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -192,23 +242,26 @@ packages: dependency: "direct main" description: name: flutter_app_lock - url: "https://pub.dartlang.org" + sha256: ca5c35058d490e2f957c36698abc61848b100b9adc02927970ec0e1b27bb2763 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "4.1.1+1" flutter_boxicons: dependency: "direct main" description: name: flutter_boxicons - url: "https://pub.dartlang.org" + sha256: "2323b3148ca0b22965c64967e87d4236c1d83b00547f661303a8c81c9dff7ac7" + url: "https://pub.dev" source: hosted version: "3.0.0" flutter_colorpicker: dependency: "direct overridden" description: name: flutter_colorpicker - url: "https://pub.dartlang.org" + sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b" + url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "1.0.3" flutter_localizations: dependency: "direct main" description: flutter @@ -218,58 +271,66 @@ packages: dependency: "direct main" description: name: flutter_login - url: "https://pub.dartlang.org" + sha256: "1f7c46d0d76081cf4c5180e3a265b1f5b1d7e48c81859f58f03a8dcd27338b85" + url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "5.0.0" flutter_material_pickers: dependency: "direct main" description: name: flutter_material_pickers - url: "https://pub.dartlang.org" + sha256: "1100bfd9a296a6680578aba8c51a0db114fb8ef94708fe320fe6da92b1f8c0e1" + url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.6.0" flutter_native_splash: dependency: "direct dev" description: name: flutter_native_splash - url: "https://pub.dartlang.org" + sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0 + url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "2.4.0" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" + url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.0.19" flutter_rating_bar: dependency: transitive description: name: flutter_rating_bar - url: "https://pub.dartlang.org" + sha256: d2af03469eac832c591a1eba47c91ecc871fe5708e69967073c043b2d775ed93 + url: "https://pub.dev" source: hosted version: "4.0.1" flutter_screen_lock: dependency: "direct main" description: name: flutter_screen_lock - url: "https://pub.dartlang.org" + sha256: f8e504aa0e5fe61ea13b66692ecdec3e8761118173b51c9b3b5518b8e2911e5b + url: "https://pub.dev" source: hosted - version: "4.0.4+3" + version: "9.0.2" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.dartlang.org" + sha256: "8cf100b8e4973dc570b6415a2090b0bfaa8756ad333db46939efc3e774ee100d" + url: "https://pub.dev" source: hosted - version: "5.6.0" + version: "5.9.0" flutter_swipe_action_cell: dependency: "direct main" description: name: flutter_swipe_action_cell - url: "https://pub.dartlang.org" + sha256: "5cea4d8c3d333c5610ffa4bc39a30561927f90857be19ba33a8322fdc856d335" + url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "3.1.3" flutter_test: dependency: "direct dev" description: flutter @@ -284,392 +345,480 @@ packages: dependency: "direct main" description: name: fluttertoast - url: "https://pub.dartlang.org" + sha256: "81b68579e23fcbcada2db3d50302813d2371664afe6165bc78148050ab94bf66" + url: "https://pub.dev" source: hosted - version: "8.1.2" + version: "8.2.5" font_awesome_flutter: dependency: "direct main" description: name: font_awesome_flutter - url: "https://pub.dartlang.org" + sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f" + url: "https://pub.dev" source: hosted - version: "9.2.0" + version: "10.7.0" google_fonts: dependency: "direct main" description: name: google_fonts - url: "https://pub.dartlang.org" + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 + url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "6.2.1" + google_identity_services_web: + dependency: transitive + description: + name: google_identity_services_web + sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8" + url: "https://pub.dev" + source: hosted + version: "0.3.1+1" google_sign_in: dependency: "direct main" description: name: google_sign_in - url: "https://pub.dartlang.org" + sha256: "0b8787cb9c1a68ad398e8010e8c8766bfa33556d2ab97c439fb4137756d7308f" + url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "6.2.1" google_sign_in_android: dependency: transitive description: name: google_sign_in_android - url: "https://pub.dartlang.org" + sha256: "41187ee48f8f3f7588cb932a5ab3cc8c83f354d1d50c750f61b240efac1b33d2" + url: "https://pub.dev" source: hosted version: "6.1.4" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - url: "https://pub.dartlang.org" + sha256: a058c9880be456f21e2e8571c1126eaacd570bdc5b6c6d9d15aea4bdf22ca9fe + url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.7.6" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - url: "https://pub.dartlang.org" + sha256: "1f6e5787d7a120cc0359ddf315c92309069171306242e181c09472d1b00a2971" + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.5" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - url: "https://pub.dartlang.org" + sha256: fc0f14ed45ea616a6cfb4d1c7534c2221b7092cc4f29a709f0c3053cc3e821bd + url: "https://pub.dev" source: hosted - version: "0.10.2" + version: "0.12.4" + html: + dependency: transitive + description: + name: html + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + url: "https://pub.dev" + source: hosted + version: "0.15.4" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "1.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" icofont_flutter: dependency: "direct main" description: name: icofont_flutter - url: "https://pub.dartlang.org" + sha256: ee022efb9428863607568cf6818dfc59afb5c987ea449d7ef9241fe69749d609 + url: "https://pub.dev" source: hosted version: "1.4.0" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" + url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "4.1.7" in_app_review: dependency: "direct main" description: name: in_app_review - url: "https://pub.dartlang.org" + sha256: "99869244d09adc76af16bf8fd731dd13cef58ecafd5917847589c49f378cbb30" + url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.0.9" in_app_review_platform_interface: dependency: transitive description: name: in_app_review_platform_interface - url: "https://pub.dartlang.org" + sha256: fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10 + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.0.5" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + intl_phone_number_input: + dependency: transitive + description: + name: intl_phone_number_input + sha256: "1c4328713a9503ab26a1fdbb6b00b4cada68c18aac922b35bedbc72eff1297c3" + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.7.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" keyboard_actions: dependency: "direct main" description: name: keyboard_actions - url: "https://pub.dartlang.org" + sha256: "31e0ab2a706ac8f58887efa60efc1f19aecdf37d8ab0f665a0f156d1fbeab650" + url: "https://pub.dev" source: hosted - version: "3.4.7" + version: "4.2.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + libphonenumber_platform_interface: + dependency: transitive + description: + name: libphonenumber_platform_interface + sha256: f801f6c65523f56504b83f0890e6dad584ab3a7507dca65fec0eed640afea40f + url: "https://pub.dev" + source: hosted + version: "0.4.2" + libphonenumber_plugin: + dependency: transitive + description: + name: libphonenumber_plugin + sha256: c615021d9816fbda2b2587881019ed595ecdf54d999652d7e4cce0e1f026368c + url: "https://pub.dev" + source: hosted + version: "0.3.3" + libphonenumber_web: + dependency: transitive + description: + name: libphonenumber_web + sha256: "8186f420dbe97c3132283e52819daff1e55d60d6db46f7ea5ac42f42a28cc2ef" + url: "https://pub.dev" + source: hosted + version: "0.3.2" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.8.0" material_design_icons_flutter: dependency: "direct main" description: name: material_design_icons_flutter - url: "https://pub.dartlang.org" + sha256: "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a" + url: "https://pub.dev" source: hosted - version: "4.0.5955" + version: "7.0.7296" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.11.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.5" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" outline_material_icons: dependency: "direct main" description: name: outline_material_icons - url: "https://pub.dartlang.org" + sha256: "83b1d79676c6299731039ac0f0fa0ebcd0a562cde2f548bceb4960a349527f47" + url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "1.0.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.0" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.0.15" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e + url: "https://pub.dev" source: hosted version: "2.0.22" - path_provider_ios: + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297" + url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.2.4" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + url: "https://pub.dev" source: hosted version: "2.1.7" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.6" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + url: "https://pub.dev" source: hosted version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + url: "https://pub.dev" source: hosted - version: "2.1.3" - pedantic: + version: "2.1.7" + petitparser: dependency: transitive description: - name: pedantic - url: "https://pub.dartlang.org" + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" source: hosted - version: "1.11.1" - petitparser: + version: "6.0.2" + phone_numbers_parser: dependency: transitive description: - name: petitparser - url: "https://pub.dartlang.org" + name: phone_numbers_parser + sha256: ebe08725e63218a6ae2bf9129b7130332cb2ababa4988f07d6ddce48b0c21e06 + url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "8.2.1" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.8" pointycastle: dependency: transitive description: name: pointycastle - url: "https://pub.dartlang.org" + sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346 + url: "https://pub.dev" source: hosted version: "3.6.2" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "6.1.2" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: "93982981971e812c94d4a6fa3a57b89f9ec12b38b6380cd3c1370c3b01e4580e" + url: "https://pub.dev" source: hosted version: "3.1.0" rate_my_app: dependency: "direct main" description: name: rate_my_app - url: "https://pub.dartlang.org" + sha256: "201681ce28d2a5dc7bcfbdd394f08a64b1e2c24daca793ee1f069034757ae6f0" + url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "2.1.0" share_plus: dependency: "direct main" description: name: share_plus - url: "https://pub.dartlang.org" + sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544 + url: "https://pub.dev" source: hosted - version: "2.2.0" - share_plus_linux: - dependency: transitive - description: - name: share_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" - share_plus_macos: - dependency: transitive - description: - name: share_plus_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" + version: "9.0.0" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - share_plus_web: - dependency: transitive - description: - name: share_plus_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" - share_plus_windows: - dependency: transitive - description: - name: share_plus_windows - url: "https://pub.dartlang.org" + sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "4.0.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.2.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" + url: "https://pub.dev" source: hosted - version: "2.0.14" - shared_preferences_ios: + version: "2.2.2" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - url: "https://pub.dartlang.org" + name: shared_preferences_foundation + sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.5" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + url: "https://pub.dev" source: hosted - version: "2.1.2" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" + version: "2.3.2" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.2" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.3.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.3.2" + sign_in_button: + dependency: transitive + description: + name: sign_in_button + sha256: "977b9b0415d2f3909e642275dfabba7919ba8e111324641b76cae6d1acbd183e" + url: "https://pub.dev" + source: hosted + version: "3.2.0" simple_gesture_detector: dependency: transitive description: name: simple_gesture_detector - url: "https://pub.dartlang.org" + sha256: "86d08f85f1f58583b7b4b941d989f48ea6ce08c1724a1d10954a277c2ec36592" + url: "https://pub.dev" source: hosted version: "0.2.0" sky_engine: @@ -681,198 +830,258 @@ packages: dependency: "direct main" description: name: sliding_up_panel - url: "https://pub.dartlang.org" + sha256: "578e90956a6212d1e406373250b2436a0f3afece29aee3c24c8360094d6cf968" + url: "https://pub.dev" source: hosted version: "2.0.0+1" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" sqflite: dependency: "direct main" description: name: sqflite - url: "https://pub.dartlang.org" + sha256: "5ce2e1a15e822c3b4bfb5400455775e421da7098eed8adc8f26298ada7c9308c" + url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.3" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" + url: "https://pub.dev" source: hosted - version: "2.4.0+2" + version: "2.5.4" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" syncfusion_flutter_charts: dependency: "direct main" description: name: syncfusion_flutter_charts - url: "https://pub.dartlang.org" + sha256: "4dd050773ef08829919879a8ac9ee3632a4fb798902aae4dd935c6d5504842d1" + url: "https://pub.dev" source: hosted - version: "19.4.56" + version: "25.1.41+1" syncfusion_flutter_core: dependency: transitive description: name: syncfusion_flutter_core - url: "https://pub.dartlang.org" + sha256: "708425f534ef04253334763c8b75acc79eaec2d9b325bcd862575ea0a2207d87" + url: "https://pub.dev" source: hosted - version: "19.4.56" + version: "25.1.41" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "7b530acd9cb7c71b0019a1e7fa22c4105e675557a4400b6a401c71c5e0ade1ac" + url: "https://pub.dev" source: hosted version: "3.0.0+3" table_calendar: dependency: "direct main" description: name: table_calendar - url: "https://pub.dartlang.org" + sha256: "1e3521a3e6d3fc7f645a58b135ab663d458ab12504f1ea7f9b4b81d47086c478" + url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.6.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted version: "1.3.1" universal_io: dependency: transitive description: name: universal_io - url: "https://pub.dartlang.org" + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.2" url_launcher: dependency: transitive description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "3c92b0efb5e9dcb8f846aefabf9f0f739f91682ed486b991ceda51c288e60896" + url: "https://pub.dev" source: hosted version: "6.1.7" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "6f91d30ce9060c204b2dbe728adb300750fa4b228e8f7ed1b961aa1ceb728799" + url: "https://pub.dev" source: hosted version: "6.0.22" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "6ba7dddee26c9fae27c9203c424631109d73c8fa26cfa7bc3e35e751cb87f62e" + url: "https://pub.dev" source: hosted version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: a9b3ea9043eabfaadfa3fb89de67a11210d85569086d22b3854484beab8b3978 + url: "https://pub.dev" source: hosted version: "3.0.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.3.1" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" + uuid: + dependency: transitive + description: + name: uuid + sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + url: "https://pub.dev" + source: hosted + version: "4.4.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" + web: + dependency: transitive + description: + name: web + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + url: "https://pub.dev" + source: hosted + version: "0.5.1" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b" + url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "5.0.3" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "11541eedefbcaec9de35aa82650b695297ce668662bbd6e3911a7fabdbde589f" + url: "https://pub.dev" source: hosted version: "0.2.0+2" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" source: hosted - version: "5.4.1" + version: "6.5.0" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=3.3.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.2" diff --git a/pubspec.yaml b/pubspec.yaml index 53914ff..7dc6519 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,47 +29,47 @@ dependencies: # cloud_firestore: ^0.16.0+1 # syncfusion_flutter_datepicker: ^19.2.62 # flutter_spinkit: ^5.1.0 - google_sign_in: ^5.2.0 - firebase_auth: ^3.1.4 - firebase_core: ^1.8.0 - shared_preferences: ^2.0.8 - sqflite: ^2.0.0+4 - intl: ^0.17.0 - provider: ^5.0.0 - flutter_screenutil: ^5.0.0+2 - flutter_login: ^2.2.1 - flutter_screen_lock: ^4.0.4+2 - flutter_app_lock: ^2.0.0 - google_fonts: ^2.1.0 - table_calendar: ^3.0.2 - syncfusion_flutter_charts: ^20.4.54 - day_night_time_picker: ^1.0.3+1 - flutter_material_pickers: ^3.1.0 + google_sign_in: ^6.2.1 + firebase_auth: ^4.19.3 + firebase_core: ^2.30.1 + shared_preferences: ^2.2.3 + sqflite: ^2.3.3 + intl: ^0.18.1 + provider: ^6.1.2 + flutter_screenutil: ^5.9.0 + flutter_login: ^5.0.0 + flutter_screen_lock: ^9.0.2 + flutter_app_lock: ^4.1.1+1 + google_fonts: ^6.2.1 + table_calendar: ^3.0.9 + syncfusion_flutter_charts: ^25.1.41+1 + day_night_time_picker: ^1.3.1 + flutter_material_pickers: ^3.4.0 sliding_up_panel: ^2.0.0+1 - keyboard_actions: ^3.4.4 - fluttertoast: ^8.2.1 + keyboard_actions: ^4.2.0 + fluttertoast: ^8.2.5 flutter_swipe_action_cell: ^3.1.0 - share_plus: ^2.1.4 - in_app_review: ^2.0.3 - rate_my_app: ^1.1.1 + share_plus: ^9.0.0 + in_app_review: ^2.0.9 + rate_my_app: ^2.1.0 # local_auth: ^1.1.8 # icons - material_design_icons_flutter: ^4.0.5955 - font_awesome_flutter: ^9.1.0 - outline_material_icons: ^0.1.1 + material_design_icons_flutter: ^7.0.7296 + font_awesome_flutter: ^10.7.0 + outline_material_icons: ^1.0.0 flutter_boxicons: ^3.0.0 icofont_flutter: ^1.4.0 - cupertino_icons: ^1.0.3 + cupertino_icons: ^1.0.8 dependency_overrides: - flutter_colorpicker: ^0.6.0 + flutter_colorpicker: ^1.0.3 dev_dependencies: flutter_test: sdk: flutter - flutter_native_splash: ^1.2.3 + flutter_native_splash: ^2.4.0 flutter_native_splash: color: "#ffffff" From 28f3ab7ff49deaa57d625c2406658cc0903ae827 Mon Sep 17 00:00:00 2001 From: Muhammad Osama Noor Date: Mon, 29 Apr 2024 22:44:27 +0500 Subject: [PATCH 2/5] Revert "updates" This reverts commit c9539bc44969d94797343bd752ea388c0146dad5. --- lib/main.dart | 2 +- lib/project/app_pages/calendar.dart | 2 +- lib/project/app_pages/input.dart | 46 +- lib/project/app_pages/report.dart | 32 +- .../shared_preferences_services.dart | 3 +- pubspec.lock | 733 +++++++----------- pubspec.yaml | 54 +- 7 files changed, 317 insertions(+), 555 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index aa84a06..9baa22c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -//// @dart=2.9 +// @dart=2.9 import 'package:money_assistant_2608/project/real_main.dart'; diff --git a/lib/project/app_pages/calendar.dart b/lib/project/app_pages/calendar.dart index 66aa725..7a18c6e 100644 --- a/lib/project/app_pages/calendar.dart +++ b/lib/project/app_pages/calendar.dart @@ -101,7 +101,7 @@ class _CalendarBodyState extends State { }, child: SwipeActionCell( key: ObjectKey(transactions[int]), - // performsFirstActionWithFullSwipe: true, + performsFirstActionWithFullSwipe: true, trailingActions: [ SwipeAction( title: getTranslated(context, 'Delete') ?? 'Delete', diff --git a/lib/project/app_pages/input.dart b/lib/project/app_pages/input.dart index 8447152..035d3d9 100644 --- a/lib/project/app_pages/input.dart +++ b/lib/project/app_pages/input.dart @@ -647,8 +647,9 @@ class _DateCardState extends State { ), ), Text( - DateFormat(sharedPrefs.dateFormat) - .format(DateFormat('dd/MM/yyyy').parse(model.date!)), + DateFormat(sharedPrefs.dateFormat).format( + DateFormat('dd/MM/yyyy').parse( + model.date!)), style: GoogleFonts.aBeeZee( fontSize: 21.5.sp, ), @@ -665,22 +666,19 @@ class _DateCardState extends State { } Navigator.of(context).push( showPicker( - cancelText: getTranslated(context, 'Cancel') ?? 'Cancel', - okText: getTranslated(context, 'Ok') ?? 'Ok', - unselectedColor: grey, - dialogInsetPadding: - EdgeInsets.symmetric(horizontal: 50.w, vertical: 30.0.h), - elevation: 12, - context: context, - value: timeOfDayToTime( - selectedTime), // Convert TimeOfDay to Time - is24HrFormat: true, - onChange: (value) => setState(() { - selectedTime = - TimeOfDay(hour: value.hour, minute: value.minute); - model.time = selectedTime.format(context); - }), - ), + cancelText: getTranslated(context, 'Cancel') ?? 'Cancel', + okText: getTranslated(context, 'Ok') ?? 'Ok', + unselectedColor: grey, + dialogInsetPadding: EdgeInsets.symmetric( + horizontal: 50.w, vertical: 30.0.h), + elevation: 12, + context: context, + value: selectedTime, + is24HrFormat: true, + onChange: (value) => setState(() { + selectedTime = value; + model.time = value.format(context); + })), ); }, child: Text( @@ -696,13 +694,6 @@ class _DateCardState extends State { } } -Time timeOfDayToTime(TimeOfDay timeOfDay) { - return Time( - hour: timeOfDay.hour, - minute: timeOfDay.minute, - ); -} - void saveInputFunc(BuildContext context, bool saveFunction) { model.amount = _amountController.text.isEmpty ? 0 @@ -718,10 +709,7 @@ void saveInputFunc(BuildContext context, bool saveFunction) { } else { DB.update(model); Navigator.pop(context); - customToast( - context, - getTranslated(context, 'Transaction has been updated') ?? - 'Transaction has been updated'); + customToast(context, getTranslated(context, 'Transaction has been updated') ?? 'Transaction has been updated'); } } diff --git a/lib/project/app_pages/report.dart b/lib/project/app_pages/report.dart index 7ddbfc5..4913475 100644 --- a/lib/project/app_pages/report.dart +++ b/lib/project/app_pages/report.dart @@ -21,7 +21,7 @@ import 'dart:io' show Platform; import 'package:syncfusion_flutter_charts/charts.dart'; import 'edit.dart'; -import 'dart:io'; + var year = todayDT.year; class Report extends StatefulWidget { @@ -36,7 +36,6 @@ class Report extends StatefulWidget { required this.icon, }); - @override _ReportState createState() => _ReportState(); } @@ -94,26 +93,13 @@ class ReportBody extends StatefulWidget { final String selectedDate; final Color color; final IconData icon; - - ReportBody(this.type, this.category, this.selectedDate, this.color, - this.icon); - + ReportBody( + this.type, this.category, this.selectedDate, this.color, this.icon); @override _ReportBodyState createState() => _ReportBodyState(); - - List> _getGradientAreaSeries(String type, - List monthAmountList) { - return >[ - SplineAreaSeries( - dataSource: monthAmountList, - xValueMapper: (MonthAmount monthAmount, _) => monthAmount.month, - yValueMapper: (MonthAmount monthAmount, _) => monthAmount.amount, - ), - ]; - } } - class _ReportBodyState extends State { +class _ReportBodyState extends State { @override Widget build(BuildContext context) { return ChangeNotifierProvider( @@ -225,8 +211,6 @@ class ReportBody extends StatefulWidget { } } - - return Column( children: [ Padding( @@ -256,8 +240,8 @@ class ReportBody extends StatefulWidget { width: 4.h, ), majorTickLines: MajorTickLines(size: 5.sp)), - // series: _getGradientAreaSeries( - // this.widget.type, monthBasedTransactionList), + series: _getGradientAreaSeries( + this.widget.type, monthBasedTransactionList), onMarkerRender: (MarkerRenderArgs args) { if (this.widget.type == 'Income') { if (args.pointIndex == 0) { @@ -448,8 +432,8 @@ class ReportBody extends StatefulWidget { key: ObjectKey( selectedTransactions[ int]), - // performsFirstActionWithFullSwipe: - // true, + performsFirstActionWithFullSwipe: + true, trailingActions: < SwipeAction>[ SwipeAction( diff --git a/lib/project/database_management/shared_preferences_services.dart b/lib/project/database_management/shared_preferences_services.dart index 0222e9d..0148868 100644 --- a/lib/project/database_management/shared_preferences_services.dart +++ b/lib/project/database_management/shared_preferences_services.dart @@ -191,10 +191,9 @@ class SharedPrefs { categoryItem(MdiIcons.dogService, 'Pets'), categoryItem(MdiIcons.tableChair, 'Furnishings'), categoryItem(MdiIcons.autoFix, 'Home Services'), - categoryItem(MdiIcons.currencyUsd, 'Mortgage & Rent'), + categoryItem(MdiIcons.homeCurrencyUsd, 'Mortgage & Rent'), ]); - saveItems('Utility Bills', [ categoryItem(FontAwesomeIcons.fileInvoiceDollar, 'Utility Bills'), categoryItem(IcoFontIcons.lightBulb, 'Electricity'), diff --git a/pubspec.lock b/pubspec.lock index 79df2c3..b64440b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,234 +5,184 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "1639d96851f9e9e215dd39c9baad56846488aef3df392cb3221f37f70beac686" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.3.31" + version: "1.0.2" another_flushbar: dependency: transitive description: name: another_flushbar - sha256: fa09f8a4ca582c417669b7b1d0e85ce65bd074d80bb0dcbb1302ad1b22bdc3ef - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.12.29" another_transformer_page_view: dependency: transitive description: name: another_transformer_page_view - sha256: a7cd46ede62d621c5abe7e58c7cb2745abe67b3bfec64f59b8889c93d7be7a8e - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" - ansicolor: - dependency: transitive - description: - name: ansicolor - sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880" - url: "https://pub.dev" - source: hosted - version: "2.0.2" + version: "1.1.0" archive: dependency: transitive description: name: archive - sha256: "20071638cbe4e5964a427cfa0e86dce55d060bc7d82d56f3554095d7239a8765" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "3.4.2" + version: "3.3.5" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.3.1" async: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.11.0" + version: "2.9.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.0" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.1" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.1.1" + cloud_firestore_platform_interface: + dependency: transitive + description: + name: cloud_firestore_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "5.7.7" + cloud_firestore_web: + dependency: transitive + description: + name: cloud_firestore_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.10" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.18.0" + version: "1.16.0" convert: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.1.1" - cross_file: - dependency: transitive - description: - name: cross_file - sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" - url: "https://pub.dev" - source: hosted - version: "0.3.4+1" crypto: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.0.2" - csslib: - dependency: transitive - description: - name: csslib - sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" - url: "https://pub.dev" - source: hosted - version: "1.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.8" + version: "1.0.5" day_night_time_picker: dependency: "direct main" description: name: day_night_time_picker - sha256: "085563dee6f64961c47abb1d444dbb923fda2f6fed0df452fcc221ae38a58898" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" - equatable: - dependency: transitive - description: - name: equatable - sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 - url: "https://pub.dev" - source: hosted - version: "2.0.5" + version: "1.1.3" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.3.1" ffi: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.0.1" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "6.1.4" file_picker: dependency: transitive description: name: file_picker - sha256: be325344c1f3070354a1d84a231a1ba75ea85d413774ec4bdf444c023342e030 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "5.5.0" + version: "5.2.4" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: "6c3b28d13d1960d9e3fb36ebae7ae5732af41410ade8ac0d546ced3ae34dd7cc" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "4.19.3" + version: "3.11.2" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: "23232537407e009e88d6b1c028c684cab1ef6511a87f7d42b340c7284e6dbcbb" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "7.2.4" + version: "6.10.1" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: "2eda928d76768847fd2e7c438ecf871a93d7fe95197b928d2de510846d07d2e5" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "5.11.3" + version: "4.6.1" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "4aef2a23d0f3265545807d68fbc2f76a6b994ca3c778d88453b99325abd63284" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.30.1" + version: "1.24.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "4.5.2" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "67f2fcc600fc78c2f731c370a3a5e6c87ee862e3a2fba6f951eca6d5dafe5c29" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.16.0" - fixnum: - dependency: transitive - description: - name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" - url: "https://pub.dev" - source: hosted - version: "1.1.0" + version: "1.7.3" flutter: dependency: "direct main" description: flutter @@ -242,26 +192,23 @@ packages: dependency: "direct main" description: name: flutter_app_lock - sha256: ca5c35058d490e2f957c36698abc61848b100b9adc02927970ec0e1b27bb2763 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "4.1.1+1" + version: "2.0.0" flutter_boxicons: dependency: "direct main" description: name: flutter_boxicons - sha256: "2323b3148ca0b22965c64967e87d4236c1d83b00547f661303a8c81c9dff7ac7" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.0.0" flutter_colorpicker: dependency: "direct overridden" description: name: flutter_colorpicker - sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "0.6.1" flutter_localizations: dependency: "direct main" description: flutter @@ -271,66 +218,58 @@ packages: dependency: "direct main" description: name: flutter_login - sha256: "1f7c46d0d76081cf4c5180e3a265b1f5b1d7e48c81859f58f03a8dcd27338b85" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "2.2.1" flutter_material_pickers: dependency: "direct main" description: name: flutter_material_pickers - sha256: "1100bfd9a296a6680578aba8c51a0db114fb8ef94708fe320fe6da92b1f8c0e1" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "3.6.0" + version: "3.3.0" flutter_native_splash: dependency: "direct dev" description: name: flutter_native_splash - sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "1.3.3" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.19" + version: "2.0.7" flutter_rating_bar: dependency: transitive description: name: flutter_rating_bar - sha256: d2af03469eac832c591a1eba47c91ecc871fe5708e69967073c043b2d775ed93 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "4.0.1" flutter_screen_lock: dependency: "direct main" description: name: flutter_screen_lock - sha256: f8e504aa0e5fe61ea13b66692ecdec3e8761118173b51c9b3b5518b8e2911e5b - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "9.0.2" + version: "4.0.4+3" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - sha256: "8cf100b8e4973dc570b6415a2090b0bfaa8756ad333db46939efc3e774ee100d" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "5.9.0" + version: "5.6.0" flutter_swipe_action_cell: dependency: "direct main" description: name: flutter_swipe_action_cell - sha256: "5cea4d8c3d333c5610ffa4bc39a30561927f90857be19ba33a8322fdc856d335" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" + version: "2.2.3" flutter_test: dependency: "direct dev" description: flutter @@ -345,480 +284,392 @@ packages: dependency: "direct main" description: name: fluttertoast - sha256: "81b68579e23fcbcada2db3d50302813d2371664afe6165bc78148050ab94bf66" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "8.2.5" + version: "8.1.2" font_awesome_flutter: dependency: "direct main" description: name: font_awesome_flutter - sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "10.7.0" + version: "9.2.0" google_fonts: dependency: "direct main" description: name: google_fonts - sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "6.2.1" - google_identity_services_web: - dependency: transitive - description: - name: google_identity_services_web - sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8" - url: "https://pub.dev" - source: hosted - version: "0.3.1+1" + version: "2.3.3" google_sign_in: dependency: "direct main" description: name: google_sign_in - sha256: "0b8787cb9c1a68ad398e8010e8c8766bfa33556d2ab97c439fb4137756d7308f" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "6.2.1" + version: "5.4.2" google_sign_in_android: dependency: transitive description: name: google_sign_in_android - sha256: "41187ee48f8f3f7588cb932a5ab3cc8c83f354d1d50c750f61b240efac1b33d2" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "6.1.4" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - sha256: a058c9880be456f21e2e8571c1126eaacd570bdc5b6c6d9d15aea4bdf22ca9fe - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "5.7.6" + version: "5.5.1" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - sha256: "1f6e5787d7a120cc0359ddf315c92309069171306242e181c09472d1b00a2971" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.4.5" + version: "2.3.0" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - sha256: fc0f14ed45ea616a6cfb4d1c7534c2221b7092cc4f29a709f0c3053cc3e821bd - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "0.12.4" - html: - dependency: transitive - description: - name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" - url: "https://pub.dev" - source: hosted - version: "0.15.4" + version: "0.10.2" http: dependency: transitive description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "0.13.5" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "4.0.2" icofont_flutter: dependency: "direct main" description: name: icofont_flutter - sha256: ee022efb9428863607568cf6818dfc59afb5c987ea449d7ef9241fe69749d609 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.4.0" image: dependency: transitive description: name: image - sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "4.1.7" + version: "3.1.3" in_app_review: dependency: "direct main" description: name: in_app_review - sha256: "99869244d09adc76af16bf8fd731dd13cef58ecafd5917847589c49f378cbb30" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.6" in_app_review_platform_interface: dependency: transitive description: name: in_app_review_platform_interface - sha256: fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.4" intl: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" - url: "https://pub.dev" - source: hosted - version: "0.18.1" - intl_phone_number_input: - dependency: transitive - description: - name: intl_phone_number_input - sha256: "1c4328713a9503ab26a1fdbb6b00b4cada68c18aac922b35bedbc72eff1297c3" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "0.7.4" + version: "0.17.0" js: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "0.6.7" + version: "0.6.4" keyboard_actions: dependency: "direct main" description: name: keyboard_actions - sha256: "31e0ab2a706ac8f58887efa60efc1f19aecdf37d8ab0f665a0f156d1fbeab650" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "4.2.0" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" - url: "https://pub.dev" - source: hosted - version: "10.0.0" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 - url: "https://pub.dev" - source: hosted - version: "2.0.1" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 - url: "https://pub.dev" - source: hosted - version: "2.0.1" - libphonenumber_platform_interface: - dependency: transitive - description: - name: libphonenumber_platform_interface - sha256: f801f6c65523f56504b83f0890e6dad584ab3a7507dca65fec0eed640afea40f - url: "https://pub.dev" - source: hosted - version: "0.4.2" - libphonenumber_plugin: - dependency: transitive - description: - name: libphonenumber_plugin - sha256: c615021d9816fbda2b2587881019ed595ecdf54d999652d7e4cce0e1f026368c - url: "https://pub.dev" - source: hosted - version: "0.3.3" - libphonenumber_web: - dependency: transitive - description: - name: libphonenumber_web - sha256: "8186f420dbe97c3132283e52819daff1e55d60d6db46f7ea5ac42f42a28cc2ef" - url: "https://pub.dev" - source: hosted - version: "0.3.2" + version: "3.4.7" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "0.12.16+1" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "0.8.0" + version: "0.1.5" material_design_icons_flutter: dependency: "direct main" description: name: material_design_icons_flutter - sha256: "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "7.0.7296" + version: "4.0.5955" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.11.0" + version: "1.8.0" mime: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.0.3" nested: dependency: transitive description: name: nested - sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.0.0" outline_material_icons: dependency: "direct main" description: name: outline_material_icons - sha256: "83b1d79676c6299731039ac0f0fa0ebcd0a562cde2f548bceb4960a349527f47" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "0.1.1" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.8.2" path_provider: dependency: transitive description: name: path_provider - sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.15" + version: "2.0.11" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.0.22" - path_provider_foundation: + path_provider_ios: dependency: transitive description: - name: path_provider_foundation - sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297" - url: "https://pub.dev" + name: path_provider_ios + url: "https://pub.dartlang.org" source: hosted - version: "2.2.4" + version: "2.0.11" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.1.7" + path_provider_macos: + dependency: transitive + description: + name: path_provider_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.6" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.1.7" - petitparser: + version: "2.1.3" + pedantic: dependency: transitive description: - name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 - url: "https://pub.dev" + name: pedantic + url: "https://pub.dartlang.org" source: hosted - version: "6.0.2" - phone_numbers_parser: + version: "1.11.1" + petitparser: dependency: transitive description: - name: phone_numbers_parser - sha256: ebe08725e63218a6ae2bf9129b7130332cb2ababa4988f07d6ddce48b0c21e06 - url: "https://pub.dev" + name: petitparser + url: "https://pub.dartlang.org" source: hosted - version: "8.2.1" + version: "5.1.0" platform: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.1.8" + version: "2.1.3" pointycastle: dependency: transitive description: name: pointycastle - sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.6.2" process: dependency: transitive description: name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "4.2.4" provider: dependency: "direct main" description: name: provider - sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "5.0.0" quiver: dependency: transitive description: name: quiver - sha256: "93982981971e812c94d4a6fa3a57b89f9ec12b38b6380cd3c1370c3b01e4580e" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.1.0" rate_my_app: dependency: "direct main" description: name: rate_my_app - sha256: "201681ce28d2a5dc7bcfbdd394f08a64b1e2c24daca793ee1f069034757ae6f0" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "1.1.3" share_plus: dependency: "direct main" description: name: share_plus - sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "9.0.0" + version: "2.2.0" + share_plus_linux: + dependency: transitive + description: + name: share_plus_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + share_plus_macos: + dependency: transitive + description: + name: share_plus_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4" - url: "https://pub.dev" + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + share_plus_web: + dependency: transitive + description: + name: share_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + share_plus_windows: + dependency: transitive + description: + name: share_plus_windows + url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "2.0.3" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.2.3" + version: "2.0.15" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.2.2" - shared_preferences_foundation: + version: "2.0.14" + shared_preferences_ios: dependency: transitive description: - name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" - url: "https://pub.dev" + name: shared_preferences_ios + url: "https://pub.dartlang.org" source: hosted - version: "2.3.5" + version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.3.2" + version: "2.1.2" + shared_preferences_macos: + dependency: transitive + description: + name: shared_preferences_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.3.2" + version: "2.1.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.3.2" - sign_in_button: - dependency: transitive - description: - name: sign_in_button - sha256: "977b9b0415d2f3909e642275dfabba7919ba8e111324641b76cae6d1acbd183e" - url: "https://pub.dev" - source: hosted - version: "3.2.0" + version: "2.1.2" simple_gesture_detector: dependency: transitive description: name: simple_gesture_detector - sha256: "86d08f85f1f58583b7b4b941d989f48ea6ce08c1724a1d10954a277c2ec36592" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "0.2.0" sky_engine: @@ -830,258 +681,198 @@ packages: dependency: "direct main" description: name: sliding_up_panel - sha256: "578e90956a6212d1e406373250b2436a0f3afece29aee3c24c8360094d6cf968" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.0.0+1" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.10.0" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" + version: "1.9.0" sqflite: dependency: "direct main" description: name: sqflite - sha256: "5ce2e1a15e822c3b4bfb5400455775e421da7098eed8adc8f26298ada7c9308c" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "2.2.2" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.5.4" + version: "2.4.0+2" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.11.1" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.1.1" syncfusion_flutter_charts: dependency: "direct main" description: name: syncfusion_flutter_charts - sha256: "4dd050773ef08829919879a8ac9ee3632a4fb798902aae4dd935c6d5504842d1" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "25.1.41+1" + version: "19.4.56" syncfusion_flutter_core: dependency: transitive description: name: syncfusion_flutter_core - sha256: "708425f534ef04253334763c8b75acc79eaec2d9b325bcd862575ea0a2207d87" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "25.1.41" + version: "19.4.56" synchronized: dependency: transitive description: name: synchronized - sha256: "7b530acd9cb7c71b0019a1e7fa22c4105e675557a4400b6a401c71c5e0ade1ac" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.0.0+3" table_calendar: dependency: "direct main" description: name: table_calendar - sha256: "1e3521a3e6d3fc7f645a58b135ab663d458ab12504f1ea7f9b4b81d47086c478" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "3.0.9" + version: "3.0.8" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "0.6.1" + version: "0.4.12" typed_data: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.3.1" universal_io: dependency: transitive description: name: universal_io - sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.2.2" + version: "2.0.4" url_launcher: dependency: transitive description: name: url_launcher - sha256: "3c92b0efb5e9dcb8f846aefabf9f0f739f91682ed486b991ceda51c288e60896" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "6.1.7" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "6f91d30ce9060c204b2dbe728adb300750fa4b228e8f7ed1b961aa1ceb728799" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "6.0.22" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "6ba7dddee26c9fae27c9203c424631109d73c8fa26cfa7bc3e35e751cb87f62e" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" + version: "3.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: a9b3ea9043eabfaadfa3fb89de67a11210d85569086d22b3854484beab8b3978 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.0.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.3.2" + version: "2.1.1" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.3.1" + version: "2.0.13" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" - uuid: - dependency: transitive - description: - name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" - url: "https://pub.dev" - source: hosted - version: "4.4.0" + version: "3.0.1" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 - url: "https://pub.dev" - source: hosted - version: "13.0.0" - web: - dependency: transitive - description: - name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" - url: "https://pub.dev" - source: hosted - version: "0.5.1" + version: "2.1.2" win32: dependency: transitive description: name: win32 - sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "5.0.3" + version: "3.1.3" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "11541eedefbcaec9de35aa82650b695297ce668662bbd6e3911a7fabdbde589f" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "0.2.0+2" xml: dependency: transitive description: name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "6.5.0" + version: "5.4.1" yaml: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.1.1" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.19.2" + dart: ">=2.18.0 <3.0.0" + flutter: ">=3.3.0" diff --git a/pubspec.yaml b/pubspec.yaml index 7dc6519..53914ff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,47 +29,47 @@ dependencies: # cloud_firestore: ^0.16.0+1 # syncfusion_flutter_datepicker: ^19.2.62 # flutter_spinkit: ^5.1.0 - google_sign_in: ^6.2.1 - firebase_auth: ^4.19.3 - firebase_core: ^2.30.1 - shared_preferences: ^2.2.3 - sqflite: ^2.3.3 - intl: ^0.18.1 - provider: ^6.1.2 - flutter_screenutil: ^5.9.0 - flutter_login: ^5.0.0 - flutter_screen_lock: ^9.0.2 - flutter_app_lock: ^4.1.1+1 - google_fonts: ^6.2.1 - table_calendar: ^3.0.9 - syncfusion_flutter_charts: ^25.1.41+1 - day_night_time_picker: ^1.3.1 - flutter_material_pickers: ^3.4.0 + google_sign_in: ^5.2.0 + firebase_auth: ^3.1.4 + firebase_core: ^1.8.0 + shared_preferences: ^2.0.8 + sqflite: ^2.0.0+4 + intl: ^0.17.0 + provider: ^5.0.0 + flutter_screenutil: ^5.0.0+2 + flutter_login: ^2.2.1 + flutter_screen_lock: ^4.0.4+2 + flutter_app_lock: ^2.0.0 + google_fonts: ^2.1.0 + table_calendar: ^3.0.2 + syncfusion_flutter_charts: ^20.4.54 + day_night_time_picker: ^1.0.3+1 + flutter_material_pickers: ^3.1.0 sliding_up_panel: ^2.0.0+1 - keyboard_actions: ^4.2.0 - fluttertoast: ^8.2.5 + keyboard_actions: ^3.4.4 + fluttertoast: ^8.2.1 flutter_swipe_action_cell: ^3.1.0 - share_plus: ^9.0.0 - in_app_review: ^2.0.9 - rate_my_app: ^2.1.0 + share_plus: ^2.1.4 + in_app_review: ^2.0.3 + rate_my_app: ^1.1.1 # local_auth: ^1.1.8 # icons - material_design_icons_flutter: ^7.0.7296 - font_awesome_flutter: ^10.7.0 - outline_material_icons: ^1.0.0 + material_design_icons_flutter: ^4.0.5955 + font_awesome_flutter: ^9.1.0 + outline_material_icons: ^0.1.1 flutter_boxicons: ^3.0.0 icofont_flutter: ^1.4.0 - cupertino_icons: ^1.0.8 + cupertino_icons: ^1.0.3 dependency_overrides: - flutter_colorpicker: ^1.0.3 + flutter_colorpicker: ^0.6.0 dev_dependencies: flutter_test: sdk: flutter - flutter_native_splash: ^2.4.0 + flutter_native_splash: ^1.2.3 flutter_native_splash: color: "#ffffff" From b410bd6d38c071d4ead156c7fc9bf6c6643e58fa Mon Sep 17 00:00:00 2001 From: Muhammad Osama Noor Date: Mon, 29 Apr 2024 23:59:40 +0500 Subject: [PATCH 3/5] version updated and fixed few bugs of old version. --- android/app/build.gradle | 8 +- android/app/src/main/AndroidManifest.xml | 17 +- android/build.gradle | 42 +- android/gradle.properties | 4 +- lib/main.dart | 2 +- lib/project/app_pages/calendar.dart | 2 +- lib/project/app_pages/input.dart | 60 +- lib/project/app_pages/report.dart | 8 +- lib/project/auth_pages/sign_in.dart | 4 +- lib/project/classes/app_bar.dart | 77 +- lib/project/classes/lockscreen.dart | 95 +-- .../classes/saveOrSaveAndDeleteButtons.dart | 10 +- .../shared_preferences_services.dart | 9 +- pubspec.lock | 773 +++++++++++------- pubspec.yaml | 44 +- 15 files changed, 686 insertions(+), 469 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ad5ea21..d9c586c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) { android { - compileSdkVersion 30 + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -43,10 +43,11 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.mmas.money_assistant_2608" - minSdkVersion 16 - targetSdkVersion 33 + minSdkVersion flutter.minSdkVersion + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName + multiDexEnabled true } signingConfigs { @@ -70,4 +71,5 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'com.android.support:multidex:2.0.1' } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b5dbadf..1ffaaa9 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + android:windowSoftInputMode="adjustResize" + android:exported="true"> + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> + android:name="io.flutter.embedding.android.SplashScreenDrawable" + android:resource="@drawable/launch_background" + /> diff --git a/android/build.gradle b/android/build.gradle index 3f83975..68c0a60 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,13 +1,45 @@ +//buildscript { +// ext.kotlin_version = '1.8.0' +// repositories { +// google() +// jcenter() +// } +// +// dependencies { +// classpath 'com.android.tools.build:gradle:4.1.0' +// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" +// } +//} +// +//allprojects { +// repositories { +// google() +// jcenter() +// } +//} +// +//rootProject.buildDir = '../build' +//subprojects { +// project.buildDir = "${rootProject.buildDir}/${project.name}" +// project.evaluationDependsOn(':app') +//} +// +//tasks.register("clean", Delete) { +// delete rootProject.buildDir +//} + buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '1.7.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.google.gms:google-services:4.3.3' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' } } @@ -21,9 +53,11 @@ allprojects { rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/android/gradle.properties b/android/gradle.properties index 556c2ee..e9eb9ea 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ #org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true -org.gradle.java.home=C:/Program Files/Java/jdk-19 -org.gradle.jvmargs=--add-opens java.base/java.io=ALL-UNNAMED \ No newline at end of file + diff --git a/lib/main.dart b/lib/main.dart index 9baa22c..e1b2db5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -// @dart=2.9 + import 'package:money_assistant_2608/project/real_main.dart'; diff --git a/lib/project/app_pages/calendar.dart b/lib/project/app_pages/calendar.dart index 7a18c6e..66aa725 100644 --- a/lib/project/app_pages/calendar.dart +++ b/lib/project/app_pages/calendar.dart @@ -101,7 +101,7 @@ class _CalendarBodyState extends State { }, child: SwipeActionCell( key: ObjectKey(transactions[int]), - performsFirstActionWithFullSwipe: true, + // performsFirstActionWithFullSwipe: true, trailingActions: [ SwipeAction( title: getTranslated(context, 'Delete') ?? 'Delete', diff --git a/lib/project/app_pages/input.dart b/lib/project/app_pages/input.dart index 035d3d9..feac9cd 100644 --- a/lib/project/app_pages/input.dart +++ b/lib/project/app_pages/input.dart @@ -658,36 +658,36 @@ class _DateCardState extends State { ), ), Spacer(), - GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () { - if (_pc.isPanelOpen) { - _pc.close(); - } - Navigator.of(context).push( - showPicker( - cancelText: getTranslated(context, 'Cancel') ?? 'Cancel', - okText: getTranslated(context, 'Ok') ?? 'Ok', - unselectedColor: grey, - dialogInsetPadding: EdgeInsets.symmetric( - horizontal: 50.w, vertical: 30.0.h), - elevation: 12, - context: context, - value: selectedTime, - is24HrFormat: true, - onChange: (value) => setState(() { - selectedTime = value; - model.time = value.format(context); - })), - ); - }, - child: Text( - model.time!, - style: GoogleFonts.aBeeZee( - fontSize: 21.5.sp, - ), - ), - ) + // GestureDetector( + // behavior: HitTestBehavior.translucent, + // onTap: () { + // if (_pc.isPanelOpen) { + // _pc.close(); + // } + // Navigator.of(context).push( + // showPicker( + // cancelText: getTranslated(context, 'Cancel') ?? 'Cancel', + // okText: getTranslated(context, 'Ok') ?? 'Ok', + // unselectedColor: grey, + // dialogInsetPadding: EdgeInsets.symmetric( + // horizontal: 50.w, vertical: 30.0.h), + // elevation: 12, + // context: context, + // // value: selectedTime, + // is24HrFormat: true, + // onChange: (value) => setState(() { + // selectedTime = value; + // model.time = value.format(context); + // }), value: ), + // ); + // }, + // child: Text( + // model.time!, + // style: GoogleFonts.aBeeZee( + // fontSize: 21.5.sp, + // ), + // ), + // ) ], ), ); diff --git a/lib/project/app_pages/report.dart b/lib/project/app_pages/report.dart index 4913475..438cee3 100644 --- a/lib/project/app_pages/report.dart +++ b/lib/project/app_pages/report.dart @@ -240,8 +240,8 @@ class _ReportBodyState extends State { width: 4.h, ), majorTickLines: MajorTickLines(size: 5.sp)), - series: _getGradientAreaSeries( - this.widget.type, monthBasedTransactionList), + // series: _getGradientAreaSeries( + // this.widget.type, monthBasedTransactionList), onMarkerRender: (MarkerRenderArgs args) { if (this.widget.type == 'Income') { if (args.pointIndex == 0) { @@ -432,8 +432,8 @@ class _ReportBodyState extends State { key: ObjectKey( selectedTransactions[ int]), - performsFirstActionWithFullSwipe: - true, + // performsFirstActionWithFullSwipe: + // true, trailingActions: < SwipeAction>[ SwipeAction( diff --git a/lib/project/auth_pages/sign_in.dart b/lib/project/auth_pages/sign_in.dart index 4ffeb35..06f77fe 100644 --- a/lib/project/auth_pages/sign_in.dart +++ b/lib/project/auth_pages/sign_in.dart @@ -24,8 +24,8 @@ class SignIn extends StatelessWidget { ); return FlutterLogin( title: 'MMAS', - logo: 'Hi!', - onSignup: _authenticateUsers, + // logo: 'Hi!', + // onSignup: _authenticateUsers, onLogin: _authenticateUsers, onRecoverPassword: _onRecoverPassword, onSubmitAnimationCompleted: () { diff --git a/lib/project/classes/app_bar.dart b/lib/project/classes/app_bar.dart index 608f8cf..177f6f3 100644 --- a/lib/project/classes/app_bar.dart +++ b/lib/project/classes/app_bar.dart @@ -6,8 +6,7 @@ import 'package:money_assistant_2608/project/app_pages/input.dart'; import 'constants.dart'; - -class BasicAppBar extends StatelessWidget with PreferredSizeWidget { +class BasicAppBar extends StatelessWidget implements PreferredSizeWidget { final String title; const BasicAppBar(this.title); @@ -23,10 +22,10 @@ class BasicAppBar extends StatelessWidget with PreferredSizeWidget { } } - class InExAppBar extends StatelessWidget implements PreferredSizeWidget { -final bool isInputPage; -const InExAppBar(this.isInputPage); + final bool isInputPage; + const InExAppBar(this.isInputPage); + @override Size get preferredSize => Size.fromHeight(kToolbarHeight); @@ -54,24 +53,25 @@ const InExAppBar(this.isInputPage); color: Color.fromRGBO(82, 179, 252, 1), ), tabs: [ - appBarTab('EXPENSE'), - appBarTab('INCOME') + appBarTab('EXPENSE'), + appBarTab('INCOME'), ], ), - actions: isInputPage ? [ + actions: isInputPage + ? [ IconButton( icon: Icon(Icons.check), iconSize: 28, onPressed: () { - saveInputFunc(context,true); + saveInputFunc(context, true); }, ) - ] : null, + ] + : null, ); } } - class CategoryAppBar extends StatelessWidget implements PreferredSizeWidget { final Widget editCategory; const CategoryAppBar(this.editCategory); @@ -91,31 +91,35 @@ class CategoryAppBar extends StatelessWidget implements PreferredSizeWidget { child: GestureDetector( behavior: HitTestBehavior.translucent, onTap: () { - Navigator.push(context, - MaterialPageRoute(builder: (context) => editCategory)); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => editCategory)); }, - child: Row(children: [ - Icon( - Icons.edit, - size: 19.sp, - ), - SizedBox(width: 3.w), - Text( - getTranslated(context, 'Edit')!, - style: TextStyle(fontSize: 19.sp), - ), - ]), + child: Row( + children: [ + Icon( + Icons.edit, + size: 19.sp, + ), + SizedBox(width: 3.w), + Text( + getTranslated(context, 'Edit')!, + style: TextStyle(fontSize: 19.sp), + ), + ], + ), ), - // child: Icon(Icons.edit), ), ], - title: Text(getTranslated(context, 'Category')!, - style: TextStyle(fontSize: 21.sp)), + title: Text( + getTranslated(context, 'Category')!, + style: TextStyle(fontSize: 21.sp), + ), ); } } - class EditCategoryAppBar extends StatelessWidget implements PreferredSizeWidget { final Widget addCategory; const EditCategoryAppBar(this.addCategory); @@ -131,20 +135,21 @@ class EditCategoryAppBar extends StatelessWidget implements PreferredSizeWidget Padding( padding: EdgeInsets.only(right: 5.w), child: TextButton( - onPressed: () => Navigator.push(context, - MaterialPageRoute(builder: (context) => addCategory)), + onPressed: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) => addCategory)), child: Text( getTranslated(context, 'Add')!, - style: TextStyle(fontSize: 18.5.sp, color: white), + style: TextStyle(fontSize: 18.5.sp, color: white), ), ), - // child: Icon(Icons.edit), ), ], - title: Text(getTranslated(context, 'Edit Category')!, - style: TextStyle(fontSize: 21.sp)), + title: Text( + getTranslated(context, 'Edit Category')!, + style: TextStyle(fontSize: 21.sp), + ), ); } } - - diff --git a/lib/project/classes/lockscreen.dart b/lib/project/classes/lockscreen.dart index fbbd769..8eb9414 100644 --- a/lib/project/classes/lockscreen.dart +++ b/lib/project/classes/lockscreen.dart @@ -1,12 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_app_lock/flutter_app_lock.dart'; -import 'package:flutter_screen_lock/configurations/input_button_config.dart'; -import 'package:flutter_screen_lock/configurations/screen_lock_config.dart'; -import 'package:flutter_screen_lock/configurations/secret_config.dart'; -import 'package:flutter_screen_lock/configurations/secrets_config.dart'; -import 'package:flutter_screen_lock/input_controller.dart'; -import 'package:flutter_screen_lock/screen_lock.dart'; +import 'package:flutter_screen_lock/flutter_screen_lock.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:money_assistant_2608/project/database_management/shared_preferences_services.dart'; import 'package:money_assistant_2608/project/localization/methods.dart'; @@ -22,8 +17,8 @@ class MainLockScreen extends StatelessWidget { Widget build(BuildContext context) { return ScreenLock( correctString: sharedPrefs.passcodeScreenLock, - canCancel: false, - didUnlocked: () => AppLock.of(context)!.didUnlock(), + // canCancel: false, + // didUnlocked: () => AppLock.of(context)!.didUnlock(), deleteButton: const Icon(Icons.close, color: Color.fromRGBO(89, 129, 163, 1)), title: Padding( @@ -40,20 +35,20 @@ class MainLockScreen extends StatelessWidget { fontSize: 20), ), ), - screenLockConfig: const ScreenLockConfig( - backgroundColor: Color.fromRGBO(210, 234, 251, 1), - ), + // screenLockConfig: const ScreenLockConfig( + // backgroundColor: Color.fromRGBO(210, 234, 251, 1), + // ), secretsConfig: SecretsConfig( secretConfig: SecretConfig( borderColor: Color.fromRGBO(79, 94, 120, 1), enabledColor: Color.fromRGBO(89, 129, 163, 1), - )), - inputButtonConfig: InputButtonConfig( - buttonStyle: OutlinedButton.styleFrom( - backgroundColor: Color.fromRGBO(71, 131, 192, 1), - // Color.fromRGBO(89, 129, 163, 1) - ), - ), + )), onUnlocked: () { }, + // inputButtonConfig: InputButtonConfig( + // buttonStyle: OutlinedButton.styleFrom( + // backgroundColor: Color.fromRGBO(71, 131, 192, 1), + // // Color.fromRGBO(89, 129, 163, 1) + // ), + // ), onUnlocked: () { }, ); } } @@ -85,40 +80,40 @@ class OtherLockScreen extends StatelessWidget { fontSize: 20.sp), ), ), - confirmTitle: Text( - getTranslated( - context, - 'Please Re-enter Passcode', - ) ?? - 'Please Re-enter Passcode', - style: TextStyle( - color: Color.fromRGBO(71, 131, 192, 1), - fontWeight: FontWeight.w500, - fontSize: 20.sp), - ), - confirmation: true, + // confirmTitle: Text( + // getTranslated( + // context, + // 'Please Re-enter Passcode', + // ) ?? + // 'Please Re-enter Passcode', + // style: TextStyle( + // color: Color.fromRGBO(71, 131, 192, 1), + // fontWeight: FontWeight.w500, + // fontSize: 20.sp), + // ), + // confirmation: true, inputController: inputController, deleteButton: const Icon(Icons.close, color: Color.fromRGBO(71, 131, 192, 1)), - screenLockConfig: const ScreenLockConfig( - backgroundColor: Color.fromRGBO(210, 234, 251, 1), - ), - secretsConfig: SecretsConfig( - secretConfig: SecretConfig( - borderColor: Color.fromRGBO(79, 94, 120, 1), - enabledColor: Color.fromRGBO(89, 129, 163, 1), - )), - inputButtonConfig: InputButtonConfig( - buttonStyle: OutlinedButton.styleFrom( - backgroundColor: Color.fromRGBO(71, 131, 192, 1), - // Color.fromRGBO(89, 129, 163, 1) - ), - ), - didConfirmed: (passCode) { - sharedPrefs.passcodeScreenLock = passCode; - Navigator.pop(context); - customToast(context,'Passcode has been enabled'); - }, + // screenLockConfig: const ScreenLockConfig( + // backgroundColor: Color.fromRGBO(210, 234, 251, 1), + // ), + // secretsConfig: SecretsConfig( + // secretConfig: SecretConfig( + // borderColor: Color.fromRGBO(79, 94, 120, 1), + // enabledColor: Color.fromRGBO(89, 129, 163, 1), + // )), + // inputButtonConfig: InputButtonConfig( + // buttonStyle: OutlinedButton.styleFrom( + // backgroundColor: Color.fromRGBO(71, 131, 192, 1), + // // Color.fromRGBO(89, 129, 163, 1) + // ), + // ), + // didConfirmed: (passCode) { + // sharedPrefs.passcodeScreenLock = passCode; + // Navigator.pop(context); + // customToast(context,'Passcode has been enabled'); + // }, cancelButton: TextButton( onPressed: () { this.providerContext.read().onSwitch(); @@ -128,7 +123,7 @@ class OtherLockScreen extends StatelessWidget { style: TextStyle( fontSize: 16.sp, fontWeight: FontWeight.w500, - color: Color.fromRGBO(71, 131, 192, 1)))), + color: Color.fromRGBO(71, 131, 192, 1)))), onUnlocked: () { }, // footer: TextButton( // onPressed: () => inputController.unsetConfirmed(), // child: Padding( diff --git a/lib/project/classes/saveOrSaveAndDeleteButtons.dart b/lib/project/classes/saveOrSaveAndDeleteButtons.dart index f849c9d..241d502 100644 --- a/lib/project/classes/saveOrSaveAndDeleteButtons.dart +++ b/lib/project/classes/saveOrSaveAndDeleteButtons.dart @@ -36,10 +36,7 @@ class _SaveButtonState extends State { } }, style: ElevatedButton.styleFrom( - padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 20.w), - primary: Color.fromRGBO(236, 158, 66, 1), - onPrimary: white, - onSurface: grey, + foregroundColor: white, backgroundColor: Color.fromRGBO(236, 158, 66, 1), padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 20.w), disabledForegroundColor: grey.withOpacity(0.38), disabledBackgroundColor: grey.withOpacity(0.12), elevation: 10, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(18.0.r), @@ -100,10 +97,7 @@ class SaveAndDeleteButton extends StatelessWidget { } }, style: ElevatedButton.styleFrom( - padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 20.w), - primary: white, - onPrimary: red, - onSurface: grey, + foregroundColor: red, backgroundColor: white, padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 20.w), disabledForegroundColor: grey.withOpacity(0.38), disabledBackgroundColor: grey.withOpacity(0.12), side: BorderSide( color: red, width: 2.h, diff --git a/lib/project/database_management/shared_preferences_services.dart b/lib/project/database_management/shared_preferences_services.dart index 0148868..e975bb1 100644 --- a/lib/project/database_management/shared_preferences_services.dart +++ b/lib/project/database_management/shared_preferences_services.dart @@ -102,7 +102,7 @@ class SharedPrefs { void saveItems(String parentItemName, List items) { List itemsEncoded = - items.map((item) => jsonEncode(item.toJson())).toList(); + items.map((item) => jsonEncode(item.toJson())).toList(); _sharedPrefs!.setStringList(parentItemName, itemsEncoded); } @@ -111,7 +111,7 @@ class SharedPrefs { List> expenseItemsLists = []; for (int i = 0; i < this.parentExpenseItemNames.length; i++) { var parentExpenseItem = - sharedPrefs.getItems(this.parentExpenseItemNames[i]); + sharedPrefs.getItems(this.parentExpenseItemNames[i]); expenseItemsLists.add(parentExpenseItem); } return expenseItemsLists; @@ -191,9 +191,10 @@ class SharedPrefs { categoryItem(MdiIcons.dogService, 'Pets'), categoryItem(MdiIcons.tableChair, 'Furnishings'), categoryItem(MdiIcons.autoFix, 'Home Services'), - categoryItem(MdiIcons.homeCurrencyUsd, 'Mortgage & Rent'), + categoryItem(MdiIcons.currencyUsd, 'Mortgage & Rent'), ]); + saveItems('Utility Bills', [ categoryItem(FontAwesomeIcons.fileInvoiceDollar, 'Utility Bills'), categoryItem(IcoFontIcons.lightBulb, 'Electricity'), @@ -239,4 +240,4 @@ class SharedPrefs { print('didnt save successfully'); } } -} +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index b64440b..c21915c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,184 +5,226 @@ packages: dependency: transitive description: name: _flutterfire_internals - url: "https://pub.dartlang.org" + sha256: "3dee3db3468c5f4640a4e8aa9c1e22561c298976d8c39ed2fdd456a9a3db26e1" + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.3.32" another_flushbar: dependency: transitive description: name: another_flushbar - url: "https://pub.dartlang.org" + sha256: "19bf9520230ec40b300aaf9dd2a8fefcb277b25ecd1c4838f530566965befc2a" + url: "https://pub.dev" source: hosted - version: "1.12.29" + version: "1.12.30" another_transformer_page_view: dependency: transitive description: name: another_transformer_page_view - url: "https://pub.dartlang.org" + sha256: a7cd46ede62d621c5abe7e58c7cb2745abe67b3bfec64f59b8889c93d7be7a8e + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.0.1" + ansicolor: + dependency: transitive + description: + name: ansicolor + sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880" + url: "https://pub.dev" + source: hosted + version: "2.0.2" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: "0763b45fa9294197a2885c8567927e2830ade852e5c896fd4ab7e0e348d0f373" + url: "https://pub.dev" source: hosted - version: "3.3.5" + version: "3.5.0" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.5.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" - cloud_firestore_platform_interface: - dependency: transitive - description: - name: cloud_firestore_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "5.7.7" - cloud_firestore_web: - dependency: transitive - description: - name: cloud_firestore_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.10" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.16.0" - convert: + version: "1.18.0" + cross_file: dependency: transitive description: - name: convert - url: "https://pub.dartlang.org" + name: cross_file + sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "0.3.4+1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" + csslib: + dependency: transitive + description: + name: csslib + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + url: "https://pub.dev" + source: hosted + version: "1.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.8" day_night_time_picker: dependency: "direct main" description: name: day_night_time_picker - url: "https://pub.dartlang.org" + sha256: "085563dee6f64961c47abb1d444dbb923fda2f6fed0df452fcc221ae38a58898" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "2.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.2" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" file_picker: dependency: transitive description: name: file_picker - url: "https://pub.dartlang.org" + sha256: be325344c1f3070354a1d84a231a1ba75ea85d413774ec4bdf444c023342e030 + url: "https://pub.dev" source: hosted - version: "5.2.4" + version: "5.5.0" firebase_auth: dependency: "direct main" description: name: firebase_auth - url: "https://pub.dartlang.org" + sha256: "63b4401c95ddb00fb272872c451147e33509e80eed43937369910ef6c34c00b7" + url: "https://pub.dev" source: hosted - version: "3.11.2" + version: "4.19.4" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - url: "https://pub.dartlang.org" + sha256: "4e204f9ef43d83ac9e7a324a9317e4dd2a1ddda2aa72b67bc6cc364f0b8492dc" + url: "https://pub.dev" source: hosted - version: "6.10.1" + version: "7.2.5" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - url: "https://pub.dartlang.org" + sha256: "809a2eb444d1a07c0a680b205b86d713bc7171a4b2627fd6c01cf05f2b6f93cd" + url: "https://pub.dev" source: hosted - version: "4.6.1" + version: "5.11.4" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "4aef2a23d0f3265545807d68fbc2f76a6b994ca3c778d88453b99325abd63284" + url: "https://pub.dev" source: hosted - version: "1.24.0" + version: "2.30.1" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 + url: "https://pub.dev" source: hosted - version: "4.5.2" + version: "5.0.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "67f2fcc600fc78c2f731c370a3a5e6c87ee862e3a2fba6f951eca6d5dafe5c29" + url: "https://pub.dev" + source: hosted + version: "2.16.0" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" source: hosted - version: "1.7.3" + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -192,21 +234,24 @@ packages: dependency: "direct main" description: name: flutter_app_lock - url: "https://pub.dartlang.org" + sha256: ca5c35058d490e2f957c36698abc61848b100b9adc02927970ec0e1b27bb2763 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "4.1.1+1" flutter_boxicons: dependency: "direct main" description: name: flutter_boxicons - url: "https://pub.dartlang.org" + sha256: "2323b3148ca0b22965c64967e87d4236c1d83b00547f661303a8c81c9dff7ac7" + url: "https://pub.dev" source: hosted version: "3.0.0" flutter_colorpicker: dependency: "direct overridden" description: name: flutter_colorpicker - url: "https://pub.dartlang.org" + sha256: "0bb8b140aa387fa924c11f047654e301c6a76f54f88895a2a5419a26f4f38f4f" + url: "https://pub.dev" source: hosted version: "0.6.1" flutter_localizations: @@ -218,58 +263,66 @@ packages: dependency: "direct main" description: name: flutter_login - url: "https://pub.dartlang.org" + sha256: "1f7c46d0d76081cf4c5180e3a265b1f5b1d7e48c81859f58f03a8dcd27338b85" + url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "5.0.0" flutter_material_pickers: dependency: "direct main" description: name: flutter_material_pickers - url: "https://pub.dartlang.org" + sha256: "1100bfd9a296a6680578aba8c51a0db114fb8ef94708fe320fe6da92b1f8c0e1" + url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.6.0" flutter_native_splash: dependency: "direct dev" description: name: flutter_native_splash - url: "https://pub.dartlang.org" + sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0 + url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "2.4.0" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" + url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.0.19" flutter_rating_bar: dependency: transitive description: name: flutter_rating_bar - url: "https://pub.dartlang.org" + sha256: d2af03469eac832c591a1eba47c91ecc871fe5708e69967073c043b2d775ed93 + url: "https://pub.dev" source: hosted version: "4.0.1" flutter_screen_lock: dependency: "direct main" description: name: flutter_screen_lock - url: "https://pub.dartlang.org" + sha256: f8e504aa0e5fe61ea13b66692ecdec3e8761118173b51c9b3b5518b8e2911e5b + url: "https://pub.dev" source: hosted - version: "4.0.4+3" + version: "9.0.2" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.dartlang.org" + sha256: "8cf100b8e4973dc570b6415a2090b0bfaa8756ad333db46939efc3e774ee100d" + url: "https://pub.dev" source: hosted - version: "5.6.0" + version: "5.9.0" flutter_swipe_action_cell: dependency: "direct main" description: name: flutter_swipe_action_cell - url: "https://pub.dartlang.org" + sha256: "5cea4d8c3d333c5610ffa4bc39a30561927f90857be19ba33a8322fdc856d335" + url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "3.1.3" flutter_test: dependency: "direct dev" description: flutter @@ -284,394 +337,466 @@ packages: dependency: "direct main" description: name: fluttertoast - url: "https://pub.dartlang.org" + sha256: "81b68579e23fcbcada2db3d50302813d2371664afe6165bc78148050ab94bf66" + url: "https://pub.dev" source: hosted - version: "8.1.2" + version: "8.2.5" font_awesome_flutter: dependency: "direct main" description: name: font_awesome_flutter - url: "https://pub.dartlang.org" + sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f" + url: "https://pub.dev" source: hosted - version: "9.2.0" + version: "10.7.0" google_fonts: dependency: "direct main" description: name: google_fonts - url: "https://pub.dartlang.org" + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 + url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "6.2.1" + google_identity_services_web: + dependency: transitive + description: + name: google_identity_services_web + sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8" + url: "https://pub.dev" + source: hosted + version: "0.3.1+1" google_sign_in: dependency: "direct main" description: name: google_sign_in - url: "https://pub.dartlang.org" + sha256: "0b8787cb9c1a68ad398e8010e8c8766bfa33556d2ab97c439fb4137756d7308f" + url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "6.2.1" google_sign_in_android: dependency: transitive description: name: google_sign_in_android - url: "https://pub.dartlang.org" + sha256: "7647893c65e6720973f0e579051c8f84b877b486614d9f70a404259c41a4632e" + url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.1.23" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - url: "https://pub.dartlang.org" + sha256: a058c9880be456f21e2e8571c1126eaacd570bdc5b6c6d9d15aea4bdf22ca9fe + url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.7.6" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - url: "https://pub.dartlang.org" + sha256: "1f6e5787d7a120cc0359ddf315c92309069171306242e181c09472d1b00a2971" + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.5" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - url: "https://pub.dartlang.org" + sha256: fc0f14ed45ea616a6cfb4d1c7534c2221b7092cc4f29a709f0c3053cc3e821bd + url: "https://pub.dev" + source: hosted + version: "0.12.4" + html: + dependency: transitive + description: + name: html + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + url: "https://pub.dev" source: hosted - version: "0.10.2" + version: "0.15.4" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "1.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" icofont_flutter: dependency: "direct main" description: name: icofont_flutter - url: "https://pub.dartlang.org" + sha256: ee022efb9428863607568cf6818dfc59afb5c987ea449d7ef9241fe69749d609 + url: "https://pub.dev" source: hosted version: "1.4.0" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" + url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "4.1.7" in_app_review: dependency: "direct main" description: name: in_app_review - url: "https://pub.dartlang.org" + sha256: "99869244d09adc76af16bf8fd731dd13cef58ecafd5917847589c49f378cbb30" + url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.0.9" in_app_review_platform_interface: dependency: transitive description: name: in_app_review_platform_interface - url: "https://pub.dartlang.org" + sha256: fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10 + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.0.5" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + intl_phone_number_input: + dependency: transitive + description: + name: intl_phone_number_input + sha256: "1c4328713a9503ab26a1fdbb6b00b4cada68c18aac922b35bedbc72eff1297c3" + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.7.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" keyboard_actions: dependency: "direct main" description: name: keyboard_actions - url: "https://pub.dartlang.org" + sha256: "31e0ab2a706ac8f58887efa60efc1f19aecdf37d8ab0f665a0f156d1fbeab650" + url: "https://pub.dev" + source: hosted + version: "4.2.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" source: hosted - version: "3.4.7" + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + libphonenumber_platform_interface: + dependency: transitive + description: + name: libphonenumber_platform_interface + sha256: f801f6c65523f56504b83f0890e6dad584ab3a7507dca65fec0eed640afea40f + url: "https://pub.dev" + source: hosted + version: "0.4.2" + libphonenumber_plugin: + dependency: transitive + description: + name: libphonenumber_plugin + sha256: c615021d9816fbda2b2587881019ed595ecdf54d999652d7e4cce0e1f026368c + url: "https://pub.dev" + source: hosted + version: "0.3.3" + libphonenumber_web: + dependency: transitive + description: + name: libphonenumber_web + sha256: "8186f420dbe97c3132283e52819daff1e55d60d6db46f7ea5ac42f42a28cc2ef" + url: "https://pub.dev" + source: hosted + version: "0.3.2" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.8.0" material_design_icons_flutter: dependency: "direct main" description: name: material_design_icons_flutter - url: "https://pub.dartlang.org" + sha256: "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a" + url: "https://pub.dev" source: hosted - version: "4.0.5955" + version: "7.0.7296" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.11.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.5" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" outline_material_icons: dependency: "direct main" description: name: outline_material_icons - url: "https://pub.dartlang.org" + sha256: "83b1d79676c6299731039ac0f0fa0ebcd0a562cde2f548bceb4960a349527f47" + url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "1.0.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.0" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.dartlang.org" + sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.1.3" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d + url: "https://pub.dev" source: hosted - version: "2.0.22" - path_provider_ios: + version: "2.2.4" + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.3.2" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" source: hosted - version: "2.1.7" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.6" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + url: "https://pub.dev" source: hosted - version: "2.1.3" - pedantic: + version: "2.2.1" + petitparser: dependency: transitive description: - name: pedantic - url: "https://pub.dartlang.org" + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" source: hosted - version: "1.11.1" - petitparser: + version: "6.0.2" + phone_numbers_parser: dependency: transitive description: - name: petitparser - url: "https://pub.dartlang.org" + name: phone_numbers_parser + sha256: ebe08725e63218a6ae2bf9129b7130332cb2ababa4988f07d6ddce48b0c21e06 + url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "8.2.1" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.4" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" source: hosted - version: "2.1.3" - pointycastle: - dependency: transitive - description: - name: pointycastle - url: "https://pub.dartlang.org" - source: hosted - version: "3.6.2" - process: - dependency: transitive - description: - name: process - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.4" + version: "2.1.8" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "6.1.2" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.1" rate_my_app: dependency: "direct main" description: name: rate_my_app - url: "https://pub.dartlang.org" + sha256: "201681ce28d2a5dc7bcfbdd394f08a64b1e2c24daca793ee1f069034757ae6f0" + url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "2.1.0" share_plus: dependency: "direct main" description: name: share_plus - url: "https://pub.dartlang.org" + sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544 + url: "https://pub.dev" source: hosted - version: "2.2.0" - share_plus_linux: - dependency: transitive - description: - name: share_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" - share_plus_macos: - dependency: transitive - description: - name: share_plus_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" + version: "9.0.0" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - share_plus_web: - dependency: transitive - description: - name: share_plus_web - url: "https://pub.dartlang.org" + sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4" + url: "https://pub.dev" source: hosted - version: "2.0.4" - share_plus_windows: - dependency: transitive - description: - name: share_plus_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.3" + version: "4.0.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.2.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" + url: "https://pub.dev" source: hosted - version: "2.0.14" - shared_preferences_ios: + version: "2.2.2" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - url: "https://pub.dartlang.org" + name: shared_preferences_foundation + sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.5" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + url: "https://pub.dev" source: hosted - version: "2.1.2" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" + version: "2.3.2" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.2" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.3.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.3.2" + sign_in_button: + dependency: transitive + description: + name: sign_in_button + sha256: "977b9b0415d2f3909e642275dfabba7919ba8e111324641b76cae6d1acbd183e" + url: "https://pub.dev" + source: hosted + version: "3.2.0" simple_gesture_detector: dependency: transitive description: name: simple_gesture_detector - url: "https://pub.dartlang.org" + sha256: ba2cd5af24ff20a0b8d609cec3f40e5b0744d2a71804a2616ae086b9c19d19a3 + url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.2.1" sky_engine: dependency: transitive description: flutter @@ -681,198 +806,258 @@ packages: dependency: "direct main" description: name: sliding_up_panel - url: "https://pub.dartlang.org" + sha256: "578e90956a6212d1e406373250b2436a0f3afece29aee3c24c8360094d6cf968" + url: "https://pub.dev" source: hosted version: "2.0.0+1" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" sqflite: dependency: "direct main" description: name: sqflite - url: "https://pub.dartlang.org" + sha256: "5ce2e1a15e822c3b4bfb5400455775e421da7098eed8adc8f26298ada7c9308c" + url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.3" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" + url: "https://pub.dev" source: hosted - version: "2.4.0+2" + version: "2.5.4" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" syncfusion_flutter_charts: dependency: "direct main" description: name: syncfusion_flutter_charts - url: "https://pub.dartlang.org" + sha256: b0af93cd77b64a759158bfed7c119c3072c8e8fbde6bf3fdc5e815fa4fdfc87c + url: "https://pub.dev" source: hosted - version: "19.4.56" + version: "25.1.41+2" syncfusion_flutter_core: dependency: transitive description: name: syncfusion_flutter_core - url: "https://pub.dartlang.org" + sha256: "708425f534ef04253334763c8b75acc79eaec2d9b325bcd862575ea0a2207d87" + url: "https://pub.dev" source: hosted - version: "19.4.56" + version: "25.1.41" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + url: "https://pub.dev" source: hosted - version: "3.0.0+3" + version: "3.1.0+1" table_calendar: dependency: "direct main" description: name: table_calendar - url: "https://pub.dartlang.org" + sha256: "1e3521a3e6d3fc7f645a58b135ab663d458ab12504f1ea7f9b4b81d47086c478" + url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.6.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" universal_io: dependency: transitive description: name: universal_io - url: "https://pub.dartlang.org" + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.2" url_launcher: dependency: transitive description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" + url: "https://pub.dev" source: hosted - version: "6.1.7" + version: "6.2.6" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775" + url: "https://pub.dev" source: hosted - version: "6.0.22" + version: "6.3.1" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" + url: "https://pub.dev" source: hosted - version: "6.0.17" + version: "6.2.5" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.3.1" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + url: "https://pub.dev" + source: hosted + version: "3.1.1" + uuid: + dependency: transitive + description: + name: uuid + sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.4.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" + web: + dependency: transitive + description: + name: web + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + url: "https://pub.dev" + source: hosted + version: "0.5.1" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" + url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "5.5.0" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + url: "https://pub.dev" source: hosted - version: "0.2.0+2" + version: "1.0.4" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" source: hosted - version: "5.4.1" + version: "6.5.0" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=3.3.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.2" diff --git a/pubspec.yaml b/pubspec.yaml index 53914ff..118e5cd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,35 +29,35 @@ dependencies: # cloud_firestore: ^0.16.0+1 # syncfusion_flutter_datepicker: ^19.2.62 # flutter_spinkit: ^5.1.0 - google_sign_in: ^5.2.0 - firebase_auth: ^3.1.4 - firebase_core: ^1.8.0 + google_sign_in: ^6.2.1 + firebase_auth: ^4.19.4 + firebase_core: ^2.30.1 shared_preferences: ^2.0.8 sqflite: ^2.0.0+4 - intl: ^0.17.0 - provider: ^5.0.0 + intl: ^0.18.1 + provider: ^6.1.2 flutter_screenutil: ^5.0.0+2 - flutter_login: ^2.2.1 - flutter_screen_lock: ^4.0.4+2 - flutter_app_lock: ^2.0.0 - google_fonts: ^2.1.0 + flutter_login: ^5.0.0 + flutter_screen_lock: ^9.0.2 + flutter_app_lock: ^4.1.1+1 + google_fonts: ^6.2.1 table_calendar: ^3.0.2 - syncfusion_flutter_charts: ^20.4.54 + syncfusion_flutter_charts: ^25.1.41+2 day_night_time_picker: ^1.0.3+1 - flutter_material_pickers: ^3.1.0 + flutter_material_pickers: sliding_up_panel: ^2.0.0+1 - keyboard_actions: ^3.4.4 + keyboard_actions: ^4.2.0 fluttertoast: ^8.2.1 flutter_swipe_action_cell: ^3.1.0 - share_plus: ^2.1.4 + share_plus: ^9.0.0 in_app_review: ^2.0.3 - rate_my_app: ^1.1.1 -# local_auth: ^1.1.8 + rate_my_app: ^2.1.0 + # local_auth: ^1.1.8 # icons - material_design_icons_flutter: ^4.0.5955 - font_awesome_flutter: ^9.1.0 - outline_material_icons: ^0.1.1 + material_design_icons_flutter: ^7.0.7296 + font_awesome_flutter: ^10.7.0 + outline_material_icons: ^1.0.0 flutter_boxicons: ^3.0.0 icofont_flutter: ^1.4.0 @@ -69,7 +69,7 @@ dependency_overrides: dev_dependencies: flutter_test: sdk: flutter - flutter_native_splash: ^1.2.3 + flutter_native_splash: ^2.4.0 flutter_native_splash: color: "#ffffff" @@ -78,7 +78,7 @@ flutter_native_splash: image: images/splash_screen.png android: true ios: true -# android12: true + # android12: true # This package generates native code to customize Flutter's default white native splash screen # with background color and splash image. @@ -152,7 +152,7 @@ flutter_native_splash: #command: flutter clean && flutter pub get && flutter pub run flutter_native_splash:create - # The following adds the Cupertino Icons font to your application. + # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. @@ -205,4 +205,4 @@ flutter: # weight: 700 # # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages + # see https://flutter.dev/custom-fonts/#from-packages \ No newline at end of file From 074be44e30475aafe4f2ffbfa9236c472c2a0e2d Mon Sep 17 00:00:00 2001 From: Muhammad Osama Noor Date: Sun, 5 May 2024 23:45:20 +0500 Subject: [PATCH 4/5] bug fixing --- lib/main.dart | 2 -- lib/project/app_pages/calendar.dart | 48 +++++++++++++++-------------- lib/project/auth_pages/sign_in.dart | 5 ++- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index e1b2db5..92f99ba 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,6 +1,4 @@ - - import 'package:money_assistant_2608/project/real_main.dart'; void main() async { diff --git a/lib/project/app_pages/calendar.dart b/lib/project/app_pages/calendar.dart index 66aa725..a48be36 100644 --- a/lib/project/app_pages/calendar.dart +++ b/lib/project/app_pages/calendar.dart @@ -449,32 +449,34 @@ class _BalanceState extends State { balance = income - expense; } } - Widget summaryFrame(String type, double amount, color) => Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - // this widget will never overflow - Text( - getTranslated(context, type)!, - style: TextStyle( - color: color, - fontSize: 15.sp, - fontStyle: FontStyle.italic, - fontWeight: FontWeight.bold), - ), - Text(format(amount.toDouble()) + ' ' + currency, - style: GoogleFonts.aBeeZee( + Widget summaryFrame(String type, double amount, color) => SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + // this widget will never overflow + Text( + getTranslated(context, type)!, + style: TextStyle( color: color, - fontSize: (format(amount.toDouble()).length > 19) - ? 11.5.sp - : format(amount.toDouble()).length > 14 - ? 14.sp - : 18.sp, + fontSize: 15.sp, fontStyle: FontStyle.italic, fontWeight: FontWeight.bold), - overflow: TextOverflow.ellipsis) - ], - ); + ), + Text(format(amount.toDouble()) + ' ' + currency, + style: GoogleFonts.aBeeZee( + color: color, + fontSize: (format(amount.toDouble()).length > 19) + ? 11.5.sp + : format(amount.toDouble()).length > 14 + ? 14.sp + : 18.sp, + fontStyle: FontStyle.italic, + fontWeight: FontWeight.bold), + overflow: TextOverflow.ellipsis) + ], + ), + ); return Container( color: Colors.white54, height: 69.h, diff --git a/lib/project/auth_pages/sign_in.dart b/lib/project/auth_pages/sign_in.dart index 06f77fe..8ddcdcb 100644 --- a/lib/project/auth_pages/sign_in.dart +++ b/lib/project/auth_pages/sign_in.dart @@ -68,14 +68,17 @@ class SignIn extends StatelessWidget { ), LoginProvider( icon: FontAwesomeIcons.linkedinIn, + label: 'Linkdein', callback: () async { - print('start linkdin sign in'); + // print('start linkdin sign in'); + await Future.delayed(Duration(seconds: 1)); print('stop linkdin sign in'); return null; }, ), LoginProvider( + label: 'Github', icon: FontAwesomeIcons.githubAlt, callback: () async { print('start github sign in'); From b4c429daeb391aa4e6c180e385ddd4f0b8dc681e Mon Sep 17 00:00:00 2001 From: Muhammad Osama Noor Date: Wed, 5 Jun 2024 22:41:19 +0500 Subject: [PATCH 5/5] bug fixing --- lib/project/app_pages/report.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/project/app_pages/report.dart b/lib/project/app_pages/report.dart index 438cee3..2664315 100644 --- a/lib/project/app_pages/report.dart +++ b/lib/project/app_pages/report.dart @@ -111,9 +111,12 @@ class _ReportBodyState extends State { builder: (BuildContext context, AsyncSnapshot> snapshot) { connectionUI(snapshot); - if (snapshot.data == null || - snapshot.connectionState == ConnectionState.waiting) { - return SizedBox(); + if (snapshot.connectionState == ConnectionState.waiting) { + return Center(child: CircularProgressIndicator()); + } else if (snapshot.hasError) { + return Center(child: Text('Error: ${snapshot.error}')); + } else if (!snapshot.hasData || snapshot.data!.isEmpty) { + return Center(child: Text('No data found')); } else { double yearAmount = 0; DateTime date(int duration) => @@ -122,7 +125,6 @@ class _ReportBodyState extends State { return (year % 4 == 0) && (year % 100 != 0) || (year % 400 == 0); } - // widget.transactions.sort((a, b) => a.date!.compareTo(b.date!)); List sortByCategory( List data, String type) {