From 497e28e86503ef196f7d9e9337336c1c0bbc2c49 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Mon, 22 Feb 2021 04:37:42 +0100
Subject: [PATCH] Apply home from Figma proposual (boris)

---
 assets/lock.png       | Bin 0 -> 7723 bytes
 lib/screens/home.dart | 146 ++++++++++++++++++++++++++++++++++++++++++--------
 pubspec.yaml          |   3 +-
 3 files changed, 126 insertions(+), 23 deletions(-)
 create mode 100644 assets/lock.png

diff --git a/assets/lock.png b/assets/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6f1c56c4b6b670d63c55b1c76e0e9534699c38e
GIT binary patch
literal 7723
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

literal 0
HcmV?d00001

diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 0c71e28..96b8aea 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -111,28 +111,130 @@ class HomeScreen extends StatelessWidget {
         backgroundColor: Color(0xffFFD58D),
       ),
       backgroundColor: Color(0xffF9F9F1),
-      body: _homeProvider.currentTab[_homeProvider.currentIndex],
-      bottomNavigationBar: BottomNavigationBar(
-        backgroundColor: Color(0xffFFD58D),
-        fixedColor: Colors.grey[850],
-        unselectedItemColor: Color(0xffBD935C),
-        type: BottomNavigationBarType.fixed,
-        onTap: (index) {
-          _homeProvider.currentIndex = index;
-        },
-        currentIndex: _homeProvider.currentIndex,
-        items: [
-          BottomNavigationBarItem(
-            icon: Image.asset('assets/block-space-disabled.png', height: 26),
-            activeIcon: Image.asset('assets/blockchain.png', height: 26),
-            label: 'Explorateur',
-          ),
-          BottomNavigationBarItem(
-            icon: Icon(Icons.lock),
-            label: 'Mes portefeuilles',
-          ),
-        ],
-      ),
+      body: // _homeProvider.currentTab[_homeProvider.currentIndex],
+          Column(children: <Widget>[
+        Padding(
+            padding: EdgeInsets.only(top: 22),
+            child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  Image(
+                      image: AssetImage('assets/icon/gecko_final.png'),
+                      height: 180),
+                ])),
+        Padding(
+            padding: EdgeInsets.only(top: 15),
+            child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  Text(
+                    "L’application de paiement Ğ1\nplus mobile qu’un lésard du Vietnam",
+                    textAlign: TextAlign.center,
+                    style: TextStyle(color: Colors.black, fontSize: 15),
+                  )
+                ])),
+        Padding(
+            padding: EdgeInsets.only(top: 60),
+            child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  Column(children: <Widget>[
+                    ClipOval(
+                      child: Material(
+                        color: Color(0xffFFD58D), // button color
+                        child: Padding(
+                            padding: EdgeInsets.all(17),
+                            child: InkWell(
+                              splashColor: Colors.black, // inkwell color
+                              child: Image(
+                                  image: AssetImage('assets/qrcode-scan.png'),
+                                  height: 58),
+                              onTap: () {},
+                            )),
+                      ),
+                    ),
+                    SizedBox(height: 5),
+                    Text(
+                      "Payer par QR-Code",
+                      textAlign: TextAlign.center,
+                      style: TextStyle(color: Colors.black, fontSize: 13),
+                    )
+                  ])
+                ])),
+        Padding(
+            padding: EdgeInsets.only(top: 60),
+            child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  Column(children: <Widget>[
+                    ClipOval(
+                      child: Material(
+                        color: Color(0xffFFD58D), // button color
+                        child: Padding(
+                            padding: EdgeInsets.symmetric(
+                                horizontal: 18, vertical: 14),
+                            child: InkWell(
+                              splashColor: Colors.black, // inkwell color
+                              child: Image(
+                                  image: AssetImage('assets/blockchain.png'),
+                                  height: 65),
+                              onTap: () {},
+                            )),
+                      ),
+                    ),
+                    SizedBox(height: 5),
+                    Text(
+                      "Explorer\n",
+                      textAlign: TextAlign.center,
+                      style: TextStyle(color: Colors.black, fontSize: 13),
+                    )
+                  ]),
+                  SizedBox(width: 160),
+                  Column(children: <Widget>[
+                    ClipOval(
+                      child: Material(
+                        color: Color(0xffFFD58D), // button color
+                        child: Padding(
+                            padding: EdgeInsets.all(20),
+                            child: InkWell(
+                              splashColor: Colors.black, // inkwell color
+                              child: Image(
+                                  image: AssetImage('assets/lock.png'),
+                                  height: 50),
+                              onTap: () {},
+                            )),
+                      ),
+                    ),
+                    SizedBox(height: 5),
+                    Text(
+                      "Gérer mes\nportefeuilles",
+                      textAlign: TextAlign.center,
+                      style: TextStyle(color: Colors.black, fontSize: 13),
+                    )
+                  ])
+                ]))
+      ]),
+      // bottomNavigationBar: BottomNavigationBar(
+      //   backgroundColor: Color(0xffFFD58D),
+      //   fixedColor: Colors.grey[850],
+      //   unselectedItemColor: Color(0xffBD935C),
+      //   type: BottomNavigationBarType.fixed,
+      //   onTap: (index) {
+      //     _homeProvider.currentIndex = index;
+      //   },
+      //   currentIndex: _homeProvider.currentIndex,
+      //   items: [
+      //     BottomNavigationBarItem(
+      //       icon: Image.asset('assets/block-space-disabled.png', height: 26),
+      //       activeIcon: Image.asset('assets/blockchain.png', height: 26),
+      //       label: 'Explorateur',
+      //     ),
+      //     BottomNavigationBarItem(
+      //       icon: Icon(Icons.lock),
+      //       label: 'Mes portefeuilles',
+      //     ),
+      //   ],
+      // ),
     );
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index ce9ab7b..49542f5 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+11
+version: 0.0.1+13
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -64,4 +64,5 @@ flutter:
     - assets/blockchain.png
     - assets/block-space.png
     - assets/block-space-disabled.png
+    - assets/lock.png