diff --git a/assets/onBoarding/GIF.png b/assets/onBoarding/GIF.png
new file mode 100755
index 0000000000000000000000000000000000000000..6cd3ad97546cd075907ed0d6beccc4c177064e8f
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 0000000000000000000000000000000000000000..56a8b897e4ed210725e11735fcd6fdb8c7b9d331
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 0000000000000000000000000000000000000000..5023a03c3805b13d56f7e8c9df09be65323668c8
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 0000000000000000000000000000000000000000..3133f9f64a7af96e0a8561debf9d6e454173ce0b
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 0000000000000000000000000000000000000000..edbda62ec80d1b6360b4f101d47a708114cb1271
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 0000000000000000000000000000000000000000..eea3e82ef4ba3916da61c01a411a56361a2fdd0f
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 0000000000000000000000000000000000000000..e94e57dbabb8883d7c9b7ee0c49c49274ea91f14
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 0000000000000000000000000000000000000000..36362a0ae608929fcd21072b8430deb31c5f3471
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 0000000000000000000000000000000000000000..4e6b9ed7ca54444c2fbdcb2be87053a73c279728
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 0000000000000000000000000000000000000000..ebf7b899f969f28d7a0ef1af89eacc50a3423d2a
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 0000000000000000000000000000000000000000..be1de87e36115bed493b5dbaf77d8e1717da1c0b
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 0000000000000000000000000000000000000000..363595d939b96d94953a82c34dc0cf04861b1efd
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 0000000000000000000000000000000000000000..bd4e93b04e19cadc244f41a8a643198cdde97ddc
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 0000000000000000000000000000000000000000..3407586058c3c64c48b56fdc0dc8f60f674f5123
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 0000000000000000000000000000000000000000..5fd955033ce2340f710601e990213dde8b519e4f
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 0000000000000000000000000000000000000000..a62776bc28d893069bfb40859fac656a6a12e2ea
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 0000000000000000000000000000000000000000..3c9ec151bce75e744795c01c26b0eca192b96bd7
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 0000000000000000000000000000000000000000..25844a12b46fcc80a259bdff2b48b452b48e09b8
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 0000000000000000000000000000000000000000..d61c44247dfafae4833d0f1d621c2c398cce31aa
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 0000000000000000000000000000000000000000..420e5461d1da6a143518455f2d4762244fe0d4b0
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 0000000000000000000000000000000000000000..b1bf527179c07568ba8cc92f509f27f9146e6e51
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 0000000000000000000000000000000000000000..72dc7b12928fac49f29a4534ad6d80f2b913df92
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 0000000000000000000000000000000000000000..fb40c23c9943edc61e5de8e313b5b12c826e2735
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 0000000000000000000000000000000000000000..9b9d514adaeacec0463d2359a34e0ad8b453ec36
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 0000000000000000000000000000000000000000..adfdbdba74e3360666eb5f7efb6be5e966d8f762
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 0000000000000000000000000000000000000000..3ff7080e2e8e1206cad001896199f1de064f38f4
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 0000000000000000000000000000000000000000..3fb1b08771b48229ddf87c5b82bc8494988758da
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 0000000000000000000000000000000000000000..50ac1fb947a5bef244647dc7ebec5898260e9bcb
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 0000000000000000000000000000000000000000..eb054f2b1ed14fd57a5cf6a08e05948d71091c5c
Binary files /dev/null and b/assets/onBoarding/wallet.png differ
diff --git a/lib/main.dart b/lib/main.dart
index 0b3fdc6c70299a4ed93120e6c5a1d82520d36ab1..1bfe2dc4d78261ebecfe731f7e0203df5e596cff 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 0000000000000000000000000000000000000000..9f4b07e4e43c520c0489009fb9bb67c9df32baf0
--- /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 e9ec8cb9c8f6d94269938198bbe843190cd0516a..5e8636ab86aff4157e6d9e87f38a2acac3552634 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<HistoryProvider>(context);
HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
this._outputPubkey.text = _historyProvider.pubkey;
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 54afc88675f0876fa2d8ecc54094fba1cf12d05f..d5b33de59db2cf27b1d70373c20ab2ad3ec04613 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<HomeProvider>(context);
HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
HistoryProvider _historyStatic = HistoryProvider('');
+ MyWalletsProvider _myWalletProvider =
+ Provider.of<MyWalletsProvider>(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 8141211a9028160dd841bc74a7beaed142595feb..2242fe5f451e45e3aa98bd327aa930687e589d58 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<ChangePinProvider>(context);
// _walletOptions.changePin(walletName, oldPin);
// _walletOptions.newPin.text = _tmpPin;
diff --git a/lib/screens/myWallets/confirmWalletStorage.dart b/lib/screens/myWallets/confirmWalletStorage.dart
index 7bcc09583480124a468949184c71b167285363d5..3b6385f73a35b1228ecc75bf480d77009712349b 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<GenerateWalletsProvider>(context);
MyWalletsProvider _myWalletProvider =
diff --git a/lib/screens/myWallets/generateWallets.dart b/lib/screens/myWallets/generateWallets.dart
index 9b2f9fbb4748de71f1c457ac22c71ca85bc6e080..8165ccff22c2151985c67e11ab23e514ab1981ba 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<GenerateWalletsProvider>(context);
_generateWalletProvider.generateMnemonic();
diff --git a/lib/screens/myWallets/importWallet.dart b/lib/screens/myWallets/importWallet.dart
index 5955469c33d92eb2146c5f2a0cf119034ed04003..ece2e5abd04cf70bee1db5c7e1f034553ebc3d6d 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 0f21b6f0db00f245725a9951e26aa0e3a24b38e2..91e44c3d6cadfa54ddba595dd539ef8c5b8ef1fa 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<WalletOptionsProvider>(context);
diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart
index a9611a1d94817268a751630247fb8abb2b06260c..e7a4963ed65aff2e4bff6a323e1830e84ce2e38d 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<MyWalletsProvider>(context);
WalletOptionsProvider _walletOptions =
@@ -54,53 +55,9 @@ class WalletsHome extends StatelessWidget {
color: Colors.grey[850])),
backgroundColor: Color(0xffEFEFBF))))),
body: SafeArea(
- child: Column(children: <Widget>[
- Visibility(
- visible: (!isWalletsExists),
- child: Column(children: <Widget>[
- 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 0000000000000000000000000000000000000000..712e72539239d81c5d7f8c2d6af6ee826b0239ed
--- /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<HomeProvider>(context);
+ return Scaffold(
+ extendBodyBehindAppBar: true,
+ // backgroundColor: Colors.white,
+ // appBar: GeckoSpeechAppBar('Mes portefeuilles'),
+ body: SafeArea(
+ child: Column(children: <Widget>[
+ 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: <Widget>[
+ // Container(
+ // color: Color(0xffFFD68E),
+ // width: MediaQuery.of(context).size.width,
+ // height: 100,
+ // ),
+ // Container(
+ // // width: 100,
+ // height: 200,
+ // child: Column(children: <Widget>[
+ // 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 ce0091b9b06b9ac6dc3ac4b91b316ac1c2c3b26d..672cd3fe3bc4179125f3f1cfe1fd19f123e51813 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 0000000000000000000000000000000000000000..75e3d86222f98390ed3f76bebe1cdbf9f8cb0af5
--- /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<HomeProvider>(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: <Widget>[
+ 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 9a59dae69cf2b50afb2b611c62d2812aea41893f..a0e96d959d78a319e26f255935f9a69a6995956a 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 21961d80a762235ba12a1443a59b9eb48f5e1c2d..07da75af413638f0b09b45ee31b3b4a17584b387 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