diff --git a/assets/avatars/0.png b/assets/avatars/0.png
new file mode 100755
index 0000000000000000000000000000000000000000..c37955248205d6f9b1894967077db08d71913fe3
Binary files /dev/null and b/assets/avatars/0.png differ
diff --git a/assets/avatars/1.png b/assets/avatars/1.png
new file mode 100755
index 0000000000000000000000000000000000000000..49023c9fb7e7ae97ab4dd5b1afe3da6a2d385202
Binary files /dev/null and b/assets/avatars/1.png differ
diff --git a/assets/avatars/2.png b/assets/avatars/2.png
new file mode 100755
index 0000000000000000000000000000000000000000..f9546ef96f3f88b13ad490a1cb54139070081898
Binary files /dev/null and b/assets/avatars/2.png differ
diff --git a/assets/chests/config.png b/assets/chests/config.png
new file mode 100755
index 0000000000000000000000000000000000000000..0bc4da72eeec4994580b8c6ce440c5e824c13554
Binary files /dev/null and b/assets/chests/config.png differ
diff --git a/assets/chests/miniChests.png b/assets/chests/miniChests.png
new file mode 100755
index 0000000000000000000000000000000000000000..8d37185cdb5a910486010cd98ac3183398cde2e5
Binary files /dev/null and b/assets/chests/miniChests.png differ
diff --git a/lib/models/generateWallets.dart b/lib/models/generateWallets.dart
index 52fb9788c2d57477cf183fb0244bff374270a8f6..93b7e95c2effe9aa35116f73e6105564d3653a86 100644
--- a/lib/models/generateWallets.dart
+++ b/lib/models/generateWallets.dart
@@ -42,8 +42,12 @@ class GenerateWalletsProvider with ChangeNotifier {
void storeHDWChest(
NewWallet _wallet, String _name, BuildContext context) async {
int chestNumber = chestBox.length;
- WalletData myWallet =
- WalletData(chest: chestNumber, number: 0, name: _name, derivation: 3);
+ WalletData myWallet = WalletData(
+ chest: chestNumber,
+ number: 0,
+ name: _name,
+ derivation: 3,
+ imageName: '0.png');
String chestName;
if (chestNumber == 0) {
diff --git a/lib/models/myWallets.dart b/lib/models/myWallets.dart
index 664668f344832dacd53d6c5a07f2946fb7a5a674..44303a6b08c29d7ad8096e6da0aa51cb2fa1cc7e 100644
--- a/lib/models/myWallets.dart
+++ b/lib/models/myWallets.dart
@@ -135,7 +135,8 @@ class MyWalletsProvider with ChangeNotifier {
chest: _chest,
number: _newWalletNbr,
name: _name,
- derivation: _newDerivationNbr);
+ derivation: _newDerivationNbr,
+ imageName: '${_newWalletNbr % 3}.png');
await walletBox.add(newWallet);
diff --git a/lib/models/walletData.dart b/lib/models/walletData.dart
index c1fbdded502fef5f0fb3da5ce80d1cfb151e0402..2c4a82dec767aef1866b5ab2f427c1d568f2278e 100644
--- a/lib/models/walletData.dart
+++ b/lib/models/walletData.dart
@@ -16,7 +16,11 @@ class WalletData extends HiveObject {
@HiveField(3)
int derivation;
- WalletData({this.chest, this.number, this.name, this.derivation});
+ @HiveField(4)
+ String imageName;
+
+ WalletData(
+ {this.chest, this.number, this.name, this.derivation, this.imageName});
// representation of WalletData when debugging
@override
@@ -26,7 +30,7 @@ class WalletData extends HiveObject {
// creates the ':'-separated string from the WalletData
String inLine() {
- return "${this.chest}:${this.number}:${this.name}:${this.derivation}";
+ return "${this.chest}:${this.number}:${this.name}:${this.derivation}:${this.imageName}";
}
// returns only the id part of the ':'-separated string
diff --git a/lib/models/walletData.g.dart b/lib/models/walletData.g.dart
index 3182ec03ea23a81fee9f1d0f82f284d5e7b6bf09..36d6a0ba5eb8114a420486e9f17f0325698d4ac8 100644
--- a/lib/models/walletData.g.dart
+++ b/lib/models/walletData.g.dart
@@ -21,13 +21,14 @@ class WalletDataAdapter extends TypeAdapter<WalletData> {
number: fields[1] as int,
name: fields[2] as String,
derivation: fields[3] as int,
+ imageName: fields[4] as String,
);
}
@override
void write(BinaryWriter writer, WalletData obj) {
writer
- ..writeByte(4)
+ ..writeByte(5)
..writeByte(0)
..write(obj.chest)
..writeByte(1)
@@ -35,7 +36,9 @@ class WalletDataAdapter extends TypeAdapter<WalletData> {
..writeByte(2)
..write(obj.name)
..writeByte(3)
- ..write(obj.derivation);
+ ..write(obj.derivation)
+ ..writeByte(4)
+ ..write(obj.imageName);
}
@override
diff --git a/lib/models/walletOptions.dart b/lib/models/walletOptions.dart
index 147d9a6d0e162401507946416f15402831fa3eca..81b14bb98e39a9f55d08917d1e0172ebc0abfa32 100644
--- a/lib/models/walletOptions.dart
+++ b/lib/models/walletOptions.dart
@@ -130,7 +130,7 @@ class WalletOptionsProvider with ChangeNotifier {
WalletData _walletTarget = myWalletClass.getWalletData(_walletID);
_walletTarget.name = _newName;
- await walletBox.putAt(_walletTarget.key, _walletTarget);
+ await walletBox.put(_walletTarget.key, _walletTarget);
_newWalletName.text = '';
}
diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart
index fdc633a1b38c5b9a7a6a5ca6a712eca555192d52..adc0884a977a789d251d5bda2ba199cf455bd28a 100644
--- a/lib/screens/myWallets/walletOptions.dart
+++ b/lib/screens/myWallets/walletOptions.dart
@@ -107,7 +107,8 @@ class WalletOptions extends StatelessWidget {
await _walletOptions.changeAvatar();
},
child: Image.asset(
- 'assets/chopp-gecko2.png',
+ 'assets/avatars/${wallet.imageName}',
+ width: 110,
)),
InkWell(
onTap: () async {
diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart
index 0d5e69ea45ee4883841e0d4ff0aaf9010e98af8a..1de430f5dfe529b2d4fe8a592e18eb1a6a9c4d66 100644
--- a/lib/screens/myWallets/walletsHome.dart
+++ b/lib/screens/myWallets/walletsHome.dart
@@ -9,6 +9,7 @@ import 'package:gecko/screens/myWallets/chooseChest.dart';
import 'package:gecko/screens/myWallets/walletOptions.dart';
import 'package:gecko/screens/onBoarding/0_noKeychainFound.dart';
import 'package:provider/provider.dart';
+import 'package:assorted_layout_widgets/assorted_layout_widgets.dart';
class WalletsHome extends StatelessWidget {
final _derivationKey = GlobalKey<FormState>();
@@ -57,9 +58,35 @@ class WalletsHome extends StatelessWidget {
Widget chestOptions(BuildContext context) {
return Column(children: [
+ SizedBox(height: 50),
SizedBox(
- height: 90,
- child: ElevatedButton(
+ height: 120,
+ width: 445,
+ child: ElevatedButton.icon(
+ icon: Image.asset(
+ 'assets/chests/config.png',
+ ),
+ style: ElevatedButton.styleFrom(
+ elevation: 2,
+ primary: floattingYellow, // background
+ onPrimary: Colors.black, // foreground
+ ),
+ onPressed: () => null,
+ label: Text(
+ " Paramétrer ce coffre",
+ style: TextStyle(
+ fontSize: 25,
+ fontWeight: FontWeight.w700,
+ color: Color(0xff8a3c0f),
+ ),
+ ),
+ )),
+ SizedBox(height: 30),
+ SizedBox(
+ height: 120,
+ width: 445,
+ child: ElevatedButton.icon(
+ icon: Image.asset('assets/chests/miniChests.png'),
style: ElevatedButton.styleFrom(
elevation: 2,
primary: floattingYellow, // background
@@ -71,11 +98,16 @@ class WalletsHome extends StatelessWidget {
return ChooseChest();
}),
),
- child: Text(
- "Changer de coffre",
- style: TextStyle(fontSize: 16),
+ label: Text(
+ " Changer de coffre",
+ style: TextStyle(
+ fontSize: 25,
+ fontWeight: FontWeight.w700,
+ color: Color(0xff8a3c0f),
+ ),
),
- ))
+ )),
+ SizedBox(height: 30)
]);
}
@@ -105,6 +137,7 @@ class WalletsHome extends StatelessWidget {
List _listWallets = _myWalletProvider.listWallets;
return CustomScrollView(slivers: <Widget>[
+ SliverToBoxAdapter(child: SizedBox(height: 20)),
SliverGrid.count(
key: Key('listWallets'),
crossAxisCount: 2,
@@ -113,92 +146,112 @@ class WalletsHome extends StatelessWidget {
mainAxisSpacing: 0,
children: <Widget>[
for (WalletData _repository in _listWallets)
+ // if (_repository.number.clamp(0, 2) == _repository.number) hasImage = true
Padding(
- padding: EdgeInsets.all(16),
- child: GestureDetector(
- onTap: () async {
- await _walletOptions.readLocalWallet(context, _repository,
- _myWalletProvider.pinCode, _myWalletProvider.pinLenght);
- Navigator.push(
- context,
- SmoothTransition(
- page: WalletOptions(
- wallet: _repository,
- )));
-
- // Navigator.push(context,
- // MaterialPageRoute(builder: (context) {
- // return UnlockingWallet(wallet: _repository);
- // }));
- },
- child: ClipRRect(
- borderRadius: BorderRadius.all(Radius.circular(12)),
- child: Column(children: <Widget>[
- Expanded(
- child: Container(
- width: double.infinity,
- height: double.infinity,
- decoration: BoxDecoration(
- gradient: RadialGradient(
- radius: 1,
- colors: [
- Colors.green[100],
- Colors.green[500],
- ],
- )),
- child:
- // SvgPicture.asset('assets/chopp-gecko2.png',
- // semanticsLabel: 'Gecko', height: 48),
- Image.asset(
- 'assets/chopp-gecko2.png',
- ),
- )),
- ListTile(
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.vertical(
- bottom: Radius.circular(12))),
- // contentPadding: const EdgeInsets.only(left: 7.0),
- tileColor: _repository.id()[1] == defaultWallet.id()[1]
- ? orangeC
- : Color(0xffFFD58D),
- // leading: Text('IMAGE'),
-
- // subtitle: Text(_repository.split(':')[3],
- // style: TextStyle(fontSize: 12.0, fontFamily: 'Monospace')),
- title: Center(
- child: Padding(
- padding: EdgeInsets.symmetric(horizontal: 5),
- child: Text(_repository.name,
- textAlign: TextAlign.center,
- style: TextStyle(
- fontSize: 16.0,
- color: _repository.id()[1] ==
- defaultWallet.id()[1]
- ? Color(0xffF9F9F1)
- : Colors.black)))),
- // dense: true,
- onTap: () {
- Navigator.push(
- context,
- SmoothTransition(
+ padding: EdgeInsets.all(16),
+ child: GestureDetector(
+ onTap: () async {
+ await _walletOptions.readLocalWallet(
+ context,
+ _repository,
+ _myWalletProvider.pinCode,
+ _myWalletProvider.pinLenght);
+ Navigator.push(
+ context,
+ SmoothTransition(
page: WalletOptions(
- wallet: _repository,
- ),
+ wallet: _repository,
+ )));
+
+ // Navigator.push(context,
+ // MaterialPageRoute(builder: (context) {
+ // return UnlockingWallet(wallet: _repository);
+ // }));
+ },
+ child: ClipOvalShadow(
+ shadow: Shadow(
+ color: Colors.transparent,
+ offset: Offset(0, 0),
+ blurRadius: 5,
+ ),
+ clipper: CustomClipperOval(),
+ child: ClipRRect(
+ borderRadius: BorderRadius.all(Radius.circular(12)),
+ child: Column(children: <Widget>[
+ Expanded(
+ child: Container(
+ width: double.infinity,
+ height: double.infinity,
+ decoration: BoxDecoration(
+ gradient: RadialGradient(
+ radius: 0.6,
+ colors: [
+ Colors.green[400],
+ Color(0xFFE7E7A6),
+ ],
+ )),
+ child:
+ // SvgPicture.asset('assets/chopp-gecko2.png',
+ // semanticsLabel: 'Gecko', height: 48),
+ Image.asset(
+ 'assets/avatars/${_repository.imageName}',
+ alignment: Alignment.bottomCenter,
+ scale: 0.5,
),
- );
- },
- )
- ]),
- ),
- ),
- ),
- addNewDerivation(context)
+ )),
+ ListTile(
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.vertical(
+ bottom: Radius.circular(12))),
+ // contentPadding: const EdgeInsets.only(left: 7.0),
+ tileColor:
+ _repository.id()[1] == defaultWallet.id()[1]
+ ? orangeC
+ : Color(0xffFFD58D),
+ // leading: Text('IMAGE'),
+
+ // subtitle: Text(_repository.split(':')[3],
+ // style: TextStyle(fontSize: 12.0, fontFamily: 'Monospace')),
+ title: Center(
+ child: Padding(
+ padding:
+ EdgeInsets.symmetric(horizontal: 5),
+ child: Text(_repository.name,
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 16.0,
+ color: _repository.id()[1] ==
+ defaultWallet.id()[1]
+ ? Color(0xffF9F9F1)
+ : Colors.black)))),
+ // dense: true,
+ onTap: () {
+ Navigator.push(
+ context,
+ SmoothTransition(
+ page: WalletOptions(
+ wallet: _repository,
+ ),
+ ),
+ );
+ },
+ )
+ ]),
+ ),
+ ),
+ )),
+ addNewDerivation(context),
+ // SizedBox(height: 1),
+ // Padding(
+ // padding: EdgeInsets.symmetric(horizontal: 35),
+ // child: Text(
+ // 'Ajouter un portefeuille',
+ // textAlign: TextAlign.center,
+ // style: TextStyle(fontSize: 18),
+ // ))
]),
// SliverToBoxAdapter(child: Spacer()),
- SliverPadding(
- padding: EdgeInsets.symmetric(horizontal: 30),
- sliver: SliverToBoxAdapter(child: chestOptions(context)),
- ),
+ SliverToBoxAdapter(child: chestOptions(context)),
]);
}
@@ -231,7 +284,7 @@ class WalletsHome extends StatelessWidget {
color: Color(0xFFFCB437)),
)),
)),
- )
+ ),
])));
}
@@ -285,3 +338,65 @@ class WalletsHome extends StatelessWidget {
);
}
}
+
+// extension Range on num {
+// bool isBetween(num from, num to) {
+// return from < this && this < to;
+// }
+// }
+
+class CustomClipperOval extends CustomClipper<Rect> {
+ @override
+ Rect getClip(Size size) {
+ return Rect.fromCircle(
+ center: new Offset(size.width / 2, size.width / 2),
+ radius: size.width / 2 + 3);
+ }
+
+ @override
+ bool shouldReclip(CustomClipper<Rect> oldClipper) {
+ return false;
+ }
+}
+
+class ClipOvalShadow extends StatelessWidget {
+ final Shadow shadow;
+ final CustomClipper<Rect> clipper;
+ final Widget child;
+
+ ClipOvalShadow({
+ @required this.shadow,
+ @required this.clipper,
+ @required this.child,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ return CustomPaint(
+ painter: _ClipOvalShadowPainter(
+ clipper: this.clipper,
+ shadow: this.shadow,
+ ),
+ child: ClipRect(child: child, clipper: this.clipper),
+ );
+ }
+}
+
+class _ClipOvalShadowPainter extends CustomPainter {
+ final Shadow shadow;
+ final CustomClipper<Rect> clipper;
+
+ _ClipOvalShadowPainter({@required this.shadow, @required this.clipper});
+
+ @override
+ void paint(Canvas canvas, Size size) {
+ var paint = shadow.toPaint();
+ var clipRect = clipper.getClip(size).shift(Offset(0, 0));
+ canvas.drawOval(clipRect, paint);
+ }
+
+ @override
+ bool shouldRepaint(CustomPainter oldDelegate) {
+ return true;
+ }
+}
diff --git a/pubspec.lock b/pubspec.lock
index ee51741c3eedb9bc2c961eac94ea570cfbb60dea..0f54e3ba47a2492d86b3ff0d1099d7f0065000b7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -29,6 +29,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.0"
+ assorted_layout_widgets:
+ dependency: "direct main"
+ description:
+ name: assorted_layout_widgets
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "5.2.1"
async:
dependency: transitive
description:
@@ -584,6 +591,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
+ matrix4_transform:
+ dependency: transitive
+ description:
+ name: matrix4_transform
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.1"
meta:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b3ffe6a36b640c0ca282e2c1d7900e9567d42915..3d75118937960f7fcfd9c14ad3e521406309bdba 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -53,6 +53,7 @@ dependencies:
truncate: ^3.0.1
unorm_dart: ^0.2.0
xml: ^5.3.0
+ assorted_layout_widgets: ^5.2.1
flutter_icons:
android: "ic_launcher"
@@ -76,6 +77,7 @@ flutter:
- images/
- config/gva_endpoints.json
- assets/
+ - assets/avatars/
- assets/chests/
- assets/icon/
- assets/onBoarding/