diff --git a/lib/main.dart b/lib/main.dart
index 1bfe2dc4d78261ebecfe731f7e0203df5e596cff..11e1eba197db18a6664b8e4a5b33e36c8434b90d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -14,6 +14,7 @@ import 'package:flutter/material.dart';
import 'package:graphql_flutter/graphql_flutter.dart';
import 'package:provider/provider.dart';
import 'package:flutter/foundation.dart';
+import 'package:responsive_framework/responsive_framework.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:catcher/catcher.dart';
@@ -102,21 +103,34 @@ class Gecko extends StatelessWidget {
ChangeNotifierProvider(create: (_) => CesiumPlusProvider())
],
child: GraphQLProvider(
- client: _client,
- child: MaterialApp(
- navigatorKey: Catcher.navigatorKey,
- title: 'Ğecko',
- theme: ThemeData(
- primaryColor: Color(0xffFFD58D),
- accentColor: Colors.grey[850],
- textTheme: TextTheme(
- bodyText1: TextStyle(),
- bodyText2: TextStyle(),
- ).apply(
- bodyColor: Color(0xff855F2D),
- ),
+ client: _client,
+ child: MaterialApp(
+ builder: (context, widget) => ResponsiveWrapper.builder(
+ BouncingScrollWrapper.builder(context, widget),
+ maxWidth: 1200,
+ minWidth: 480,
+ defaultScale: true,
+ breakpoints: [
+ ResponsiveBreakpoint.resize(480, name: MOBILE),
+ ResponsiveBreakpoint.autoScale(800, name: TABLET),
+ ResponsiveBreakpoint.resize(1000, name: DESKTOP),
+ ],
+ background: Container(color: Color(0xFFF5F5F5))),
+ navigatorKey: Catcher.navigatorKey,
+ title: 'Ğecko',
+ theme: ThemeData(
+ primaryColor: Color(0xffFFD58D),
+ accentColor: Colors.grey[850],
+ textTheme: TextTheme(
+ bodyText1: TextStyle(),
+ bodyText2: TextStyle(),
+ ).apply(
+ bodyColor: Color(0xff855F2D),
),
- home: HomeScreen(),
- )));
+ ),
+ home: HomeScreen(),
+ initialRoute: "/",
+ ),
+ ));
}
}
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 3ce94525bf116498c0d7b9a1dd7e4aa8f750a472..4b5afdffe78d9c429dab7d0263dbc8467e40b2c6 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -126,7 +126,7 @@ class HomeScreen extends StatelessWidget {
},
child: Column(children: <Widget>[
Padding(
- padding: EdgeInsets.only(top: 22),
+ padding: EdgeInsets.only(top: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
@@ -134,22 +134,24 @@ class HomeScreen extends StatelessWidget {
Image(
image:
AssetImage('assets/icon/gecko_final.png'),
- height: 160),
+ height: 180),
])),
Padding(
- padding: EdgeInsets.only(top: 12),
+ 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",
+ "y'a pas de lézard !",
textAlign: TextAlign.center,
style: TextStyle(
- color: Colors.black, fontSize: 15),
+ color: Colors.black,
+ fontSize: 17,
+ fontStyle: FontStyle.italic),
)
])),
Padding(
- padding: EdgeInsets.only(top: 40),
+ padding: EdgeInsets.only(top: 60),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
@@ -162,11 +164,11 @@ class HomeScreen extends StatelessWidget {
splashColor: Color(
0xffD28928), // inkwell color
child: Padding(
- padding: EdgeInsets.all(17),
+ padding: EdgeInsets.all(22),
child: Image(
image: AssetImage(
'assets/qrcode-scan.png'),
- height: 50)),
+ height: 60)),
onTap: () async {
await _historyProvider
.scan(context);
@@ -185,17 +187,17 @@ class HomeScreen extends StatelessWidget {
],
),
),
- SizedBox(height: 10),
+ SizedBox(height: 12),
Text(
"Payer par QR-Code",
textAlign: TextAlign.center,
style: TextStyle(
- color: Colors.black, fontSize: 13),
+ color: Colors.black, fontSize: 16),
)
])
])),
Padding(
- padding: EdgeInsets.only(top: 40),
+ padding: EdgeInsets.only(top: 50),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
@@ -209,11 +211,11 @@ class HomeScreen extends StatelessWidget {
0xffD28928), // inkwell color
child: Padding(
padding: EdgeInsets.symmetric(
- horizontal: 18, vertical: 14),
+ horizontal: 20, vertical: 16),
child: Image(
image: AssetImage(
'assets/blockchain.png'),
- height: 55)),
+ height: 70)),
onTap: () {
// Navigator.push(
// context,
@@ -237,15 +239,15 @@ class HomeScreen extends StatelessWidget {
],
),
),
- SizedBox(height: 10),
+ SizedBox(height: 12),
Text(
"Explorer\n",
textAlign: TextAlign.center,
style: TextStyle(
- color: Colors.black, fontSize: 13),
+ color: Colors.black, fontSize: 16),
)
]),
- SizedBox(width: 100),
+ SizedBox(width: 140),
Column(children: <Widget>[
Container(
child: ClipOval(
@@ -255,11 +257,11 @@ class HomeScreen extends StatelessWidget {
splashColor: Color(
0xffD28928), // inkwell color
child: Padding(
- padding: EdgeInsets.all(20),
+ padding: EdgeInsets.all(23),
child: Image(
image: AssetImage(
'assets/lock.png'),
- height: 45)),
+ height: 57)),
onTap: () {
isWalletsExists
? Navigator.push(
@@ -289,12 +291,12 @@ class HomeScreen extends StatelessWidget {
],
),
),
- SizedBox(height: 10),
+ SizedBox(height: 12),
Text(
"Gérer mes\nportefeuilles",
textAlign: TextAlign.center,
style: TextStyle(
- color: Colors.black, fontSize: 13),
+ color: Colors.black, fontSize: 16),
)
])
]))
diff --git a/pubspec.lock b/pubspec.lock
index a0e96d959d78a319e26f255935f9a69a6995956a..ea1bcdd970d2f8e72a96ea9272984d1e42882b55 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -576,6 +576,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.21"
+ responsive_framework:
+ dependency: "direct main"
+ description:
+ name: responsive_framework
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.0.14"
rxdart:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7a4f952b3a13e2e4b3a1c04e6b6568a9465ad4f2..15e62dd4307561ffcc03a929b899813a9b4c9fc6 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+18
+version: 0.0.1+19
environment:
sdk: ">=2.7.0 <3.0.0"
@@ -39,6 +39,7 @@ dependencies:
sentry_flutter: ^4.0.4
catcher: ^0.4.1
bubble: ^1.1.9+1
+ responsive_framework: ^0.0.14
flutter_icons:
android: "ic_launcher"
@@ -60,4 +61,4 @@ flutter:
- assets/
- assets/icon/
- assets/onBoarding/
- - assets/onBoarding/progress_bar/
\ No newline at end of file
+ - assets/onBoarding/progress_bar/