diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7bf1ee64c31af8afcb8c8d1491be8e94a4e9fb83..101936ce33903de64ab8bd3ef235dafed6c4d3ff 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
<application
android:name="io.flutter.app.FlutterApplication"
android:label="gecko">
- <!-- android:icon="@mipmap/launcher_icon"> -->
+ <!-- android:icon="@mipmap/ic_launcher"> -->
<activity
android:name=".MainActivity"
android:launchMode="singleTop"
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..bafaafdfb0b29789295e040c39891081277fc426 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
deleted file mode 100644
index a18621b26e2050d3c0abd43327e4c0b5c68e64fe..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..9a3a690c821d3dd59e81b328aebf08e166451845 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
deleted file mode 100644
index 6755bb41b0eb8c54a9774144c4b5522c3432f00e..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d4391482be68e9e4a07fab769b5de337d16eb1..e3b34c585563a7f21c8436257b4aa649dbe0b6a1 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
deleted file mode 100644
index bd05bf8690925426590d7d5706cfa6e7d5a569b1..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..021ec4fda5100c400aaabbe22cc4b2b8fb9aa95b 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
deleted file mode 100644
index 4945891e6f3b8ea6e8fee27c9a850750db524af1..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372eebdb28e45604e46eeda8dd24651419bc0..5cda28a82658f5bb91f1d74e86c4fbf4215a9380 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
deleted file mode 100644
index cbd60d0cc89d9a7742230247d37c976ca668c389..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and /dev/null differ
diff --git a/assets/icon/gecko5bduniter2.png b/assets/icon/gecko5bduniter2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eed27053a6e5f05ffdfa60d5361376595059c0d
Binary files /dev/null and b/assets/icon/gecko5bduniter2.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index 90ecf02a9edb77d3e567fe6a7105291b285b5082..e91355631d40242d749a3e7c83f1969885d438ed 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 30b909c2f6f9eb1306d02183f3dbb5cb77a6e8a5..d63359fb378ca0a2326165f0fdddd5e87db7769b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 87b7b2545308b13acc6c8454141f85654faad406..c72faca0f875b2018d810b9855d00778f40eff7f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index d92351139e835a7c30738075945e7d3caab04e81..bb56cf624324fc0a7dbf4922e94caf45f4c3aa7f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 7ac6db45a49fd8086b91f7ee41b939c65b303af8..9de36fe01e0479c3c3b8fe63ee2724a3926e701e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 488718637ad0d96b2da62c4a19baf581be77634c..7a8533adcafd2a9460bf1ccdd34b88062137ed13 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 0b116b00ee5485e5274316e71453c852426617d5..12758ed33584a23a119a1c6bd2662ba0b4e07f96 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 87b7b2545308b13acc6c8454141f85654faad406..c72faca0f875b2018d810b9855d00778f40eff7f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index d8f62058758d4919f240e4742bdf26f2698716b7..e9f0de1dad0ae7a9a6c5a95f3c8209af992bde25 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index a34e8df14b90d39de29fe792b7b2d456d88a3668..f21f515c434189038fbc4f1acec686cab8becd38 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index a34e8df14b90d39de29fe792b7b2d456d88a3668..f21f515c434189038fbc4f1acec686cab8becd38 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 506fe20238bf57b1347a672bc1ec929459e6d859..daadf23de05cde3325b81487b1f41e59fc57b730 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 20cd0675e6de6ff5e7d9478be54d82c7a6510593..ee8674dbde36c50d94c0ab017fa7ce772f42e26e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index d37c49bb8e7fb544e5d538fdbca659b86a51fb6f..b3a80eb00f553e6441d0a4a5c6cf5924fa693d44 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index 288e205907d2c3f737b277c51367fc3a13cb98d8..83b0ea4b7dda5aa466c5eb5569b4fd88a8f221b9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/lib/main.dart b/lib/main.dart
index b90210deb01913407a8657bbf7ee47a665da67dd..f8867a93dd095d94ceba45c41f52480a62419338 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -38,8 +38,17 @@ class Gecko extends StatelessWidget {
);
return MaterialApp(
title: 'Äžecko',
- theme:
- ThemeData(primaryColor: Colors.blue[50], accentColor: Colors.black),
+ theme: ThemeData(
+ primaryColor: Color(0xffD28928),
+ accentColor: Color(0xffFFD68E),
+ textTheme: TextTheme(
+ bodyText1: TextStyle(),
+ bodyText2: TextStyle(),
+ ).apply(
+ bodyColor: Color(0xff855F2D),
+ // displayColor: Colors.blue,
+ ),
+ ),
home: GraphQLProvider(
client: _client,
child: HomeScreen(),
diff --git a/lib/ui/generateWallets.dart b/lib/ui/generateWallets.dart
index 71e11978588ad97ea3bfae8a15452675471672cc..47a30732b9a805659c8a25b421961466cebe4e6f 100644
--- a/lib/ui/generateWallets.dart
+++ b/lib/ui/generateWallets.dart
@@ -17,35 +17,63 @@ class _GenerateWalletState extends State<GenerateWalletScreen> {
DubpRust.setup();
}
- TextEditingController _mnemonic = new TextEditingController();
+ TextEditingController _mnemonicController = new TextEditingController();
TextEditingController _pubkey = new TextEditingController();
TextEditingController _pin = new TextEditingController();
+ String generatedMnemonic;
+ NewWallet actualWallet;
final formKey = GlobalKey<FormState>();
@override
Widget build(BuildContext context) {
return SafeArea(
child: Column(children: <Widget>[
+ SizedBox(height: 8),
+ Text(
+ 'Clé publique:',
+ style: TextStyle(
+ fontSize: 15.0,
+ color: Colors.grey[600],
+ fontWeight: FontWeight.w400),
+ ),
TextField(
enabled: false,
- controller: this._mnemonic,
- maxLines: 2,
+ controller: this._pubkey,
+ maxLines: 1,
textAlign: TextAlign.center,
decoration: InputDecoration(),
style: TextStyle(
- fontSize: 15.0,
+ fontSize: 14.0,
color: Colors.black,
fontWeight: FontWeight.bold)),
+ SizedBox(height: 8),
+ Text(
+ 'Phrase secrète:',
+ style: TextStyle(
+ fontSize: 15.0,
+ color: Colors.grey[600],
+ fontWeight: FontWeight.w400),
+ ),
TextField(
enabled: false,
- controller: this._pubkey,
- maxLines: 1,
+ controller: this._mnemonicController,
+ maxLines: 3,
textAlign: TextAlign.center,
- decoration: InputDecoration(),
+ decoration: InputDecoration(
+ contentPadding: EdgeInsets.all(15.0),
+ ),
style: TextStyle(
- fontSize: 14.0,
+ fontSize: 22.0,
color: Colors.black,
- fontWeight: FontWeight.bold)),
+ fontWeight: FontWeight.w400)),
+ SizedBox(height: 8),
+ Text(
+ 'Code PIN:',
+ style: TextStyle(
+ fontSize: 15.0,
+ color: Colors.grey[600],
+ fontWeight: FontWeight.w400),
+ ),
TextField(
enabled: false,
controller: this._pin,
@@ -53,21 +81,47 @@ class _GenerateWalletState extends State<GenerateWalletScreen> {
textAlign: TextAlign.center,
decoration: InputDecoration(),
style: TextStyle(
- fontSize: 20.0,
+ fontSize: 30.0,
color: Colors.black,
fontWeight: FontWeight.bold)),
SizedBox(height: 12),
new RaisedButton(
+ color: Color(0xffFFD68E),
onPressed: () => generateMnemonic(),
child: Text('Générer un wallet', style: TextStyle(fontSize: 20))),
- SizedBox(height: 20)
+ SizedBox(height: 30),
+ Expanded(
+ child: Align(
+ alignment: Alignment.bottomCenter,
+ child: new RaisedButton(
+ color: Color(0xffFFD68E),
+ onPressed: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(builder: (context) {
+ return ValidStoreWalletScreen(
+ generatedMnemonic: this.generatedMnemonic,
+ generatedWallet:
+ this.actualWallet); //, this.actualWallet);
+ }),
+ ).then((value) => setState(() {
+ if (value) {
+ _pin.clear();
+ _mnemonicController.clear();
+ _pubkey.clear();
+ }
+ }));
+ },
+ child: Text('Enregistrer ce wallet',
+ style: TextStyle(fontSize: 20))))),
+ SizedBox(height: 15)
]));
}
Future generateMnemonic() async {
- String generatedMnemonic;
try {
- generatedMnemonic = await DubpRust.genMnemonic(language: Language.french);
+ this.generatedMnemonic =
+ await DubpRust.genMnemonic(language: Language.french);
} catch (e, stack) {
print(e);
if (kReleaseMode) {
@@ -77,15 +131,13 @@ class _GenerateWalletState extends State<GenerateWalletScreen> {
);
}
}
-
- generateWallet(generatedMnemonic);
+ this.actualWallet = await generateWallet(this.generatedMnemonic);
+ return this.generatedMnemonic;
}
Future generateWallet(generatedMnemonic) async {
- final walletFile = await _localWallet;
- NewWallet newWallet;
try {
- newWallet = await DubpRust.genWalletFromMnemonic(
+ this.actualWallet = await DubpRust.genWalletFromMnemonic(
language: Language.french, mnemonic: generatedMnemonic);
} catch (e, stack) {
print(e);
@@ -98,12 +150,82 @@ class _GenerateWalletState extends State<GenerateWalletScreen> {
}
setState(() {
- this._mnemonic.text = generatedMnemonic;
- this._pubkey.text = newWallet.publicKey;
- this._pin.text = newWallet.pin;
+ this._mnemonicController.text = generatedMnemonic;
+ this._pubkey.text = actualWallet.publicKey;
+ this._pin.text = actualWallet.pin;
});
- return walletFile.writeAsString('${newWallet.dewif}');
+ return actualWallet;
+ }
+}
+
+class ValidStoreWalletScreen extends StatefulWidget {
+ final String generatedMnemonic;
+ final NewWallet generatedWallet;
+
+ ValidStoreWalletScreen(
+ {Key validationKey,
+ @required this.generatedMnemonic,
+ @required this.generatedWallet})
+ : super(key: validationKey);
+
+ @override
+ _ValidStoreWalletScreen createState() => _ValidStoreWalletScreen();
+}
+
+class _ValidStoreWalletScreen extends State<ValidStoreWalletScreen> {
+ void initState() {
+ super.initState();
+ // DubpRust.setup();
+ this._mnemonicController.text = widget.generatedMnemonic;
+ this._pubkey.text = widget.generatedWallet.publicKey;
+ }
+
+ TextEditingController _mnemonicController = new TextEditingController();
+ TextEditingController _pubkey = new TextEditingController();
+ TextEditingController _pin = new TextEditingController();
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: AppBar(),
+ body: Center(
+ child: Column(children: <Widget>[
+ TextField(
+ enabled: false,
+ controller: this._mnemonicController,
+ maxLines: 2,
+ textAlign: TextAlign.center,
+ decoration: InputDecoration(),
+ style: TextStyle(
+ fontSize: 15.0,
+ color: Colors.black,
+ fontWeight: FontWeight.bold)),
+ TextField(
+ enabled: false,
+ controller: this._pubkey,
+ maxLines: 1,
+ textAlign: TextAlign.center,
+ decoration: InputDecoration(),
+ style: TextStyle(
+ fontSize: 14.0,
+ color: Colors.black,
+ fontWeight: FontWeight.bold)),
+ new RaisedButton(
+ color: Color(0xffFFD68E),
+ onPressed: () => storeWallet(widget.generatedWallet),
+ child: Text('Confirmer', style: TextStyle(fontSize: 20))),
+ ]),
+ ),
+ );
+ }
+
+ Future storeWallet(actualWallet) async {
+ final walletFile = await _localWallet;
+ walletFile.writeAsString('${widget.generatedWallet.dewif}');
+ _pin.clear();
+ Navigator.pop(context, true);
+ FocusScope.of(context).unfocus();
}
Future<String> get _localPath async {
diff --git a/lib/ui/historyScreen.dart b/lib/ui/historyScreen.dart
index 69506f40e5005fff71f2f50dced873f174a870a1..7569a6f01afda30143dd6e28cfde788cbe4f6812 100644
--- a/lib/ui/historyScreen.dart
+++ b/lib/ui/historyScreen.dart
@@ -64,6 +64,7 @@ class HistoryScreenState extends State<HistoryScreen> {
print('Build this.pubkey : ' + this.pubkey);
print('isBuilding: ' + isBuilding.toString());
return Column(children: <Widget>[
+ SizedBox(height: 8),
TextField(
// Entrée de la pubkey
onChanged: (text) {
@@ -84,10 +85,7 @@ class HistoryScreenState extends State<HistoryScreen> {
errorBorder: InputBorder.none,
disabledBorder: InputBorder.none,
),
- style: TextStyle(
- fontSize: 15.0,
- color: Colors.black,
- fontWeight: FontWeight.bold)),
+ style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold)),
historyQuery(),
]);
}
@@ -186,7 +184,7 @@ class HistoryScreenState extends State<HistoryScreen> {
if (this.pubkey != '')
Text(balance.toString() + ' Äž1',
textAlign: TextAlign.center,
- style: TextStyle(fontSize: 30.0, color: Colors.black)),
+ style: TextStyle(fontSize: 30.0)),
for (var repository in _transBC)
ListTile(
contentPadding: const EdgeInsets.all(5.0),
diff --git a/lib/ui/home.dart b/lib/ui/home.dart
index 65897771cf4ace3b20f9ce5bc13777235a205f1b..171397a46fa67558c71f0a31bfe4122c68c55d53 100644
--- a/lib/ui/home.dart
+++ b/lib/ui/home.dart
@@ -31,9 +31,8 @@ class HomeScreenState extends State<HomeScreen> {
@override
Widget build(BuildContext context) {
- return MaterialApp(
- home: Scaffold(
- backgroundColor: Colors.grey[300],
+ return Scaffold(
+ backgroundColor: Color(0xffF9F9F1),
body: SafeArea(
child: IndexedStack(
index: currentIndex,
@@ -62,12 +61,15 @@ class HomeScreenState extends State<HomeScreen> {
height: 40.0,
width: 40.0,
child: Image.asset('images/scanner.png')),
- backgroundColor: Color.fromARGB(500, 204, 255, 255),
+ backgroundColor: Color(
+ 0xffEFEFBF), //Color(0xffFFD68E), //Color.fromARGB(500, 204, 255, 255),
),
),
),
bottomNavigationBar: BottomNavigationBar(
- fixedColor: Colors.black,
+ backgroundColor: Color(0xffFFD68E),
+ fixedColor: Color(0xff855F2D),
+ unselectedItemColor: Color(0xffBD935C),
type: BottomNavigationBarType.fixed,
onTap: onTabTapped,
currentIndex: currentIndex,
@@ -86,6 +88,6 @@ class HomeScreenState extends State<HomeScreen> {
)
],
),
- ));
+ );
}
}
diff --git a/lib/ui/myWallets.dart b/lib/ui/myWallets.dart
index 73b325a3ea33a8bc9278cab8461ec4bdfda1fd05..e84bf0835155a0c689e91e4ee5ad7edf2d3290a2 100644
--- a/lib/ui/myWallets.dart
+++ b/lib/ui/myWallets.dart
@@ -30,12 +30,13 @@ class _MyWalletState extends State<MyWalletsScreen> {
bool hasError = false;
String validPin = 'NO PIN';
String currentText = "";
- var pinColor = Colors.grey[300];
+ var pinColor = Color(0xffF9F9F1);
@override
Widget build(BuildContext context) {
return SafeArea(
child: Column(children: <Widget>[
+ SizedBox(height: 8),
InkWell(
child: TextField(
enabled: false,
@@ -113,9 +114,9 @@ class _MyWalletState extends State<MyWalletsScreen> {
}
},
onChanged: (value) {
- if (pinColor != Colors.grey[300]) {
+ if (pinColor != Color(0xffF9F9F1)) {
setState(() {
- pinColor = Colors.grey[300];
+ pinColor = Color(0xffF9F9F1);
});
}
print(value);
diff --git a/pubspec.yaml b/pubspec.yaml
index 29917e695e01d43af18ed2fea3ec9e8d72b5270c..785cb38ceba06d1c2ead120a2b771a92c433cd86 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ description: A new Flutter project.
# pub.dev using `pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 0.0.0+7
+version: 0.0.0+8
environment:
sdk: ">=2.7.0 <3.0.0"
@@ -29,10 +29,10 @@ dependencies:
flutter_icons:
- android: "launcher_icon"
+ android: "ic_launcher"
ios: true
- image_path: "assets/icon/gecko5b96.png"
- cupertino_icons: ^1.0.0
+ image_path: "assets/icon/gecko5bduniter2.png"
+ # cupertino_icons: ^1.0.0
dev_dependencies:
flutter_test: