diff --git a/lib/globals.dart b/lib/globals.dart
index 9a29df7f50ea6dc82b0aa4cc57a0afe3125d7187..8953573a46489b8fe5b2451f5d5d95573ba64a9b 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -1,4 +1,5 @@
import 'dart:io';
+import 'package:flutter/material.dart';
import 'package:gecko/models/walletData.dart';
import 'package:hive/hive.dart';
import 'package:logger/logger.dart';
@@ -25,3 +26,9 @@ double ratio;
// Logger
var log = Logger();
+
+// Colors
+Color orangeC = Color(0xffD28928);
+Color yellowC = Color(0xffFFD68E);
+Color floattingYellow = Color(0xffEFEFBF);
+Color backgroundColor = Color(0xFFF5F5F5);
diff --git a/lib/main.dart b/lib/main.dart
index 90bd4d4ffd51ac6c7634a66dabef62f5addbec96..2af5d1e54c407f134534c34de23262aa153a2497 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -150,7 +150,7 @@ class Gecko extends StatelessWidget {
ResponsiveBreakpoint.autoScale(800, name: TABLET),
ResponsiveBreakpoint.resize(1000, name: DESKTOP),
],
- background: Container(color: Color(0xFFF5F5F5))),
+ background: Container(color: backgroundColor)),
title: 'Äžecko',
theme: ThemeData(
appBarTheme: AppBarTheme(
diff --git a/lib/screens/commonElements.dart b/lib/screens/commonElements.dart
index b6c3d6b8a4514c6b71fc17d0aa9eb739a9f76dc7..78c66216a8f0d769c7ed0993c7248c7477691b6c 100644
--- a/lib/screens/commonElements.dart
+++ b/lib/screens/commonElements.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:bubble/bubble.dart';
+import 'package:gecko/globals.dart';
class CommonElements {
// Exemple de Widget
@@ -103,7 +104,7 @@ class CommonElements {
child: Material(
color: Color(0xffFFD58D), // button color
child: InkWell(
- splashColor: Color(0xffD28928), // inkwell color
+ splashColor: orangeC, // inkwell color
child: Padding(
padding: padding,
child: Image(image: image, height: imgHight)),
diff --git a/lib/screens/history.dart b/lib/screens/history.dart
index a6ca0950bbf1265290eb9a4a340bd66f8f2a689b..79480066b133028606b9342faa0ba07c49051dd0 100644
--- a/lib/screens/history.dart
+++ b/lib/screens/history.dart
@@ -96,8 +96,8 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 3),
child: Image.asset('assets/qrcode-scan.png'))),
- backgroundColor: Color(
- 0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255),
+ backgroundColor:
+ floattingYellow, //smoothYellow, //Color.fromARGB(500, 204, 255, 255),
),
),
),
@@ -302,8 +302,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
child: Text(
_historyProvider.historySwitchButtun,
style: TextStyle(
- fontSize: 15,
- color: Color(0xffD28928)))),
+ fontSize: 15, color: orangeC))),
// const Divider(
// color: Colors.grey,
// height: 5,
@@ -377,7 +376,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
padding: const EdgeInsets.only(top: 15),
child: OutlinedButton(
style: OutlinedButton.styleFrom(
- side: BorderSide(width: 2, color: Color(0xffD28928))),
+ side: BorderSide(width: 2, color: orangeC)),
onPressed: () {
// if (_formKey.currentState.validate()) {
// _formKey.currentState.save();
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index f645ebb20041f9053c19053bf0142985379dc72e..3c37a15844f92fb37f38b9306ec5228f88d78cbb 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -49,7 +49,7 @@ class HomeScreen extends StatelessWidget {
height: 130),
]),
decoration: BoxDecoration(
- color: Color(0xffD28928),
+ color: orangeC,
),
),
ListTile(
@@ -177,8 +177,7 @@ class HomeScreen extends StatelessWidget {
child: Material(
color: Color(0xffFFD58D), // button color
child: InkWell(
- splashColor: Color(
- 0xffD28928), // inkwell color
+ splashColor: orangeC, // inkwell color
child: Padding(
padding: EdgeInsets.all(22),
child: Image(
@@ -223,8 +222,7 @@ class HomeScreen extends StatelessWidget {
child: Material(
color: Color(0xffFFD58D), // button color
child: InkWell(
- splashColor: Color(
- 0xffD28928), // inkwell color
+ splashColor: orangeC, // inkwell color
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 20, vertical: 16),
@@ -271,8 +269,7 @@ class HomeScreen extends StatelessWidget {
child: Material(
color: Color(0xffFFD58D), // button color
child: InkWell(
- splashColor: Color(
- 0xffD28928), // inkwell color
+ splashColor: orangeC, // inkwell color
child: Padding(
padding: EdgeInsets.all(23),
child: Image(
diff --git a/lib/screens/myWallets/changePin.dart b/lib/screens/myWallets/changePin.dart
index 2242fe5f451e45e3aa98bd327aa930687e589d58..19a87f0d1036902ce1efe73bfaa3143a5aee09dc 100644
--- a/lib/screens/myWallets/changePin.dart
+++ b/lib/screens/myWallets/changePin.dart
@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:dubp/dubp.dart';
import 'package:flutter/services.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/models/changePin.dart';
import 'dart:io';
import 'package:provider/provider.dart';
@@ -69,7 +70,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
fontWeight: FontWeight.bold)),
IconButton(
icon: Icon(Icons.replay),
- color: Color(0xffD28928),
+ color: orangeC,
onPressed: () async {
_newWalletFile =
await _changePin.changePin(walletName, oldPin);
@@ -85,8 +86,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
child: ElevatedButton(
style: ElevatedButton.styleFrom(
elevation: 12,
- primary:
- Colors.green[400], //Color(0xffFFD68E), // background
+ primary: Colors.green[400], //smoothYellow, // background
onPrimary: Colors.black, // foreground
),
onPressed: _changePin.newPin.text != ''
diff --git a/lib/screens/myWallets/confirmWalletStorage.dart b/lib/screens/myWallets/confirmWalletStorage.dart
index fcac81a8b0e326e32ea4bec530292706265185f8..0125c55734b9aff02b524dac42c10819653523e0 100644
--- a/lib/screens/myWallets/confirmWalletStorage.dart
+++ b/lib/screens/myWallets/confirmWalletStorage.dart
@@ -127,8 +127,8 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
key: Key('confirmStorage'),
style: ElevatedButton.styleFrom(
elevation: 12,
- primary: Colors.green[
- 400], //Color(0xffFFD68E), // background
+ primary: Colors
+ .green[400], //smoothYellow, // background
onPrimary: Colors.black, // foreground
),
onPressed: (_generateWalletProvider
diff --git a/lib/screens/myWallets/generateWallets.dart b/lib/screens/myWallets/generateWallets.dart
index 9847000130865b05aaf3024460bfdc9c6f96f17c..b1d623e3bd9a1b8bc3c48172cc79fb842897f4e7 100644
--- a/lib/screens/myWallets/generateWallets.dart
+++ b/lib/screens/myWallets/generateWallets.dart
@@ -1,4 +1,5 @@
import 'package:flutter/services.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/models/generateWallets.dart';
import 'package:gecko/screens/myWallets/confirmWalletStorage.dart';
import 'package:flutter/material.dart';
@@ -42,8 +43,8 @@ class GenerateWalletsScreen extends StatelessWidget {
width: 40.0,
child: Icon(Icons.replay, color: Colors.grey[850]),
),
- backgroundColor: Color(
- 0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255),
+ backgroundColor:
+ floattingYellow, //smoothYellow, //Color.fromARGB(500, 204, 255, 255),
))),
body: Builder(
builder: (ctx) => SafeArea(
@@ -83,7 +84,7 @@ class GenerateWalletsScreen extends StatelessWidget {
fontWeight: FontWeight.bold)),
IconButton(
icon: Icon(Icons.replay),
- color: Color(0xffD28928),
+ color: orangeC,
onPressed: () {
_generateWalletProvider.changePinCode(
reload: false);
@@ -96,7 +97,7 @@ class GenerateWalletsScreen extends StatelessWidget {
ElevatedButton(
key: Key('storeKeychain'),
style: ElevatedButton.styleFrom(
- primary: Color(0xffFFD68E), // background
+ primary: yellowC, // background
onPrimary: Colors.black, // foreground
),
onPressed: _generateWalletProvider.walletIsGenerated
@@ -153,8 +154,8 @@ class GenerateWalletsScreen extends StatelessWidget {
SizedBox(
width: 30,
height: 25,
- child: Icon(Icons.info_outline,
- size: 22, color: Color(0xffD28928))),
+ child:
+ Icon(Icons.info_outline, size: 22, color: orangeC)),
SizedBox(height: 1)
]),
Text(
diff --git a/lib/screens/myWallets/importWallet.dart b/lib/screens/myWallets/importWallet.dart
index a0547622a3f4cf8b7d2d675dc5772ffc0c87140d..c825d749f3110dcb0d80dd69755fd270c435c761 100644
--- a/lib/screens/myWallets/importWallet.dart
+++ b/lib/screens/myWallets/importWallet.dart
@@ -1,5 +1,6 @@
import 'dart:async';
import 'package:flutter/services.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/models/generateWallets.dart';
import 'package:flutter/material.dart';
import 'package:gecko/models/myWallets.dart';
@@ -149,7 +150,7 @@ class ImportWalletScreen extends StatelessWidget {
fontWeight: FontWeight.bold)),
IconButton(
icon: Icon(Icons.replay),
- color: Color(0xffD28928),
+ color: orangeC,
onPressed: () {
_generateWalletProvider.changePinCode(
reload: true);
@@ -161,7 +162,7 @@ class ImportWalletScreen extends StatelessWidget {
SizedBox(height: 30),
ElevatedButton(
style: ElevatedButton.styleFrom(
- primary: Color(0xffFFD68E), // background
+ primary: yellowC, // background
onPrimary: Colors.black, // foreground
),
onPressed: _generateWalletProvider.canImport &&
@@ -205,8 +206,8 @@ class ImportWalletScreen extends StatelessWidget {
SizedBox(
width: 30,
height: 25,
- child: Icon(Icons.info_outline,
- size: 22, color: Color(0xffD28928))),
+ child:
+ Icon(Icons.info_outline, size: 22, color: orangeC)),
SizedBox(height: 1)
]),
Text(
diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart
index 121e7c190e95a78d47992c87025256ba55a6145f..fdc633a1b38c5b9a7a6a5ca6a712eca555192d52 100644
--- a/lib/screens/myWallets/walletOptions.dart
+++ b/lib/screens/myWallets/walletOptions.dart
@@ -88,7 +88,7 @@ class WalletOptions extends StatelessWidget {
child: Column(children: <Widget>[
Container(
height: isTall ? 15 : 0,
- color: Color(0xffFFD68E),
+ color: yellowC,
),
Container(
decoration: BoxDecoration(
@@ -96,7 +96,7 @@ class WalletOptions extends StatelessWidget {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
- Color(0xffFFD68E),
+ yellowC,
Color(0xfffafafa),
],
)),
@@ -318,7 +318,7 @@ class WalletOptions extends StatelessWidget {
new BorderRadius.circular(8),
),
elevation: 1,
- primary: Color(0xffD28928), // background
+ primary: orangeC, // background
onPrimary: Colors.black, // foreground
),
onPressed: () {
diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart
index 03b0c25ee02f22cffc5e7f5cc2256a9b2cac2c79..0f0b441cfcd61730b3d710f763cdb26593bc9377 100644
--- a/lib/screens/myWallets/walletsHome.dart
+++ b/lib/screens/myWallets/walletsHome.dart
@@ -78,7 +78,7 @@ class WalletsHome extends StatelessWidget {
width: 40,
child: Icon(Icons.person_add_alt_1_rounded,
color: Colors.grey[850])),
- backgroundColor: Color(0xffEFEFBF))))),
+ backgroundColor: floattingYellow)))),
body: SafeArea(
child: !isWalletsExists
? NoKeyChainScreen()
@@ -168,7 +168,7 @@ class WalletsHome extends StatelessWidget {
// contentPadding: const EdgeInsets.only(left: 7.0),
tileColor:
_repository.id()[1] == defaultWallet.id()[1]
- ? Color(0xffD28928)
+ ? orangeC
: Color(0xffFFD58D),
// leading: Text('IMAGE'),
@@ -231,7 +231,7 @@ class WalletsHome extends StatelessWidget {
key: Key('validDerivation'),
style: ElevatedButton.styleFrom(
elevation: 1,
- primary: Color(0xffFFD68E), // background
+ primary: yellowC, // background
onPrimary: Colors.black, // foreground
),
onPressed: () async {
diff --git a/lib/screens/onBoarding/0_noKeychainFound.dart b/lib/screens/onBoarding/0_noKeychainFound.dart
index 3cc2c101c701746e96d9675a35fe3bdf5aa06a51..c69d4d66c9d0c72a77089c7c92109004bb6305dd 100644
--- a/lib/screens/onBoarding/0_noKeychainFound.dart
+++ b/lib/screens/onBoarding/0_noKeychainFound.dart
@@ -1,6 +1,7 @@
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/screens/commonElements.dart';
import 'package:gecko/screens/myWallets/importWallet.dart';
import 'package:gecko/screens/onBoarding/1.dart';
@@ -32,7 +33,7 @@ class NoKeyChainScreen extends StatelessWidget {
color: Color(0xffFFD58D), // button color
child: InkWell(
key: Key('goStep1'),
- splashColor: Color(0xffD28928), // inkwell color
+ splashColor: orangeC, // inkwell color
child: Padding(
padding: EdgeInsets.all(8),
child: Image(
@@ -73,7 +74,7 @@ class NoKeyChainScreen extends StatelessWidget {
child: Material(
color: Color(0xffFFD58D), // button color
child: InkWell(
- splashColor: Color(0xffD28928), // inkwell color
+ splashColor: orangeC, // inkwell color
child: Padding(
padding: EdgeInsets.all(12),
child:
diff --git a/lib/screens/onBoarding/1.dart b/lib/screens/onBoarding/1.dart
index cf6ba1386ec3f15d54bab1d8332acd0f40d5001b..d58c8a346e9f0bd5274b7df6b437afb3f03f982a 100644
--- a/lib/screens/onBoarding/1.dart
+++ b/lib/screens/onBoarding/1.dart
@@ -1,5 +1,6 @@
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/screens/commonElements.dart';
import 'package:gecko/screens/onBoarding/2.dart';
// import 'package:gecko/models/home.dart';
@@ -39,7 +40,7 @@ class OnboardingStepOne extends StatelessWidget {
key: Key('goStep2'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart
index 798d4635eca2ead4ad747a7603814b0a4710f006..12c82117d0964f8e32d0d869e6c3b0e6cd2ca899 100644
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@@ -39,7 +39,7 @@ class OnboardingStepTwelve extends StatelessWidget {
key: Key('goStep11'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/11.dart b/lib/screens/onBoarding/11.dart
index 42969dfaaf5754f64f39b37a46a36ecc7beb7a27..d0173cc71ef999219b75b93f60e75f4451897666 100644
--- a/lib/screens/onBoarding/11.dart
+++ b/lib/screens/onBoarding/11.dart
@@ -2,6 +2,7 @@ import 'dart:ui';
import 'package:dubp/dubp.dart';
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/models/generateWallets.dart';
import 'package:gecko/screens/commonElements.dart';
import 'package:gecko/screens/onBoarding/12.dart';
@@ -68,7 +69,7 @@ class OnboardingStepThirteen extends StatelessWidget {
fontWeight: FontWeight.bold)),
IconButton(
icon: Icon(Icons.replay),
- color: Color(0xffD28928),
+ color: orangeC,
onPressed: () async {
generatedWallet = await _generateWalletProvider
.changePinCode(reload: false);
@@ -105,7 +106,7 @@ class OnboardingStepThirteen extends StatelessWidget {
key: Key('goStep12'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () async {
diff --git a/lib/screens/onBoarding/13_congratulations.dart b/lib/screens/onBoarding/13_congratulations.dart
index 0a1f432dfc8f69c527916d77fdd142c8657aa2dc..58ad16a34bbf5e664f96e951ba5572ef3c1968e6 100644
--- a/lib/screens/onBoarding/13_congratulations.dart
+++ b/lib/screens/onBoarding/13_congratulations.dart
@@ -38,7 +38,7 @@ class OnboardingStepFiveteen extends StatelessWidget {
key: Key('goWalletHome'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/2.dart b/lib/screens/onBoarding/2.dart
index 0c220199432509da349a1ed48ab26a116d9552a3..0d7a3f9e9ef797ff1d93c661b6ff86919d9f99ef 100644
--- a/lib/screens/onBoarding/2.dart
+++ b/lib/screens/onBoarding/2.dart
@@ -1,5 +1,6 @@
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/screens/commonElements.dart';
import 'package:gecko/screens/onBoarding/3.dart';
// import 'package:gecko/screens/commonElements.dart';
@@ -39,7 +40,7 @@ class OnboardingStepTwo extends StatelessWidget {
key: Key('goStep3'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/3.dart b/lib/screens/onBoarding/3.dart
index 2300cbb45aaf3019b5d7db3b82260e0e231f758a..6d589ccf196740ef4157983f96e5c84e4829e816 100644
--- a/lib/screens/onBoarding/3.dart
+++ b/lib/screens/onBoarding/3.dart
@@ -44,7 +44,7 @@ class OnboardingStepFor extends StatelessWidget {
key: Key('goStep4'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/4.dart b/lib/screens/onBoarding/4.dart
index bb08542e666975d27a7bc7b8e41260d8af87bbfc..8d1feecf93df3a0b3768be1713a3e7ef78990ca8 100644
--- a/lib/screens/onBoarding/4.dart
+++ b/lib/screens/onBoarding/4.dart
@@ -39,7 +39,7 @@ class OnboardingStepFive extends StatelessWidget {
key: Key('goStep5'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/5.dart b/lib/screens/onBoarding/5.dart
index c2135ba63f7783c3e301c156191670064b4798ac..426770f6700cb48af22b5df54f8fac9102313031 100644
--- a/lib/screens/onBoarding/5.dart
+++ b/lib/screens/onBoarding/5.dart
@@ -56,7 +56,7 @@ class OnboardingStepSeven extends StatelessWidget {
key: Key('goStep6'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart
index 97eacfe12cd92f8f50106d5d51c8475ee05d86f1..54155cfacfae0558f8658723700503ed9f3da4d1 100644
--- a/lib/screens/onBoarding/6.dart
+++ b/lib/screens/onBoarding/6.dart
@@ -39,7 +39,7 @@ class OnboardingStepEight extends StatelessWidget {
key: Key('goStep7'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart
index 817e0bbe6df8eacd4cec6d18b977d066824f1e8d..7d5fc06af3f49741e469ee2b4e1d8e43f5ac0f1d 100644
--- a/lib/screens/onBoarding/7.dart
+++ b/lib/screens/onBoarding/7.dart
@@ -76,7 +76,7 @@ class OnboardingStepNine extends StatelessWidget {
key: Key('goStep8'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/8.dart b/lib/screens/onBoarding/8.dart
index 56733e264510a9f716e12e3913caad9bb5775c20..3a16dde6d7442341f1ec3b9ce67d1a4723f531fa 100644
--- a/lib/screens/onBoarding/8.dart
+++ b/lib/screens/onBoarding/8.dart
@@ -62,56 +62,12 @@ class OnboardingStepTen extends StatelessWidget {
],
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),
-
Text('${_generateWalletProvider.nbrWord + 1}',
key: Key('askedWord'),
style: TextStyle(
fontSize: isTall ? 17 : 10,
- color: Color(0xffD28928),
+ color: orangeC,
fontWeight: FontWeight.w400)),
SizedBox(height: isTall ? 10 : 0),
Container(
@@ -162,7 +118,7 @@ class OnboardingStepTen extends StatelessWidget {
key: Key('goStep9'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart
index 22e67c9a1fe906f70acdb7970a03ec59ed996253..67b9cc5a30ae617cf7f60bba24739816fa9685ea 100644
--- a/lib/screens/onBoarding/9.dart
+++ b/lib/screens/onBoarding/9.dart
@@ -47,7 +47,7 @@ class OnboardingStepEleven extends StatelessWidget {
key: Key('goStep10'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xffD28928),
+ primary: orangeC,
onPrimary: Colors.white, // foreground
),
onPressed: () {
diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
index 851a4c5802ab48dc68af22ca7bdd740f50eddb2a..3f8148a1f537c336927059cf7f105a9e45946897 100644
--- a/lib/screens/settings.dart
+++ b/lib/screens/settings.dart
@@ -44,7 +44,7 @@ class SettingsScreen extends StatelessWidget {
child: ElevatedButton(
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xFFFFCA6F), // background
+ primary: yellowC, // background
onPrimary: Colors.black, // foreground
),
onPressed: () => Navigator.push(
@@ -65,7 +65,7 @@ class SettingsScreen extends StatelessWidget {
key: Key('generateKeychain'),
style: ElevatedButton.styleFrom(
elevation: 5,
- primary: Color(0xFFFFCA6F), // background
+ primary: yellowC, // background
onPrimary: Colors.black, // foreground
),
onPressed: !_myWallets.checkIfWalletExist()
diff --git a/lib/screens/templateScreen.dart b/lib/screens/templateScreen.dart
index 6b34beab74134d89a9ae62f018c1b2d771149318..cf6dfd6abd34b9cac768b149ff3d828659d66950 100644
--- a/lib/screens/templateScreen.dart
+++ b/lib/screens/templateScreen.dart
@@ -1,4 +1,5 @@
import 'package:flutter/services.dart';
+import 'package:gecko/globals.dart';
import 'package:gecko/screens/home.dart';
import 'package:flutter/material.dart';
// import 'package:gecko/models/home.dart';
@@ -35,8 +36,8 @@ class TemplateScreen extends StatelessWidget {
width: 40.0,
child: Icon(Icons.home, color: Colors.grey[850]),
),
- backgroundColor: Color(
- 0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255),
+ backgroundColor:
+ floattingYellow, //smoothYellow, //Color.fromARGB(500, 204, 255, 255),
))),
body: SafeArea(
child: Column(children: <Widget>[
@@ -56,7 +57,7 @@ class TemplateScreen extends StatelessWidget {
SizedBox(height: 20),
ElevatedButton(
style: ElevatedButton.styleFrom(
- primary: Color(0xffFFD68E), // background
+ primary: yellowC, // background
onPrimary: Colors.black, // foreground
),
onPressed: () {