diff --git a/lib/screens/commonElements.dart b/lib/screens/commonElements.dart
index da74024cf143299a20209ceaabc5a17a75c978fe..59bc2b6f3b5291fc660183f4f001f2d8258fa4c3 100644
--- a/lib/screens/commonElements.dart
+++ b/lib/screens/commonElements.dart
@@ -42,7 +42,8 @@ class CommonElements {
);
}
- Widget onboardingProgressBar(String screenTitle, int progress) {
+ Widget onboardingProgressBar(
+ BuildContext context, String screenTitle, int progress) {
return Stack(children: [
Container(height: 100),
Positioned(
@@ -50,8 +51,16 @@ class CommonElements {
Positioned(
top: 0,
left: 0,
- child: Image.asset(
- 'assets/onBoarding/gecko_bar.png',
+ child: GestureDetector(
+ onTap: () {
+ Navigator.popUntil(
+ context,
+ ModalRoute.withName('/'),
+ );
+ },
+ child: Image.asset(
+ 'assets/onBoarding/gecko_bar.png',
+ ),
),
),
if (progress != 0)
diff --git a/lib/screens/onBoarding/0_noKeychainFound.dart b/lib/screens/onBoarding/0_noKeychainFound.dart
index e4b547f2f4e7b7ee6cc1ab1af0b4e423e3abc9a3..d5c9acbca0daee69f3b351737769c8a374090af1 100644
--- a/lib/screens/onBoarding/0_noKeychainFound.dart
+++ b/lib/screens/onBoarding/0_noKeychainFound.dart
@@ -21,7 +21,7 @@ class NoKeyChainScreen extends StatelessWidget {
// appBar: GeckoSpeechAppBar('Mes portefeuilles'),
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Mes portefeuilles', 0),
+ common.onboardingProgressBar(context, 'Mes portefeuilles', 0),
common.bubbleSpeak(
"Je ne connais pour l’instant aucun de vos portefeuilles.\n\nVous pouvez en créer un nouveau, ou bien importer un portefeuille Cesium existant.",
),
diff --git a/lib/screens/onBoarding/1.dart b/lib/screens/onBoarding/1.dart
index 2c8bf9616de70bff1b027aa31c3d09155e2e655e..6fd16a1a69f87e43ea92109f60fb1df4ec69bc8a 100644
--- a/lib/screens/onBoarding/1.dart
+++ b/lib/screens/onBoarding/1.dart
@@ -19,7 +19,7 @@ class OnboardingStepOne extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Nouveau portefeuilles', progress),
+ common.onboardingProgressBar(context, 'Nouveau portefeuilles', progress),
common.bubbleSpeak(
"Il semblerait que vous n’ayez pas encore de trousseau.\n\nUn trousseau vous permet de gérer un ou plusieurs portefeuilles.",
),
diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart
index 4bf73713e68403dd326952c75f9122f0b42784a4..51fc97090ceff772788f36f54ddc4b3efdfc9989 100644
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@@ -18,7 +18,7 @@ class OnboardingStepTwelve extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeak(
"Si un jour vous changez de téléphone, votre code secret sera différent, mais il vous suffira de me redonner votre phrase de restauration pour recréer votre trousseau."),
SizedBox(height: 10),
diff --git a/lib/screens/onBoarding/11.dart b/lib/screens/onBoarding/11.dart
index f552b075885e1aecdb966d5f0cc7e70510271d72..9d6a2c19a958a940c2b39eeef265f18c0de7df2e 100644
--- a/lib/screens/onBoarding/11.dart
+++ b/lib/screens/onBoarding/11.dart
@@ -33,7 +33,7 @@ class OnboardingStepThirteen extends StatelessWidget {
generatedWallet = snapshot.data;
return Visibility(visible: false, child: Text(''));
}),
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeakRich(<TextSpan>[
TextSpan(
text:
diff --git a/lib/screens/onBoarding/12.dart b/lib/screens/onBoarding/12.dart
index 01294e54887b411e397c94c5e99da186423dced2..fcb280de91314022ee1e416ae7600fbf9cc41f3f 100644
--- a/lib/screens/onBoarding/12.dart
+++ b/lib/screens/onBoarding/12.dart
@@ -39,7 +39,7 @@ class OnboardingStepFourteen extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeak(
"Avez-vous bien mémorisé votre code secret ?\n\nVérifions ça ensemble !\n\nTapez votre code secret dans le champ ci-dessous (après c’est fini, promis-juré-gecko)."),
SizedBox(height: isTall ? 80 : 10),
diff --git a/lib/screens/onBoarding/13_congratulations.dart b/lib/screens/onBoarding/13_congratulations.dart
index 4893e13323387447ed834e6ddf17b35cc999124c..2e69b4f25999e55f248553d96ed001b3eb77af8d 100644
--- a/lib/screens/onBoarding/13_congratulations.dart
+++ b/lib/screens/onBoarding/13_congratulations.dart
@@ -18,7 +18,7 @@ class OnboardingStepFiveteen extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeak(
"Top !\n\nVotre trousseau de clef et votre portefeuille ont été créés avec un immense succès.\n\nFélicitations !",
),
diff --git a/lib/screens/onBoarding/2.dart b/lib/screens/onBoarding/2.dart
index f2491f178cc2531b538cb2ffa14f9623f23eca1a..b0693d6b960318b957d85300ea97ab00a9d8ee5d 100644
--- a/lib/screens/onBoarding/2.dart
+++ b/lib/screens/onBoarding/2.dart
@@ -20,7 +20,7 @@ class OnboardingStepTwo extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Nouveau portefeuilles', progress),
+ common.onboardingProgressBar(context, 'Nouveau portefeuilles', progress),
common.bubbleSpeak(
"Un trousseau est créé à partir d’une phrase de restauration.",
),
diff --git a/lib/screens/onBoarding/3.dart b/lib/screens/onBoarding/3.dart
index bf11c93ad704ae9b521044e1d13c0803ad3db1e9..83b1f55071a7a1ae318722f812042ca5aff1d1a5 100644
--- a/lib/screens/onBoarding/3.dart
+++ b/lib/screens/onBoarding/3.dart
@@ -18,7 +18,7 @@ class OnboardingStepFor extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeak(
"Si un jour vous changez de téléphone, il vous suffira de me redonner votre phrase de restauration pour recréer votre trousseau.",
),
diff --git a/lib/screens/onBoarding/4.dart b/lib/screens/onBoarding/4.dart
index 87b3880c706d9c5af3195e66211d0a2bd3124ba5..7e37aa2b9332b030726a535d634274d7f733221d 100644
--- a/lib/screens/onBoarding/4.dart
+++ b/lib/screens/onBoarding/4.dart
@@ -18,7 +18,7 @@ class OnboardingStepFive extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeak(
"Par contre, attention :\n\nDans une blockchain, il n’y a pas de procédure de récupération de trousseau.\n\nSi vous perdez votre phrase de restauration, je ne pourrai pas vous la communiquer, et vous ne pourrez donc plus jamais accéder à votre compte.",
),
diff --git a/lib/screens/onBoarding/5.dart b/lib/screens/onBoarding/5.dart
index af61bb25f4e70022d660ee2a012307435fcc8b59..62f234504d3bc1473ae2bcbbd4ba57dc320e91fc 100644
--- a/lib/screens/onBoarding/5.dart
+++ b/lib/screens/onBoarding/5.dart
@@ -18,7 +18,7 @@ class OnboardingStepSeven extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeakRich(
<TextSpan>[
TextSpan(text: "Munissez-vous d'"),
diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart
index 9a09fb84238a2469eae5773f1321e02df412fe21..e6ed3d3ff90a7a294425d47fa7458b2a9507380c 100644
--- a/lib/screens/onBoarding/6.dart
+++ b/lib/screens/onBoarding/6.dart
@@ -19,7 +19,7 @@ class OnboardingStepEight extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeak(
"J’ai généré votre phrase de restauration !\nTâchez de la garder bien secrète, car elle permet à quiconque la connaît d’accéder à tous vos portefeuilles.",
),
diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart
index 36a0abc264dd643912518260e3f8b08a20a605ff..b2786047dd6a8742d05674e62477240b89bd127c 100644
--- a/lib/screens/onBoarding/7.dart
+++ b/lib/screens/onBoarding/7.dart
@@ -25,7 +25,7 @@ class OnboardingStepNine extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(context, 'Ma phrase de restauration', progress),
common.bubbleSpeak(
"C’est le moment de noter votre phrase !",
long: 60,
diff --git a/lib/screens/onBoarding/8.dart b/lib/screens/onBoarding/8.dart
index 0b16f08bbc9e5e65a5370f067fd9cc9ddee80549..4b2b198b307695f889bcfc88d09437fa9604afc8 100644
--- a/lib/screens/onBoarding/8.dart
+++ b/lib/screens/onBoarding/8.dart
@@ -44,7 +44,7 @@ class OnboardingStepTen extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar(
+ common.onboardingProgressBar(context,
'Valider ma phrase de restauration', progress),
common.bubbleSpeakRich(<TextSpan>[
TextSpan(
diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart
index 4ce102837cb021abf3a1be64d5b77fb44525146c..d34f1380884fdf524720e5dfd5957f271955037f 100644
--- a/lib/screens/onBoarding/9.dart
+++ b/lib/screens/onBoarding/9.dart
@@ -18,7 +18,8 @@ class OnboardingStepEleven extends StatelessWidget {
extendBodyBehindAppBar: true,
body: SafeArea(
child: Column(children: <Widget>[
- common.onboardingProgressBar('Ma phrase de restauration', progress),
+ common.onboardingProgressBar(
+ context, 'Ma phrase de restauration', progress),
common.bubbleSpeakRich(<TextSpan>[
TextSpan(text: "Super !\n\nJe vais maintenant créer votre "),
TextSpan(
@@ -48,7 +49,8 @@ class OnboardingStepEleven extends StatelessWidget {
onPressed: () {
Navigator.push(
context,
- FaderTransition(page: OnboardingStepTwelve(), isFast: true),
+ FaderTransition(
+ page: OnboardingStepTwelve(), isFast: true),
);
},
child: Text("J'ai compris",