From ed8b343af4dbae36931ab1fee312579c59faa85f Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Fri, 19 Mar 2021 06:33:48 +0100
Subject: [PATCH] Change wallet list store format; Start to implement figma
wallet options screen
---
assets/walletOptions/QR_icon.png | Bin 0 -> 1622 bytes
assets/walletOptions/android-checkmark.png | Bin 0 -> 264 bytes
assets/walletOptions/camera.png | Bin 0 -> 585 bytes
assets/walletOptions/clock.png | Bin 0 -> 1048 bytes
assets/walletOptions/copy-white.png | Bin 0 -> 482 bytes
assets/walletOptions/edit.png | Bin 0 -> 284 bytes
assets/walletOptions/icon_oeuil.png | Bin 0 -> 719 bytes
assets/walletOptions/key.png | Bin 0 -> 492 bytes
assets/walletOptions/trash.png | Bin 0 -> 2275 bytes
lib/globals.dart | 3 +
lib/main.dart | 2 +-
lib/models/cesiumPlus.dart | 4 +-
lib/models/generateWallets.dart | 16 +-
lib/models/history.dart | 3 +-
lib/models/myWallets.dart | 85 ++++---
lib/models/queries.dart | 2 +-
lib/models/walletOptions.dart | 44 ++--
lib/screens/history.dart | 2 +-
.../myWallets/confirmWalletStorage.dart | 6 +-
lib/screens/myWallets/walletOptions-old.dart | 164 +++++++++++++
lib/screens/myWallets/walletOptions.dart | 216 ++++++++++--------
lib/screens/myWallets/walletsHome.dart | 183 ++++++---------
lib/screens/myWallets/walletsHome_old.dart | 157 -------------
lib/screens/onBoarding/12.dart | 6 +-
pubspec.yaml | 1 +
25 files changed, 475 insertions(+), 419 deletions(-)
create mode 100755 assets/walletOptions/QR_icon.png
create mode 100755 assets/walletOptions/android-checkmark.png
create mode 100755 assets/walletOptions/camera.png
create mode 100755 assets/walletOptions/clock.png
create mode 100755 assets/walletOptions/copy-white.png
create mode 100755 assets/walletOptions/edit.png
create mode 100755 assets/walletOptions/icon_oeuil.png
create mode 100755 assets/walletOptions/key.png
create mode 100755 assets/walletOptions/trash.png
create mode 100644 lib/screens/myWallets/walletOptions-old.dart
delete mode 100644 lib/screens/myWallets/walletsHome_old.dart
diff --git a/assets/walletOptions/QR_icon.png b/assets/walletOptions/QR_icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..6b6a887d727560ae6bfe018fd8f4eff3cb85858d
GIT binary patch
literal 1622
zcmeAS@N?(olHy`uVBq!ia0y~yV2l7^4mO~OSk4m%AjMhW5n0T@z%2~Ij105pNB{*H
zi-X*q7}lMWc?smOq&xaLGB9lH=l+w(%D}+-+SA1`q=ND7UB|q~ZUPP$iyl-*nhVz&
zzfKX>{8rSE^P_p?2ipbT&W62iey}VZXaG)7_c&K-`|}!}=$dms^EN-{v6=VT^!aZ7
z=#X@Uk5&=;&&<-ilm2h=*7=6tGjl5Igy%NyXKQFVz~sUrrl7QeL9mgvgG0x`C4o_i
ziCaK0qM?HrsfpijF5Sgi-hKUO&hePrSI-|XJga+P_Mcg*dk#`&FvvMMyT5EGs6Kam
z&ihy5mqXtb?>k<+@7b+4*$xT&A6K3E$+E5R%+Ef-8_DO&&m8@JRh@}AC*$?#-+gmF
z=+0QZdHrsY{a2sI%)u81d=AdU1lEb)Z;Iw;?>;LBiktM^yxBS2ZwzxjcD**7^VUph
zcbh*8nPHFcNW#qPya)C-HJVZ*)c5#4{x+xI^8WKV@6FCearZy3Im@?w<NEJ67yrl)
z?W(=|<$hG@;*71=lHMI&R{MAIxpVu^s%4*Rpn^Ak9G`Xi+_K2k5ACYIZH>w{{LWd?
zOirRi1PmxCSI&>^v%H@y1x%lB)6I6+K2JXP-ST<$-0R8f-p=?OD%)`6^|W)3zMWsa
zzI5{G_p7Pkk7+CQtc}m+1ljzrm8!p#|EGQywIb%<98hB4dbjRb&QVK{S8hC-@wxWz
z8MgkLo3FhIySe)Imi5<md4K%#J#$SYHN2w4^!m{5+*S8q>CP~n{@JxJ^V@<SYwgq(
z$Sp6BqUQbK<bC?-$?d@Cm~qUo_tB%n$=@{Q{V!$Pm)3cmO=P=g+}&lhceh;geUtt9
z&v(urE(}DMN=UXKmt_evUnQAcKBG4KTj^zycbn7Ka^_RRAD1g^o=aHVH_TbcjI(S8
cO6>n^ekWk}&dp7Y_d&`$UHx3vIVCg!06H}sA^-pY
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/android-checkmark.png b/assets/walletOptions/android-checkmark.png
new file mode 100755
index 0000000000000000000000000000000000000000..578859d6b12b932c7fc9668e0a5163c485ab242d
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^;y^6M!3HF?%h*|g6lZ})WHAE+w=f7ZGR&GI0Tg5`
z4sv&5Sa(k5C6L3C?&#~tz_78O`%fZB$6QYr$B+ufw-X=oIv5DJ?SIAOX3!MalfbMj
zagf8!ut~5dfn^=%r3=pMpYrSP6v(`v&Gn;lMvUgwi^i@gJrzr4X8fAL7;SU2ktK0Y
zk!X8x@$7eV4rwlXue&=wJND9|#yI1J66udh4aGl*3%5Rg_l<F)#4~k^CuI(5aVL5@
zxD6h$$<1N?_DG6Jk2&aLszS&awxmw}#v6}x9fBVgpRxa({a@DfU<J^j44$rjF6*2U
FngFpkT5$jX
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/camera.png b/assets/walletOptions/camera.png
new file mode 100755
index 0000000000000000000000000000000000000000..ce9ad0fb1edb6469fea18f112feec17b1dea9968
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0p3YOK~#7F?UqYR
z!$1^;kM`+<wpx4^u?UK~5dHuE!Hu|3L0fz)LQAQw+N$?BGZI6RW~L7}`QR*)xs#mS
zduK90LPA2qFH>+MFWMIsB4RqC6VWRyNx>c(Iuy+fh|7qUL@%NbjM0=al#dyoaxoTE
zzO-mjG#xNjwJ_x6U34Y-3b@}C^$}spHWQ<uD>{ZU_=7(iD-$x*6V<gLzHiw(nDzzR
zuEvJw9;yWF88&xOv?eM=%ws&u$rZZm_mPGh?2R+g1Js8Uv>CqSQL7@_4w+xlW96Vh
zS5p_-(5h%ll=Y0UBsI}3RGIby=5tk6!XEBoie~Oa>!O{2arTHQ$qiJ$lwrX%>|q9S
zP#KD%3T5mXme`tNIa*LXF(}I%=f-Ik!Prchy<{e4JTuBg(SrrHrc8W4X8b1{ur<Xd
zW?5P><C}U;+|0to6yZ{CXhrd)O)bC@7gHNhy>g21jM4BpRF*bjiT~(QLiF!}@I(0Z
z&rr*~qo4DpP1Z!0I_^L;i^2TKyz7oWFFMjMH@_7xG|de(2M1hD5pyKwCfbI|SXLX#
zU<igWWyoX1#~pv8ckn-Sy%+vQZ|i$SOa^YQJdf4AH^UBfG&WRU#H0tyUr<6q!Z`T`
Xd45$xEQvq@00000NkvXXu0mjfB!%}D
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/clock.png b/assets/walletOptions/clock.png
new file mode 100755
index 0000000000000000000000000000000000000000..cf9a80270f311ac67d260b6be3bae8e744fb85a5
GIT binary patch
literal 1048
zcmV+z1n2vSP)<h;3K|Lk000e1NJLTq001cf001cn1^@s6s9*s000009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1FcC!K~#7F?O4xC
zRY4T~Qpt!YQ;G=6ThI?8tW||AYFAOaA}Rx4n_MJmwy>S$Hva<^Y2hYUfdrxHqNq(~
zR%o^82SG-Qav>B*+WELM-1DyYJ!kHFY70O3c=P7YnK?6e?)e3*pg35C!ciiu5$+YP
zQT;!JQ^IFhCR7NUgoDE0!nr)05e^75!mU^WR0`XLzZOs|7pH|C!fjY2G$ts=|GmN%
z;VI#1(|=BQOxP^!6Mm1$O$r-OMDW#i#TFSAUNFxz0`t5&)?X^D6Ml%z(=FV90#RiY
z(kC}A9Lh015DsI$@)rHV3E>wt=LqI+${F0@OEuY;QDVROe*%8U7`feMo^fQqnF^#p
zx0>XMuv|UkT{{3j>=L%B|5WO!TB8%5Xi&oANV!V~aN}cYt!u7=G!K(Th<7J|J2JvH
zVZDb;ApC~t&R4n!bs*Z=1pJg7HgdxrGQ8vZe%@I~fF5Dm45qp0H|<uq!B@!}W<0Hh
zwIV#tyw~drq8-(lz6`=kzZgpL<Fi)cl3M$EKA{0Kh#sO8{z&t>EqHp?qYdf@C9#3W
z%`Z*PUo0&cF+DWxqfokOC2NIcru`htgAwz~kgvveY9%)&4E8~Q$PyfcpH;AUr`mgL
zLo2ySwKtnZe2n;GM2b=F0o+kxWVJq9k_KilKmPOi0OnGX=t<~rvlEx)Sn!PSE&T8r
z>K+L`Biy(PXfJOI4+-y^zG?eVEBQyYXA!zYSJ0LI6n+%$MChp)0Dp3npEBH``o@z6
z^0M2bZh@bIv}=L+za8n(qI9TD8o*0yld4|0AwYO<0~7~+h?2LQ7=)w$#QYO16!dU5
z7aGVnunEy|Uo?I6t?>XiKyglxF+sg)Ush{p@(F4GIf}>^H>)vgg^y626Kpl}GupCA
z8o%lV^YeCON99Kn#;iv1z?|oWTJx@p5F=xIn*0s0xCjv1RGW`G7Y-Vcoh6oIalnl9
zjaus}Jkg2lY*Byhx8NQKTQE(~i59QSkXoY)DL|!kVSx8DKvbouhaYSS<}kuyz$-O3
z^ZV45j4EUo2<R#q#`WhI&yDpUw~eK>ppX9=Q?MEZf;-fO0-L1KuEkS~0LitW^}@5r
zelxZpP}H2B1%t`hBJ>b+Wj7I~9_LN}NrX;-&fy-Ct8vbS0AJ8N(2h+bUF=BZm{&U$
z015>?LI$CaomoIJ1}*gQOjA?6+G5nq35Hd?yZeOe5XOeQ3hxnqD6?3>e}I1g{7)|d
S!Wq>70000<MNUMnLSTY;)!HNg
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/copy-white.png b/assets/walletOptions/copy-white.png
new file mode 100755
index 0000000000000000000000000000000000000000..819e852fc49f7a8a7a519f2b9247f9aeabc66335
GIT binary patch
literal 482
zcmV<80UiE{P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0e4A6K~#7Fm6Sb8
z13?gm=Rzt4ji{w0)`Ezwh4BZ7))q#r)W*WX!ooiwsGyx~O2I-xN(&3E1Ot{Pf}LQZ
zB7%tLv*aS1ac|wc@UXWZ^X}};-iav1aa@8%9IjiK>cmINY=ou;=Wr=uT7)8uM^V($
zhB=y?C%9#TR7`=U4%5ut*b__83^?M3HcZB6O+T9qj?(PIDI9q+G#MPTzK?A7QdhB{
znCvp?F%ws&I>U^Lc@e)F*0afUO)tngvM@y%gMMrHog<p+&%vg&3ums%7F5My(m8S-
zc2bIwS24R#cNRsd43BEeT$cw4&>uqr8`Ax*dXnoMnw!7viTQ&0w8@NP>@x{UllfA<
zB{V~hT%oDRKjI`|hAbSSSrAW#Y<gz(2fT)884kps-LTbNg%7xM8nXK#0oUnv(qzqZ
za^wP(V4bli+wfJHUP+itRx|c5tz&pE?dqMdb2-3h5LVzq{~v#a(FD}uFug%F`R=>)
Y0~AMBz@5c-@&Et;07*qoM6N<$f<&Rt761SM
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/edit.png b/assets/walletOptions/edit.png
new file mode 100755
index 0000000000000000000000000000000000000000..a45788da6b98ff24811ebacd61d02ba9716887d4
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?H!3HGDmOlFkq&N#aB8wRqxP?KOkzv*x37{Zj
zage(c!@6@aFM%AEbVpxD28NCO+<y{Tf&7i0E{-7;jAt*|a~(1eVf!#$#&P#<D~>7#
z@qDEU#{35l^v?CkIpkl^p7QUeb!qnb33dEJ70wH5b(j8qpscC5Ur1<C>n77<f7Wiz
zKf~M0!7TY|N5j6TjOKex3JcCBFh~cP9Q>mvSo7b+;fBV-p8gfADkXE73X0db2RGh*
z<gg|0z^{)zX0oqai{CYET(<8)zUsX9+{tTfolXSWJY3!$!tnfv{sm>xUDuiBuvaZ$
d{BEBewQ^r1i}oWsX`tg7JYD@<);T3K0RYKjXvqKo
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/icon_oeuil.png b/assets/walletOptions/icon_oeuil.png
new file mode 100755
index 0000000000000000000000000000000000000000..f707647c214f59072e8349f8bbf994aa3770b676
GIT binary patch
literal 719
zcmV;=0x<oFP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0%S=<K~#7F?Uh+;
zR6!7h>l!r}<E~K=B<@N?G@>Z_5XBfl1btA%pXaNJPew$9xCKN77hEHPCT^K5W?xBi
z4s|-yxy)qdAy45Jd`#cl-Bs1+R`r-=me~SWQs%m)V6&(OOSE?yOoA?u1Ks5~OG?b`
z1odDKSZ1ZI7kmV-!2kIi7cvHG0yTQ(iE@H-E26by3b4UkkzjAYV=E9mDe!z2oYHs{
zyacbo8gLa1f%l+a?~a(ueHW|-XTW;-W57G0qgc=ia6>1dwSuP#T&uZ<=F&~4l4X(&
z;3jAX2f=x;O7qQ1el}3BMsP^uN1(;LNNCs1<$4Y(!D(>9T+&YP-CXixQibn6fjX_{
zLE6BeNfsI_@}$P!z_TcswQ~L<O0EIyH<$9F-cyxLpi0k__I`A@#^5jn-4O+8vAIS^
zf55PU*Qe&|^nL{NfUVKo7t0q?Em#=`oro5WrJODYQyNpMbn)@~R%<*S`84h8)i{x_
z*#$o=|NV}poU%>WIu#lZM8Rl%;Fsp9N>8+Ro#j>R2nmFsl%`eV<K|KX>r_IlNGft$
zffMb!r+KyxRqBpT))Xb!92~~g`_o+WZD5yqKmOAkWjhCco2$a2dT0Lqc?IqT7tE{v
zuX(>-Gr!3wF$?Nzp`gsBO&QY30kB1x^F42y%W}ws*uN|wwht@w33zMXvscWeW{cbc
zAEG!#ufgr$64<Ecb_HhE?B$wh?Ld^&KJ#MZ0X~BV=HJ}P2^wrSIIQ1FD{VX(Ps@v>
ztJtD)|JrD53rfbzqDp&NKrE)5f{a^cnPs*pYzCmQin{_rTmk?9002ovPDHLkV1jJ`
BM1=qV
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/key.png b/assets/walletOptions/key.png
new file mode 100755
index 0000000000000000000000000000000000000000..45c0e85ae5630256f68c58881ae717c3bd1d7049
GIT binary patch
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0f9+GK~#7F?UuVr
z#6T2=e=k_MxTS)Z5z*RqLD1G0u(TFSYhfEfvGoP)L@jK^X0;JTv9b~`>vgSEM8QJT
zf0zjg<8C%lHVN$c;Dfn^Ihi?=2_Oi9AP9nx0b1(xPtYk^pn3X0&*(bcMg~x{M888k
zvEx!h(K5n=^wi^qkOKYm3eke})Z_DLFzrr#7V)=J!329sKVVk*&i1|2C;CcX=%-b;
z-Ox8g#63)9I$+C3bd~1l3>ue@`sJ=^1?DAm`H=3|@-N2VZ|A<#r|2W%rNn=|MIfbG
z1Hp6#$_q}QWx9!E>7|oirB<LhWP_?XJPLo=OSCP}rx5>Z;HoFxqL+cTifz+gRC%W0
z1>hd0XZU$>OxJ9{bF>@L_@X0rVnvI#eFf%{(7UxnyXZVjTEWhv$M)H}z5y3&O;W_)
zR_mND!yL#CB!FJcxLd5pE2O|6q6d4Al&(+@1@plV3vw3;u4KL6ym2~BhiMPYRd_%*
i=pF<?5ClOGnvEZAYrQK$klxV%0000<MNUMnLSTZnX4#Vf
literal 0
HcmV?d00001
diff --git a/assets/walletOptions/trash.png b/assets/walletOptions/trash.png
new file mode 100755
index 0000000000000000000000000000000000000000..6dc972b9aaebf7ecb89d33a1dafa12d586692e89
GIT binary patch
literal 2275
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
literal 0
HcmV?d00001
diff --git a/lib/globals.dart b/lib/globals.dart
index 045c95a5..e500877b 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -1,9 +1,12 @@
import 'dart:io';
import 'package:shared_preferences/shared_preferences.dart';
+// Files paths
Directory appPath;
Directory walletsDirectory;
File defaultWalletFile;
+File currentChestFile;
+
String defaultWallet;
String appVersion;
SharedPreferences prefs;
diff --git a/lib/main.dart b/lib/main.dart
index af7109e8..3029d262 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -28,7 +28,7 @@ Future<void> main() async {
MyWalletsProvider _walletsProvider = MyWalletsProvider();
await _homeProvider.getAppPath();
await _homeProvider.createDefaultAvatar();
- await _walletsProvider.getDefaultWallet();
+ await _walletsProvider.initWalletFolder();
appVersion = await _homeProvider.getAppVersion();
prefs = await SharedPreferences.getInstance();
final HiveStore _store =
diff --git a/lib/models/cesiumPlus.dart b/lib/models/cesiumPlus.dart
index bf59c6c5..7cbe5e4f 100644
--- a/lib/models/cesiumPlus.dart
+++ b/lib/models/cesiumPlus.dart
@@ -67,7 +67,7 @@ class CesiumPlusProvider with ChangeNotifier {
String _name;
List queryOptions = await _buildQuery(_pubkey);
- final response = await http.post(queryOptions[0],
+ final response = await http.post((Uri.parse(queryOptions[0])),
body: queryOptions[1], headers: queryOptions[2]);
// print('RESULT CESIUM QUERY: ${response.body}'); //For debug
final responseJson = json.decode(response.body);
@@ -87,7 +87,7 @@ class CesiumPlusProvider with ChangeNotifier {
Future<List> getAvatar(String _pubkey) async {
List queryOptions = await _buildQuery(_pubkey);
- final response = await http.post(queryOptions[0],
+ final response = await http.post((Uri.parse(queryOptions[0])),
body: queryOptions[1], headers: queryOptions[2]);
// print('RESULT CESIUM QUERY: ${response.body}'); //For debug
final responseJson = json.decode(response.body);
diff --git a/lib/models/generateWallets.dart b/lib/models/generateWallets.dart
index 88b85c29..dfcd9e91 100644
--- a/lib/models/generateWallets.dart
+++ b/lib/models/generateWallets.dart
@@ -39,14 +39,16 @@ class GenerateWalletsProvider with ChangeNotifier {
bool canImport = false;
bool isPinChanged = false;
- Future storeHDWallet(
+ Future storeHDWChest(
NewWallet _wallet, String _name, BuildContext context) async {
// Directory walletDirectory;
final Directory hdDirectory = Directory('${walletsDirectory.path}/0');
await hdDirectory.create();
- final configFile = File('${hdDirectory.path}/config.txt');
+ final configFile = File('${hdDirectory.path}/list.conf');
+ File _currentChestFile = File('${walletsDirectory.path}/currentChest.conf');
+
final dewifFile = File('${hdDirectory.path}/wallet.dewif');
// List<String> _lastConfig = [];
@@ -61,8 +63,14 @@ class GenerateWalletsProvider with ChangeNotifier {
accountsIndex: [_derivationNbr]);
String _pubkey = _pubkeysTmp[0];
- await configFile.writeAsString('0:$_name:$_derivationNbr:$_pubkey');
+ await configFile.writeAsString('0:0:$_name:$_derivationNbr:$_pubkey');
await dewifFile.writeAsString(_wallet.dewif);
+ bool isCurrentChestExist = _currentChestFile.existsSync();
+ if (isCurrentChestExist) {
+ await _currentChestFile.delete();
+ }
+ await _currentChestFile.create();
+ await _currentChestFile.writeAsString('0');
return _name;
}
@@ -147,11 +155,9 @@ class GenerateWalletsProvider with ChangeNotifier {
generatedMnemonic = await DubpRust.genMnemonic(language: Language.french);
this.actualWallet = await generateWallet(this.generatedMnemonic);
walletIsGenerated = true;
- // notifyListeners();
} catch (e) {
print(e);
}
- // await checkIfWalletExist();
return generatedMnemonic;
}
diff --git a/lib/models/history.dart b/lib/models/history.dart
index d8da067a..facb32b8 100644
--- a/lib/models/history.dart
+++ b/lib/models/history.dart
@@ -101,7 +101,6 @@ class HistoryProvider with ChangeNotifier {
// Lion simone: 78jhpprYkMNF6i5kQPXfkAVBpd2aqcpieNsXTSW4c21f
List parseHistory(txs, _pubkey) {
- // print(txs);
var transBC = [];
int i = 0;
@@ -135,7 +134,7 @@ class HistoryProvider with ChangeNotifier {
transBC[i].add(date);
// print(
// "DEBUG date et comment: ${date.toString()} -- ${transaction['comment'].toString()}");
- int amountBrut = int.parse(output.split(':')[0]);
+ final int amountBrut = int.parse(output.split(':')[0]);
final base = int.parse(output.split(':')[1]);
final int applyBase = base - currentBase;
final num amount =
diff --git a/lib/models/myWallets.dart b/lib/models/myWallets.dart
index b0b61bab..350a2270 100644
--- a/lib/models/myWallets.dart
+++ b/lib/models/myWallets.dart
@@ -8,15 +8,50 @@ import 'package:provider/provider.dart';
class MyWalletsProvider with ChangeNotifier {
String listWallets;
+ Future initWalletFolder() async {
+ await getDefaultWallet();
+
+ final bool isWalletFolderExist = await walletsDirectory.exists();
+ if (!isWalletFolderExist) {
+ await Directory(walletsDirectory.path).create();
+ }
+
+ File _currentChestFile = File('${walletsDirectory.path}/currentChest.conf');
+
+ await _currentChestFile.create();
+ await _currentChestFile.writeAsString('0');
+
+ final bool isChestsExist =
+ await Directory('${walletsDirectory.path}/0').exists();
+ if (!isChestsExist) {
+ await Directory('${walletsDirectory.path}/0').create();
+ await Directory('${walletsDirectory.path}/1').create();
+ await File('${walletsDirectory.path}/0/list.conf').create();
+ await File('${walletsDirectory.path}/0/order.conf').create();
+ await File('${walletsDirectory.path}/1/list.conf').create();
+ await File('${walletsDirectory.path}/1/order.conf').create();
+ }
+ }
+
+ int getCurrentChest() {
+ File _currentChestFile = File('${walletsDirectory.path}/currentChest.conf');
+
+ bool isCurrentChestExist = _currentChestFile.existsSync();
+ if (!isCurrentChestExist) {
+ _currentChestFile.createSync();
+ _currentChestFile.writeAsString('0');
+ }
+ return int.parse(_currentChestFile.readAsStringSync());
+ }
+
bool checkIfWalletExist() {
if (appPath == null) {
return false;
}
- print(walletsDirectory.listSync());
+ final String _walletList = getAllWalletsNames(0);
- List contents = walletsDirectory.listSync();
- if (contents.length == 0) {
+ if (_walletList == '') {
print('No wallets detected');
return false;
} else {
@@ -25,12 +60,7 @@ class MyWalletsProvider with ChangeNotifier {
}
}
- String getAllWalletsNames() {
- final bool _isWalletsExists = checkIfWalletExist();
- if (!_isWalletsExists) {
- return '';
- }
-
+ String getAllWalletsNames(int _chest) {
if (listWallets != null && listWallets.isNotEmpty) {
listWallets = '';
}
@@ -39,17 +69,13 @@ class MyWalletsProvider with ChangeNotifier {
}
// int i = 0;
- walletsDirectory
- .listSync(recursive: false, followLinks: false)
- .forEach((_wallet) {
- File _walletConfig = File('${_wallet.path}/config.txt');
- _walletConfig.readAsLinesSync().forEach((element) {
- if (listWallets != '') {
- listWallets += '\n';
- }
- listWallets += element;
- // listWallets += "${element.split(':')[0]}:${element.split(':')[1]}:${element.split(':')[2]}"
- });
+ File _walletConfig = File('${walletsDirectory.path}/$_chest/list.conf');
+ _walletConfig.readAsLinesSync().forEach((element) {
+ if (listWallets != '') {
+ listWallets += '\n';
+ }
+ listWallets += element;
+ // listWallets += "${element.split(':')[0]}:${element.split(':')[1]}:${element.split(':')[2]}"
});
print(listWallets);
@@ -68,9 +94,9 @@ class MyWalletsProvider with ChangeNotifier {
try {
defaultWallet = await defaultWalletFile.readAsString();
} catch (e) {
- defaultWallet = '0:3';
+ defaultWallet = '0:0';
}
- if (defaultWallet == '') defaultWallet = '0:3';
+ if (defaultWallet == '') defaultWallet = '0:0';
}
Future<int> deleteAllWallet(context) async {
@@ -82,6 +108,7 @@ class MyWalletsProvider with ChangeNotifier {
if (_answer) {
await walletsDirectory.delete(recursive: true);
await walletsDirectory.create();
+ await initWalletFolder();
notifyListeners();
Navigator.pop(context);
}
@@ -114,7 +141,7 @@ class MyWalletsProvider with ChangeNotifier {
onPressed: () {
WidgetsBinding.instance.addPostFrameCallback((_) {
_myWalletProvider.listWallets =
- _myWalletProvider.getAllWalletsNames();
+ _myWalletProvider.getAllWalletsNames(getCurrentChest());
_myWalletProvider.rebuildWidget();
});
Navigator.pop(context, true);
@@ -128,18 +155,24 @@ class MyWalletsProvider with ChangeNotifier {
Future<void> generateNewDerivation(context, String _name) async {
int _newDerivationNbr;
- final _walletConfig = File('${walletsDirectory.path}/0/config.txt');
+ int _newWalletNbr;
+ final _walletConfig = File('${walletsDirectory.path}/0/list.conf');
if (await _walletConfig.readAsString() == '') {
_newDerivationNbr = 3;
+ _newWalletNbr = 0;
} else {
String _lastWallet =
await _walletConfig.readAsLines().then((value) => value.last);
- int _lastDerivation = int.parse(_lastWallet.split(':')[2]);
+ int _lastDerivation = int.parse(_lastWallet.split(':')[3]);
_newDerivationNbr = _lastDerivation + 3;
+
+ int _lastWalletNbr = int.parse(_lastWallet.split(':')[1]);
+ _newWalletNbr = _lastWalletNbr + 1;
}
- await _walletConfig.writeAsString('\n0:$_name:$_newDerivationNbr',
+ await _walletConfig.writeAsString(
+ '\n0:$_newWalletNbr:$_name:$_newDerivationNbr',
mode: FileMode.append);
print(await _walletConfig.readAsString());
diff --git a/lib/models/queries.dart b/lib/models/queries.dart
index 52754abd..fda93453 100644
--- a/lib/models/queries.dart
+++ b/lib/models/queries.dart
@@ -1,7 +1,7 @@
const String getHistory = r'''
query ($pubkey: String!, $number: Int!, $cursor: String) {
txsHistoryBc(
- pubkeyOrScript: $pubkey
+ script: $pubkey
pagination: { pageSize: $number, ord: DESC, cursor: $cursor }
) {
both {
diff --git a/lib/models/walletOptions.dart b/lib/models/walletOptions.dart
index 034f9a51..2c238a79 100644
--- a/lib/models/walletOptions.dart
+++ b/lib/models/walletOptions.dart
@@ -1,9 +1,12 @@
import 'dart:io';
+import 'package:crypto/crypto.dart';
import 'package:dubp/dubp.dart';
+import 'package:fast_base58/fast_base58.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'dart:async';
import 'package:gecko/globals.dart';
+import 'package:truncate/truncate.dart';
class WalletOptionsProvider with ChangeNotifier {
TextEditingController pubkey = TextEditingController();
@@ -65,8 +68,7 @@ class WalletOptionsProvider with ChangeNotifier {
int _walletNbr, String _pin, int _pinLenght, int derivation) async {
isWalletUnlock = false;
try {
- File _walletFile =
- File('${walletsDirectory.path}/$_walletNbr/wallet.dewif');
+ File _walletFile = File('${walletsDirectory.path}/0/wallet.dewif');
String _localDewif = await _walletFile.readAsString();
String _localPubkey;
@@ -107,8 +109,7 @@ class WalletOptionsProvider with ChangeNotifier {
int getPinLenght(_walletNbr) {
String _localDewif;
if (_walletNbr is int) {
- File _walletFile =
- File('${walletsDirectory.path}/$_walletNbr/wallet.dewif');
+ File _walletFile = File('${walletsDirectory.path}/0/wallet.dewif');
_localDewif = _walletFile.readAsStringSync();
} else {
_localDewif = _walletNbr;
@@ -121,21 +122,21 @@ class WalletOptionsProvider with ChangeNotifier {
}
Future _renameWallet(_walletName, _newName, _walletNbr, _derivation) async {
- final _walletConfig =
- File('${walletsDirectory.path}/$_walletNbr/config.txt');
+ final _walletConfig = File('${walletsDirectory.path}/0/list.conf');
String newConfig =
await _walletConfig.readAsLines().then((List<String> lines) {
int nbrLines = lines.length;
- int _index = lines.indexOf('$_walletNbr:$_walletName:$_derivation');
+ print(lines);
print(nbrLines);
+ int _index = lines.indexOf('0:$_walletNbr:$_walletName:$_derivation');
if (nbrLines != 1) {
lines.removeWhere((element) =>
- element.contains('$_walletNbr:$_walletName:$_derivation'));
- lines.insert(_index, '$_walletNbr:$_newName:$_derivation');
+ element.contains('0:$_walletNbr:$_walletName:$_derivation'));
+ lines.insert(_index, '0:$_walletNbr:$_newName:$_derivation');
return lines.join('\n');
} else {
- return '$_walletNbr:$_newName:$_derivation';
+ return '0:$_walletNbr:$_newName:$_derivation';
}
});
@@ -189,14 +190,13 @@ class WalletOptionsProvider with ChangeNotifier {
final bool _answer = await _confirmDeletingWallet(context, _name);
if (_answer) {
- final _walletConfig =
- File('${walletsDirectory.path}/$_walletNbr/config.txt');
+ final _walletConfig = File('${walletsDirectory.path}/0/list.conf');
if (_derivation != -1) {
String newConfig =
await _walletConfig.readAsLines().then((List<String> lines) {
- lines.removeWhere(
- (element) => element.contains('$_walletNbr:$_name:$_derivation'));
+ lines.removeWhere((element) =>
+ element.contains('0:$_walletNbr:$_name:$_derivation'));
return lines.join('\n');
});
@@ -289,6 +289,22 @@ class WalletOptionsProvider with ChangeNotifier {
ScaffoldMessenger.of(context).showSnackBar(snackBar);
}
+ String getShortPubkey(String pubkey) {
+ List<int> pubkeyByte = Base58Decode(pubkey);
+ Digest pubkeyS256 = sha256.convert(sha256.convert(pubkeyByte).bytes);
+ String pubkeyCheksum = Base58Encode(pubkeyS256.bytes);
+ String pubkeyChecksumShort = truncate(pubkeyCheksum, 3,
+ omission: "", position: TruncatePosition.end);
+
+ String pubkeyShort = truncate(pubkey, 5,
+ omission: String.fromCharCode(0x2026),
+ position: TruncatePosition.end) +
+ truncate(pubkey, 4, omission: "", position: TruncatePosition.start) +
+ ':$pubkeyChecksumShort';
+
+ return pubkeyShort;
+ }
+
void reloadBuild() {
notifyListeners();
}
diff --git a/lib/screens/history.dart b/lib/screens/history.dart
index a8b4cb12..6f26752f 100644
--- a/lib/screens/history.dart
+++ b/lib/screens/history.dart
@@ -254,7 +254,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
initialData: '...',
builder: (context, snapshot) {
return Text(
- snapshot.data != ''
+ snapshot.data != null
? snapshot.data
: '-',
style:
diff --git a/lib/screens/myWallets/confirmWalletStorage.dart b/lib/screens/myWallets/confirmWalletStorage.dart
index db1566ae..4aa01301 100644
--- a/lib/screens/myWallets/confirmWalletStorage.dart
+++ b/lib/screens/myWallets/confirmWalletStorage.dart
@@ -28,6 +28,8 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
Provider.of<GenerateWalletsProvider>(context);
MyWalletsProvider _myWalletProvider =
Provider.of<MyWalletsProvider>(context);
+ final int _currentChest = _myWalletProvider.getCurrentChest();
+
this._mnemonicController.text = generatedMnemonic;
return WillPopScope(
@@ -126,7 +128,7 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
.isAskedWordValid &&
this.walletName.text != '')
? () async {
- await _generateWalletProvider.storeHDWallet(
+ await _generateWalletProvider.storeHDWChest(
generatedWallet,
walletName.text,
context);
@@ -138,7 +140,7 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
.addPostFrameCallback((_) {
_myWalletProvider.listWallets =
_myWalletProvider
- .getAllWalletsNames();
+ .getAllWalletsNames(_currentChest);
_myWalletProvider.rebuildWidget();
});
}
diff --git a/lib/screens/myWallets/walletOptions-old.dart b/lib/screens/myWallets/walletOptions-old.dart
new file mode 100644
index 00000000..7713274e
--- /dev/null
+++ b/lib/screens/myWallets/walletOptions-old.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/models/myWallets.dart';
+import 'package:gecko/models/walletOptions.dart';
+import 'dart:async';
+import 'package:provider/provider.dart';
+import 'package:flutter/services.dart';
+
+// ignore: must_be_immutable
+class WalletOptionsOld extends StatelessWidget with ChangeNotifier {
+ WalletOptionsOld(
+ {Key keyMyWallets,
+ @required this.walletNbr,
+ @required this.walletName,
+ @required this.derivation})
+ : super(key: keyMyWallets);
+ int walletNbr;
+ String walletName;
+ int derivation;
+
+ @override
+ Widget build(BuildContext context) {
+ SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+ print("Build walletOptions");
+ WalletOptionsProvider _walletOptions =
+ Provider.of<WalletOptionsProvider>(context);
+ MyWalletsProvider _myWalletProvider =
+ Provider.of<MyWalletsProvider>(context);
+
+ // _walletOptions.isWalletUnlock = false;
+ print("Is unlock ? ${_walletOptions.isWalletUnlock}");
+
+ final int _currentChest = _myWalletProvider.getCurrentChest();
+
+ return WillPopScope(
+ onWillPop: () {
+ _walletOptions.isWalletUnlock = false;
+ Navigator.popUntil(
+ context,
+ ModalRoute.withName('/mywallets'),
+ );
+ return Future<bool>.value(true);
+ },
+ child: Scaffold(
+ resizeToAvoidBottomInset: false,
+ appBar: AppBar(
+ leading: IconButton(
+ icon: Icon(Icons.arrow_back, color: Colors.black),
+ onPressed: () {
+ _walletOptions.isWalletUnlock = false;
+ Navigator.popUntil(
+ context,
+ ModalRoute.withName('/mywallets'),
+ );
+ }),
+ title: SizedBox(
+ height: 22,
+ child: Text(walletName),
+ )),
+ body: Builder(
+ builder: (ctx) => SafeArea(
+ child: Column(children: <Widget>[
+ Expanded(
+ child: Column(children: <Widget>[
+ SizedBox(height: 15),
+ Text(
+ 'Clé publique:',
+ style: TextStyle(
+ fontSize: 15.0,
+ color: Colors.grey[600],
+ fontWeight: FontWeight.w400),
+ ),
+ SizedBox(height: 15),
+ GestureDetector(
+ onTap: () {
+ Clipboard.setData(ClipboardData(
+ text: _walletOptions.pubkey.text));
+ _walletOptions.snackCopyKey(ctx);
+ },
+ child: Text(
+ _walletOptions.pubkey.text,
+ style: TextStyle(
+ fontSize: 14.0,
+ color: Colors.black,
+ fontWeight: FontWeight.bold,
+ fontFamily: 'Monospace'),
+ )),
+ Expanded(
+ child: Align(
+ alignment: Alignment.bottomCenter,
+ child: SizedBox(
+ height: 50,
+ width: 300,
+ child: ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ elevation: 5,
+ primary: Color(
+ 0xffFFD68E), //Color(0xffFFD68E), // background
+ onPrimary: Colors.black, // foreground
+ ),
+ onPressed: () => _walletOptions
+ .renameWalletAlerte(
+ context,
+ walletName,
+ walletNbr,
+ derivation)
+ .then((_result) {
+ if (_result == true) {
+ WidgetsBinding.instance
+ .addPostFrameCallback((_) {
+ _myWalletProvider
+ .listWallets =
+ _myWalletProvider
+ .getAllWalletsNames(_currentChest);
+ _myWalletProvider
+ .rebuildWidget();
+ });
+ Navigator.popUntil(
+ context,
+ ModalRoute.withName(
+ '/mywallets'),
+ );
+ }
+ }),
+ child: Text('Renommer ce portefeuille',
+ style: TextStyle(fontSize: 20)))))),
+ SizedBox(height: 30),
+ SizedBox(
+ height: 50,
+ width: 300,
+ child: ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ elevation: 6,
+ primary: Colors
+ .redAccent, //Color(0xffFFD68E), // background
+ onPrimary: Colors.black, // foreground
+ ),
+ onPressed: () async {
+ await _walletOptions.deleteWallet(context,
+ walletNbr, walletName, derivation);
+ WidgetsBinding.instance
+ .addPostFrameCallback((_) {
+ _myWalletProvider.listWallets =
+ _myWalletProvider.getAllWalletsNames(_currentChest);
+ _myWalletProvider.rebuildWidget();
+ });
+ },
+ child: Text('Supprimer ce portefeuille',
+ style: TextStyle(fontSize: 20)))),
+ SizedBox(height: 50),
+ Text(
+ 'Portefeuille déverrouillé',
+ style: TextStyle(
+ color: Colors.green,
+ fontWeight: FontWeight.w700,
+ fontSize: 15),
+ ),
+ SizedBox(height: 10)
+ ])),
+ ]),
+ )),
+ ));
+ }
+}
diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart
index 221e9e10..8ed09d49 100644
--- a/lib/screens/myWallets/walletOptions.dart
+++ b/lib/screens/myWallets/walletOptions.dart
@@ -27,12 +27,12 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
MyWalletsProvider _myWalletProvider =
Provider.of<MyWalletsProvider>(context);
- // _walletOptions.isWalletUnlock = false;
- print("Is unlock ? ${_walletOptions.isWalletUnlock}");
+ final int _currentChest = _myWalletProvider.getCurrentChest();
+ final String shortPubkey =
+ _walletOptions.getShortPubkey(_walletOptions.pubkey.text);
return WillPopScope(
onWillPop: () {
- _walletOptions.isWalletUnlock = false;
Navigator.popUntil(
context,
ModalRoute.withName('/mywallets'),
@@ -45,7 +45,6 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
leading: IconButton(
icon: Icon(Icons.arrow_back, color: Colors.black),
onPressed: () {
- _walletOptions.isWalletUnlock = false;
Navigator.popUntil(
context,
ModalRoute.withName('/mywallets'),
@@ -57,105 +56,124 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
)),
body: Builder(
builder: (ctx) => SafeArea(
- child: Column(children: <Widget>[
- Expanded(
- child: Column(children: <Widget>[
- SizedBox(height: 15),
- Text(
- 'Clé publique:',
- style: TextStyle(
- fontSize: 15.0,
- color: Colors.grey[600],
- fontWeight: FontWeight.w400),
+ child: Expanded(
+ child: Column(children: <Widget>[
+ SizedBox(height: 25),
+ Row(children: <Widget>[
+ SizedBox(width: 25),
+ Image.asset(
+ 'assets/chopp-gecko2.png',
+ ),
+ Image.asset(
+ 'assets/walletOptions/camera.png',
+ ),
+ // SizedBox(width: 20),
+ Column(children: <Widget>[
+ Row(children: <Widget>[
+ Column(children: <Widget>[
+ SizedBox(
+ width: 250,
+ child: Text(
+ walletName,
+ textAlign: TextAlign.center,
+ style: TextStyle(fontSize: 27),
+ )),
+ SizedBox(height: 5),
+ Text(
+ '500 DU',
+ style: TextStyle(
+ fontSize: 20, color: Colors.black),
+ ),
+ SizedBox(height: 5),
+ Image.asset(
+ 'assets/walletOptions/icon_oeuil.png',
+ ),
+ ]),
+ SizedBox(width: 0),
+ Column(children: <Widget>[
+ Image.asset(
+ 'assets/walletOptions/edit.png',
+ ),
+ SizedBox(
+ height: 60,
+ )
+ ])
+ ]),
+ ]),
+ ]),
+ Image.asset(
+ 'assets/walletOptions/QR_icon.png',
),
SizedBox(height: 15),
- GestureDetector(
- onTap: () {
- Clipboard.setData(ClipboardData(
- text: _walletOptions.pubkey.text));
- _walletOptions.snackCopyKey(ctx);
- },
- child: Text(
- _walletOptions.pubkey.text,
+ Row(children: <Widget>[
+ SizedBox(width: 30),
+ Image.asset(
+ 'assets/walletOptions/key.png',
+ ),
+ SizedBox(width: 10),
+ Text("${shortPubkey.split(':')[0]}:",
+ style: TextStyle(
+ fontSize: 22,
+ fontWeight: FontWeight.w800,
+ fontFamily: 'Monospace',
+ color: Colors.black)),
+ Text(shortPubkey.split(':')[1],
style: TextStyle(
- fontSize: 14.0,
- color: Colors.black,
- fontWeight: FontWeight.bold,
- fontFamily: 'Monospace'),
- )),
- Expanded(
- child: Align(
- alignment: Alignment.bottomCenter,
- child: SizedBox(
- height: 50,
- width: 300,
- child: ElevatedButton(
- style: ElevatedButton.styleFrom(
- elevation: 5,
- primary: Color(
- 0xffFFD68E), //Color(0xffFFD68E), // background
- onPrimary: Colors.black, // foreground
- ),
- onPressed: () => _walletOptions
- .renameWalletAlerte(
- context,
- walletName,
- walletNbr,
- derivation)
- .then((_result) {
- if (_result == true) {
- WidgetsBinding.instance
- .addPostFrameCallback((_) {
- _myWalletProvider
- .listWallets =
- _myWalletProvider
- .getAllWalletsNames();
- _myWalletProvider
- .rebuildWidget();
- });
- Navigator.popUntil(
- context,
- ModalRoute.withName(
- '/mywallets'),
- );
- }
- }),
- child: Text('Renommer ce portefeuille',
- style: TextStyle(fontSize: 20)))))),
- SizedBox(height: 30),
- SizedBox(
- height: 50,
- width: 300,
- child: ElevatedButton(
- style: ElevatedButton.styleFrom(
- elevation: 6,
- primary: Colors
- .redAccent, //Color(0xffFFD68E), // background
- onPrimary: Colors.black, // foreground
+ fontSize: 22,
+ fontWeight: FontWeight.w800,
+ fontFamily: 'Monospace')),
+ SizedBox(width: 15),
+ ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ shape: RoundedRectangleBorder(
+ borderRadius: new BorderRadius.circular(8),
),
- onPressed: () async {
- await _walletOptions.deleteWallet(context,
- walletNbr, walletName, derivation);
- WidgetsBinding.instance
- .addPostFrameCallback((_) {
- _myWalletProvider.listWallets =
- _myWalletProvider.getAllWalletsNames();
- _myWalletProvider.rebuildWidget();
- });
- },
- child: Text('Supprimer ce portefeuille',
- style: TextStyle(fontSize: 20)))),
- SizedBox(height: 50),
- Text(
- 'Portefeuille déverrouillé',
- style: TextStyle(
- color: Colors.green,
- fontWeight: FontWeight.w700,
- fontSize: 15),
- ),
- SizedBox(height: 10)
- ])),
- ]),
+ elevation: 1,
+ primary: Color(0xffD28928), // background
+ onPrimary: Colors.black, // foreground
+ ),
+ onPressed: () {
+ print('COPY PUBKEY');
+ },
+ child: Text('Copier',
+ style: TextStyle(
+ fontSize: 15, color: Colors.grey[50]))),
+ ]),
+ SizedBox(height: 10),
+ Row(children: <Widget>[
+ SizedBox(width: 30),
+ Image.asset(
+ 'assets/walletOptions/clock.png',
+ ),
+ SizedBox(width: 10),
+ Text('Historique des transactions',
+ style:
+ TextStyle(fontSize: 20, color: Colors.black)),
+ ]),
+ SizedBox(height: 15),
+ Row(children: <Widget>[
+ SizedBox(width: 35),
+ Image.asset(
+ 'assets/walletOptions/android-checkmark.png',
+ ),
+ SizedBox(width: 10),
+ Text('Portefeuille par defaut',
+ style:
+ TextStyle(fontSize: 20, color: Colors.black)),
+ ]),
+ SizedBox(height: 15),
+ Row(children: <Widget>[
+ SizedBox(width: 30),
+ Image.asset(
+ 'assets/walletOptions/trash.png',
+ ),
+ SizedBox(width: 10),
+ Text('Supprimer ce portefeuille',
+ style: TextStyle(
+ fontSize: 20, color: Color(0xffD80000))),
+ ]),
+ ]),
+ ),
)),
));
}
diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart
index 1ab1650e..a4aca349 100644
--- a/lib/screens/myWallets/walletsHome.dart
+++ b/lib/screens/myWallets/walletsHome.dart
@@ -20,12 +20,16 @@ class WalletsHome extends StatelessWidget {
WalletOptionsProvider _walletOptions =
Provider.of<WalletOptionsProvider>(context);
_walletOptions.isWalletUnlock = false;
- myWalletProvider.listWallets = myWalletProvider.getAllWalletsNames();
+
+ final int _currentChest = myWalletProvider.getCurrentChest();
+
+ myWalletProvider.listWallets =
+ myWalletProvider.getAllWalletsNames(_currentChest);
final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
if (myWalletProvider.listWallets != '') {
firstWalletDerivation =
- int.parse(myWalletProvider.listWallets.split('\n')[0].split(':')[2]);
+ int.parse(myWalletProvider.listWallets.split('\n')[0].split(':')[3]);
}
return Scaffold(
@@ -95,114 +99,79 @@ class WalletsHome extends StatelessWidget {
for (String _repository in _listWallets)
Padding(
padding: EdgeInsets.all(16),
- 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(
- // contentPadding: const EdgeInsets.only(left: 7.0),
- tileColor:
- "${_repository.split(':')[0]}:${_repository.split(':')[2]}" ==
- defaultWallet
- ? Color(0xffD28928)
- : 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.split(':')[1],
- textAlign: TextAlign.center,
- style: TextStyle(
- fontSize: 16.0,
- color:
- "${_repository.split(':')[0]}:${_repository.split(':')[2]}" ==
- defaultWallet
- ? Color(0xffF9F9F1)
- : Colors.black)))),
- // dense: true,
- onTap: () {
- Navigator.push(context,
- MaterialPageRoute(builder: (context) {
- return UnlockingWallet(
- walletNbr: int.parse(_repository.split(':')[0]),
- walletName: _repository.split(':')[1],
- derivation:
- int.parse(_repository.split(':')[2]));
- }));
- },
- )
- ])))
+ child: GestureDetector(
+ onTap: () {
+ Navigator.push(context,
+ MaterialPageRoute(builder: (context) {
+ return UnlockingWallet(
+ walletNbr: int.parse(_repository.split(':')[1]),
+ walletName: _repository.split(':')[2],
+ derivation: int.parse(_repository.split(':')[3]));
+ }));
+ },
+ 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(
+ // contentPadding: const EdgeInsets.only(left: 7.0),
+ tileColor:
+ "${_repository.split(':')[0]}:${_repository.split(':')[1]}" ==
+ defaultWallet
+ ? Color(0xffD28928)
+ : 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.split(':')[2],
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 16.0,
+ color:
+ "${_repository.split(':')[0]}:${_repository.split(':')[1]}" ==
+ defaultWallet
+ ? Color(0xffF9F9F1)
+ : Colors.black)))),
+ // dense: true,
+ onTap: () {
+ Navigator.push(context,
+ MaterialPageRoute(builder: (context) {
+ return UnlockingWallet(
+ walletNbr:
+ int.parse(_repository.split(':')[1]),
+ walletName: _repository.split(':')[2],
+ derivation:
+ int.parse(_repository.split(':')[3]));
+ }));
+ },
+ )
+ ]))))
]);
}
- Widget myWalletsList(BuildContext context) {
- MyWalletsProvider _myWalletProvider =
- Provider.of<MyWalletsProvider>(context);
-
- final bool isWalletsExists = _myWalletProvider.checkIfWalletExist();
-
- if (!isWalletsExists) {
- return Text('');
- }
-
- if (_myWalletProvider.listWallets == '') {
- return Expanded(
- child: Center(
- child: Text(
- 'Veuillez générer votre premier portefeuille',
- style: TextStyle(fontSize: 17, fontWeight: FontWeight.w500),
- )));
- }
-
- List _listWallets = _myWalletProvider.listWallets.split('\n');
-
- return Expanded(
- child: ListView(children: <Widget>[
- SizedBox(height: 8),
- for (String _repository in _listWallets)
- ListTile(
- contentPadding: const EdgeInsets.only(left: 7.0),
- leading: Padding(
- padding: const EdgeInsets.all(6.0),
- child: Text("0 Äž1", style: TextStyle(fontSize: 14.0))),
- // subtitle: Text(_repository.split(':')[3],
- // style: TextStyle(fontSize: 12.0, fontFamily: 'Monospace')),
- title:
- Text(_repository.split(':')[1], style: TextStyle(fontSize: 16.0)),
- dense: true,
- onTap: () {
- Navigator.push(context, MaterialPageRoute(builder: (context) {
- return UnlockingWallet(
- walletNbr: int.parse(_repository.split(':')[0]),
- walletName: _repository.split(':')[1],
- derivation: int.parse(_repository.split(':')[2]));
- }));
- },
- )
- ]));
- }
-
Widget addNewDerivation(context, int _walletNbr) {
final TextEditingController _newDerivationName = TextEditingController();
MyWalletsProvider _myWalletProvider =
diff --git a/lib/screens/myWallets/walletsHome_old.dart b/lib/screens/myWallets/walletsHome_old.dart
deleted file mode 100644
index 7a5f99ee..00000000
--- a/lib/screens/myWallets/walletsHome_old.dart
+++ /dev/null
@@ -1,157 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:gecko/models/myWallets.dart';
-import 'package:gecko/models/walletOptions.dart';
-import 'package:flutter/material.dart';
-import 'package:gecko/screens/myWallets/unlockingWallet.dart';
-import 'package:gecko/screens/onBoarding/0_noKeychainFound.dart';
-import 'package:provider/provider.dart';
-
-// ignore: must_be_immutable
-class WalletsHome extends StatelessWidget {
- final _derivationKey = GlobalKey<FormState>();
- int firstWalletDerivation;
-
- @override
- Widget build(BuildContext context) {
- SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
- MyWalletsProvider myWalletProvider =
- Provider.of<MyWalletsProvider>(context);
- WalletOptionsProvider _walletOptions =
- Provider.of<WalletOptionsProvider>(context);
- _walletOptions.isWalletUnlock = false;
- myWalletProvider.listWallets = myWalletProvider.getAllWalletsNames();
- final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
-
- if (myWalletProvider.listWallets != '') {
- firstWalletDerivation =
- int.parse(myWalletProvider.listWallets.split('\n')[0].split(':')[2]);
- }
-
- return Scaffold(
- appBar: AppBar(
- title: Text('Mes portefeuilles',
- style: TextStyle(color: Colors.grey[850])),
- backgroundColor: Color(0xffFFD58D),
- ),
- floatingActionButton: Visibility(
- visible: (isWalletsExists && firstWalletDerivation != -1),
- child: Container(
- height: 80.0,
- width: 80.0,
- child: FittedBox(
- child: FloatingActionButton(
- 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()
- : myWalletsList(context)));
- }
-
- Widget myWalletsList(BuildContext context) {
- MyWalletsProvider _myWalletProvider =
- Provider.of<MyWalletsProvider>(context);
-
- final bool isWalletsExists = _myWalletProvider.checkIfWalletExist();
-
- if (!isWalletsExists) {
- return Text('');
- }
-
- if (_myWalletProvider.listWallets == '') {
- return Expanded(
- child: Center(
- child: Text(
- 'Veuillez générer votre premier portefeuille',
- style: TextStyle(fontSize: 17, fontWeight: FontWeight.w500),
- )));
- }
-
- List _listWallets = _myWalletProvider.listWallets.split('\n');
-
- return Expanded(
- child: ListView(children: <Widget>[
- SizedBox(height: 8),
- for (String _repository in _listWallets)
- ListTile(
- contentPadding: const EdgeInsets.only(left: 7.0),
- leading: Padding(
- padding: const EdgeInsets.all(6.0),
- child: Text("0 Äž1", style: TextStyle(fontSize: 14.0))),
- // subtitle: Text(_repository.split(':')[3],
- // style: TextStyle(fontSize: 12.0, fontFamily: 'Monospace')),
- title:
- Text(_repository.split(':')[1], style: TextStyle(fontSize: 16.0)),
- dense: true,
- onTap: () {
- Navigator.push(context, MaterialPageRoute(builder: (context) {
- return UnlockingWallet(
- walletNbr: int.parse(_repository.split(':')[0]),
- walletName: _repository.split(':')[1],
- derivation: int.parse(_repository.split(':')[2]));
- }));
- },
- )
- ]));
- }
-
- Widget addNewDerivation(context, int _walletNbr) {
- final TextEditingController _newDerivationName = TextEditingController();
- MyWalletsProvider _myWalletProvider =
- Provider.of<MyWalletsProvider>(context);
-
- return AlertDialog(
- content: Stack(
- clipBehavior: Clip.hardEdge,
- children: <Widget>[
- Form(
- key: _derivationKey,
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: <Widget>[
- Text('Nom du portefeuille:'),
- Padding(
- padding: EdgeInsets.all(8.0),
- child: TextFormField(
- controller: _newDerivationName,
- textAlign: TextAlign.center,
- autofocus: true,
- ),
- ),
- SizedBox(height: 20),
- Padding(
- padding: const EdgeInsets.all(8.0),
- child: ElevatedButton(
- style: ElevatedButton.styleFrom(
- elevation: 1,
- primary: Color(0xffFFD68E), // background
- onPrimary: Colors.black, // foreground
- ),
- onPressed: () async {
- await _myWalletProvider
- .generateNewDerivation(
- context, _newDerivationName.text)
- .then((_) => _newDerivationName.text == '');
- },
- child: Text("Créer")),
- )
- ],
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/screens/onBoarding/12.dart b/lib/screens/onBoarding/12.dart
index d9e8e618..fd01ff46 100644
--- a/lib/screens/onBoarding/12.dart
+++ b/lib/screens/onBoarding/12.dart
@@ -61,6 +61,8 @@ class OnboardingStepFourteen extends StatelessWidget {
GenerateWalletsProvider _generateWalletProvider =
Provider.of<GenerateWalletsProvider>(context);
+ final int _currentChest = _myWalletProvider.getCurrentChest();
+
return Form(
key: formKey,
child: Padding(
@@ -116,9 +118,9 @@ class OnboardingStepFourteen extends StatelessWidget {
if (resultWallet) {
pinColor = Colors.green[500];
print(generatedWallet.pin);
- await _generateWalletProvider.storeHDWallet(
+ await _generateWalletProvider.storeHDWChest(
generatedWallet, 'Mon portefeuille courant', context);
- _myWalletProvider.getAllWalletsNames();
+ _myWalletProvider.getAllWalletsNames(_currentChest);
_walletOptions.reloadBuild();
_myWalletProvider.rebuildWidget();
Navigator.push(
diff --git a/pubspec.yaml b/pubspec.yaml
index 8cdb9aa6..73c0f3f1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -67,3 +67,4 @@ flutter:
- assets/icon/
- assets/onBoarding/
- assets/onBoarding/progress_bar/
+ - assets/walletOptions/
--
GitLab