Compare commits
1 Commits
master
...
MakeItMult
| Author | SHA1 | Date |
|---|---|---|
 poka
|
f4aac1e1a4 |
|
|
@ -1,4 +1,5 @@
|
|||
import 'dart:io';
|
||||
import 'package:flutter/cupertino.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 orange = Color(0xffD28928);
|
||||
Color yellow = Color(0xFFFFCA6F);
|
||||
Color floattingYellow = Color(0xffEFEFBF);
|
||||
Color backgroundColor = Color(0xFFF5F5F5);
|
||||
|
|
|
|||
|
|
@ -150,14 +150,14 @@ 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(
|
||||
color: const Color(0xffFFD58D),
|
||||
color: yellow,
|
||||
foregroundColor: const Color(0xFF000000),
|
||||
),
|
||||
primaryColor: Color(0xffFFD58D),
|
||||
primaryColor: yellow,
|
||||
textTheme: TextTheme(
|
||||
bodyText1: TextStyle(),
|
||||
bodyText2: TextStyle(),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:bubble/bubble.dart';
|
||||
import 'package:gecko/globals.dart';
|
||||
|
||||
class CommonElements {
|
||||
// Exemple de Widget
|
||||
|
|
@ -101,9 +102,9 @@ class CommonElements {
|
|||
return Container(
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: Color(0xffFFD58D), // button color
|
||||
color: yellow, // button color
|
||||
child: InkWell(
|
||||
splashColor: Color(0xffD28928), // inkwell color
|
||||
splashColor: orange, // inkwell color
|
||||
child: Padding(
|
||||
padding: padding,
|
||||
child: Image(image: image, height: imgHight)),
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
|||
}
|
||||
}))
|
||||
],
|
||||
backgroundColor: Color(0xffFFD58D),
|
||||
backgroundColor: yellow,
|
||||
),
|
||||
floatingActionButton: Container(
|
||||
height: 80.0,
|
||||
|
|
@ -96,8 +96,7 @@ 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,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -302,8 +301,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
|||
child: Text(
|
||||
_historyProvider.historySwitchButtun,
|
||||
style: TextStyle(
|
||||
fontSize: 15,
|
||||
color: Color(0xffD28928)))),
|
||||
fontSize: 15, color: orange))),
|
||||
// const Divider(
|
||||
// color: Colors.grey,
|
||||
// height: 5,
|
||||
|
|
@ -377,7 +375,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: orange)),
|
||||
onPressed: () {
|
||||
// if (_formKey.currentState.validate()) {
|
||||
// _formKey.currentState.save();
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class HomeScreen extends StatelessWidget {
|
|||
height: 130),
|
||||
]),
|
||||
decoration: BoxDecoration(
|
||||
color: Color(0xffD28928),
|
||||
color: orange,
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
|
|
@ -129,9 +129,9 @@ class HomeScreen extends StatelessWidget {
|
|||
}
|
||||
}))
|
||||
],
|
||||
backgroundColor: Color(0xffFFD58D),
|
||||
backgroundColor: yellow,
|
||||
),
|
||||
backgroundColor: Color(0xffF9F9F1),
|
||||
backgroundColor: backgroundColor,
|
||||
body: Builder(
|
||||
builder: (ctx) => StatefulWrapper(
|
||||
onInit: () {
|
||||
|
|
@ -175,10 +175,9 @@ class HomeScreen extends StatelessWidget {
|
|||
Container(
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: Color(0xffFFD58D), // button color
|
||||
color: yellow, // button color
|
||||
child: InkWell(
|
||||
splashColor: Color(
|
||||
0xffD28928), // inkwell color
|
||||
splashColor: orange, // inkwell color
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(22),
|
||||
child: Image(
|
||||
|
|
@ -221,10 +220,9 @@ class HomeScreen extends StatelessWidget {
|
|||
Container(
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: Color(0xffFFD58D), // button color
|
||||
color: yellow, // button color
|
||||
child: InkWell(
|
||||
splashColor: Color(
|
||||
0xffD28928), // inkwell color
|
||||
splashColor: orange, // inkwell color
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 20, vertical: 16),
|
||||
|
|
@ -269,10 +267,9 @@ class HomeScreen extends StatelessWidget {
|
|||
child: ClipOval(
|
||||
key: Key('manageWallets'),
|
||||
child: Material(
|
||||
color: Color(0xffFFD58D), // button color
|
||||
color: yellow, // button color
|
||||
child: InkWell(
|
||||
splashColor: Color(
|
||||
0xffD28928), // inkwell color
|
||||
splashColor: orange, // inkwell color
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(23),
|
||||
child: Image(
|
||||
|
|
@ -323,7 +320,7 @@ class HomeScreen extends StatelessWidget {
|
|||
]))
|
||||
]),
|
||||
// bottomNavigationBar: BottomNavigationBar(
|
||||
// backgroundColor: Color(0xffFFD58D),
|
||||
// backgroundColor: yellow,
|
||||
// fixedColor: Colors.grey[850],
|
||||
// unselectedItemColor: Color(0xffBD935C),
|
||||
// type: BottomNavigationBarType.fixed,
|
||||
|
|
|
|||
|
|
@ -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: orange,
|
||||
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], //yellow, // background
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: _changePin.newPin.text != ''
|
||||
|
|
|
|||
|
|
@ -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], //yellow, // background
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: (_generateWalletProvider
|
||||
|
|
|
|||
|
|
@ -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, //yellow, //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: orange,
|
||||
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: yellow, // 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: orange)),
|
||||
SizedBox(height: 1)
|
||||
]),
|
||||
Text(
|
||||
|
|
|
|||
|
|
@ -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: orange,
|
||||
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: yellow, // 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: orange)),
|
||||
SizedBox(height: 1)
|
||||
]),
|
||||
Text(
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ class UnlockingWallet extends StatelessWidget {
|
|||
StreamController<ErrorAnimationType> errorController;
|
||||
final formKey = GlobalKey<FormState>();
|
||||
bool hasError = false;
|
||||
var pinColor = Color(0xffF9F9F1);
|
||||
var pinColor = backgroundColor;
|
||||
var walletPin = '';
|
||||
String resultPay;
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ class UnlockingWallet extends StatelessWidget {
|
|||
cursorColor: Colors.black,
|
||||
animationDuration: Duration(milliseconds: 300),
|
||||
textStyle: TextStyle(fontSize: 20, height: 1.6),
|
||||
backgroundColor: Color(0xffF9F9F1),
|
||||
backgroundColor: backgroundColor,
|
||||
enableActiveFill: false,
|
||||
errorAnimationController: errorController,
|
||||
controller: _enterPin,
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class WalletOptions extends StatelessWidget {
|
|||
child: Column(children: <Widget>[
|
||||
Container(
|
||||
height: isTall ? 15 : 0,
|
||||
color: Color(0xffFFD68E),
|
||||
color: yellow,
|
||||
),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
|
|
@ -96,7 +96,7 @@ class WalletOptions extends StatelessWidget {
|
|||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
Color(0xffFFD68E),
|
||||
yellow,
|
||||
Color(0xfffafafa),
|
||||
],
|
||||
)),
|
||||
|
|
@ -318,7 +318,7 @@ class WalletOptions extends StatelessWidget {
|
|||
new BorderRadius.circular(8),
|
||||
),
|
||||
elevation: 1,
|
||||
primary: Color(0xffD28928), // background
|
||||
primary: orange, // background
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
|
|||
import 'package:gecko/screens/commonElements.dart';
|
||||
import 'package:gecko/screens/myWallets/walletOptions.dart';
|
||||
import 'package:gecko/screens/onBoarding/0_noKeychainFound.dart';
|
||||
import 'package:gecko/screens/onBoarding/1.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
// ignore: must_be_immutable
|
||||
|
|
@ -32,57 +33,89 @@ class WalletsHome extends StatelessWidget {
|
|||
myWalletProvider.getDefaultWallet();
|
||||
}
|
||||
|
||||
log.d("${myWalletProvider.pinCode},${myWalletProvider.pinLenght}");
|
||||
// log.d("${myWalletProvider.pinCode},${myWalletProvider.pinLenght}");
|
||||
|
||||
return WillPopScope(
|
||||
onWillPop: () {
|
||||
Navigator.popUntil(
|
||||
context,
|
||||
ModalRoute.withName('/'),
|
||||
);
|
||||
return Future<bool>.value(true);
|
||||
},
|
||||
child: Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: IconButton(
|
||||
icon: Icon(Icons.arrow_back, color: Colors.black),
|
||||
onPressed: () {
|
||||
Navigator.popUntil(
|
||||
context,
|
||||
ModalRoute.withName('/'),
|
||||
);
|
||||
}),
|
||||
title: Text('Mes portefeuilles',
|
||||
key: Key('myWallets'),
|
||||
style: TextStyle(color: Colors.grey[850])),
|
||||
backgroundColor: Color(0xffFFD58D),
|
||||
),
|
||||
floatingActionButton: Visibility(
|
||||
visible: (isWalletsExists && firstWalletDerivation != -1),
|
||||
onWillPop: () {
|
||||
Navigator.popUntil(
|
||||
context,
|
||||
ModalRoute.withName('/'),
|
||||
);
|
||||
return Future<bool>.value(true);
|
||||
},
|
||||
child: Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: IconButton(
|
||||
icon: Icon(Icons.arrow_back, color: Colors.black),
|
||||
onPressed: () {
|
||||
Navigator.popUntil(
|
||||
context,
|
||||
ModalRoute.withName('/'),
|
||||
);
|
||||
}),
|
||||
title: Text('Mes portefeuilles',
|
||||
key: Key('myWallets'), style: TextStyle(color: Colors.grey[850])),
|
||||
backgroundColor: yellow,
|
||||
),
|
||||
floatingActionButton: Visibility(
|
||||
visible: (isWalletsExists && firstWalletDerivation != -1),
|
||||
child: Container(
|
||||
height: 80.0,
|
||||
width: 80.0,
|
||||
child: FittedBox(
|
||||
child: FloatingActionButton(
|
||||
key: Key('addDerivation'),
|
||||
heroTag: "buttonGenerateWallet",
|
||||
onPressed: () {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return addNewDerivation(context, 1);
|
||||
});
|
||||
},
|
||||
child: Container(
|
||||
height: 80.0,
|
||||
width: 80.0,
|
||||
child: FittedBox(
|
||||
child: FloatingActionButton(
|
||||
key: Key('addDerivation'),
|
||||
heroTag: "buttonGenerateWallet",
|
||||
onPressed: () {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return addNewDerivation(context, 1);
|
||||
});
|
||||
},
|
||||
child: Container(
|
||||
height: 40,
|
||||
width: 40,
|
||||
child: Icon(Icons.person_add_alt_1_rounded,
|
||||
color: Colors.grey[850])),
|
||||
backgroundColor: Color(0xffEFEFBF))))),
|
||||
body: SafeArea(
|
||||
child: !isWalletsExists
|
||||
? NoKeyChainScreen()
|
||||
: myWalletsTiles(context))));
|
||||
height: 40,
|
||||
width: 40,
|
||||
child: Icon(Icons.person_add_alt_1_rounded,
|
||||
color: Colors.grey[850])),
|
||||
backgroundColor: floattingYellow,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
body: SafeArea(
|
||||
child: !isWalletsExists
|
||||
? NoKeyChainScreen()
|
||||
: Column(children: <Widget>[
|
||||
Expanded(
|
||||
child: myWalletsTiles(context),
|
||||
),
|
||||
myChestOptions(context)
|
||||
]),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget myChestOptions(BuildContext context) {
|
||||
return Column(children: <Widget>[
|
||||
ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: yellow, // background
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: () => Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(builder: (context) {
|
||||
return OnboardingStepOne();
|
||||
}),
|
||||
).then((value) => {
|
||||
if (value == true) {Navigator.pop(context)}
|
||||
}),
|
||||
child: Text("Changer de coffre", style: TextStyle(fontSize: 16))),
|
||||
SizedBox(height: 50)
|
||||
]);
|
||||
}
|
||||
|
||||
Widget myWalletsTiles(BuildContext context) {
|
||||
|
|
@ -168,8 +201,8 @@ class WalletsHome extends StatelessWidget {
|
|||
// contentPadding: const EdgeInsets.only(left: 7.0),
|
||||
tileColor:
|
||||
_repository.id()[1] == defaultWallet.id()[1]
|
||||
? Color(0xffD28928)
|
||||
: Color(0xffFFD58D),
|
||||
? orange
|
||||
: yellow,
|
||||
// leading: Text('IMAGE'),
|
||||
|
||||
// subtitle: Text(_repository.split(':')[3],
|
||||
|
|
@ -184,7 +217,7 @@ class WalletsHome extends StatelessWidget {
|
|||
fontSize: 16.0,
|
||||
color: _repository.id()[1] ==
|
||||
defaultWallet.id()[1]
|
||||
? Color(0xffF9F9F1)
|
||||
? backgroundColor
|
||||
: Colors.black)))),
|
||||
// dense: true,
|
||||
onTap: () {
|
||||
|
|
@ -231,7 +264,7 @@ class WalletsHome extends StatelessWidget {
|
|||
key: Key('validDerivation'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 1,
|
||||
primary: Color(0xffFFD68E), // background
|
||||
primary: yellow, // background
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: () async {
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
@ -29,10 +30,10 @@ class NoKeyChainScreen extends StatelessWidget {
|
|||
Container(
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: Color(0xffFFD58D), // button color
|
||||
color: yellow, // button color
|
||||
child: InkWell(
|
||||
key: Key('goStep1'),
|
||||
splashColor: Color(0xffD28928), // inkwell color
|
||||
splashColor: orange, // inkwell color
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(8),
|
||||
child: Image(
|
||||
|
|
@ -71,9 +72,9 @@ class NoKeyChainScreen extends StatelessWidget {
|
|||
Container(
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: Color(0xffFFD58D), // button color
|
||||
color: yellow, // button color
|
||||
child: InkWell(
|
||||
splashColor: Color(0xffD28928), // inkwell color
|
||||
splashColor: orange, // inkwell color
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(12),
|
||||
child:
|
||||
|
|
|
|||
|
|
@ -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: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ class OnboardingStepTwelve extends StatelessWidget {
|
|||
key: Key('goStep11'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -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: orange,
|
||||
onPressed: () async {
|
||||
generatedWallet = await _generateWalletProvider
|
||||
.changePinCode(reload: false);
|
||||
|
|
@ -87,7 +88,7 @@ class OnboardingStepThirteen extends StatelessWidget {
|
|||
key: Key('changeSecretCode'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffFFD58D),
|
||||
primary: yellow,
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: () async {
|
||||
|
|
@ -105,7 +106,7 @@ class OnboardingStepThirteen extends StatelessWidget {
|
|||
key: Key('goStep12'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () async {
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ class OnboardingStepFourteen extends StatelessWidget {
|
|||
cursorColor: Colors.black,
|
||||
animationDuration: Duration(milliseconds: 300),
|
||||
textStyle: TextStyle(fontSize: 20, height: 1.6),
|
||||
backgroundColor: Color(0xffF9F9F1),
|
||||
backgroundColor: backgroundColor,
|
||||
enableActiveFill: false,
|
||||
errorAnimationController: errorController,
|
||||
controller: _enterPin,
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ class OnboardingStepFiveteen extends StatelessWidget {
|
|||
key: Key('goWalletHome'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -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: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class OnboardingStepFor extends StatelessWidget {
|
|||
key: Key('goStep4'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ class OnboardingStepFive extends StatelessWidget {
|
|||
key: Key('goStep5'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class OnboardingStepSeven extends StatelessWidget {
|
|||
key: Key('goStep6'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ class OnboardingStepEight extends StatelessWidget {
|
|||
key: Key('goStep7'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ class OnboardingStepNine extends StatelessWidget {
|
|||
key: Key('generateMnemonic'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffFFD58D),
|
||||
primary: yellow,
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
@ -76,7 +76,7 @@ class OnboardingStepNine extends StatelessWidget {
|
|||
key: Key('goStep8'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ class OnboardingStepTen extends StatelessWidget {
|
|||
key: Key('askedWord'),
|
||||
style: TextStyle(
|
||||
fontSize: isTall ? 17 : 10,
|
||||
color: Color(0xffD28928),
|
||||
color: orange,
|
||||
fontWeight: FontWeight.w400)),
|
||||
SizedBox(height: isTall ? 10 : 0),
|
||||
Container(
|
||||
|
|
@ -162,7 +162,7 @@ class OnboardingStepTen extends StatelessWidget {
|
|||
key: Key('goStep9'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class OnboardingStepEleven extends StatelessWidget {
|
|||
key: Key('goStep10'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xffD28928),
|
||||
primary: orange,
|
||||
onPrimary: Colors.white, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class SettingsScreen extends StatelessWidget {
|
|||
child: ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
elevation: 5,
|
||||
primary: Color(0xFFFFCA6F), // background
|
||||
primary: yellow, // 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: yellow, // background
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: !_myWallets.checkIfWalletExist()
|
||||
|
|
|
|||
|
|
@ -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,7 @@ 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,
|
||||
))),
|
||||
body: SafeArea(
|
||||
child: Column(children: <Widget>[
|
||||
|
|
@ -56,7 +56,7 @@ class TemplateScreen extends StatelessWidget {
|
|||
SizedBox(height: 20),
|
||||
ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
primary: Color(0xffFFD68E), // background
|
||||
primary: yellow, // background
|
||||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
|
|
|
|||
Loading…
Reference in New Issue