Skip to content
Snippets Groups Projects
Commit abb2810e authored by poka's avatar poka
Browse files

upgrade flutter 3.10

parent c316c0d6
Branches
Tags
No related merge requests found
Pipeline #32036 waiting for manual action
Showing
with 209 additions and 218 deletions
...@@ -26,6 +26,6 @@ subprojects { ...@@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
...@@ -71,6 +71,10 @@ Future restoreChest() async { ...@@ -71,6 +71,10 @@ Future restoreChest() async {
// Go to wallets home // Go to wallets home
await tapKey(keyGoWalletsHome, duration: 0); await tapKey(keyGoWalletsHome, duration: 0);
// Skip tutorial
await sleep(500);
await tapKey(keyDragAndDrop).timeout(const Duration(seconds: 3));
// Check if string "ĞD" is present in screen // Check if string "ĞD" is present in screen
await waitFor('ĞD'); await waitFor('ĞD');
......
...@@ -24,6 +24,7 @@ const keyImportG1v1 = Key('keyImportG1v1'); ...@@ -24,6 +24,7 @@ const keyImportG1v1 = Key('keyImportG1v1');
const keyChangeChest = Key('keyChangeChest'); const keyChangeChest = Key('keyChangeChest');
const keyListWallets = Key('keyListWallets'); const keyListWallets = Key('keyListWallets');
const keyAddDerivation = Key('keyAddDerivation'); const keyAddDerivation = Key('keyAddDerivation');
final keyDragAndDrop = GlobalKey(debugLabel: 'keyDragAndDrop');
// Wallet options // Wallet options
const keyCopyAddress = Key('keyCopyAddress'); const keyCopyAddress = Key('keyCopyAddress');
......
...@@ -33,8 +33,8 @@ class GenerateWalletsProvider with ChangeNotifier { ...@@ -33,8 +33,8 @@ class GenerateWalletsProvider with ChangeNotifier {
String? generatedMnemonic; String? generatedMnemonic;
bool walletIsGenerated = true; bool walletIsGenerated = true;
TextEditingController mnemonicController = TextEditingController(); final mnemonicController = TextEditingController();
TextEditingController pin = TextEditingController(); final pin = TextEditingController();
// Import wallet // Import wallet
TextEditingController cesiumID = TextEditingController(); TextEditingController cesiumID = TextEditingController();
......
...@@ -10,7 +10,6 @@ import 'package:jdenticon_dart/jdenticon_dart.dart'; ...@@ -10,7 +10,6 @@ import 'package:jdenticon_dart/jdenticon_dart.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
// import 'package:qrscan/qrscan.dart' as scanner; // import 'package:qrscan/qrscan.dart' as scanner;
import 'package:barcode_scan2/barcode_scan2.dart'; import 'package:barcode_scan2/barcode_scan2.dart';
import 'package:confetti/confetti.dart';
class WalletsProfilesProvider with ChangeNotifier { class WalletsProfilesProvider with ChangeNotifier {
WalletsProfilesProvider(this.address); WalletsProfilesProvider(this.address);
...@@ -24,8 +23,6 @@ class WalletsProfilesProvider with ChangeNotifier { ...@@ -24,8 +23,6 @@ class WalletsProfilesProvider with ChangeNotifier {
TextEditingController payAmount = TextEditingController(); TextEditingController payAmount = TextEditingController();
TextEditingController payComment = TextEditingController(); TextEditingController payComment = TextEditingController();
num? _balance; num? _balance;
final centerController =
ConfettiController(duration: const Duration(milliseconds: 300));
Future<String> scan(context) async { Future<String> scan(context) async {
if (Platform.isAndroid || Platform.isIOS) { if (Platform.isAndroid || Platform.isIOS) {
...@@ -145,7 +142,6 @@ class WalletsProfilesProvider with ChangeNotifier { ...@@ -145,7 +142,6 @@ class WalletsProfilesProvider with ChangeNotifier {
snackMessage(homeContext, snackMessage(homeContext,
message: 'removedFromcontacts'.tr(), duration: 4); message: 'removedFromcontacts'.tr(), duration: 4);
} else { } else {
centerController.play();
await contactsBox.put(profile.address, profile); await contactsBox.put(profile.address, profile);
// drawStar(Size(50, 50)); // drawStar(Size(50, 50));
snackMessage(homeContext, message: 'addedToContacts'.tr(), duration: 4); snackMessage(homeContext, message: 'addedToContacts'.tr(), duration: 4);
......
...@@ -85,7 +85,7 @@ class ChooseWalletScreen extends StatelessWidget { ...@@ -85,7 +85,7 @@ class ChooseWalletScreen extends StatelessWidget {
} }
if (myWalletProvider.listWallets.isEmpty) { if (myWalletProvider.listWallets.isEmpty) {
return Column(children: const <Widget>[ return const Column(children: <Widget>[
Center( Center(
child: Text( child: Text(
'Veuillez générer votre premier portefeuille', 'Veuillez générer votre premier portefeuille',
......
...@@ -61,11 +61,11 @@ class ImportG1v1 extends StatelessWidget { ...@@ -61,11 +61,11 @@ class ImportG1v1 extends StatelessWidget {
// log.d(_certs.data); // log.d(_certs.data);
if (status.data == null) { if (status.data == null) {
return Column(children: [ return const Column(children: [
const SizedBox(height: 80), SizedBox(height: 80),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: const [ children: [
SizedBox( SizedBox(
height: 35, height: 35,
width: 35, width: 35,
......
...@@ -93,9 +93,9 @@ class ManageMembership extends StatelessWidget { ...@@ -93,9 +93,9 @@ class ManageMembership extends StatelessWidget {
}), }),
); );
}, },
child: SizedBox( child: const SizedBox(
height: 60, height: 60,
child: Row(children: const <Widget>[ child: Row(children: <Widget>[
SizedBox(width: 16), SizedBox(width: 16),
Icon(Icons.change_circle_outlined, size: 35), Icon(Icons.change_circle_outlined, size: 35),
SizedBox(width: 11.5), SizedBox(width: 11.5),
......
...@@ -47,12 +47,12 @@ class MigrateIdentityScreen extends StatelessWidget { ...@@ -47,12 +47,12 @@ class MigrateIdentityScreen extends StatelessWidget {
); );
if (walletsList.length < 2) { if (walletsList.length < 2) {
return Column( return const Column(
children: [ children: [
const SizedBox(height: 80), SizedBox(height: 80),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: const [ children: [
Text( Text(
'Vous devez avoir au moins 2 portefeuilles\npour effecter cette opération', 'Vous devez avoir au moins 2 portefeuilles\npour effecter cette opération',
style: TextStyle(fontSize: 20), style: TextStyle(fontSize: 20),
...@@ -78,11 +78,9 @@ class MigrateIdentityScreen extends StatelessWidget { ...@@ -78,11 +78,9 @@ class MigrateIdentityScreen extends StatelessWidget {
fromAddress, selectedWallet.address), fromAddress, selectedWallet.address),
builder: (BuildContext context, AsyncSnapshot<List> status) { builder: (BuildContext context, AsyncSnapshot<List> status) {
if (status.data == null) { if (status.data == null) {
return Column(children: [ return const Column(children: [
const SizedBox(height: 80), SizedBox(height: 80),
Row( Row(mainAxisAlignment: MainAxisAlignment.center, children: [
mainAxisAlignment: MainAxisAlignment.center,
children: const [
SizedBox( SizedBox(
height: 35, height: 35,
width: 35, width: 35,
...@@ -136,7 +134,7 @@ class MigrateIdentityScreen extends StatelessWidget { ...@@ -136,7 +134,7 @@ class MigrateIdentityScreen extends StatelessWidget {
final unit = isUdUnit ? 'ud'.tr(args: ['']) : currencyName; final unit = isUdUnit ? 'ud'.tr(args: ['']) : currencyName;
return Column(children: <Widget>[ return Column(children: <Widget>[
Row(children: const []), const Row(children: []),
const SizedBox(height: 20), const SizedBox(height: 20),
SizedBox( SizedBox(
......
...@@ -81,7 +81,7 @@ class ShowSeed extends StatelessWidget { ...@@ -81,7 +81,7 @@ class ShowSeed extends StatelessWidget {
), ),
onPressed: () { onPressed: () {
Clipboard.setData( Clipboard.setData(
ClipboardData(text: seed.data)); ClipboardData(text: seed.data!));
snackCopySeed(context); snackCopySeed(context);
}, },
child: Row(children: <Widget>[ child: Row(children: <Widget>[
......
...@@ -225,15 +225,13 @@ class _WalletsHomeState extends State<WalletsHome> { ...@@ -225,15 +225,13 @@ class _WalletsHomeState extends State<WalletsHome> {
final bool isWalletsExists = myWalletProvider.checkIfWalletExist(); final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
final sub = Provider.of<SubstrateSdk>(context, listen: false); final sub = Provider.of<SubstrateSdk>(context, listen: false);
final keyDragAndDrop = GlobalKey(debugLabel: 'keyDragAndDrop');
if (!isWalletsExists) { if (!isWalletsExists) {
return const Text(''); return const Text('');
} }
if (myWalletProvider.listWallets.isEmpty) { if (myWalletProvider.listWallets.isEmpty) {
return Expanded( return const Expanded(
child: Column(children: const <Widget>[ child: Column(children: <Widget>[
Center( Center(
child: Text( child: Text(
'Veuillez générer votre premier portefeuille', 'Veuillez générer votre premier portefeuille',
......
...@@ -94,7 +94,7 @@ class _ChooseChestState extends State<OnboardingStepFive> { ...@@ -94,7 +94,7 @@ class _ChooseChestState extends State<OnboardingStepFive> {
), ),
onPressed: () { onPressed: () {
Clipboard.setData(ClipboardData( Clipboard.setData(ClipboardData(
text: generateWalletProvider.generatedMnemonic)); text: generateWalletProvider.generatedMnemonic!));
snackCopySeed(context); snackCopySeed(context);
}, },
child: Row(children: <Widget>[ child: Row(children: <Widget>[
......
...@@ -16,8 +16,8 @@ class TemplateScreen extends StatelessWidget { ...@@ -16,8 +16,8 @@ class TemplateScreen extends StatelessWidget {
height: 22, height: 22,
child: Text('Template screen'), child: Text('Template screen'),
)), )),
body: SafeArea( body: const SafeArea(
child: Column(children: const <Widget>[ child: Column(children: <Widget>[
SizedBox(height: 20), SizedBox(height: 20),
Text('data'), Text('data'),
SizedBox(height: 20), SizedBox(height: 20),
......
// ignore_for_file: use_build_context_synchronously // ignore_for_file: use_build_context_synchronously
import 'dart:math';
import 'package:confetti/confetti.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
...@@ -64,16 +60,6 @@ class WalletViewScreen extends StatelessWidget { ...@@ -64,16 +60,6 @@ class WalletViewScreen extends StatelessWidget {
actions: [ actions: [
Row( Row(
children: [ children: [
ConfettiWidget(
confettiController: walletProfile.centerController,
blastDirection: pi / 2,
maxBlastForce: 7,
minBlastForce: 3,
emissionFrequency: 0,
numberOfParticles: 7,
shouldLoop: false,
gravity: 0.001,
),
Consumer<WalletsProfilesProvider>( Consumer<WalletsProfilesProvider>(
builder: (context, walletProfile, _) { builder: (context, walletProfile, _) {
return IconButton( return IconButton(
......
...@@ -8,7 +8,7 @@ class BuildProgressBar extends StatelessWidget { ...@@ -8,7 +8,7 @@ class BuildProgressBar extends StatelessWidget {
required this.pagePosition, required this.pagePosition,
}) : super(key: key); }) : super(key: key);
final double pagePosition; final int pagePosition;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
......
...@@ -24,7 +24,7 @@ class InfoIntro extends StatelessWidget { ...@@ -24,7 +24,7 @@ class InfoIntro extends StatelessWidget {
final String assetName; final String assetName;
final String buttonText; final String buttonText;
final Widget nextScreen; final Widget nextScreen;
final double pagePosition; final int pagePosition;
final bool isMd; final bool isMd;
final bool isFast; final bool isFast;
final double boxHeight; final double boxHeight;
......
...@@ -24,11 +24,11 @@ class MainDrawer extends StatelessWidget { ...@@ -24,11 +24,11 @@ class MainDrawer extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: ListView(padding: EdgeInsets.zero, children: <Widget>[ child: ListView(padding: EdgeInsets.zero, children: <Widget>[
DrawerHeader( const DrawerHeader(
decoration: const BoxDecoration( decoration: BoxDecoration(
color: orangeC, color: orangeC,
), ),
child: Column(children: const <Widget>[ child: Column(children: <Widget>[
SizedBox(height: 0), SizedBox(height: 0),
Image( Image(
image: AssetImage('assets/icon/gecko_final.png'), image: AssetImage('assets/icon/gecko_final.png'),
......
...@@ -96,9 +96,9 @@ class HistoryView extends StatelessWidget { ...@@ -96,9 +96,9 @@ class HistoryView extends StatelessWidget {
]); ]);
}).toList()), }).toList()),
if (result.isLoading && duniterIndexer.pageInfo!['hasPreviousPage']) if (result.isLoading && duniterIndexer.pageInfo!['hasPreviousPage'])
Row( const Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: const <Widget>[ children: <Widget>[
CircularProgressIndicator(), CircularProgressIndicator(),
], ],
), ),
......
This diff is collapsed.
...@@ -34,7 +34,7 @@ dependencies: ...@@ -34,7 +34,7 @@ dependencies:
git: git:
url: https://github.com/insinfo/qr.flutter.git url: https://github.com/insinfo/qr.flutter.git
ref: master ref: master
responsive_framework: ^0.2.0 responsive_framework: 0.2.0
sentry_flutter: ^7.4.1 sentry_flutter: ^7.4.1
shared_preferences: ^2.0.7 shared_preferences: ^2.0.7
truncate: ^3.0.1 truncate: ^3.0.1
...@@ -49,7 +49,7 @@ dependencies: ...@@ -49,7 +49,7 @@ dependencies:
url: https://github.com/poka-IT/sdk.git url: https://github.com/poka-IT/sdk.git
# ref: gecko-fixes-2 # ref: gecko-fixes-2
ref: ff98a117e86060a91113107f31355a17ccfb346c ref: ff98a117e86060a91113107f31355a17ccfb346c
dots_indicator: ^2.1.0 dots_indicator: ^3.0.0
connectivity_plus: ^3.0.2 connectivity_plus: ^3.0.2
image_cropper: ^3.0.0 image_cropper: ^3.0.0
easy_localization: ^3.0.1 easy_localization: ^3.0.1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment