diff --git a/integration_test/multi_chests.dart b/integration_test/multi_chests.dart
index 2b299db78349ae0ff426a153c3017312394f483c..a81742ee4b228766f07f2bb2798bdfdf2e6393fe 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 43355a70b7ec1912fb2dafbe32a973b91ede289c..0d81211904b3455271d4f79effcf97d4eadc49c4 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 af1bbca27f9b081732159b87efbbb703e8ac5ca3..3955cf4e3066eb829ee5e52fccd0cc6baec28964 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 ac2f106a7e21c2a473f7f521ce533c902a87f971..3438becd3d7426471b4262878fe17abdd4a1960e 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<DuniterIndexer>(context, listen: false);
- _showText(String text,
+ showText(String text,
[double size = 18, bool bold = false, bool smooth = true]) {
log.d('$address $text');
return AnimatedFadeOutIn<String>(
@@ -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 5635c49c9831b4c488c8237c95808d09c1ed9e0d..2be757d961cf8389aa13456473fdda5672b64daa 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 682e29012b5fea163efb0557410c1733c014181c..ef87be1281147f8fa2f95d698ecf375507351ec9 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 d077384b0c97507d1884d965df0d6a6524f3b42d..0b88edb3dd94c6c8d4fbae4c5cb303e982936348 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 2516f867ecef90193e0d74e1887a4967e36b4afc..cc51af0389b8fe87730176f566503e237aaec6e1 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 26b3f4c027b74bb900db87029a9f15cd9f7453d8..be5a3bc9c8244da45155adacfcd29f7011b530f2 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 4974f2c9e4121cf1d02a9d47aebd94ccd89c39fd..ee99910acc820304f9303f4ef3114491b91ea360 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<ChooseChest> {
TextEditingController tplController = TextEditingController();
CarouselController buttonCarouselController = CarouselController();
@@ -112,8 +111,7 @@ class _ChooseChestState extends State<ChooseChest> {
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 8f4d73a444eb2991f645785f2155312d1a2bd17b..a5772de881a1966b7ffeacd8c37f05463a6d8296 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 a5d264d3ac415cc22cf3b166c889447bdc7c15b7..43d3493828136e96bb3d5597e9eee6741ccfc78e 100644
--- a/lib/screens/myWallets/custom_derivations.dart
+++ b/lib/screens/myWallets/custom_derivations.dart
@@ -107,9 +107,7 @@ class _CustomDerivationState extends State<CustomDerivation> {
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 2683757cb1bb79d54cb6891a3fea7f50cc2e87bc..0e40a355a13a22514815b72377e9243ef8ecae86 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 b8fa00d6a528fae77172681c7051b06d815915a7..12137e90186d57f2747b8bce4a85848eb550dbf6 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 4ec6d680d875011642af471f1b47b58eb497731d..6f98b45b73e9f41b8f1818027f078ca22c2673ed 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 002bed1f515ceadb51fd59ebfbb55cadd804b246..92a454b4f02430fb2133252a6b5fc60b27e0ceab 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 3632f650e5c9dfe9ea19ed1bbc98d4c548242a82..7312324f7d7f19e121ba853d02163152ce7a2f46 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 30115886bc57540f6bf70443dc536579e36360e7..04c23ab947c0fbab97c236ce2ec6e1fdf1864235 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 f213449d5d3559ca6169aaf5c2429abdeafe63a4..bdb3799b6ee6511da0342ec7550fcb417cc86025 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 7e452bf49426d80caec0ba4a72c64b52a672a3a3..ef355d2d8848aca59e87aa425fd60b31f7e10fa4 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 e3150a15a014236f3bf26e21ccb0ed1290f7cfd0..4b7b144890f8e127df96ee194aea79685fced76b 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 de1747d68e06bc2692ceb8417f0db18b2a23090a..61bd8b0c3666b3603fb9a64937635dc8e9f9c1ef 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 dd4907c36fba2b0aa425fea771ac176e26f07c38..f82c2e9dcc2412f1fc2e2e7afc2a33dfedd4ba28 100644
--- a/lib/screens/onBoarding/5.dart
+++ b/lib/screens/onBoarding/5.dart
@@ -83,9 +83,7 @@ class _ChooseChestState extends State<OnboardingStepFive> {
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 2c8562bc214e01c042f8a932e809ca96186a93e8..8e3a62436a65afd911f0bc344940ddc8ae6a6ddb 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 a2b83ea16923b9fa32c44f3561c985b1257c2de0..6958157a40a1f0c925b9e4bdc43551e1c5842522 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 c789e015c02b7e7d65620a185f79e39aa9a613d4..4ad6e6d0230dce21060fec1ad87bd2c682ad0244 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 ff3c6d79cf1c9b76ebb3cdd9079c64682ce50123..a28a7dc9904678d3151d9ada4de7e117e4cf55df 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 5c9e32562eaeaf38337fbfd31b90d7a043b5f9a2..94fee97a0a8ae541c8da5ee69f749478b2c4178a 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 9c8b2614f1bc6d105f1a5cfd8b1637454ac76ddc..6bd77e4b7b81519dc0abaf9179a5860bcbeb984c 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 6089693e5f4e3370b7324630cf8f47ecc99fc910..27f971be3e4e6a9aa4387379e771e4b3534eb2d8 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 6fc8368a2216029a585c91af6c77fa9aea856530..661ba8ac4475f9c42ddc32f3104b43d0f9385abc 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: