From 4bb4991e0452d1c9be99e6a785e1bb9ad63ca93b Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 8 Mar 2021 06:33:14 +0100 Subject: [PATCH] Lezard on top bar is clickable to go back home --- lib/screens/commonElements.dart | 15 ++++++++++++--- lib/screens/onBoarding/0_noKeychainFound.dart | 2 +- lib/screens/onBoarding/1.dart | 2 +- lib/screens/onBoarding/10.dart | 2 +- lib/screens/onBoarding/11.dart | 2 +- lib/screens/onBoarding/12.dart | 2 +- lib/screens/onBoarding/13_congratulations.dart | 2 +- lib/screens/onBoarding/2.dart | 2 +- lib/screens/onBoarding/3.dart | 2 +- lib/screens/onBoarding/4.dart | 2 +- lib/screens/onBoarding/5.dart | 2 +- lib/screens/onBoarding/6.dart | 2 +- lib/screens/onBoarding/7.dart | 2 +- lib/screens/onBoarding/8.dart | 2 +- lib/screens/onBoarding/9.dart | 6 ++++-- 15 files changed, 29 insertions(+), 18 deletions(-) diff --git a/lib/screens/commonElements.dart b/lib/screens/commonElements.dart index da74024..59bc2b6 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 e4b547f..d5c9acb 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: [ - 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 2c8bf96..6fd16a1 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: [ - 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 4bf7371..51fc970 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: [ - 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 f552b07..9d6a2c1 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( text: diff --git a/lib/screens/onBoarding/12.dart b/lib/screens/onBoarding/12.dart index 01294e5..fcb280d 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: [ - 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 4893e13..2e69b4f 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: [ - 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 f2491f1..b0693d6 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: [ - 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 bf11c93..83b1f55 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: [ - 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 87b3880..7e37aa2 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: [ - 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 af61bb2..62f2345 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: [ - common.onboardingProgressBar('Ma phrase de restauration', progress), + common.onboardingProgressBar(context, 'Ma phrase de restauration', progress), common.bubbleSpeakRich( [ TextSpan(text: "Munissez-vous d'"), diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart index 9a09fb8..e6ed3d3 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: [ - 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 36a0abc..b278604 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: [ - 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 0b16f08..4b2b198 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: [ - common.onboardingProgressBar( + common.onboardingProgressBar(context, 'Valider ma phrase de restauration', progress), common.bubbleSpeakRich([ TextSpan( diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart index 4ce1028..d34f138 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: [ - common.onboardingProgressBar('Ma phrase de restauration', progress), + common.onboardingProgressBar( + context, 'Ma phrase de restauration', progress), common.bubbleSpeakRich([ 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",