From f39cafd309201bb1d39fb1980efa054eab47394e Mon Sep 17 00:00:00 2001 From: poka Date: Thu, 11 Mar 2021 07:08:45 +0100 Subject: [PATCH] Big improve on Wallets Tiles; Review of wallets index format --- assets/chopp-gecko.svg | 9 ++ assets/chopp-gecko2.png | Bin 0 -> 9520 bytes lib/globals.dart | 2 + lib/main.dart | 2 + lib/models/generateWallets.dart | 62 +++++-------- lib/models/myWallets.dart | 27 ++++-- .../myWallets/confirmWalletStorage.dart | 5 +- lib/screens/myWallets/walletsHome.dart | 82 +++++++++++++----- lib/screens/myWallets/walletsHome_old.dart | 2 +- lib/screens/onBoarding/12.dart | 5 +- pubspec.yaml | 2 +- 11 files changed, 122 insertions(+), 76 deletions(-) create mode 100755 assets/chopp-gecko.svg create mode 100755 assets/chopp-gecko2.png diff --git a/assets/chopp-gecko.svg b/assets/chopp-gecko.svg new file mode 100755 index 0000000..39b6a7b --- /dev/null +++ b/assets/chopp-gecko.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/chopp-gecko2.png b/assets/chopp-gecko2.png new file mode 100755 index 0000000000000000000000000000000000000000..6e97b0b626fad33362a517736bacdb3d013b71cd GIT binary patch literal 9520 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 O0000 main() async { WidgetsFlutterBinding.ensureInitialized(); HomeProvider _homeProvider = HomeProvider(); + MyWalletsProvider _walletsProvider = MyWalletsProvider(); await _homeProvider.getAppPath(); await _homeProvider.createDefaultAvatar(); + await _walletsProvider.getDefaultWallet(); appVersion = await _homeProvider.getAppVersion(); prefs = await SharedPreferences.getInstance(); final HiveStore _store = diff --git a/lib/models/generateWallets.dart b/lib/models/generateWallets.dart index a7bc55d..88b85c2 100644 --- a/lib/models/generateWallets.dart +++ b/lib/models/generateWallets.dart @@ -39,50 +39,30 @@ class GenerateWalletsProvider with ChangeNotifier { bool canImport = false; bool isPinChanged = false; - Future storeWallet(NewWallet wallet, String _name, BuildContext context, - {bool isHD = false}) async { - int nbrWallet; - if (isHD) { - nbrWallet = 0; - } else { - nbrWallet = 1; - } + Future storeHDWallet( + NewWallet _wallet, String _name, BuildContext context) async { + // Directory walletDirectory; - Directory walletNbrDirectory; - do { - nbrWallet++; - walletNbrDirectory = Directory('${walletsDirectory.path}/$nbrWallet'); - } while (await walletNbrDirectory.exists()); + final Directory hdDirectory = Directory('${walletsDirectory.path}/0'); + await hdDirectory.create(); - final walletFile = File('${walletNbrDirectory.path}/wallet.dewif'); + final configFile = File('${hdDirectory.path}/config.txt'); + final dewifFile = File('${hdDirectory.path}/wallet.dewif'); - await walletNbrDirectory.create(); - await walletFile.writeAsString(wallet.dewif); + // List _lastConfig = []; + // _lastConfig = await masterConfigFile.readAsLines(); + // final int _lastDerivation = int.parse(_lastConfig.last.split(':')[2]); + // final int _derivationNbr = _lastDerivation + 3; - final configFile = File('${walletNbrDirectory.path}/config.txt'); + final int _derivationNbr = 3; + List _pubkeysTmp = await DubpRust.getBip32DewifAccountsPublicKeys( + dewif: _wallet.dewif, + secretCode: _wallet.pin, + accountsIndex: [_derivationNbr]); + String _pubkey = _pubkeysTmp[0]; - if (isHD) { - final int _derivationNbr = 3; - List _pubkeysTmp = await DubpRust.getBip32DewifAccountsPublicKeys( - dewif: wallet.dewif, - secretCode: wallet.pin, - accountsIndex: [_derivationNbr]); - String _pubkey = _pubkeysTmp[0]; - - await configFile - .writeAsString('$nbrWallet:$_name:$_derivationNbr:$_pubkey'); - // Navigator.pop(context, true); - } else { - final int _derivationNbr = -1; - String _pubkey = await DubpRust.getDewifPublicKey( - dewif: wallet.dewif, - pin: wallet.pin, - ); - await configFile - .writeAsString('$nbrWallet:$_name:$_derivationNbr:$_pubkey'); - } - - // Navigator.pop(context, true); + await configFile.writeAsString('0:$_name:$_derivationNbr:$_pubkey'); + await dewifFile.writeAsString(_wallet.dewif); return _name; } @@ -263,8 +243,8 @@ class GenerateWalletsProvider with ChangeNotifier { salt: _cesiumID, password: _cesiumPWD); String shortPubkey = truncate(_walletPubkey, 9, omission: "...", position: TruncatePosition.end); - await storeWallet( - actualWallet, 'Portefeuille Cesium - $shortPubkey', context); + // await storeWallet( + // actualWallet, 'Portefeuille Cesium - $shortPubkey', context); cesiumID.text = ''; cesiumPWD.text = ''; cesiumPubkey.text = ''; diff --git a/lib/models/myWallets.dart b/lib/models/myWallets.dart index 4473f87..b0b61ba 100644 --- a/lib/models/myWallets.dart +++ b/lib/models/myWallets.dart @@ -13,6 +13,8 @@ class MyWalletsProvider with ChangeNotifier { return false; } + print(walletsDirectory.listSync()); + List contents = walletsDirectory.listSync(); if (contents.length == 0) { print('No wallets detected'); @@ -54,6 +56,23 @@ class MyWalletsProvider with ChangeNotifier { return listWallets; } + Future getDefaultWallet() async { + defaultWalletFile = File('${appPath.path}/defaultWallet'); + + bool isdefaultWalletFile = await defaultWalletFile.exists(); + + if (!isdefaultWalletFile) { + await File(defaultWalletFile.path).create(); + } + + try { + defaultWallet = await defaultWalletFile.readAsString(); + } catch (e) { + defaultWallet = '0:3'; + } + if (defaultWallet == '') defaultWallet = '0:3'; + } + Future deleteAllWallet(context) async { try { print('DELETE THAT ?: $walletsDirectory'); @@ -107,11 +126,9 @@ class MyWalletsProvider with ChangeNotifier { ); } - Future generateNewDerivation( - context, String _name, int _walletNbr) async { + Future generateNewDerivation(context, String _name) async { int _newDerivationNbr; - final _walletConfig = - File('${walletsDirectory.path}/$_walletNbr/config.txt'); + final _walletConfig = File('${walletsDirectory.path}/0/config.txt'); if (await _walletConfig.readAsString() == '') { _newDerivationNbr = 3; @@ -122,7 +139,7 @@ class MyWalletsProvider with ChangeNotifier { _newDerivationNbr = _lastDerivation + 3; } - await _walletConfig.writeAsString('\n$_walletNbr:$_name:$_newDerivationNbr', + await _walletConfig.writeAsString('\n0:$_name:$_newDerivationNbr', mode: FileMode.append); print(await _walletConfig.readAsString()); diff --git a/lib/screens/myWallets/confirmWalletStorage.dart b/lib/screens/myWallets/confirmWalletStorage.dart index 3b6385f..db1566a 100644 --- a/lib/screens/myWallets/confirmWalletStorage.dart +++ b/lib/screens/myWallets/confirmWalletStorage.dart @@ -126,11 +126,10 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { .isAskedWordValid && this.walletName.text != '') ? () async { - await _generateWalletProvider.storeWallet( + await _generateWalletProvider.storeHDWallet( generatedWallet, walletName.text, - context, - isHD: true); + context); _generateWalletProvider.isAskedWordValid = false; _generateWalletProvider.askedWordColor = diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart index 370cc13..1ab1650 100644 --- a/lib/screens/myWallets/walletsHome.dart +++ b/lib/screens/myWallets/walletsHome.dart @@ -1,4 +1,5 @@ import 'package:flutter/services.dart'; +import 'package:gecko/globals.dart'; import 'package:gecko/models/myWallets.dart'; import 'package:gecko/models/walletOptions.dart'; import 'package:flutter/material.dart'; @@ -81,7 +82,9 @@ class WalletsHome extends StatelessWidget { List _listWallets = _myWalletProvider.listWallets.split('\n'); // final int nbrOfWallets = _listWallets.length; - print(_listWallets); + // print(_listWallets); + // print("${_listWallets[0].split(':')[0]}:${_listWallets[0].split(':')[2]}"); + // print(defaultWallet); return GridView.count( crossAxisCount: 2, @@ -94,27 +97,62 @@ class WalletsHome extends StatelessWidget { padding: EdgeInsets.all(16), child: ClipRRect( borderRadius: BorderRadius.all(Radius.circular(12)), - child: ListTile( - // contentPadding: const EdgeInsets.only(left: 7.0), - tileColor: Colors.green[100], - // leading: Text('IMAGE'), + child: Column(children: [ + 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: 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])); - })); - }, - ))) + // 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])); + })); + }, + ) + ]))) ]); } @@ -200,7 +238,7 @@ class WalletsHome extends StatelessWidget { onPressed: () async { await _myWalletProvider .generateNewDerivation( - context, _newDerivationName.text, _walletNbr) + context, _newDerivationName.text) .then((_) => _newDerivationName.text == ''); }, child: Text("Créer")), diff --git a/lib/screens/myWallets/walletsHome_old.dart b/lib/screens/myWallets/walletsHome_old.dart index 9f6dace..7a5f99e 100644 --- a/lib/screens/myWallets/walletsHome_old.dart +++ b/lib/screens/myWallets/walletsHome_old.dart @@ -142,7 +142,7 @@ class WalletsHome extends StatelessWidget { onPressed: () async { await _myWalletProvider .generateNewDerivation( - context, _newDerivationName.text, _walletNbr) + 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 73f44ee..d9e8e61 100644 --- a/lib/screens/onBoarding/12.dart +++ b/lib/screens/onBoarding/12.dart @@ -116,9 +116,8 @@ class OnboardingStepFourteen extends StatelessWidget { if (resultWallet) { pinColor = Colors.green[500]; print(generatedWallet.pin); - await _generateWalletProvider.storeWallet( - generatedWallet, 'Mon portefeuille courant', context, - isHD: true); + await _generateWalletProvider.storeHDWallet( + generatedWallet, 'Mon portefeuille courant', context); _myWalletProvider.getAllWalletsNames(); _walletOptions.reloadBuild(); _myWalletProvider.rebuildWidget(); diff --git a/pubspec.yaml b/pubspec.yaml index 7179ea6..8cdb9aa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: Pay with G1. # 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.1+20 +version: 0.0.1+21 environment: sdk: ">=2.7.0 <3.0.0"