diff --git a/assets/onBoarding/GIF.png b/assets/onBoarding/GIF.png new file mode 100755 index 0000000..6cd3ad9 Binary files /dev/null and b/assets/onBoarding/GIF.png differ diff --git a/assets/onBoarding/cesium.png b/assets/onBoarding/cesium.png new file mode 100755 index 0000000..56a8b89 Binary files /dev/null and b/assets/onBoarding/cesium.png differ diff --git a/assets/onBoarding/chopp-gecko.png b/assets/onBoarding/chopp-gecko.png new file mode 100755 index 0000000..5023a03 Binary files /dev/null and b/assets/onBoarding/chopp-gecko.png differ diff --git a/assets/onBoarding/gecko_bar.png b/assets/onBoarding/gecko_bar.png new file mode 100755 index 0000000..3133f9f Binary files /dev/null and b/assets/onBoarding/gecko_bar.png differ diff --git a/assets/onBoarding/good-bad-passphrase.png b/assets/onBoarding/good-bad-passphrase.png new file mode 100755 index 0000000..edbda62 Binary files /dev/null and b/assets/onBoarding/good-bad-passphrase.png differ diff --git a/assets/onBoarding/keys-and-wallets-horizontal-plus-phrase.png b/assets/onBoarding/keys-and-wallets-horizontal-plus-phrase.png new file mode 100755 index 0000000..eea3e82 Binary files /dev/null and b/assets/onBoarding/keys-and-wallets-horizontal-plus-phrase.png differ diff --git a/assets/onBoarding/keys-and-wallets-horizontal.png b/assets/onBoarding/keys-and-wallets-horizontal.png new file mode 100755 index 0000000..e94e57d Binary files /dev/null and b/assets/onBoarding/keys-and-wallets-horizontal.png differ diff --git a/assets/onBoarding/keys.png b/assets/onBoarding/keys.png new file mode 100755 index 0000000..36362a0 Binary files /dev/null and b/assets/onBoarding/keys.png differ diff --git a/assets/onBoarding/maison-qui-brule.png b/assets/onBoarding/maison-qui-brule.png new file mode 100755 index 0000000..4e6b9ed Binary files /dev/null and b/assets/onBoarding/maison-qui-brule.png differ diff --git a/assets/onBoarding/phrase_flou.png b/assets/onBoarding/phrase_flou.png new file mode 100755 index 0000000..ebf7b89 Binary files /dev/null and b/assets/onBoarding/phrase_flou.png differ diff --git a/assets/onBoarding/plusieurs-appareils-un-trousseau.png b/assets/onBoarding/plusieurs-appareils-un-trousseau.png new file mode 100755 index 0000000..be1de87 Binary files /dev/null and b/assets/onBoarding/plusieurs-appareils-un-trousseau.png differ diff --git a/assets/onBoarding/plusieurs-codes-secrets-un-trousseau.png b/assets/onBoarding/plusieurs-codes-secrets-un-trousseau.png new file mode 100755 index 0000000..363595d Binary files /dev/null and b/assets/onBoarding/plusieurs-codes-secrets-un-trousseau.png differ diff --git a/assets/onBoarding/progress_bar/100.png b/assets/onBoarding/progress_bar/100.png new file mode 100755 index 0000000..bd4e93b Binary files /dev/null and b/assets/onBoarding/progress_bar/100.png differ diff --git a/assets/onBoarding/progress_bar/17.png b/assets/onBoarding/progress_bar/17.png new file mode 100755 index 0000000..3407586 Binary files /dev/null and b/assets/onBoarding/progress_bar/17.png differ diff --git a/assets/onBoarding/progress_bar/20.png b/assets/onBoarding/progress_bar/20.png new file mode 100755 index 0000000..5fd9550 Binary files /dev/null and b/assets/onBoarding/progress_bar/20.png differ diff --git a/assets/onBoarding/progress_bar/25.png b/assets/onBoarding/progress_bar/25.png new file mode 100755 index 0000000..a62776b Binary files /dev/null and b/assets/onBoarding/progress_bar/25.png differ diff --git a/assets/onBoarding/progress_bar/28.png b/assets/onBoarding/progress_bar/28.png new file mode 100755 index 0000000..3c9ec15 Binary files /dev/null and b/assets/onBoarding/progress_bar/28.png differ diff --git a/assets/onBoarding/progress_bar/33.png b/assets/onBoarding/progress_bar/33.png new file mode 100755 index 0000000..25844a1 Binary files /dev/null and b/assets/onBoarding/progress_bar/33.png differ diff --git a/assets/onBoarding/progress_bar/42.png b/assets/onBoarding/progress_bar/42.png new file mode 100755 index 0000000..d61c442 Binary files /dev/null and b/assets/onBoarding/progress_bar/42.png differ diff --git a/assets/onBoarding/progress_bar/50.png b/assets/onBoarding/progress_bar/50.png new file mode 100755 index 0000000..420e546 Binary files /dev/null and b/assets/onBoarding/progress_bar/50.png differ diff --git a/assets/onBoarding/progress_bar/58.png b/assets/onBoarding/progress_bar/58.png new file mode 100755 index 0000000..b1bf527 Binary files /dev/null and b/assets/onBoarding/progress_bar/58.png differ diff --git a/assets/onBoarding/progress_bar/67.png b/assets/onBoarding/progress_bar/67.png new file mode 100755 index 0000000..72dc7b1 Binary files /dev/null and b/assets/onBoarding/progress_bar/67.png differ diff --git a/assets/onBoarding/progress_bar/75.png b/assets/onBoarding/progress_bar/75.png new file mode 100755 index 0000000..fb40c23 Binary files /dev/null and b/assets/onBoarding/progress_bar/75.png differ diff --git a/assets/onBoarding/progress_bar/8.png b/assets/onBoarding/progress_bar/8.png new file mode 100755 index 0000000..9b9d514 Binary files /dev/null and b/assets/onBoarding/progress_bar/8.png differ diff --git a/assets/onBoarding/progress_bar/83.png b/assets/onBoarding/progress_bar/83.png new file mode 100755 index 0000000..adfdbdb Binary files /dev/null and b/assets/onBoarding/progress_bar/83.png differ diff --git a/assets/onBoarding/progress_bar/92.png b/assets/onBoarding/progress_bar/92.png new file mode 100755 index 0000000..3ff7080 Binary files /dev/null and b/assets/onBoarding/progress_bar/92.png differ diff --git a/assets/onBoarding/progress_bar/total.png b/assets/onBoarding/progress_bar/total.png new file mode 100755 index 0000000..3fb1b08 Binary files /dev/null and b/assets/onBoarding/progress_bar/total.png differ diff --git a/assets/onBoarding/treasure-chest-gecko-souligne.png b/assets/onBoarding/treasure-chest-gecko-souligne.png new file mode 100755 index 0000000..50ac1fb Binary files /dev/null and b/assets/onBoarding/treasure-chest-gecko-souligne.png differ diff --git a/assets/onBoarding/wallet.png b/assets/onBoarding/wallet.png new file mode 100755 index 0000000..eb054f2 Binary files /dev/null and b/assets/onBoarding/wallet.png differ diff --git a/lib/main.dart b/lib/main.dart index 0b3fdc6..1bfe2dc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; import 'package:gecko/models/cesiumPlus.dart'; import 'package:gecko/models/changePin.dart'; @@ -75,6 +76,7 @@ class Gecko extends StatelessWidget { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); final _httpLink = HttpLink( randomEndpoint, ); diff --git a/lib/screens/commonElements.dart b/lib/screens/commonElements.dart new file mode 100644 index 0000000..9f4b07e --- /dev/null +++ b/lib/screens/commonElements.dart @@ -0,0 +1,38 @@ +import 'package:flutter/material.dart'; + +class CommonElements { + Widget roundButton( + AssetImage image, + ontap, + isAsync, + double imgHight, + EdgeInsets padding, + ) { + return Container( + child: ClipOval( + child: Material( + color: Color(0xffFFD58D), // button color + child: InkWell( + splashColor: Color(0xffD28928), // inkwell color + child: Padding( + padding: padding, + child: Image(image: image, height: imgHight)), + onTap: () async { + await ontap; + }), + ), + ), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey, + blurRadius: 4.0, + offset: Offset(2.0, 2.5), + spreadRadius: 0.5) + ], + ), + ); + } +} diff --git a/lib/screens/history.dart b/lib/screens/history.dart index e9ec8cb..5e8636a 100644 --- a/lib/screens/history.dart +++ b/lib/screens/history.dart @@ -28,6 +28,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); HistoryProvider _historyProvider = Provider.of(context); HomeProvider _homeProvider = Provider.of(context); this._outputPubkey.text = _historyProvider.pubkey; diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 54afc88..d5b33de 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -3,17 +3,26 @@ import 'package:gecko/globals.dart'; import 'package:gecko/models/history.dart'; import 'package:gecko/models/home.dart'; import 'package:flutter/material.dart'; +import 'package:gecko/models/myWallets.dart'; +import 'package:gecko/screens/commonElements.dart'; import 'package:gecko/screens/myWallets/walletsHome.dart'; +import 'package:gecko/screens/onBoarding/1_noKeychainFound.dart'; import 'dart:ui'; import 'package:gecko/screens/settings.dart'; +import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; class HomeScreen extends StatelessWidget { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); HomeProvider _homeProvider = Provider.of(context); HistoryProvider _historyProvider = Provider.of(context); HistoryProvider _historyStatic = HistoryProvider(''); + MyWalletsProvider _myWalletProvider = + Provider.of(context); + final bool isWalletsExists = _myWalletProvider.checkIfWalletExist(); + // CommonElements commonElements = CommonElements(); return Scaffold( resizeToAvoidBottomInset: false, drawer: Drawer( @@ -206,7 +215,15 @@ class HomeScreen extends StatelessWidget { image: AssetImage( 'assets/blockchain.png'), height: 55)), - onTap: () {}), + onTap: () { + // Navigator.push( + // context, + // MaterialPageRoute( + // builder: (context) { + // return TemplateScreen(); + // }), + // ); + }), ), ), decoration: BoxDecoration( @@ -245,13 +262,19 @@ class HomeScreen extends StatelessWidget { 'assets/lock.png'), height: 45)), onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return WalletsHome(); - }), - ); + isWalletsExists + ? Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return WalletsHome(); + }), + ) + : Navigator.push(context, + MaterialPageRoute( + builder: (context) { + return NoKeyChainScreen(); + })); }), ), ), diff --git a/lib/screens/myWallets/changePin.dart b/lib/screens/myWallets/changePin.dart index 8141211..2242fe5 100644 --- a/lib/screens/myWallets/changePin.dart +++ b/lib/screens/myWallets/changePin.dart @@ -1,6 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:dubp/dubp.dart'; +import 'package:flutter/services.dart'; import 'package:gecko/models/changePin.dart'; import 'dart:io'; import 'package:provider/provider.dart'; @@ -17,6 +18,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); ChangePinProvider _changePin = Provider.of(context); // _walletOptions.changePin(walletName, oldPin); // _walletOptions.newPin.text = _tmpPin; diff --git a/lib/screens/myWallets/confirmWalletStorage.dart b/lib/screens/myWallets/confirmWalletStorage.dart index 7bcc095..3b6385f 100644 --- a/lib/screens/myWallets/confirmWalletStorage.dart +++ b/lib/screens/myWallets/confirmWalletStorage.dart @@ -23,6 +23,7 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); GenerateWalletsProvider _generateWalletProvider = Provider.of(context); MyWalletsProvider _myWalletProvider = diff --git a/lib/screens/myWallets/generateWallets.dart b/lib/screens/myWallets/generateWallets.dart index 9b2f9fb..8165ccf 100644 --- a/lib/screens/myWallets/generateWallets.dart +++ b/lib/screens/myWallets/generateWallets.dart @@ -1,3 +1,4 @@ +import 'package:flutter/services.dart'; import 'package:gecko/models/generateWallets.dart'; import 'package:gecko/screens/myWallets/confirmWalletStorage.dart'; import 'package:flutter/material.dart'; @@ -18,6 +19,7 @@ class GenerateWalletsScreen extends StatelessWidget { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); GenerateWalletsProvider _generateWalletProvider = Provider.of(context); _generateWalletProvider.generateMnemonic(); diff --git a/lib/screens/myWallets/importWallet.dart b/lib/screens/myWallets/importWallet.dart index 5955469..ece2e5a 100644 --- a/lib/screens/myWallets/importWallet.dart +++ b/lib/screens/myWallets/importWallet.dart @@ -9,6 +9,7 @@ import 'package:provider/provider.dart'; class ImportWalletScreen extends StatelessWidget { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); GlobalKey _toolTipSecret = GlobalKey(); Timer _debounce; GenerateWalletsProvider _generateWalletProvider = diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart index 0f21b6f..91e44c3 100644 --- a/lib/screens/myWallets/walletOptions.dart +++ b/lib/screens/myWallets/walletOptions.dart @@ -31,6 +31,7 @@ class WalletOptions extends StatelessWidget with ChangeNotifier { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); print("Build walletOptions"); WalletOptionsProvider _walletOptions = Provider.of(context); diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart index a9611a1..e7a4963 100644 --- a/lib/screens/myWallets/walletsHome.dart +++ b/lib/screens/myWallets/walletsHome.dart @@ -1,9 +1,9 @@ +import 'package:flutter/services.dart'; import 'package:gecko/models/myWallets.dart'; import 'package:gecko/models/walletOptions.dart'; -import 'package:gecko/screens/myWallets/generateWallets.dart'; import 'package:flutter/material.dart'; -import 'package:gecko/screens/myWallets/importWallet.dart'; import 'package:gecko/screens/myWallets/walletOptions.dart'; +import 'package:gecko/screens/onBoarding/1_noKeychainFound.dart'; import 'package:provider/provider.dart'; // ignore: must_be_immutable @@ -13,6 +13,7 @@ class WalletsHome extends StatelessWidget { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); MyWalletsProvider myWalletProvider = Provider.of(context); WalletOptionsProvider _walletOptions = @@ -54,53 +55,9 @@ class WalletsHome extends StatelessWidget { color: Colors.grey[850])), backgroundColor: Color(0xffEFEFBF))))), body: SafeArea( - child: Column(children: [ - Visibility( - visible: (!isWalletsExists), - child: Column(children: [ - SizedBox(height: 120), - Center( - child: Text("Vous n'avez encore généré aucun portefeuille.", - style: TextStyle( - fontSize: 20, fontWeight: FontWeight.w500), - textAlign: TextAlign.center)), - SizedBox(height: 80), - ElevatedButton( - style: ElevatedButton.styleFrom( - primary: Color(0xffFFD68E), // background - onPrimary: Colors.black, // foreground - ), - onPressed: () => Navigator.push( - context, - MaterialPageRoute(builder: (context) { - return GenerateWalletsScreen(); - }), - ), - child: Text('Générer un trousseau', - style: TextStyle(fontSize: 20))), - SizedBox(height: 15), - Center( - child: Text("ou", - style: TextStyle( - fontSize: 20, fontWeight: FontWeight.w500), - textAlign: TextAlign.center)), - SizedBox(height: 15), - ElevatedButton( - style: ElevatedButton.styleFrom( - primary: Color(0xffFFD68E), // background - onPrimary: Colors.black, // foreground - ), - onPressed: () => Navigator.push( - context, - MaterialPageRoute(builder: (context) { - return ImportWalletScreen(); - }), - ), - child: Text('Importer un portefeuille existant', - style: TextStyle(fontSize: 20))), - ])), - Visibility(visible: isWalletsExists, child: myWalletsList(context)) - ]))); + child: !isWalletsExists + ? NoKeyChainScreen() + : Text('Wallet list screen'))); } Widget myWalletsList(BuildContext context) { diff --git a/lib/screens/onBoarding/1_noKeychainFound.dart b/lib/screens/onBoarding/1_noKeychainFound.dart new file mode 100644 index 0000000..712e725 --- /dev/null +++ b/lib/screens/onBoarding/1_noKeychainFound.dart @@ -0,0 +1,197 @@ +import 'package:bubble/bubble.dart'; +import 'package:flutter/services.dart'; +import 'package:gecko/screens/home.dart'; +import 'package:flutter/material.dart'; +// import 'package:gecko/models/home.dart'; +// import 'package:provider/provider.dart'; + +// ignore: must_be_immutable +class NoKeyChainScreen extends StatelessWidget { + TextEditingController tplController = TextEditingController(); + + @override + Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); + // HomeProvider _homeProvider = Provider.of(context); + return Scaffold( + extendBodyBehindAppBar: true, + // backgroundColor: Colors.white, + // appBar: GeckoSpeechAppBar('Mes portefeuilles'), + body: SafeArea( + child: Column(children: [ + Stack(children: [ + Container(height: 100), + Positioned( + top: 0, + left: 0, + right: 0, + child: GeckoSpeechAppBar('Mes portefeuilles')), + Positioned( + top: 0, + left: 0, + child: Image.asset( + 'assets/onBoarding/gecko_bar.png', + ), + ), + ]), + Bubble( + padding: BubbleEdges.all(15), + elevation: 5, + color: Colors.white, + margin: BubbleEdges.fromLTRB(10, 0, 20, 10), + // nip: BubbleNip.leftTop, + child: Text( + "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.", + style: TextStyle( + color: Colors.black, + fontSize: 15, + fontWeight: FontWeight.w500), + ), + ), + SizedBox(height: 70), + Container( + child: ClipOval( + child: Material( + color: Color(0xffFFD58D), // button color + child: InkWell( + splashColor: Color(0xffD28928), // inkwell color + child: Padding( + padding: EdgeInsets.all(12), + child: Image( + image: AssetImage('assets/onBoarding/wallet.png'), + height: 75)), + onTap: () {}), + ), + ), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey, + blurRadius: 4.0, + offset: Offset(2.0, 2.5), + spreadRadius: 0.5) + ], + ), + ), + SizedBox(height: 10), + Text( + "Créer un nouveau\nportefeuille", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.black, + fontSize: 13, + fontWeight: FontWeight.w500), + ), + SizedBox(height: 70), + Container( + child: ClipOval( + child: Material( + color: Color(0xffFFD58D), // button color + child: InkWell( + splashColor: Color(0xffD28928), // inkwell color + child: Padding( + padding: EdgeInsets.all(8), + child: Image( + image: AssetImage('assets/onBoarding/cesium.png'), + height: 50)), + onTap: () {}), + ), + ), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey, + blurRadius: 4.0, + offset: Offset(2.0, 2.5), + spreadRadius: 0.5) + ], + ), + ), + SizedBox(height: 10), + Text( + "Importer un\nportefeuille Cesium", + textAlign: TextAlign.center, + style: TextStyle(color: Colors.black, fontSize: 10), + ) + ]), + )); + } +} + +// class GeckoSpeechAppBar extends StatelessWidget with PreferredSizeWidget { + +// } +// // Widget build(BuildContext context) { +// // return AppBar( +// // leading: IconButton( +// // icon: Container( +// // height: 100, +// // child: Image.asset('assets/onBoarding/gecko_bar.png')), +// // onPressed: () => Navigator.popUntil( +// // context, +// // ModalRoute.withName('/'), +// // ), +// // ), +// // title: SizedBox( +// // height: 22, +// // child: Text('Mes portefeuilles'), +// // )); +// // } +// } + +class GeckoSpeechAppBar extends StatelessWidget with PreferredSizeWidget { + @override + final Size preferredSize; + final String title; + + GeckoSpeechAppBar( + this.title, { + Key key, + }) : preferredSize = Size.fromHeight(105.4), + super(key: key); + + @override + Widget build(BuildContext context) { + // return PreferredSize( + // preferredSize: Size(MediaQuery.of(context).size.width, 200), + // child: Container( + // child: Stack( + // alignment: Alignment.topLeft, + // children: [ + // Container( + // color: Color(0xffFFD68E), + // width: MediaQuery.of(context).size.width, + // height: 100, + // ), + // Container( + // // width: 100, + // height: 200, + // child: Column(children: [ + // SizedBox(height: 61.5), + // Image.asset('assets/onBoarding/gecko_bar.png') + // ]), + // ), + // ], + // ), + // ), + // ); + return AppBar( + leading: IconButton( + icon: Container( + height: 30, + child: Image.asset('assets/onBoarding/gecko_bar.png')), + onPressed: () => Navigator.popUntil( + context, + ModalRoute.withName('/'), + ), + ), + title: SizedBox( + height: 25, + child: Text(title), + )); + } +} diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index ce0091b..672cd3f 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:dubp/dubp.dart'; +import 'package:flutter/services.dart'; import 'package:gecko/models/myWallets.dart'; import 'package:gecko/screens/myWallets/generateWallets.dart'; import 'dart:io'; - import 'package:gecko/screens/myWallets/importWallet.dart'; // ignore: must_be_immutable @@ -23,6 +23,7 @@ class SettingsScreen extends StatelessWidget { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); // getAppDirectory(); return Scaffold( appBar: AppBar( diff --git a/lib/screens/templateScreen.dart b/lib/screens/templateScreen.dart new file mode 100644 index 0000000..75e3d86 --- /dev/null +++ b/lib/screens/templateScreen.dart @@ -0,0 +1,85 @@ +import 'package:flutter/services.dart'; +import 'package:gecko/screens/home.dart'; +import 'package:flutter/material.dart'; +// import 'package:gecko/models/home.dart'; +// import 'package:provider/provider.dart'; + +// ignore: must_be_immutable +class TemplateScreen extends StatelessWidget { + TextEditingController tplController = TextEditingController(); + + @override + Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); + // HomeProvider _homeProvider = Provider.of(context); + return Scaffold( + appBar: AppBar( + title: SizedBox( + height: 22, + child: Text('Template screen'), + )), + floatingActionButton: Container( + height: 80.0, + width: 80.0, + child: FittedBox( + child: FloatingActionButton( + heroTag: "tplButton", + onPressed: () => Navigator.push( + context, + MaterialPageRoute(builder: (context) { + return HomeScreen(); + }), + ), + child: Container( + height: 40.0, + width: 40.0, + child: Icon(Icons.home, color: Colors.grey[850]), + ), + backgroundColor: Color( + 0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255), + ))), + body: SafeArea( + child: Column(children: [ + SizedBox(height: 20), + TextField( + enabled: true, + controller: tplController, + maxLines: 1, + textAlign: TextAlign.center, + decoration: InputDecoration( + contentPadding: EdgeInsets.all(15.0), + ), + style: TextStyle( + fontSize: 22.0, + color: Colors.black, + fontWeight: FontWeight.w400)), + SizedBox(height: 20), + ElevatedButton( + style: ElevatedButton.styleFrom( + primary: Color(0xffFFD68E), // background + onPrimary: Colors.black, // foreground + ), + onPressed: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) { + return HomeScreen(); + }), + ); + }, + child: Text('Retour Accueil', style: TextStyle(fontSize: 20))), + SizedBox(height: 20), + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) { + return HomeScreen(); + }), + ); + }, + child: Icon(Icons.home)) + ]), + )); + } +} diff --git a/pubspec.lock b/pubspec.lock index 9a59dae..a0e96d9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -36,6 +36,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0-nullsafety.1" + bubble: + dependency: "direct main" + description: + name: bubble + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.9+1" catcher: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 21961d8..07da75a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: A new Flutter project. # pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.0.1+17 +version: 0.0.1+18 environment: sdk: ">=2.7.0 <3.0.0" @@ -38,6 +38,7 @@ dependencies: sentry: ^4.0.4 sentry_flutter: ^4.0.4 catcher: ^0.4.1 + bubble: ^1.1.9+1 flutter_icons: android: "ic_launcher" @@ -65,4 +66,7 @@ flutter: - assets/block-space.png - assets/block-space-disabled.png - assets/lock.png + - assets/onBoarding/gecko_bar.png + - assets/onBoarding/wallet.png + - assets/onBoarding/cesium.png