From 6b86cfbea27a0b6fde0044c16b00760fa36c8ee0 Mon Sep 17 00:00:00 2001 From: M Date: Mon, 19 Oct 2020 14:20:24 +0300 Subject: [PATCH] Updated to flutter v1.22.2 --- .gitignore | 1 + lib/main.dart | 4 +- lib/router.dart | 430 ++++++++++++++++++++++++------------------------ pubspec.lock | 100 +++++------ pubspec.yaml | 10 +- 5 files changed, 261 insertions(+), 284 deletions(-) diff --git a/.gitignore b/.gitignore index 0e6907b4f..cf669e13b 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ android/key.properties vendor/ android/app/.cxx/** +ios/Flutter/.last_build_id diff --git a/lib/main.dart b/lib/main.dart index 809600174..2d84cbaa0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -8,7 +8,7 @@ import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:cw_monero/wallet.dart' as monero_wallet; -import 'package:cake_wallet/router.dart'; +import 'package:cake_wallet/router.dart' as Router; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/reactions/bootstrap.dart'; @@ -144,7 +144,7 @@ class App extends StatelessWidget { ], supportedLocales: S.delegate.supportedLocales, locale: Locale(settingsStore.languageCode), - onGenerateRoute: (settings) => Router.generateRoute(settings), + onGenerateRoute: (settings) => Router.createRoute(settings), initialRoute: initialRoute, )); }); diff --git a/lib/router.dart b/lib/router.dart index d98c9c7cf..fc07b3b66 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -49,271 +49,265 @@ import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart'; import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart'; import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart'; -class Router { - static Route generateRoute(RouteSettings settings) { - switch (settings.name) { - case Routes.welcome: - return MaterialPageRoute(builder: (_) => createWelcomePage()); +Route createRoute(RouteSettings settings) { + switch (settings.name) { + case Routes.welcome: + return MaterialPageRoute(builder: (_) => createWelcomePage()); - case Routes.newWalletFromWelcome: - return CupertinoPageRoute( - builder: (_) => getIt.get( - param1: (BuildContext context, dynamic _) => - Navigator.pushNamed(context, Routes.newWallet)), - fullscreenDialog: true); + case Routes.newWalletFromWelcome: + return CupertinoPageRoute( + builder: (_) => getIt.get( + param1: (BuildContext context, dynamic _) => + Navigator.pushNamed(context, Routes.newWallet)), + fullscreenDialog: true); - case Routes.newWalletType: - return CupertinoPageRoute( - builder: (_) => NewWalletTypePage( + case Routes.newWalletType: + return CupertinoPageRoute( + builder: (_) => NewWalletTypePage( + onTypeSelected: (context, type) => Navigator.of(context) + .pushNamed(Routes.newWallet, arguments: type))); + + case Routes.newWallet: + final type = WalletType.monero; // settings.arguments as WalletType; + final walletNewVM = getIt.get(param1: type); + + return CupertinoPageRoute( + builder: (_) => NewWalletPage(walletNewVM)); + + case Routes.setupPin: + Function(BuildContext, String) callback; + + if (settings.arguments is Function(BuildContext, String)) { + callback = settings.arguments as Function(BuildContext, String); + } + + return CupertinoPageRoute( + builder: (_) => getIt.get(param1: callback)); + + case Routes.restoreWalletType: + return CupertinoPageRoute( + builder: (_) => NewWalletTypePage( onTypeSelected: (context, type) => Navigator.of(context) - .pushNamed(Routes.newWallet, arguments: type))); + .pushNamed(Routes.restoreWalletOptions, arguments: type), + isNewWallet: false, + )); - case Routes.newWallet: - final type = WalletType.monero; // settings.arguments as WalletType; - final walletNewVM = getIt.get(param1: type); + case Routes.restoreOptions: + final type = settings.arguments as WalletType; + return CupertinoPageRoute( + builder: (_) => RestoreOptionsPage(type: type)); - return CupertinoPageRoute( - builder: (_) => NewWalletPage(walletNewVM)); + case Routes.restoreWalletOptions: + final type = WalletType.monero; //settings.arguments as WalletType; - case Routes.setupPin: - Function(BuildContext, String) callback; + return CupertinoPageRoute( + builder: (_) => RestoreWalletOptionsPage( + type: type, + onRestoreFromSeed: (context) { + final route = type == WalletType.monero + ? Routes.seedLanguage + : Routes.restoreWalletFromSeed; + final args = type == WalletType.monero + ? [type, Routes.restoreWalletFromSeed] + : [type]; - if (settings.arguments is Function(BuildContext, String)) { - callback = settings.arguments as Function(BuildContext, String); - } + Navigator.of(context).pushNamed(route, arguments: args); + }, + onRestoreFromKeys: (context) { + final route = type == WalletType.monero + ? Routes.seedLanguage + : Routes.restoreWalletFromKeys; + final args = type == WalletType.monero + ? [type, Routes.restoreWalletFromKeys] + : [type]; - return CupertinoPageRoute( - builder: (_) => getIt.get(param1: callback)); + Navigator.of(context).pushNamed(route, arguments: args); + })); - case Routes.restoreWalletType: - return CupertinoPageRoute( - builder: (_) => NewWalletTypePage( - onTypeSelected: (context, type) => Navigator.of(context) - .pushNamed(Routes.restoreWalletOptions, arguments: type), - isNewWallet: false, - )); + case Routes.restoreWalletOptionsFromWelcome: + return CupertinoPageRoute( + builder: (_) => getIt.get( + param1: (BuildContext context, dynamic _) => + Navigator.pushNamed(context, Routes.restoreWallet)), + fullscreenDialog: true); - case Routes.restoreOptions: - final type = settings.arguments as WalletType; - return CupertinoPageRoute( - builder: (_) => RestoreOptionsPage(type: type)); + case Routes.seed: + return MaterialPageRoute( + builder: (_) => + getIt.get(param1: settings.arguments as bool)); - case Routes.restoreWalletOptions: - final type = WalletType.monero; //settings.arguments as WalletType; + case Routes.restoreWallet: + return MaterialPageRoute( + builder: (_) => + getIt.get(param1: WalletType.monero)); - return CupertinoPageRoute( - builder: (_) => RestoreWalletOptionsPage( - type: type, - onRestoreFromSeed: (context) { - final route = type == WalletType.monero - ? Routes.seedLanguage - : Routes.restoreWalletFromSeed; - final args = type == WalletType.monero - ? [type, Routes.restoreWalletFromSeed] - : [type]; + case Routes.restoreWalletFromSeed: + // final args = settings.arguments as List; + final type = WalletType.monero; //args.first as WalletType; + // final language = type == WalletType.monero + // ? args[1] as String + // : LanguageList.english; - Navigator.of(context).pushNamed(route, arguments: args); - }, - onRestoreFromKeys: (context) { - final route = type == WalletType.monero - ? Routes.seedLanguage - : Routes.restoreWalletFromKeys; - final args = type == WalletType.monero - ? [type, Routes.restoreWalletFromKeys] - : [type]; + return CupertinoPageRoute( + builder: (_) => RestoreWalletFromSeedPage(type: type)); - Navigator.of(context).pushNamed(route, arguments: args); - })); + case Routes.restoreWalletFromKeys: + final args = settings.arguments as List; + final type = args.first as WalletType; + final language = + type == WalletType.monero ? args[1] as String : LanguageList.english; - case Routes.restoreWalletOptionsFromWelcome: - return CupertinoPageRoute( - builder: (_) => getIt.get( - param1: (BuildContext context, dynamic _) => - Navigator.pushNamed(context, Routes.restoreWallet)), - fullscreenDialog: true); + final walletRestorationFromKeysVM = + getIt.get(param1: [type, language]); - case Routes.seed: - return MaterialPageRoute( - builder: (_) => - getIt.get(param1: settings.arguments as bool)); + return CupertinoPageRoute( + builder: (_) => RestoreWalletFromKeysPage( + walletRestorationFromKeysVM: walletRestorationFromKeysVM)); - case Routes.restoreWallet: - return MaterialPageRoute( - builder: (_) => - getIt.get(param1: WalletType.monero)); + case Routes.dashboard: + return CupertinoPageRoute( + builder: (_) => getIt.get()); - case Routes.restoreWalletFromSeed: - // final args = settings.arguments as List; - final type = WalletType.monero; //args.first as WalletType; - // final language = type == WalletType.monero - // ? args[1] as String - // : LanguageList.english; + case Routes.send: + return CupertinoPageRoute( + fullscreenDialog: true, builder: (_) => getIt.get()); - return CupertinoPageRoute( - builder: (_) => RestoreWalletFromSeedPage(type: type)); + case Routes.sendTemplate: + return CupertinoPageRoute( + fullscreenDialog: true, + builder: (_) => getIt.get()); - case Routes.restoreWalletFromKeys: - final args = settings.arguments as List; - final type = args.first as WalletType; - final language = type == WalletType.monero - ? args[1] as String - : LanguageList.english; + case Routes.receive: + return CupertinoPageRoute( + fullscreenDialog: true, builder: (_) => getIt.get()); - final walletRestorationFromKeysVM = - getIt.get(param1: [type, language]); + case Routes.transactionDetails: + return CupertinoPageRoute( + fullscreenDialog: true, + builder: (_) => + TransactionDetailsPage(settings.arguments as TransactionInfo)); - return CupertinoPageRoute( - builder: (_) => RestoreWalletFromKeysPage( - walletRestorationFromKeysVM: walletRestorationFromKeysVM)); + case Routes.newSubaddress: + return CupertinoPageRoute( + builder: (_) => + getIt.get(param1: settings.arguments)); - case Routes.dashboard: - return CupertinoPageRoute( - builder: (_) => getIt.get()); + case Routes.disclaimer: + return CupertinoPageRoute(builder: (_) => DisclaimerPage()); - case Routes.send: - return CupertinoPageRoute( - fullscreenDialog: true, builder: (_) => getIt.get()); + case Routes.readDisclaimer: + return CupertinoPageRoute( + builder: (_) => DisclaimerPage(isReadOnly: true)); - case Routes.sendTemplate: - return CupertinoPageRoute( - fullscreenDialog: true, - builder: (_) => getIt.get()); + case Routes.seedLanguage: + final args = settings.arguments as List; + final type = args.first as WalletType; + final redirectRoute = args[1] as String; - case Routes.receive: - return CupertinoPageRoute( - fullscreenDialog: true, builder: (_) => getIt.get()); + return CupertinoPageRoute(builder: (_) { + return SeedLanguage( + onConfirm: (context, lang) => Navigator.of(context) + .popAndPushNamed(redirectRoute, arguments: [type, lang])); + }); - case Routes.transactionDetails: - return CupertinoPageRoute( - fullscreenDialog: true, - builder: (_) => - TransactionDetailsPage(settings.arguments as TransactionInfo)); + case Routes.walletList: + return MaterialPageRoute( + fullscreenDialog: true, builder: (_) => getIt.get()); - case Routes.newSubaddress: - return CupertinoPageRoute( - builder: (_) => - getIt.get(param1: settings.arguments)); + case Routes.auth: + return MaterialPageRoute( + fullscreenDialog: true, + builder: (_) => getIt.get( + param1: settings.arguments as OnAuthenticationFinished, + param2: true)); - case Routes.disclaimer: - return CupertinoPageRoute(builder: (_) => DisclaimerPage()); + case Routes.unlock: + return MaterialPageRoute( + fullscreenDialog: true, + builder: (_) => getIt.get( + param1: settings.arguments as OnAuthenticationFinished, + param2: false)); - case Routes.readDisclaimer: - return CupertinoPageRoute( - builder: (_) => DisclaimerPage(isReadOnly: true)); + case Routes.nodeList: + return CupertinoPageRoute( + builder: (_) => getIt.get()); - case Routes.seedLanguage: - final args = settings.arguments as List; - final type = args.first as WalletType; - final redirectRoute = args[1] as String; + case Routes.newNode: + return CupertinoPageRoute( + builder: (_) => getIt.get()); - return CupertinoPageRoute(builder: (_) { - return SeedLanguage( - onConfirm: (context, lang) => Navigator.of(context) - .popAndPushNamed(redirectRoute, arguments: [type, lang])); - }); + case Routes.login: + return CupertinoPageRoute( + builder: (context) => getIt.get(instanceName: 'login'), + fullscreenDialog: true); - case Routes.walletList: - return MaterialPageRoute( - fullscreenDialog: true, - builder: (_) => getIt.get()); + case Routes.accountCreation: + return CupertinoPageRoute( + builder: (_) => getIt.get()); - case Routes.auth: - return MaterialPageRoute( - fullscreenDialog: true, - builder: (_) => getIt.get( - param1: settings.arguments as OnAuthenticationFinished, - param2: true)); + case Routes.addressBook: + return MaterialPageRoute( + builder: (_) => getIt.get(param1: true)); - case Routes.unlock: - return MaterialPageRoute( - fullscreenDialog: true, - builder: (_) => getIt.get( - param1: settings.arguments as OnAuthenticationFinished, - param2: false)); + case Routes.pickerAddressBook: + return MaterialPageRoute( + builder: (_) => getIt.get(param1: false)); - case Routes.nodeList: - return CupertinoPageRoute( - builder: (_) => getIt.get()); + case Routes.addressBookAddContact: + return CupertinoPageRoute( + builder: (_) => getIt.get( + param1: settings.arguments as ContactRecord)); - case Routes.newNode: - return CupertinoPageRoute( - builder: (_) => getIt.get()); + case Routes.showKeys: + return MaterialPageRoute( + builder: (_) => getIt.get(), fullscreenDialog: true); - case Routes.login: - return CupertinoPageRoute( - builder: (context) => getIt.get(instanceName: 'login'), - fullscreenDialog: true); + case Routes.exchangeTrade: + return CupertinoPageRoute( + builder: (_) => getIt.get()); - case Routes.accountCreation: - return CupertinoPageRoute( - builder: (_) => getIt.get()); + case Routes.exchangeConfirm: + return MaterialPageRoute( + builder: (_) => getIt.get()); - case Routes.addressBook: - return MaterialPageRoute( - builder: (_) => getIt.get(param1: true)); + case Routes.tradeDetails: + return MaterialPageRoute( + builder: (_) => TradeDetailsPage(settings.arguments as Trade)); - case Routes.pickerAddressBook: - return MaterialPageRoute( - builder: (_) => getIt.get(param1: false)); + case Routes.restoreWalletFromSeedDetails: + final args = settings.arguments as List; + final walletRestorationFromSeedVM = + getIt.get(param1: args); - case Routes.addressBookAddContact: - return CupertinoPageRoute( - builder: (_) => getIt.get( - param1: settings.arguments as ContactRecord)); + return CupertinoPageRoute( + builder: (_) => RestoreWalletFromSeedDetailsPage( + walletRestorationFromSeedVM: walletRestorationFromSeedVM)); - case Routes.showKeys: - return MaterialPageRoute( - builder: (_) => getIt.get(), - fullscreenDialog: true); + case Routes.exchange: + return CupertinoPageRoute( + builder: (_) => getIt.get()); - case Routes.exchangeTrade: - return CupertinoPageRoute( - builder: (_) => getIt.get()); + case Routes.exchangeTemplate: + return CupertinoPageRoute( + builder: (_) => getIt.get()); - case Routes.exchangeConfirm: - return MaterialPageRoute( - builder: (_) => getIt.get()); + case Routes.settings: + return MaterialPageRoute(builder: (_) => getIt.get()); - case Routes.tradeDetails: - return MaterialPageRoute( - builder: (_) => TradeDetailsPage(settings.arguments as Trade)); + case Routes.rescan: + return MaterialPageRoute(builder: (_) => getIt.get()); - case Routes.restoreWalletFromSeedDetails: - final args = settings.arguments as List; - final walletRestorationFromSeedVM = - getIt.get(param1: args); + case Routes.faq: + return MaterialPageRoute(builder: (_) => getIt.get()); - return CupertinoPageRoute( - builder: (_) => RestoreWalletFromSeedDetailsPage( - walletRestorationFromSeedVM: walletRestorationFromSeedVM)); + case Routes.changeLanguage: + return MaterialPageRoute( + builder: (_) => getIt.get()); - case Routes.exchange: - return CupertinoPageRoute( - builder: (_) => getIt.get()); - - case Routes.exchangeTemplate: - return CupertinoPageRoute( - builder: (_) => getIt.get()); - - case Routes.settings: - return MaterialPageRoute( - builder: (_) => getIt.get()); - - case Routes.rescan: - return MaterialPageRoute(builder: (_) => getIt.get()); - - case Routes.faq: - return MaterialPageRoute(builder: (_) => getIt.get()); - - case Routes.changeLanguage: - return MaterialPageRoute( - builder: (_) => getIt.get()); - - default: - return MaterialPageRoute( - builder: (_) => Scaffold( - body: Center( - child: Text(S.current.router_no_route(settings.name))))); - } + default: + return MaterialPageRoute( + builder: (_) => Scaffold( + body: Center( + child: Text(S.current.router_no_route(settings.name))))); } -} +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 5513bc46f..973e3cd7b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "6.0.0" + version: "11.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.39.14" + version: "0.40.4" archive: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.5.0-nullsafety.1" auto_size_text: dependency: "direct main" description: @@ -98,7 +98,7 @@ packages: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" bs58check: dependency: transitive description: @@ -112,7 +112,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.5.0" build_config: dependency: transitive description: @@ -133,21 +133,21 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "1.3.11" + version: "1.4.1" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.10.1" + version: "1.10.3" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.0.3" built_collection: dependency: transitive description: @@ -168,14 +168,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.2.0-nullsafety.1" checked_yaml: dependency: transitive description: @@ -189,35 +189,35 @@ packages: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.2.0" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0-nullsafety.1" code_builder: dependency: transitive description: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.4.1" + version: "3.5.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.13" + version: "1.15.0-nullsafety.3" connectivity: dependency: "direct main" description: name: connectivity url: "https://pub.dartlang.org" source: hosted - version: "0.4.9+3" + version: "0.4.9+5" connectivity_for_web: dependency: transitive description: @@ -253,13 +253,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.5" - csslib: - dependency: transitive - description: - name: csslib - url: "https://pub.dartlang.org" - source: hosted - version: "0.16.2" cupertino_icons: dependency: "direct main" description: @@ -280,9 +273,9 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "1.3.6" + version: "1.3.7" dartx: - dependency: "direct overridden" + dependency: transitive description: name: dartx url: "https://pub.dartlang.org" @@ -336,7 +329,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety.1" ffi: dependency: transitive description: @@ -463,7 +456,7 @@ packages: name: hive url: "https://pub.dartlang.org" source: hosted - version: "1.4.4" + version: "1.4.4+1" hive_flutter: dependency: "direct main" description: @@ -477,14 +470,7 @@ packages: name: hive_generator url: "https://pub.dartlang.org" source: hosted - version: "0.7.2+1" - html: - dependency: transitive - description: - name: html - url: "https://pub.dartlang.org" - source: hosted - version: "0.14.0+3" + version: "0.8.1" http: dependency: "direct main" description: @@ -547,14 +533,14 @@ packages: name: keyboard_actions url: "https://pub.dartlang.org" source: hosted - version: "3.3.0+1" + version: "3.3.1+1" local_auth: dependency: "direct main" description: name: local_auth url: "https://pub.dartlang.org" source: hosted - version: "0.6.3+2" + version: "0.6.3+3" logging: dependency: transitive description: @@ -568,14 +554,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.8" + version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0-nullsafety.3" mime: dependency: transitive description: @@ -589,14 +575,14 @@ packages: name: mobx url: "https://pub.dartlang.org" source: hosted - version: "1.2.1+2" + version: "1.2.1+3" mobx_codegen: dependency: "direct dev" description: name: mobx_codegen url: "https://pub.dartlang.org" source: hosted - version: "1.1.0+2" + version: "1.1.1+1" node_interop: dependency: transitive description: @@ -638,7 +624,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0-nullsafety.1" path_drawing: dependency: transitive description: @@ -659,7 +645,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "1.6.18" + version: "1.6.21" path_provider_linux: dependency: transitive description: @@ -694,14 +680,14 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.9.2" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.1.0" platform: dependency: transitive description: @@ -792,14 +778,14 @@ packages: name: share url: "https://pub.dartlang.org" source: hosted - version: "0.6.5+2" + version: "0.6.5+3" shared_preferences: dependency: "direct main" description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.12" + version: "0.5.12+2" shared_preferences_linux: dependency: transitive description: @@ -874,21 +860,21 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.5" + version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" stream_transform: dependency: transitive description: @@ -902,21 +888,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.17" + version: "0.2.19-nullsafety.2" time: dependency: transitive description: @@ -937,14 +923,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0-nullsafety.3" url_launcher: dependency: "direct main" description: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "5.7.2" + version: "5.7.5" url_launcher_linux: dependency: transitive description: @@ -993,7 +979,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.3" watcher: dependency: transitive description: @@ -1021,7 +1007,7 @@ packages: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.1.2" xml: dependency: transitive description: @@ -1037,5 +1023,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.9.0-14.0.dev <3.0.0" + dart: ">=2.10.0-110 <2.11.0" flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 73cb7c48e..e0d38d66e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,7 +46,7 @@ dependencies: dio: 3.0.7 cw_monero: path: ./cw_monero - hive: ^1.4.2 + hive: ^1.4.4+1 hive_flutter: ^0.3.1 local_auth: ^0.6.1 package_info: ^0.4.0+13 @@ -70,17 +70,13 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - build_runner: 1.10.1 + build_runner: ^1.10.3 build_resolvers: ^1.3.10 mobx_codegen: ^1.1.0+1 - hive_generator: ^0.7.0+2 + hive_generator: ^0.8.1 flutter_launcher_icons: ^0.7.4 pedantic: ^1.8.0 -# Fix for hive https://github.com/hivedb/hive/issues/247#issuecomment-606838497 -dependency_overrides: - dartx: ^0.5.0 - flutter_icons: image_path: "assets/images/app_logo.png" android: true