From 58572a5e0ec47652e23996de4101171450519c7e Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 5 Sep 2022 04:15:27 +0200 Subject: [PATCH] migrate flutter 3.3.0 --- integration_test/multi_chests.dart | 1 - lib/providers/generate_wallets.dart | 1 - lib/providers/substrate_sdk.dart | 1 - lib/providers/wallet_options.dart | 14 +++---- lib/screens/activity.dart | 3 +- lib/screens/avatar_fullscreen.dart | 7 +--- lib/screens/common_elements.dart | 4 +- lib/screens/home.dart | 4 +- lib/screens/myWallets/change_pin.dart | 12 ++---- lib/screens/myWallets/choose_chest.dart | 4 +- lib/screens/myWallets/choose_wallet.dart | 7 +--- lib/screens/myWallets/custom_derivations.dart | 4 +- lib/screens/myWallets/import_g1_v1.dart | 4 +- lib/screens/myWallets/migrate_identity.dart | 4 +- lib/screens/myWallets/restore_chest.dart | 8 +--- lib/screens/myWallets/show_seed.dart | 13 ++---- .../myWallets/transaction_comment.dart | 3 +- lib/screens/myWallets/unlocking_wallet.dart | 3 +- lib/screens/myWallets/wallet_options.dart | 12 ++---- lib/screens/myWallets/wallets_home.dart | 4 +- lib/screens/onBoarding/10.dart | 3 +- .../onBoarding/11_congratulations.dart | 8 +--- lib/screens/onBoarding/5.dart | 9 +---- lib/screens/onBoarding/6.dart | 7 ++-- lib/screens/onBoarding/9.dart | 5 +-- lib/screens/qrcode_fullscreen.dart | 3 +- lib/screens/search.dart | 4 +- lib/screens/settings.dart | 1 - lib/screens/transaction_in_progress.dart | 5 +-- lib/screens/wallet_view.dart | 4 +- pubspec.lock | 40 +++++++++---------- 31 files changed, 70 insertions(+), 132 deletions(-) diff --git a/integration_test/multi_chests.dart b/integration_test/multi_chests.dart index 2b299db..a81742e 100644 --- a/integration_test/multi_chests.dart +++ b/integration_test/multi_chests.dart @@ -1,6 +1,5 @@ import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:gecko/models/widgets_keys.dart'; import 'package:integration_test/integration_test.dart'; import 'general_actions.dart'; import 'tests_utility.dart'; diff --git a/lib/providers/generate_wallets.dart b/lib/providers/generate_wallets.dart index 43355a7..0d81211 100644 --- a/lib/providers/generate_wallets.dart +++ b/lib/providers/generate_wallets.dart @@ -1,5 +1,4 @@ import 'dart:math'; -import 'dart:typed_data'; import 'package:durt/durt.dart' as durt; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart index af1bbca..3955cf4 100644 --- a/lib/providers/substrate_sdk.dart +++ b/lib/providers/substrate_sdk.dart @@ -1,6 +1,5 @@ // ignore_for_file: use_build_context_synchronously -import 'dart:typed_data'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/providers/wallet_options.dart b/lib/providers/wallet_options.dart index ac2f106..3438bec 100644 --- a/lib/providers/wallet_options.dart +++ b/lib/providers/wallet_options.dart @@ -137,7 +137,7 @@ class WalletOptionsProvider with ChangeNotifier { DuniterIndexer duniterIndexer = Provider.of(context, listen: false); - _showText(String text, + showText(String text, [double size = 18, bool bold = false, bool smooth = true]) { log.d('$address $text'); return AnimatedFadeOutIn( @@ -163,16 +163,16 @@ class WalletOptionsProvider with ChangeNotifier { switch (snapshot.data.toString()) { case 'noid': { - return _showText('noIdentity'.tr()); + return showText('noIdentity'.tr()); } case 'Created': { - return _showText('identityCreated'.tr()); + return showText('identityCreated'.tr()); } case 'ConfirmedByOwner': { return isOwner - ? _showText('identityConfirmed'.tr()) + ? showText('identityConfirmed'.tr()) : duniterIndexer.getNameByAddress( context, address, @@ -187,7 +187,7 @@ class WalletOptionsProvider with ChangeNotifier { case 'Validated': { return isOwner - ? _showText('memberValidated'.tr(), 18, true) + ? showText('memberValidated'.tr(), 18, true) : duniterIndexer.getNameByAddress( context, address, @@ -201,11 +201,11 @@ class WalletOptionsProvider with ChangeNotifier { case 'expired': { - return _showText('identityExpired'.tr()); + return showText('identityExpired'.tr()); } } return SizedBox( - child: _showText('', 18, false, false), + child: showText('', 18, false, false), ); }); }); diff --git a/lib/screens/activity.dart b/lib/screens/activity.dart index 5635c49..2be757d 100644 --- a/lib/screens/activity.dart +++ b/lib/screens/activity.dart @@ -1,3 +1,5 @@ +// ignore_for_file: must_be_immutable + import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; @@ -13,7 +15,6 @@ import 'package:gecko/screens/wallet_view.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; import 'package:provider/provider.dart'; -// ignore: must_be_immutable class ActivityScreen extends StatelessWidget with ChangeNotifier { ActivityScreen({required this.address, this.avatar, this.username, Key? key}) : super(key: key); diff --git a/lib/screens/avatar_fullscreen.dart b/lib/screens/avatar_fullscreen.dart index 682e290..ef87be1 100644 --- a/lib/screens/avatar_fullscreen.dart +++ b/lib/screens/avatar_fullscreen.dart @@ -1,14 +1,9 @@ import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; import 'package:flutter/material.dart'; -// import 'package:gecko/models/home.dart'; -// import 'package:provider/provider.dart'; -// ignore: must_be_immutable class AvatarFullscreen extends StatelessWidget { - TextEditingController tplController = TextEditingController(); - - AvatarFullscreen(this.avatar, {this.title, this.color, Key? key}) + const AvatarFullscreen(this.avatar, {this.title, this.color, Key? key}) : super(key: key); final Image? avatar; final String? title; diff --git a/lib/screens/common_elements.dart b/lib/screens/common_elements.dart index d077384..0b88edb 100644 --- a/lib/screens/common_elements.dart +++ b/lib/screens/common_elements.dart @@ -65,9 +65,7 @@ class CommonElements { child: ElevatedButton( key: keyGoNext, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, backgroundColor: orangeC, elevation: 4, // foreground ), onPressed: () { Navigator.push( diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 2516f86..cc51af0 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -540,9 +540,7 @@ Widget welcomeHome(context) { height: 70, child: ElevatedButton(key: keyOnboardingNewChest, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () { Navigator.push( diff --git a/lib/screens/myWallets/change_pin.dart b/lib/screens/myWallets/change_pin.dart index 26b3f4c..be5a3bc 100644 --- a/lib/screens/myWallets/change_pin.dart +++ b/lib/screens/myWallets/change_pin.dart @@ -1,4 +1,4 @@ -// ignore_for_file: use_build_context_synchronously +// ignore_for_file: use_build_context_synchronously, must_be_immutable import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; @@ -10,11 +10,9 @@ import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/providers/my_wallets.dart'; import 'package:gecko/providers/substrate_sdk.dart'; import 'package:gecko/screens/myWallets/unlocking_wallet.dart'; -import 'dart:io'; import 'package:provider/provider.dart'; -// ignore: must_be_immutable class ChangePinScreen extends StatelessWidget with ChangeNotifier { ChangePinScreen( {Key? keyMyWallets, @@ -23,9 +21,8 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier { : super(key: keyMyWallets); final String? walletName; final MyWalletsProvider walletProvider; - Directory? appPath; - TextEditingController newPin = TextEditingController(); + final TextEditingController newPin = TextEditingController(); @override Widget build(BuildContext context) { @@ -102,9 +99,8 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier { height: 50, child: ElevatedButton( style: ElevatedButton.styleFrom( - elevation: 12, - primary: Colors.green[400], //smoothYellow, // background - onPrimary: Colors.black, // foreground + foregroundColor: Colors.black, elevation: 12, + backgroundColor: Colors.green[400], // foreground ), onPressed: () async { WalletData defaultWallet = diff --git a/lib/screens/myWallets/choose_chest.dart b/lib/screens/myWallets/choose_chest.dart index 4974f2c..ee99910 100644 --- a/lib/screens/myWallets/choose_chest.dart +++ b/lib/screens/myWallets/choose_chest.dart @@ -23,7 +23,6 @@ class ChooseChest extends StatefulWidget { } } -// ignore: must_be_immutable class _ChooseChestState extends State { TextEditingController tplController = TextEditingController(); CarouselController buttonCarouselController = CarouselController(); @@ -112,8 +111,7 @@ class _ChooseChestState extends State { height: 70, child: ElevatedButton( style: ElevatedButton.styleFrom( - primary: orangeC, // background - onPrimary: Colors.black, // foreground + foregroundColor: Colors.black, backgroundColor: orangeC, // foreground ), onPressed: () async { await configBox.put('currentChest', currentChest); diff --git a/lib/screens/myWallets/choose_wallet.dart b/lib/screens/myWallets/choose_wallet.dart index 8f4d73a..a5772de 100644 --- a/lib/screens/myWallets/choose_wallet.dart +++ b/lib/screens/myWallets/choose_wallet.dart @@ -1,4 +1,4 @@ -// ignore_for_file: use_build_context_synchronously +// ignore_for_file: use_build_context_synchronously, must_be_immutable import 'dart:io'; @@ -16,7 +16,6 @@ import 'package:provider/provider.dart'; // import 'package:gecko/models/home.dart'; // import 'package:provider/provider.dart'; -// ignore: must_be_immutable class ChooseWalletScreen extends StatelessWidget { ChooseWalletScreen({Key? key, required this.pin}) : super(key: key); final String pin; @@ -49,9 +48,7 @@ class ChooseWalletScreen extends StatelessWidget { child: ElevatedButton( key: keyConfirm, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () async { await sub.setCurrentWallet(selectedWallet!); diff --git a/lib/screens/myWallets/custom_derivations.dart b/lib/screens/myWallets/custom_derivations.dart index a5d264d..43d3493 100644 --- a/lib/screens/myWallets/custom_derivations.dart +++ b/lib/screens/myWallets/custom_derivations.dart @@ -107,9 +107,7 @@ class _CustomDerivationState extends State { height: 70, child: ElevatedButton( style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () async { WalletData? defaultWallet = diff --git a/lib/screens/myWallets/import_g1_v1.dart b/lib/screens/myWallets/import_g1_v1.dart index 2683757..0e40a35 100644 --- a/lib/screens/myWallets/import_g1_v1.dart +++ b/lib/screens/myWallets/import_g1_v1.dart @@ -239,9 +239,7 @@ class ImportG1v1 extends StatelessWidget { child: ElevatedButton( key: keyConfirm, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: canValidate ? () async { diff --git a/lib/screens/myWallets/migrate_identity.dart b/lib/screens/myWallets/migrate_identity.dart index b8fa00d..12137e9 100644 --- a/lib/screens/myWallets/migrate_identity.dart +++ b/lib/screens/myWallets/migrate_identity.dart @@ -188,9 +188,7 @@ class MigrateIdentityScreen extends StatelessWidget { height: 60 * ratio, child: ElevatedButton( style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: canValidate ? () async { diff --git a/lib/screens/myWallets/restore_chest.dart b/lib/screens/myWallets/restore_chest.dart index 4ec6d68..6f98b45 100644 --- a/lib/screens/myWallets/restore_chest.dart +++ b/lib/screens/myWallets/restore_chest.dart @@ -94,9 +94,7 @@ class RestoreChest extends StatelessWidget { child: ElevatedButton( key: keyGoNext, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () async { if (await sub @@ -134,9 +132,7 @@ class RestoreChest extends StatelessWidget { child: ElevatedButton( key: keyPastMnemonic, style: ElevatedButton.styleFrom( - elevation: 4, - primary: yellowC, // background - onPrimary: Colors.black, // foreground + foregroundColor: Colors.black, elevation: 4, backgroundColor: yellowC, // foreground ), onPressed: () { genW.pasteMnemonic(context); diff --git a/lib/screens/myWallets/show_seed.dart b/lib/screens/myWallets/show_seed.dart index 002bed1..92a454b 100644 --- a/lib/screens/myWallets/show_seed.dart +++ b/lib/screens/myWallets/show_seed.dart @@ -1,4 +1,3 @@ -import 'dart:typed_data'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; @@ -74,12 +73,10 @@ class ShowSeed extends StatelessWidget { height: 40, child: ElevatedButton( style: ElevatedButton.styleFrom( - shape: RoundedRectangleBorder( + foregroundColor: Colors.black, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), - ), - elevation: 1, - primary: orangeC, // background - onPrimary: Colors.black, // foreground + ), backgroundColor: orangeC, + elevation: 1, // foreground ), onPressed: () { Clipboard.setData( @@ -124,9 +121,7 @@ class ShowSeed extends StatelessWidget { height: 60 * ratio, child: ElevatedButton( style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () { Navigator.pop(context); diff --git a/lib/screens/myWallets/transaction_comment.dart b/lib/screens/myWallets/transaction_comment.dart index 3632f65..7312324 100644 --- a/lib/screens/myWallets/transaction_comment.dart +++ b/lib/screens/myWallets/transaction_comment.dart @@ -1,3 +1,5 @@ +// ignore_for_file: must_be_immutable + import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; @@ -5,7 +7,6 @@ import 'package:flutter/material.dart'; // import 'package:gecko/models/home.dart'; // import 'package:provider/provider.dart'; -// ignore: must_be_immutable class TransactionCommentScreen extends StatelessWidget { TextEditingController tplController = TextEditingController(); diff --git a/lib/screens/myWallets/unlocking_wallet.dart b/lib/screens/myWallets/unlocking_wallet.dart index 3011588..04c23ab 100644 --- a/lib/screens/myWallets/unlocking_wallet.dart +++ b/lib/screens/myWallets/unlocking_wallet.dart @@ -1,3 +1,5 @@ +// ignore_for_file: must_be_immutable + import 'dart:async'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/foundation.dart'; @@ -14,7 +16,6 @@ import 'package:pin_code_fields/pin_code_fields.dart'; import 'package:provider/provider.dart'; import 'package:gecko/globals.dart'; -// ignore: must_be_immutable class UnlockingWallet extends StatelessWidget { UnlockingWallet({Key? keyUnlockWallet, required this.wallet}) : super(key: keyUnlockWallet); diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart index f213449..bdb3799 100644 --- a/lib/screens/myWallets/wallet_options.dart +++ b/lib/screens/myWallets/wallet_options.dart @@ -299,9 +299,7 @@ class WalletOptions extends StatelessWidget { child: ElevatedButton( key: keyConfirmIdentity, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () { walletProvider.confirmIdentityPopup(context); @@ -365,12 +363,10 @@ class WalletOptions extends StatelessWidget { height: 40, child: ElevatedButton( style: ElevatedButton.styleFrom( - shape: RoundedRectangleBorder( + foregroundColor: Colors.black, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), - ), - elevation: 1, - primary: orangeC, // background - onPrimary: Colors.black, // foreground + ), backgroundColor: orangeC, + elevation: 1, // foreground ), onPressed: () { Clipboard.setData( diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart index 7e452bf..ef355d2 100644 --- a/lib/screens/myWallets/wallets_home.dart +++ b/lib/screens/myWallets/wallets_home.dart @@ -88,9 +88,7 @@ class WalletsHome extends StatelessWidget { height: 60, ), style: ElevatedButton.styleFrom( - elevation: 2, - primary: floattingYellow, // background - onPrimary: Colors.black, // foreground + foregroundColor: Colors.black, elevation: 2, backgroundColor: floattingYellow, // foreground ), onPressed: () => Navigator.push( context, diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart index e3150a1..4b7b144 100644 --- a/lib/screens/onBoarding/10.dart +++ b/lib/screens/onBoarding/10.dart @@ -1,7 +1,7 @@ // ignore_for_file: file_names +// ignore_for_file: must_be_immutable import 'dart:async'; -import 'dart:io'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; @@ -18,7 +18,6 @@ import 'package:gecko/screens/onBoarding/11_congratulations.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; import 'package:provider/provider.dart'; -// ignore: must_be_immutable class OnboardingStepTen extends StatelessWidget { OnboardingStepTen({Key? validationKey, this.scanDerivation = false}) : super(key: validationKey); diff --git a/lib/screens/onBoarding/11_congratulations.dart b/lib/screens/onBoarding/11_congratulations.dart index de1747d..61bd8b0 100644 --- a/lib/screens/onBoarding/11_congratulations.dart +++ b/lib/screens/onBoarding/11_congratulations.dart @@ -1,16 +1,12 @@ // ignore_for_file: file_names -import 'dart:io'; - import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; import 'package:gecko/globals.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:gecko/screens/common_elements.dart'; -import 'package:gecko/screens/myWallets/wallets_home.dart'; -// ignore: must_be_immutable class OnboardingStepEleven extends StatelessWidget { const OnboardingStepEleven({Key? key}) : super(key: key); @@ -59,9 +55,7 @@ Widget finishButton(BuildContext context) { child: ElevatedButton( key: keyGoWalletsHome, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () { // sleep(const Duration(milliseconds: 50)); diff --git a/lib/screens/onBoarding/5.dart b/lib/screens/onBoarding/5.dart index dd4907c..f82c2e9 100644 --- a/lib/screens/onBoarding/5.dart +++ b/lib/screens/onBoarding/5.dart @@ -83,9 +83,7 @@ class _ChooseChestState extends State { child: ElevatedButton( key: keyGenerateMnemonic, style: ElevatedButton.styleFrom( - elevation: 4, - primary: const Color(0xffFFD58D), - onPrimary: Colors.black, // foreground + foregroundColor: Colors.black, elevation: 4, backgroundColor: const Color(0xffFFD58D), // foreground ), onPressed: () { // _generateWalletProvider.reloadBuild(); @@ -183,7 +181,6 @@ Widget arrayCell(dataWord) { ); } -// ignore: must_be_immutable class PrintWallet extends StatelessWidget { const PrintWallet(this.sentence, {Key? key}) : super(key: key); @@ -234,9 +231,7 @@ Widget nextButton( child: ElevatedButton( key: keyGoNext, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () { generateWalletProvider.nbrWord = generateWalletProvider.getRandomInt(); diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart index 2c8562b..8e3a624 100644 --- a/lib/screens/onBoarding/6.dart +++ b/lib/screens/onBoarding/6.dart @@ -1,4 +1,5 @@ // ignore_for_file: file_names +// ignore_for_file: must_be_immutable import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; @@ -11,7 +12,6 @@ import 'package:gecko/screens/onBoarding/7.dart'; import 'package:gecko/screens/onBoarding/9.dart'; import 'package:provider/provider.dart'; -// ignore: must_be_immutable class OnboardingStepSix extends StatelessWidget { OnboardingStepSix( {Key? key, required this.skipIntro, required this.generatedMnemonic}) @@ -227,9 +227,8 @@ Widget nextButton(BuildContext context, String text, nextScreen, bool isFast) { child: ElevatedButton( key: keyGoNext, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, + backgroundColor: orangeC, // foreground ), onPressed: () { Navigator.push( diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart index a2b83ea..6958157 100644 --- a/lib/screens/onBoarding/9.dart +++ b/lib/screens/onBoarding/9.dart @@ -9,7 +9,6 @@ import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/onBoarding/10.dart'; import 'package:provider/provider.dart'; -// ignore: must_be_immutable class OnboardingStepNine extends StatelessWidget { const OnboardingStepNine({Key? key, this.scanDerivation = false}) : super(key: key); @@ -82,9 +81,7 @@ class OnboardingStepNine extends StatelessWidget { child: ElevatedButton( key: keyChangePin, style: ElevatedButton.styleFrom( - elevation: 4, - primary: const Color(0xffFFD58D), - onPrimary: Colors.black, // foreground + foregroundColor: Colors.black, elevation: 4, backgroundColor: const Color(0xffFFD58D), // foreground ), onPressed: () { generateWalletProvider.changePinCode( diff --git a/lib/screens/qrcode_fullscreen.dart b/lib/screens/qrcode_fullscreen.dart index c789e01..4ad6e6d 100644 --- a/lib/screens/qrcode_fullscreen.dart +++ b/lib/screens/qrcode_fullscreen.dart @@ -1,3 +1,5 @@ +// ignore_for_file: must_be_immutable + import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; import 'package:flutter/material.dart'; @@ -6,7 +8,6 @@ import 'package:qr_flutter/qr_flutter.dart'; // import 'package:gecko/models/home.dart'; // import 'package:provider/provider.dart'; -// ignore: must_be_immutable class QrCodeFullscreen extends StatelessWidget { TextEditingController tplController = TextEditingController(); diff --git a/lib/screens/search.dart b/lib/screens/search.dart index ff3c6d7..a28a7dc 100644 --- a/lib/screens/search.dart +++ b/lib/screens/search.dart @@ -95,9 +95,7 @@ class SearchScreen extends StatelessWidget { child: ElevatedButton( key: keyConfirmSearch, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: searchProvider.searchController.text.length >= 2 ? () { diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index 5c9e325..94fee97 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -11,7 +11,6 @@ import 'package:polkawallet_sdk/api/types/networkParams.dart'; import 'package:provider/provider.dart'; // import 'package:dropdown_button2/dropdown_button2.dart'; -// ignore: must_be_immutable class SettingsScreen extends StatelessWidget { final MyWalletsProvider _myWallets = MyWalletsProvider(); diff --git a/lib/screens/transaction_in_progress.dart b/lib/screens/transaction_in_progress.dart index 9c8b261..6bd77e4 100644 --- a/lib/screens/transaction_in_progress.dart +++ b/lib/screens/transaction_in_progress.dart @@ -10,7 +10,6 @@ import 'package:provider/provider.dart'; // import 'package:gecko/models/home.dart'; // import 'package:provider/provider.dart'; -// ignore: must_be_immutable class TransactionInProgress extends StatelessWidget { const TransactionInProgress( {Key? key, this.transType = 'pay', this.fromAddress, this.toAddress}) @@ -268,9 +267,7 @@ class TransactionInProgress extends StatelessWidget { child: ElevatedButton( key: keyCloseTransactionScreen, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: () { Navigator.pop(context); diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart index 6089693..27f971b 100644 --- a/lib/screens/wallet_view.dart +++ b/lib/screens/wallet_view.dart @@ -626,9 +626,7 @@ class WalletViewScreen extends StatelessWidget { child: ElevatedButton( key: keyConfirmPayment, style: ElevatedButton.styleFrom( - elevation: 4, - primary: orangeC, // background - onPrimary: Colors.white, // foreground + foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground ), onPressed: canValidate ? () async { diff --git a/pubspec.lock b/pubspec.lock index 6fc8368..661ba8a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.11" + version: "3.3.0" args: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" auth_header: dependency: transitive description: @@ -161,7 +161,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -182,7 +182,7 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" code_builder: dependency: transitive description: @@ -259,7 +259,7 @@ packages: name: coverage url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.5.0" cross_file: dependency: transitive description: @@ -273,7 +273,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" dart_style: dependency: transitive description: @@ -343,7 +343,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" fast_base58: dependency: "direct main" description: @@ -791,14 +791,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" matrix4_transform: dependency: transitive description: @@ -812,7 +812,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" mime: dependency: transitive description: @@ -910,7 +910,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" path_drawing: dependency: transitive description: @@ -1311,7 +1311,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -1339,42 +1339,42 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" sync_http: dependency: "direct main" description: name: sync_http url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.3.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test: dependency: "direct main" description: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.21.1" + version: "1.21.4" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.13" + version: "0.4.16" timing: dependency: transitive description: @@ -1395,7 +1395,7 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" universal_io: dependency: transitive description: @@ -1430,7 +1430,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "8.2.2" + version: "9.0.0" watcher: dependency: transitive description: