From f9bb49b3d08a92df28e9e5431a628b2b383cfe6b Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 8 Nov 2021 23:12:25 +0100 Subject: [PATCH] Globalise colors --- lib/globals.dart | 7 +++ lib/main.dart | 2 +- lib/screens/commonElements.dart | 3 +- lib/screens/history.dart | 9 ++-- lib/screens/home.dart | 11 ++--- lib/screens/myWallets/changePin.dart | 6 +-- .../myWallets/confirmWalletStorage.dart | 4 +- lib/screens/myWallets/generateWallets.dart | 13 ++--- lib/screens/myWallets/importWallet.dart | 9 ++-- lib/screens/myWallets/walletOptions.dart | 6 +-- lib/screens/myWallets/walletsHome.dart | 6 +-- lib/screens/onBoarding/0_noKeychainFound.dart | 5 +- lib/screens/onBoarding/1.dart | 3 +- lib/screens/onBoarding/10.dart | 2 +- lib/screens/onBoarding/11.dart | 5 +- .../onBoarding/13_congratulations.dart | 2 +- lib/screens/onBoarding/2.dart | 3 +- lib/screens/onBoarding/3.dart | 2 +- lib/screens/onBoarding/4.dart | 2 +- lib/screens/onBoarding/5.dart | 2 +- lib/screens/onBoarding/6.dart | 2 +- lib/screens/onBoarding/7.dart | 2 +- lib/screens/onBoarding/8.dart | 48 +------------------ lib/screens/onBoarding/9.dart | 2 +- lib/screens/settings.dart | 4 +- lib/screens/templateScreen.dart | 7 +-- 26 files changed, 67 insertions(+), 100 deletions(-) diff --git a/lib/globals.dart b/lib/globals.dart index 9a29df7..8953573 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 90bd4d4..2af5d1e 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 b6c3d6b..78c6621 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 a6ca095..7948006 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 f645ebb..3c37a15 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 2242fe5..19a87f0 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 fcac81a..0125c55 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 9847000..b1d623e 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 a054762..c825d74 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 121e7c1..fdc633a 100644 --- a/lib/screens/myWallets/walletOptions.dart +++ b/lib/screens/myWallets/walletOptions.dart @@ -88,7 +88,7 @@ class WalletOptions extends StatelessWidget { child: Column(children: [ 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 03b0c25..0f0b441 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 3cc2c10..c69d4d6 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 cf6ba13..d58c8a3 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 798d463..12c8211 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 42969df..d0173cc 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 0a1f432..58ad16a 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 0c22019..0d7a3f9 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 2300cbb..6d589cc 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 bb08542..8d1feec 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 c2135ba..426770f 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 97eacfe..54155cf 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 817e0bb..7d5fc06 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 56733e2..3a16dde 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 22e67c9..67b9cc5 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 851a4c5..3f8148a 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 6b34bea..cf6dfd6 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: [ @@ -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: () {