From e701ce564a0cff167683d1cf5fd871ca894c7fa1 Mon Sep 17 00:00:00 2001 From: Federico Correa Date: Thu, 31 Aug 2023 15:29:34 -0300 Subject: [PATCH 1/5] feat: add flavorizr config file --- .fvm/fvm_config.json | 2 +- flavorizr.yaml | 40 +++++++++++ ios/Runner.xcodeproj/project.pbxproj | 18 ++--- ios/Runner/Info.plist | 100 +++++++++++++-------------- pubspec.lock | 38 ++++++---- pubspec.yaml | 46 +----------- 6 files changed, 125 insertions(+), 119 deletions(-) create mode 100644 flavorizr.yaml diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 0e8090af..e341c5be 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.10.2", + "flutterSdkVersion": "3.13.2", "flavors": {} } \ No newline at end of file diff --git a/flavorizr.yaml b/flavorizr.yaml new file mode 100644 index 00000000..30b41bea --- /dev/null +++ b/flavorizr.yaml @@ -0,0 +1,40 @@ +flavors: + dev: + app: + name: 'Template Dev' + android: + applicationId: 'com.xmartlabs.template.dev' + ios: + bundleId: 'com.xmartlabs.template.dev' + variables: + FLUTTER_TARGET: + value: 'lib/main.dart' + prod: + app: + name: 'Template' + android: + applicationId: 'com.xmartlabs.template' + ios: + bundleId: 'com.xmartlabs.template' + variables: + FLUTTER_TARGET: + value: 'lib/main.dart' + staging: + app: + name: 'Template Sta' + android: + applicationId: 'com.xmartlabs.template.sta' + ios: + bundleId: 'com.xmartlabs.template.sta' + variables: + FLUTTER_TARGET: + value: 'lib/main.dart' +instructions: + - assets:download + - assets:extract + - android:buildGradle + - ios:xcconfig + - ios:buildTargets + - ios:schema + - ios:plist + - assets:clean diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 718511a0..398431c0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ baseConfigurationReference = 6C37016DF19997B0AAD05FAF /* prodProfile.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -506,7 +506,7 @@ baseConfigurationReference = 51B5A3EF356677109FE751EB /* prodRelease.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -577,7 +577,7 @@ baseConfigurationReference = 5626E2C804EE32F56C2D8F06 /* prodDebug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -801,7 +801,7 @@ baseConfigurationReference = 78DFC5A53E53B9D74505FF20 /* devDebug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -896,7 +896,7 @@ baseConfigurationReference = 113F326E4F1DD43142CE6D30 /* stagingDebug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -991,7 +991,7 @@ baseConfigurationReference = ED9BFBD52F04E77F2174E192 /* devRelease.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -1082,7 +1082,7 @@ baseConfigurationReference = D7BA5182467EB92CA3E895F1 /* stagingRelease.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -1173,7 +1173,7 @@ baseConfigurationReference = BF41E84758AF984855B34375 /* devProfile.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -1262,7 +1262,7 @@ baseConfigurationReference = FA08A5EF6F6A019FEADEFC1B /* stagingProfile.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "$(ASSET_PREFIX)AppIcon"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 402fe821..e4ed3e6b 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -1,53 +1,53 @@ - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(BUNDLE_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - CFBundleDisplayName - $(BUNDLE_DISPLAY_NAME) - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - CADisableMinimumFrameDurationOnPhone - - UIStatusBarHidden - - UIApplicationSupportsIndirectInputEvents - - - + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(BUNDLE_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + CFBundleDisplayName + $(BUNDLE_DISPLAY_NAME) + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + CADisableMinimumFrameDurationOnPhone + + UIStatusBarHidden + + UIApplicationSupportsIndirectInputEvents + + + \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 2d7cbb59..794a41b6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" color: dependency: transitive description: @@ -378,10 +378,10 @@ packages: dependency: "direct dev" description: name: flutter_flavorizr - sha256: ea4e1c91c6c587bc8277d274cbd4a223d4fe58e7e884d1568d3ec80746f347d1 + sha256: "54c799a467d2d5102d3e2ec9c999377ca11e30590b8d0ddd929ee9e69e26c0a0" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" flutter_gen_core: dependency: transitive description: @@ -601,10 +601,10 @@ packages: dependency: "direct main" description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -673,10 +673,10 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_generator: dependency: "direct main" description: @@ -689,10 +689,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -974,10 +974,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sprintf: dependency: transitive description: @@ -1094,10 +1094,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" time: dependency: transitive description: @@ -1162,6 +1162,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -1203,5 +1211,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.10.2" diff --git a/pubspec.yaml b/pubspec.yaml index 20193a04..04a5af02 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: freezed_annotation: 2.2.0 get_it: 7.6.0 google_fonts: 5.0.0 - intl: 0.18.0 + intl: 0.18.1 json_annotation: 4.8.1 logger: 1.3.0 material_color_generator: 1.1.0 @@ -58,7 +58,7 @@ dev_dependencies: build_runner: 2.4.4 dart_code_metrics: 5.7.4 floor_generator: 1.4.2 - flutter_flavorizr: 2.2.0 + flutter_flavorizr: 2.2.1 flutter_gen_runner: 5.3.1 flutter_launcher_icons: 0.13.1 flutter_lints: 2.0.1 @@ -79,48 +79,6 @@ flutter_gen: - environments/* - assets/README.md -flavorizr: - flavors: - dev: - app: - name: 'Template Dev' - android: - applicationId: 'com.xmartlabs.template.dev' - ios: - bundleId: 'com.xmartlabs.template.dev' - variables: - FLUTTER_TARGET: - value: 'lib/main.dart' - prod: - app: - name: 'Template' - android: - applicationId: 'com.xmartlabs.template' - ios: - bundleId: 'com.xmartlabs.template' - variables: - FLUTTER_TARGET: - value: 'lib/main.dart' - staging: - app: - name: 'Template Sta' - android: - applicationId: 'com.xmartlabs.template.sta' - ios: - bundleId: 'com.xmartlabs.template.sta' - variables: - FLUTTER_TARGET: - value: 'lib/main.dart' - instructions: - - assets:download - - assets:extract - - android:buildGradle - - ios:xcconfig - - ios:buildTargets - - ios:schema - - ios:plist - - assets:clean - # Run command: flutter pub run flutter_launcher_icons:main flutter_launcher_icons: android: true From 7eb6ce20db72c4f5412075f898e415aff7371407 Mon Sep 17 00:00:00 2001 From: Federico Correa Date: Thu, 31 Aug 2023 15:40:23 -0300 Subject: [PATCH 2/5] Update flavorizr.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Felipe de León --- flavorizr.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flavorizr.yaml b/flavorizr.yaml index 30b41bea..8675fb23 100644 --- a/flavorizr.yaml +++ b/flavorizr.yaml @@ -9,23 +9,23 @@ flavors: variables: FLUTTER_TARGET: value: 'lib/main.dart' - prod: + staging: app: - name: 'Template' + name: 'Template Sta' android: - applicationId: 'com.xmartlabs.template' + applicationId: 'com.xmartlabs.template.sta' ios: - bundleId: 'com.xmartlabs.template' + bundleId: 'com.xmartlabs.template.sta' variables: FLUTTER_TARGET: value: 'lib/main.dart' - staging: + prod: app: - name: 'Template Sta' + name: 'Template' android: - applicationId: 'com.xmartlabs.template.sta' + applicationId: 'com.xmartlabs.template' ios: - bundleId: 'com.xmartlabs.template.sta' + bundleId: 'com.xmartlabs.template' variables: FLUTTER_TARGET: value: 'lib/main.dart' From aa4645f24864c03a56bcaf0d06eb502e98b8e4fc Mon Sep 17 00:00:00 2001 From: Federico Correa Date: Thu, 31 Aug 2023 15:46:00 -0300 Subject: [PATCH 3/5] fix: remove deprecated analysis options --- analysis_options.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 24a20a71..3bc113a6 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -48,10 +48,8 @@ linter: - exhaustive_cases - file_names - hash_and_equals - - iterable_contains_unrelated_type - library_names - lines_longer_than_80_chars - - list_remove_unrelated_type - literal_only_boolean_expressions - missing_whitespace_between_adjacent_strings - no_default_cases From 7c7bafd12a3d51324ef99e511b9bdded1ee0cc90 Mon Sep 17 00:00:00 2001 From: Federico Correa Date: Fri, 1 Sep 2023 09:33:00 -0300 Subject: [PATCH 4/5] fix: remove deprecated code and update libraries --- lib/core/common/logger.dart | 38 ++- lib/core/common/network_exceptions.dart | 28 +- lib/core/source/common/auth_interceptor.dart | 2 +- .../global_event_handler_cubit.dart | 8 +- pubspec.lock | 266 +++++++++--------- pubspec.yaml | 38 +-- 6 files changed, 187 insertions(+), 193 deletions(-) diff --git a/lib/core/common/logger.dart b/lib/core/common/logger.dart index e164b9a2..24be58c4 100644 --- a/lib/core/common/logger.dart +++ b/lib/core/common/logger.dart @@ -16,22 +16,27 @@ interface class Logger { static Future init() => _crashReportTool.init(); static void v(dynamic message, [dynamic error, StackTrace? stackTrace]) => - _instance.log(Level.verbose, message, error, stackTrace); + _instance.log(Level.trace, message, error: error, stackTrace: stackTrace); static void d(dynamic message, [dynamic error, StackTrace? stackTrace]) => - _instance.log(Level.debug, message, error, stackTrace); + _instance.log(Level.debug, message, error: error, stackTrace: stackTrace); static void i(dynamic message, [dynamic error, StackTrace? stackTrace]) => - _instance.log(Level.info, message, error, stackTrace); + _instance.log(Level.info, message, error: error, stackTrace: stackTrace); static void w(dynamic message, [dynamic error, StackTrace? stackTrace]) => - _instance.log(Level.warning, message, error, stackTrace); + _instance.log( + Level.warning, + message, + error: error, + stackTrace: stackTrace, + ); static void e(dynamic message, [dynamic error, StackTrace? stackTrace]) => - _instance.log(Level.error, message, error, stackTrace); + _instance.log(Level.error, message, error: error, stackTrace: stackTrace); static void wtf(dynamic message, [dynamic error, StackTrace? stackTrace]) => - _instance.log(Level.wtf, message, error, stackTrace); + _instance.log(Level.off, message, error: error, stackTrace: stackTrace); static Future fatal({dynamic error, StackTrace? stackTrace}) async { d('Fatal', error, stackTrace); @@ -52,7 +57,7 @@ class _CrashReportWrappedPrinter extends LogPrinter { _CrashReportWrappedPrinter(this._printer, this._crashReportTool); @override - void init() => _printer.init(); + Future init() => _printer.init(); StackTrace _currentStacktrace() { // Filter: FirebaseCrashlytics.record, _CrashReportWrappedPrinter @@ -75,26 +80,17 @@ class _CrashReportWrappedPrinter extends LogPrinter { final sanitizedEvent = dart_log.LogEvent( event.level, event.message, - event.error, - event.stackTrace ?? _currentStacktrace(), + error: event.error, + stackTrace: event.stackTrace ?? _currentStacktrace(), ); - switch (event.level) { - case Level.verbose: - case Level.debug: - case Level.nothing: - case Level.info: - break; - case Level.warning: - case Level.error: - case Level.wtf: - _crashReportTool.logNonFatal(sanitizedEvent); - break; + if (event.level case Level.warning || Level.error) { + _crashReportTool.logNonFatal(sanitizedEvent); } return _printer.log(sanitizedEvent); } @override - void destroy() => _printer.destroy(); + Future destroy() => _printer.destroy(); } class _PrintableTrace extends Trace { diff --git a/lib/core/common/network_exceptions.dart b/lib/core/common/network_exceptions.dart index cedb6764..dd3bb4a6 100644 --- a/lib/core/common/network_exceptions.dart +++ b/lib/core/common/network_exceptions.dart @@ -65,23 +65,21 @@ sealed class NetworkException with _$NetworkException implements Exception { if (error is Exception) { try { NetworkException networkExceptions; - if (error is DioError) { - switch (error.type) { - case DioErrorType.connectionTimeout || - DioErrorType.cancel || - DioErrorType.sendTimeout || - DioErrorType.receiveTimeout || - DioErrorType.connectionError || - DioErrorType.unknown || - DioErrorType.badCertificate: - networkExceptions = const NetworkException.noInternetConnection(); - break; - case DioErrorType.badResponse: - networkExceptions = NetworkException.handleResponse( + if (error is DioException) { + networkExceptions = switch (error.type) { + DioExceptionType.connectionTimeout || + DioExceptionType.cancel || + DioExceptionType.sendTimeout || + DioExceptionType.badCertificate || + DioExceptionType.unknown || + DioExceptionType.receiveTimeout || + DioExceptionType.connectionError => + const NetworkException.noInternetConnection(), + DioExceptionType.badResponse => NetworkException.handleResponse( error.response?.statusCode, error.response?.data, - ); - } + ), + }; } else if (error is SocketException) { networkExceptions = const NetworkException.noInternetConnection(); } else { diff --git a/lib/core/source/common/auth_interceptor.dart b/lib/core/source/common/auth_interceptor.dart index 5d539976..850894c8 100644 --- a/lib/core/source/common/auth_interceptor.dart +++ b/lib/core/source/common/auth_interceptor.dart @@ -22,7 +22,7 @@ class AuthInterceptor extends Interceptor { @override Future onError( - DioError err, + DioException err, ErrorInterceptorHandler handler, ) async { if (err.response?.statusCode == HttpStatus.unauthorized) { diff --git a/lib/ui/section/error_handler/global_event_handler_cubit.dart b/lib/ui/section/error_handler/global_event_handler_cubit.dart index b1785f9f..4244a07b 100644 --- a/lib/ui/section/error_handler/global_event_handler_cubit.dart +++ b/lib/ui/section/error_handler/global_event_handler_cubit.dart @@ -17,10 +17,10 @@ class GlobalEventHandlerCubit extends Cubit StackTrace? stackTrace, VoidCallback? retry, ]) { - if (error is DioError && - (error.type == DioErrorType.connectionTimeout || - error.type == DioErrorType.sendTimeout || - error.type == DioErrorType.receiveTimeout)) { + if (error is DioException && + (error.type == DioExceptionType.connectionTimeout || + error.type == DioExceptionType.sendTimeout || + error.type == DioExceptionType.receiveTimeout)) { emit( const GlobalEventHandlerState.error( GlobalEventHandlerStateError.internetError(), diff --git a/pubspec.lock b/pubspec.lock index 794a41b6..e3c8490b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -61,18 +61,18 @@ packages: dependency: "direct main" description: name: auto_route - sha256: "02120972925a567c37921fa28ac7e90680c7095dd0e70711353737ec2727cdc6" + sha256: "72f21e8b6cbbe25f02ea69183e024996530bf495cc1b077a49e0ec6726f0c271" url: "https://pub.dev" source: hosted - version: "7.4.0" + version: "7.8.3" auto_route_generator: dependency: "direct dev" description: name: auto_route_generator - sha256: d0555913cc54153c38b1dd4f69e0d6a623818ca7195e7c1437901d52b2596eec + sha256: e7aa9ab44b77cd31a4619d94db645ab5736e543fd0b4c6058c281249e479dfb8 url: "https://pub.dev" source: hosted - version: "7.1.1" + version: "7.3.1" bloc: dependency: transitive description: @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: build - sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" build_config: dependency: transitive description: @@ -117,26 +117,26 @@ packages: dependency: transitive description: name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + sha256: a7417cc44d9edb3f2c8760000270c99dba8c72ff66d0146772b8326565780745 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "220ae4553e50d7c21a17c051afc7b183d28a24a420502e842f303f8e4e6edced" + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.6" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" url: "https://pub.dev" source: hosted - version: "7.2.7" + version: "7.2.10" built_collection: dependency: transitive description: @@ -149,10 +149,10 @@ packages: dependency: transitive description: name: built_value - sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0" + sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf url: "https://pub.dev" source: hosted - version: "8.4.4" + version: "8.6.2" characters: dependency: transitive description: @@ -197,10 +197,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "315a598c7fbe77f22de1c9da7cfd6fd21816312f16ffa124453b4fc679e540f1" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.6.0" collection: dependency: transitive description: @@ -229,66 +229,66 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" csslib: dependency: transitive description: name: csslib - sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" url: "https://pub.dev" source: hosted - version: "0.17.2" + version: "1.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" dart_code_metrics: dependency: "direct dev" description: name: dart_code_metrics - sha256: "8d40e9fa6ba6b5f4f569768e267e9cb3e74350f98b30ac4b8160795792ce5414" + sha256: "3dede3f7abc077a4181ec7445448a289a9ce08e2981e6a4d49a3fb5099d47e1f" url: "https://pub.dev" source: hosted - version: "5.7.4" + version: "5.7.6" dart_code_metrics_presets: dependency: transitive description: name: dart_code_metrics_presets - sha256: "9c9b0ecc5e23937a4b62c1fe3b3edb72d3c1b08563a1eac69fb75f1306bb57c4" + sha256: b71eadf02a3787ebd5c887623f83f6fdc204d45c75a081bd636c4104b3fd8b73 url: "https://pub.dev" source: hosted - version: "1.6.0" + version: "1.8.0" dart_style: dependency: transitive description: name: dart_style - sha256: "6d691edde054969f0e0f26abb1b30834b5138b963793e56f69d3a9a4435e6352" + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.2" dartx: dependency: "direct main" description: name: dartx - sha256: "45d7176701f16c5a5e00a4798791c1964bc231491b879369c818dd9a9c764871" + sha256: "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" dio: dependency: "direct main" description: name: dio - sha256: "347d56c26d63519552ef9a569f2a593dda99a81fdbdff13c584b7197cfe05059" + sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197 url: "https://pub.dev" source: hosted - version: "5.1.2" + version: "5.3.2" equatable: dependency: "direct main" description: @@ -309,10 +309,10 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.0" file: dependency: transitive description: @@ -410,10 +410,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.3" flutter_localizations: dependency: "direct main" description: flutter @@ -423,66 +423,66 @@ packages: dependency: "direct main" description: name: flutter_native_splash - sha256: ba45d8cfbd778478a74696b012f33ffb6b1760c9bc531b21e2964444a4870dae + sha256: ecff62b3b893f2f665de7e4ad3de89f738941fcfcaaba8ee601e749efafa4698 url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - sha256: "1b61f8c4cbf965104b6ca7160880ff1af6755aad7fec70b58444245132453745" + sha256: "8cf100b8e4973dc570b6415a2090b0bfaa8756ad333db46939efc3e774ee100d" url: "https://pub.dev" source: hosted - version: "5.8.4" + version: "5.9.0" flutter_secure_storage: dependency: "direct main" description: name: flutter_secure_storage - sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "9.0.0" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3" + sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.2.0" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50" + sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b + sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" flutter_secure_storage_web: dependency: transitive description: name: flutter_secure_storage_web - sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe" + sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" flutter_secure_storage_windows: dependency: transitive description: name: flutter_secure_storage_windows - sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -505,18 +505,18 @@ packages: dependency: "direct dev" description: name: freezed - sha256: a9520490532087cf38bf3f7de478ab6ebeb5f68bb1eb2641546d92719b224445 + sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.4.1" freezed_annotation: dependency: "direct main" description: name: freezed_annotation - sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338 + sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.1" frontend_server_client: dependency: transitive description: @@ -529,42 +529,42 @@ packages: dependency: "direct main" description: name: get_it - sha256: "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468" + sha256: "66c270f23f1b49d3af9c6651d8c40367319f4abefffc23380e4e7c5efd9fe4a7" url: "https://pub.dev" source: hosted - version: "7.6.0" + version: "7.6.2" glob: dependency: transitive description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" google_fonts: dependency: "direct main" description: name: google_fonts - sha256: db5efba8106bd784a92c96cfd81716f4e06baab54e37de858488e9a00a764cad + sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.0" graphs: dependency: transitive description: name: graphs - sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" html: dependency: transitive description: name: html - sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8" + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" url: "https://pub.dev" source: hosted - version: "0.15.3" + version: "0.15.4" http: dependency: "direct overridden" description: @@ -633,10 +633,10 @@ packages: dependency: "direct dev" description: name: json_serializable - sha256: "61a60716544392a82726dd0fa1dd6f5f1fd32aec66422b6e229e7b90d52325c4" + sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 url: "https://pub.dev" source: hosted - version: "6.7.0" + version: "6.7.1" lints: dependency: "direct dev" description: @@ -657,18 +657,18 @@ packages: dependency: "direct main" description: name: logger - sha256: db2ff852ed77090ba9f62d3611e4208a3d11dfa35991a81ae724c113fcb3e3f7 + sha256: "66cb048220ca51cf9011da69fa581e4ee2bed4be6e82870d9e9baae75739da49" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "2.0.1" logging: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" matcher: dependency: transitive description: @@ -745,50 +745,50 @@ packages: dependency: transitive description: name: path_provider - sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4 + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "2.1.1" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: da97262be945a72270513700a92b39dd2f4a54dad55d061687e2e37a6390366a + sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" url: "https://pub.dev" source: hosted - version: "2.0.25" + version: "2.2.0" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183 + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130 + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.2.1" petitparser: dependency: transitive description: @@ -801,18 +801,18 @@ packages: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.6" pointycastle: dependency: transitive description: @@ -849,26 +849,26 @@ packages: dependency: transitive description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" pub_updater: dependency: transitive description: name: pub_updater - sha256: "05ae70703e06f7fdeb05f7f02dd680b8aad810e87c756a618f33e1794635115c" + sha256: b06600619c8c219065a548f8f7c192b3e080beff95488ed692780f48f69c0625 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.3.1" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.3" rxdart: dependency: "direct main" description: @@ -881,74 +881,74 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "16d3fb6b3692ad244a695c0183fca18cf81fd4b821664394a781de42386bf022" + sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.2.1" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "7fa90471a6875d26ad78c7e4a675874b2043874586891128dc5899662c97db46" + sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.2.1" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07" + sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.4" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa" + sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d + sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173" + sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" shelf: dependency: transitive description: name: shelf - sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" sky_engine: dependency: transitive description: flutter @@ -958,18 +958,18 @@ packages: dependency: transitive description: name: source_gen - sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33" + sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" source_helper: dependency: transitive description: name: source_helper - sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f" + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.4" source_span: dependency: transitive description: @@ -990,34 +990,34 @@ packages: dependency: "direct main" description: name: sqflite - sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9 + sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" url: "https://pub.dev" source: hosted - version: "2.2.8+4" + version: "2.3.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: e77abf6ff961d69dfef41daccbb66b51e9983cdd5cb35bf30733598057401555 + sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.5.0" sqflite_common_ffi: dependency: transitive description: name: sqflite_common_ffi - sha256: "55641c9310e1da0856559f077ccc3cb7637b718d10b1fd8461c8088ef2d2f720" + sha256: "0d5cc1be2eb18400ac6701c31211d44164393aa75886093002ecdd947be04f93" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.3.0+2" sqlite3: dependency: transitive description: name: sqlite3 - sha256: a3ba4b66a7ab170ce7aa3f5ac43c19ee8d6637afbe7b7c95c94112b4f4d91566 + sha256: db65233e6b99e99b2548932f55a987961bc06d82a31a0665451fa0b4fff4c3fb url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "2.1.0" sqlparser: dependency: transitive description: @@ -1118,10 +1118,10 @@ packages: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" unicode: dependency: transitive description: @@ -1158,10 +1158,10 @@ packages: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.0" web: dependency: transitive description: @@ -1182,18 +1182,18 @@ packages: dependency: transitive description: name: win32 - sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "5.0.7" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.3" xml: dependency: transitive description: @@ -1212,4 +1212,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.1.0-185.0.dev <4.0.0" - flutter: ">=3.10.2" + flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index 04a5af02..c9dd426f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,28 +21,28 @@ dependencies: flutter_localizations: sdk: flutter - auto_route: 7.4.0 - cupertino_icons: 1.0.5 - dartx: 1.1.0 - dio: 5.1.2 + auto_route: 7.8.3 + cupertino_icons: 1.0.6 + dartx: 1.2.0 + dio: 5.3.2 equatable: 2.0.5 floor: 1.4.2 flutter_bloc: 8.1.3 flutter_dotenv: 5.1.0 - flutter_native_splash: 2.3.1 - flutter_screenutil: 5.8.4 - flutter_secure_storage: 8.0.0 + flutter_native_splash: 2.3.2 + flutter_screenutil: 5.9.0 + flutter_secure_storage: 9.0.0 flutter_web_browser: 0.17.1 # This can be removed - freezed_annotation: 2.2.0 - get_it: 7.6.0 - google_fonts: 5.0.0 + freezed_annotation: 2.4.1 + get_it: 7.6.2 + google_fonts: 5.1.0 intl: 0.18.1 json_annotation: 4.8.1 - logger: 1.3.0 + logger: 2.0.1 material_color_generator: 1.1.0 rxdart: 0.27.7 - shared_preferences: 2.1.1 - sqflite: 2.2.8+4 + shared_preferences: 2.2.1 + sqflite: 2.3.0 stack_trace: 1.11.0 stock: 1.0.1 @@ -54,16 +54,16 @@ dev_dependencies: flutter_test: sdk: flutter - auto_route_generator: 7.1.1 - build_runner: 2.4.4 - dart_code_metrics: 5.7.4 + auto_route_generator: 7.3.1 + build_runner: 2.4.6 + dart_code_metrics: 5.7.6 floor_generator: 1.4.2 flutter_flavorizr: 2.2.1 flutter_gen_runner: 5.3.1 flutter_launcher_icons: 0.13.1 - flutter_lints: 2.0.1 - freezed: 2.3.5 - json_serializable: 6.7.0 + flutter_lints: 2.0.3 + freezed: 2.4.1 + json_serializable: 6.7.1 lints: 2.1.1 flutter: From 0b4e031d8d25a26ab337e35b8e3773947602a6fa Mon Sep 17 00:00:00 2001 From: Federico Correa Date: Fri, 1 Sep 2023 10:17:07 -0300 Subject: [PATCH 5/5] fix linter --- lib/ui/router/app_router.gr.dart | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/ui/router/app_router.gr.dart b/lib/ui/router/app_router.gr.dart index 9c1c305f..83d82bf4 100644 --- a/lib/ui/router/app_router.gr.dart +++ b/lib/ui/router/app_router.gr.dart @@ -21,22 +21,22 @@ abstract class _$AppRouter extends RootStackRouter { child: const AuthenticatedSectionRouter(), ); }, - UnauthenticatedSectionRoute.name: (routeData) { + SignInRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: const UnauthenticatedSectionRouter(), + child: const SignInScreen(), ); }, - WelcomeRoute.name: (routeData) { + UnauthenticatedSectionRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: const WelcomeScreen(), + child: const UnauthenticatedSectionRouter(), ); }, - SignInRoute.name: (routeData) { + WelcomeRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: const SignInScreen(), + child: const WelcomeScreen(), ); }, }; @@ -56,6 +56,20 @@ class AuthenticatedSectionRoute extends PageRouteInfo { static const PageInfo page = PageInfo(name); } +/// generated route for +/// [SignInScreen] +class SignInRoute extends PageRouteInfo { + const SignInRoute({List? children}) + : super( + SignInRoute.name, + initialChildren: children, + ); + + static const String name = 'SignInRoute'; + + static const PageInfo page = PageInfo(name); +} + /// generated route for /// [UnauthenticatedSectionRouter] class UnauthenticatedSectionRoute extends PageRouteInfo { @@ -83,17 +97,3 @@ class WelcomeRoute extends PageRouteInfo { static const PageInfo page = PageInfo(name); } - -/// generated route for -/// [SignInScreen] -class SignInRoute extends PageRouteInfo { - const SignInRoute({List? children}) - : super( - SignInRoute.name, - initialChildren: children, - ); - - static const String name = 'SignInRoute'; - - static const PageInfo page = PageInfo(name); -}