Globalise colors
This commit is contained in:
parent
de4e0b5457
commit
f9bb49b3d0
|
@ -1,4 +1,5 @@
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
import 'package:gecko/models/walletData.dart';
|
import 'package:gecko/models/walletData.dart';
|
||||||
import 'package:hive/hive.dart';
|
import 'package:hive/hive.dart';
|
||||||
import 'package:logger/logger.dart';
|
import 'package:logger/logger.dart';
|
||||||
|
@ -25,3 +26,9 @@ double ratio;
|
||||||
|
|
||||||
// Logger
|
// Logger
|
||||||
var log = Logger();
|
var log = Logger();
|
||||||
|
|
||||||
|
// Colors
|
||||||
|
Color orangeC = Color(0xffD28928);
|
||||||
|
Color yellowC = Color(0xffFFD68E);
|
||||||
|
Color floattingYellow = Color(0xffEFEFBF);
|
||||||
|
Color backgroundColor = Color(0xFFF5F5F5);
|
||||||
|
|
|
@ -150,7 +150,7 @@ class Gecko extends StatelessWidget {
|
||||||
ResponsiveBreakpoint.autoScale(800, name: TABLET),
|
ResponsiveBreakpoint.autoScale(800, name: TABLET),
|
||||||
ResponsiveBreakpoint.resize(1000, name: DESKTOP),
|
ResponsiveBreakpoint.resize(1000, name: DESKTOP),
|
||||||
],
|
],
|
||||||
background: Container(color: Color(0xFFF5F5F5))),
|
background: Container(color: backgroundColor)),
|
||||||
title: 'Ğecko',
|
title: 'Ğecko',
|
||||||
theme: ThemeData(
|
theme: ThemeData(
|
||||||
appBarTheme: AppBarTheme(
|
appBarTheme: AppBarTheme(
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:bubble/bubble.dart';
|
import 'package:bubble/bubble.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
|
|
||||||
class CommonElements {
|
class CommonElements {
|
||||||
// Exemple de Widget
|
// Exemple de Widget
|
||||||
|
@ -103,7 +104,7 @@ class CommonElements {
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Color(0xffFFD58D), // button color
|
color: Color(0xffFFD58D), // button color
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
splashColor: Color(0xffD28928), // inkwell color
|
splashColor: orangeC, // inkwell color
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: padding,
|
padding: padding,
|
||||||
child: Image(image: image, height: imgHight)),
|
child: Image(image: image, height: imgHight)),
|
||||||
|
|
|
@ -96,8 +96,8 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 3),
|
padding: EdgeInsets.symmetric(horizontal: 3),
|
||||||
child: Image.asset('assets/qrcode-scan.png'))),
|
child: Image.asset('assets/qrcode-scan.png'))),
|
||||||
backgroundColor: Color(
|
backgroundColor:
|
||||||
0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255),
|
floattingYellow, //smoothYellow, //Color.fromARGB(500, 204, 255, 255),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -302,8 +302,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
||||||
child: Text(
|
child: Text(
|
||||||
_historyProvider.historySwitchButtun,
|
_historyProvider.historySwitchButtun,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 15,
|
fontSize: 15, color: orangeC))),
|
||||||
color: Color(0xffD28928)))),
|
|
||||||
// const Divider(
|
// const Divider(
|
||||||
// color: Colors.grey,
|
// color: Colors.grey,
|
||||||
// height: 5,
|
// height: 5,
|
||||||
|
@ -377,7 +376,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
||||||
padding: const EdgeInsets.only(top: 15),
|
padding: const EdgeInsets.only(top: 15),
|
||||||
child: OutlinedButton(
|
child: OutlinedButton(
|
||||||
style: OutlinedButton.styleFrom(
|
style: OutlinedButton.styleFrom(
|
||||||
side: BorderSide(width: 2, color: Color(0xffD28928))),
|
side: BorderSide(width: 2, color: orangeC)),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// if (_formKey.currentState.validate()) {
|
// if (_formKey.currentState.validate()) {
|
||||||
// _formKey.currentState.save();
|
// _formKey.currentState.save();
|
||||||
|
|
|
@ -49,7 +49,7 @@ class HomeScreen extends StatelessWidget {
|
||||||
height: 130),
|
height: 130),
|
||||||
]),
|
]),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Color(0xffD28928),
|
color: orangeC,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
|
@ -177,8 +177,7 @@ class HomeScreen extends StatelessWidget {
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Color(0xffFFD58D), // button color
|
color: Color(0xffFFD58D), // button color
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
splashColor: Color(
|
splashColor: orangeC, // inkwell color
|
||||||
0xffD28928), // inkwell color
|
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.all(22),
|
padding: EdgeInsets.all(22),
|
||||||
child: Image(
|
child: Image(
|
||||||
|
@ -223,8 +222,7 @@ class HomeScreen extends StatelessWidget {
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Color(0xffFFD58D), // button color
|
color: Color(0xffFFD58D), // button color
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
splashColor: Color(
|
splashColor: orangeC, // inkwell color
|
||||||
0xffD28928), // inkwell color
|
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.symmetric(
|
padding: EdgeInsets.symmetric(
|
||||||
horizontal: 20, vertical: 16),
|
horizontal: 20, vertical: 16),
|
||||||
|
@ -271,8 +269,7 @@ class HomeScreen extends StatelessWidget {
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Color(0xffFFD58D), // button color
|
color: Color(0xffFFD58D), // button color
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
splashColor: Color(
|
splashColor: orangeC, // inkwell color
|
||||||
0xffD28928), // inkwell color
|
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.all(23),
|
padding: EdgeInsets.all(23),
|
||||||
child: Image(
|
child: Image(
|
||||||
|
|
|
@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:dubp/dubp.dart';
|
import 'package:dubp/dubp.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/models/changePin.dart';
|
import 'package:gecko/models/changePin.dart';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
@ -69,7 +70,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
|
||||||
fontWeight: FontWeight.bold)),
|
fontWeight: FontWeight.bold)),
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: Icon(Icons.replay),
|
icon: Icon(Icons.replay),
|
||||||
color: Color(0xffD28928),
|
color: orangeC,
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
_newWalletFile =
|
_newWalletFile =
|
||||||
await _changePin.changePin(walletName, oldPin);
|
await _changePin.changePin(walletName, oldPin);
|
||||||
|
@ -85,8 +86,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
|
||||||
child: ElevatedButton(
|
child: ElevatedButton(
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 12,
|
elevation: 12,
|
||||||
primary:
|
primary: Colors.green[400], //smoothYellow, // background
|
||||||
Colors.green[400], //Color(0xffFFD68E), // background
|
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: _changePin.newPin.text != ''
|
onPressed: _changePin.newPin.text != ''
|
||||||
|
|
|
@ -127,8 +127,8 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
|
||||||
key: Key('confirmStorage'),
|
key: Key('confirmStorage'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 12,
|
elevation: 12,
|
||||||
primary: Colors.green[
|
primary: Colors
|
||||||
400], //Color(0xffFFD68E), // background
|
.green[400], //smoothYellow, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: (_generateWalletProvider
|
onPressed: (_generateWalletProvider
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/models/generateWallets.dart';
|
import 'package:gecko/models/generateWallets.dart';
|
||||||
import 'package:gecko/screens/myWallets/confirmWalletStorage.dart';
|
import 'package:gecko/screens/myWallets/confirmWalletStorage.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
@ -42,8 +43,8 @@ class GenerateWalletsScreen extends StatelessWidget {
|
||||||
width: 40.0,
|
width: 40.0,
|
||||||
child: Icon(Icons.replay, color: Colors.grey[850]),
|
child: Icon(Icons.replay, color: Colors.grey[850]),
|
||||||
),
|
),
|
||||||
backgroundColor: Color(
|
backgroundColor:
|
||||||
0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255),
|
floattingYellow, //smoothYellow, //Color.fromARGB(500, 204, 255, 255),
|
||||||
))),
|
))),
|
||||||
body: Builder(
|
body: Builder(
|
||||||
builder: (ctx) => SafeArea(
|
builder: (ctx) => SafeArea(
|
||||||
|
@ -83,7 +84,7 @@ class GenerateWalletsScreen extends StatelessWidget {
|
||||||
fontWeight: FontWeight.bold)),
|
fontWeight: FontWeight.bold)),
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: Icon(Icons.replay),
|
icon: Icon(Icons.replay),
|
||||||
color: Color(0xffD28928),
|
color: orangeC,
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
_generateWalletProvider.changePinCode(
|
_generateWalletProvider.changePinCode(
|
||||||
reload: false);
|
reload: false);
|
||||||
|
@ -96,7 +97,7 @@ class GenerateWalletsScreen extends StatelessWidget {
|
||||||
ElevatedButton(
|
ElevatedButton(
|
||||||
key: Key('storeKeychain'),
|
key: Key('storeKeychain'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
primary: Color(0xffFFD68E), // background
|
primary: yellowC, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: _generateWalletProvider.walletIsGenerated
|
onPressed: _generateWalletProvider.walletIsGenerated
|
||||||
|
@ -153,8 +154,8 @@ class GenerateWalletsScreen extends StatelessWidget {
|
||||||
SizedBox(
|
SizedBox(
|
||||||
width: 30,
|
width: 30,
|
||||||
height: 25,
|
height: 25,
|
||||||
child: Icon(Icons.info_outline,
|
child:
|
||||||
size: 22, color: Color(0xffD28928))),
|
Icon(Icons.info_outline, size: 22, color: orangeC)),
|
||||||
SizedBox(height: 1)
|
SizedBox(height: 1)
|
||||||
]),
|
]),
|
||||||
Text(
|
Text(
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/models/generateWallets.dart';
|
import 'package:gecko/models/generateWallets.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:gecko/models/myWallets.dart';
|
import 'package:gecko/models/myWallets.dart';
|
||||||
|
@ -149,7 +150,7 @@ class ImportWalletScreen extends StatelessWidget {
|
||||||
fontWeight: FontWeight.bold)),
|
fontWeight: FontWeight.bold)),
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: Icon(Icons.replay),
|
icon: Icon(Icons.replay),
|
||||||
color: Color(0xffD28928),
|
color: orangeC,
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
_generateWalletProvider.changePinCode(
|
_generateWalletProvider.changePinCode(
|
||||||
reload: true);
|
reload: true);
|
||||||
|
@ -161,7 +162,7 @@ class ImportWalletScreen extends StatelessWidget {
|
||||||
SizedBox(height: 30),
|
SizedBox(height: 30),
|
||||||
ElevatedButton(
|
ElevatedButton(
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
primary: Color(0xffFFD68E), // background
|
primary: yellowC, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: _generateWalletProvider.canImport &&
|
onPressed: _generateWalletProvider.canImport &&
|
||||||
|
@ -205,8 +206,8 @@ class ImportWalletScreen extends StatelessWidget {
|
||||||
SizedBox(
|
SizedBox(
|
||||||
width: 30,
|
width: 30,
|
||||||
height: 25,
|
height: 25,
|
||||||
child: Icon(Icons.info_outline,
|
child:
|
||||||
size: 22, color: Color(0xffD28928))),
|
Icon(Icons.info_outline, size: 22, color: orangeC)),
|
||||||
SizedBox(height: 1)
|
SizedBox(height: 1)
|
||||||
]),
|
]),
|
||||||
Text(
|
Text(
|
||||||
|
|
|
@ -88,7 +88,7 @@ class WalletOptions extends StatelessWidget {
|
||||||
child: Column(children: <Widget>[
|
child: Column(children: <Widget>[
|
||||||
Container(
|
Container(
|
||||||
height: isTall ? 15 : 0,
|
height: isTall ? 15 : 0,
|
||||||
color: Color(0xffFFD68E),
|
color: yellowC,
|
||||||
),
|
),
|
||||||
Container(
|
Container(
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
|
@ -96,7 +96,7 @@ class WalletOptions extends StatelessWidget {
|
||||||
begin: Alignment.topCenter,
|
begin: Alignment.topCenter,
|
||||||
end: Alignment.bottomCenter,
|
end: Alignment.bottomCenter,
|
||||||
colors: [
|
colors: [
|
||||||
Color(0xffFFD68E),
|
yellowC,
|
||||||
Color(0xfffafafa),
|
Color(0xfffafafa),
|
||||||
],
|
],
|
||||||
)),
|
)),
|
||||||
|
@ -318,7 +318,7 @@ class WalletOptions extends StatelessWidget {
|
||||||
new BorderRadius.circular(8),
|
new BorderRadius.circular(8),
|
||||||
),
|
),
|
||||||
elevation: 1,
|
elevation: 1,
|
||||||
primary: Color(0xffD28928), // background
|
primary: orangeC, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -78,7 +78,7 @@ class WalletsHome extends StatelessWidget {
|
||||||
width: 40,
|
width: 40,
|
||||||
child: Icon(Icons.person_add_alt_1_rounded,
|
child: Icon(Icons.person_add_alt_1_rounded,
|
||||||
color: Colors.grey[850])),
|
color: Colors.grey[850])),
|
||||||
backgroundColor: Color(0xffEFEFBF))))),
|
backgroundColor: floattingYellow)))),
|
||||||
body: SafeArea(
|
body: SafeArea(
|
||||||
child: !isWalletsExists
|
child: !isWalletsExists
|
||||||
? NoKeyChainScreen()
|
? NoKeyChainScreen()
|
||||||
|
@ -168,7 +168,7 @@ class WalletsHome extends StatelessWidget {
|
||||||
// contentPadding: const EdgeInsets.only(left: 7.0),
|
// contentPadding: const EdgeInsets.only(left: 7.0),
|
||||||
tileColor:
|
tileColor:
|
||||||
_repository.id()[1] == defaultWallet.id()[1]
|
_repository.id()[1] == defaultWallet.id()[1]
|
||||||
? Color(0xffD28928)
|
? orangeC
|
||||||
: Color(0xffFFD58D),
|
: Color(0xffFFD58D),
|
||||||
// leading: Text('IMAGE'),
|
// leading: Text('IMAGE'),
|
||||||
|
|
||||||
|
@ -231,7 +231,7 @@ class WalletsHome extends StatelessWidget {
|
||||||
key: Key('validDerivation'),
|
key: Key('validDerivation'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 1,
|
elevation: 1,
|
||||||
primary: Color(0xffFFD68E), // background
|
primary: yellowC, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/screens/commonElements.dart';
|
import 'package:gecko/screens/commonElements.dart';
|
||||||
import 'package:gecko/screens/myWallets/importWallet.dart';
|
import 'package:gecko/screens/myWallets/importWallet.dart';
|
||||||
import 'package:gecko/screens/onBoarding/1.dart';
|
import 'package:gecko/screens/onBoarding/1.dart';
|
||||||
|
@ -32,7 +33,7 @@ class NoKeyChainScreen extends StatelessWidget {
|
||||||
color: Color(0xffFFD58D), // button color
|
color: Color(0xffFFD58D), // button color
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
key: Key('goStep1'),
|
key: Key('goStep1'),
|
||||||
splashColor: Color(0xffD28928), // inkwell color
|
splashColor: orangeC, // inkwell color
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.all(8),
|
padding: EdgeInsets.all(8),
|
||||||
child: Image(
|
child: Image(
|
||||||
|
@ -73,7 +74,7 @@ class NoKeyChainScreen extends StatelessWidget {
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Color(0xffFFD58D), // button color
|
color: Color(0xffFFD58D), // button color
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
splashColor: Color(0xffD28928), // inkwell color
|
splashColor: orangeC, // inkwell color
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.all(12),
|
padding: EdgeInsets.all(12),
|
||||||
child:
|
child:
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/screens/commonElements.dart';
|
import 'package:gecko/screens/commonElements.dart';
|
||||||
import 'package:gecko/screens/onBoarding/2.dart';
|
import 'package:gecko/screens/onBoarding/2.dart';
|
||||||
// import 'package:gecko/models/home.dart';
|
// import 'package:gecko/models/home.dart';
|
||||||
|
@ -39,7 +40,7 @@ class OnboardingStepOne extends StatelessWidget {
|
||||||
key: Key('goStep2'),
|
key: Key('goStep2'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -39,7 +39,7 @@ class OnboardingStepTwelve extends StatelessWidget {
|
||||||
key: Key('goStep11'),
|
key: Key('goStep11'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -2,6 +2,7 @@ import 'dart:ui';
|
||||||
import 'package:dubp/dubp.dart';
|
import 'package:dubp/dubp.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/models/generateWallets.dart';
|
import 'package:gecko/models/generateWallets.dart';
|
||||||
import 'package:gecko/screens/commonElements.dart';
|
import 'package:gecko/screens/commonElements.dart';
|
||||||
import 'package:gecko/screens/onBoarding/12.dart';
|
import 'package:gecko/screens/onBoarding/12.dart';
|
||||||
|
@ -68,7 +69,7 @@ class OnboardingStepThirteen extends StatelessWidget {
|
||||||
fontWeight: FontWeight.bold)),
|
fontWeight: FontWeight.bold)),
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: Icon(Icons.replay),
|
icon: Icon(Icons.replay),
|
||||||
color: Color(0xffD28928),
|
color: orangeC,
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
generatedWallet = await _generateWalletProvider
|
generatedWallet = await _generateWalletProvider
|
||||||
.changePinCode(reload: false);
|
.changePinCode(reload: false);
|
||||||
|
@ -105,7 +106,7 @@ class OnboardingStepThirteen extends StatelessWidget {
|
||||||
key: Key('goStep12'),
|
key: Key('goStep12'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
|
|
|
@ -38,7 +38,7 @@ class OnboardingStepFiveteen extends StatelessWidget {
|
||||||
key: Key('goWalletHome'),
|
key: Key('goWalletHome'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/screens/commonElements.dart';
|
import 'package:gecko/screens/commonElements.dart';
|
||||||
import 'package:gecko/screens/onBoarding/3.dart';
|
import 'package:gecko/screens/onBoarding/3.dart';
|
||||||
// import 'package:gecko/screens/commonElements.dart';
|
// import 'package:gecko/screens/commonElements.dart';
|
||||||
|
@ -39,7 +40,7 @@ class OnboardingStepTwo extends StatelessWidget {
|
||||||
key: Key('goStep3'),
|
key: Key('goStep3'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -44,7 +44,7 @@ class OnboardingStepFor extends StatelessWidget {
|
||||||
key: Key('goStep4'),
|
key: Key('goStep4'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -39,7 +39,7 @@ class OnboardingStepFive extends StatelessWidget {
|
||||||
key: Key('goStep5'),
|
key: Key('goStep5'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -56,7 +56,7 @@ class OnboardingStepSeven extends StatelessWidget {
|
||||||
key: Key('goStep6'),
|
key: Key('goStep6'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -39,7 +39,7 @@ class OnboardingStepEight extends StatelessWidget {
|
||||||
key: Key('goStep7'),
|
key: Key('goStep7'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -76,7 +76,7 @@ class OnboardingStepNine extends StatelessWidget {
|
||||||
key: Key('goStep8'),
|
key: Key('goStep8'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -62,56 +62,12 @@ class OnboardingStepTen extends StatelessWidget {
|
||||||
],
|
],
|
||||||
textKey: Key('step8'),
|
textKey: Key('step8'),
|
||||||
),
|
),
|
||||||
|
|
||||||
// LayoutBuilder(builder: (builder, constraints) {
|
|
||||||
// // 2
|
|
||||||
// var hasDetailPage = constraints.maxWidth > 480;
|
|
||||||
|
|
||||||
// if (hasDetailPage) {
|
|
||||||
// // 3
|
|
||||||
// return Row(
|
|
||||||
// children: [
|
|
||||||
// // 4
|
|
||||||
// SizedBox(
|
|
||||||
// width: 250,
|
|
||||||
// height: 500,
|
|
||||||
// child: Text('GRAND'),
|
|
||||||
// ),
|
|
||||||
// // 5
|
|
||||||
// Expanded(
|
|
||||||
// child: Text('GRAND 2'),
|
|
||||||
// ),
|
|
||||||
// ],
|
|
||||||
// );
|
|
||||||
// } else {
|
|
||||||
// // 6
|
|
||||||
// return Text('PETIT');
|
|
||||||
// }
|
|
||||||
// }),
|
|
||||||
|
|
||||||
// Expanded(
|
|
||||||
// child:
|
|
||||||
// //ScreenTypeLayout with custom breakpoints supplied
|
|
||||||
// ScreenTypeLayout(
|
|
||||||
// breakpoints: ScreenBreakpoints(
|
|
||||||
// tablet: 600,
|
|
||||||
// desktop: 950,
|
|
||||||
// watch: 480,
|
|
||||||
// ),
|
|
||||||
// mobile: Container(color: Colors.blue),
|
|
||||||
// tablet: Container(color: Colors.yellow),
|
|
||||||
// desktop: Container(color: Colors.red),
|
|
||||||
// watch: Container(color: Colors.purple),
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
|
|
||||||
SizedBox(height: isTall ? 70 : 10),
|
SizedBox(height: isTall ? 70 : 10),
|
||||||
|
|
||||||
Text('${_generateWalletProvider.nbrWord + 1}',
|
Text('${_generateWalletProvider.nbrWord + 1}',
|
||||||
key: Key('askedWord'),
|
key: Key('askedWord'),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: isTall ? 17 : 10,
|
fontSize: isTall ? 17 : 10,
|
||||||
color: Color(0xffD28928),
|
color: orangeC,
|
||||||
fontWeight: FontWeight.w400)),
|
fontWeight: FontWeight.w400)),
|
||||||
SizedBox(height: isTall ? 10 : 0),
|
SizedBox(height: isTall ? 10 : 0),
|
||||||
Container(
|
Container(
|
||||||
|
@ -162,7 +118,7 @@ class OnboardingStepTen extends StatelessWidget {
|
||||||
key: Key('goStep9'),
|
key: Key('goStep9'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -47,7 +47,7 @@ class OnboardingStepEleven extends StatelessWidget {
|
||||||
key: Key('goStep10'),
|
key: Key('goStep10'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xffD28928),
|
primary: orangeC,
|
||||||
onPrimary: Colors.white, // foreground
|
onPrimary: Colors.white, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -44,7 +44,7 @@ class SettingsScreen extends StatelessWidget {
|
||||||
child: ElevatedButton(
|
child: ElevatedButton(
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xFFFFCA6F), // background
|
primary: yellowC, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () => Navigator.push(
|
onPressed: () => Navigator.push(
|
||||||
|
@ -65,7 +65,7 @@ class SettingsScreen extends StatelessWidget {
|
||||||
key: Key('generateKeychain'),
|
key: Key('generateKeychain'),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
primary: Color(0xFFFFCA6F), // background
|
primary: yellowC, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: !_myWallets.checkIfWalletExist()
|
onPressed: !_myWallets.checkIfWalletExist()
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/screens/home.dart';
|
import 'package:gecko/screens/home.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
// import 'package:gecko/models/home.dart';
|
// import 'package:gecko/models/home.dart';
|
||||||
|
@ -35,8 +36,8 @@ class TemplateScreen extends StatelessWidget {
|
||||||
width: 40.0,
|
width: 40.0,
|
||||||
child: Icon(Icons.home, color: Colors.grey[850]),
|
child: Icon(Icons.home, color: Colors.grey[850]),
|
||||||
),
|
),
|
||||||
backgroundColor: Color(
|
backgroundColor:
|
||||||
0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255),
|
floattingYellow, //smoothYellow, //Color.fromARGB(500, 204, 255, 255),
|
||||||
))),
|
))),
|
||||||
body: SafeArea(
|
body: SafeArea(
|
||||||
child: Column(children: <Widget>[
|
child: Column(children: <Widget>[
|
||||||
|
@ -56,7 +57,7 @@ class TemplateScreen extends StatelessWidget {
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
ElevatedButton(
|
ElevatedButton(
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
primary: Color(0xffFFD68E), // background
|
primary: yellowC, // background
|
||||||
onPrimary: Colors.black, // foreground
|
onPrimary: Colors.black, // foreground
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
Loading…
Reference in New Issue