From 4bbb7e39151c4ff934b9bba91222284f8e05a239 Mon Sep 17 00:00:00 2001 From: poka Date: Sun, 14 Feb 2021 21:04:58 +0100 Subject: [PATCH] Remove pubkey from HD wallet infos; Rename portefeuille to trousseau --- lib/models/generateWallets.dart | 13 +----- lib/models/myWallets.dart | 2 +- lib/screens/myWallets/confirmWalletStorage.dart | 59 +++++++++---------------- lib/screens/myWallets/generateWallets.dart | 41 +++-------------- lib/screens/myWallets/walletsHome.dart | 2 +- 5 files changed, 31 insertions(+), 86 deletions(-) diff --git a/lib/models/generateWallets.dart b/lib/models/generateWallets.dart index da33f96..ea67e0f 100644 --- a/lib/models/generateWallets.dart +++ b/lib/models/generateWallets.dart @@ -33,7 +33,6 @@ class GenerateWalletsProvider with ChangeNotifier { final Directory walletNameDirectory = Directory('${walletsDirectory.path}/$_name'); final walletFile = File('${walletNameDirectory.path}/wallet.dewif'); - final walletPubkey = File('${walletNameDirectory.path}/pubkey'); if (await walletNameDirectory.exists()) { print('Ce wallet existe déjà, impossible de le créer.'); @@ -43,10 +42,9 @@ class GenerateWalletsProvider with ChangeNotifier { await walletNameDirectory.create(); await walletFile.writeAsString('${wallet.dewif}'); - await walletPubkey.writeAsString('${wallet.publicKey}'); Navigator.pop(context, true); - Navigator.pop(context, wallet.publicKey); + Navigator.pop(context, true); // notifyListeners(); return _name; @@ -173,7 +171,6 @@ class GenerateWalletsProvider with ChangeNotifier { } mnemonicController.text = generatedMnemonic; - pubkey.text = this.actualWallet.publicKey; pin.text = this.actualWallet.pin; // notifyListeners(); @@ -190,7 +187,7 @@ class GenerateWalletsProvider with ChangeNotifier { // notifyListeners(); } - Future printWallet(String _title, String _pubkey) async { + Future printWallet(String _title) async { final ByteData fontData = await rootBundle.load("assets/OpenSans-Regular.ttf"); final pw.Font ttf = pw.Font.ttf(fontData.buffer.asByteData()); @@ -204,12 +201,6 @@ class GenerateWalletsProvider with ChangeNotifier { pageFormat: PdfPageFormat.a4, build: (context) { return pw.Column(children: [ - pw.Text("Clé publique:", - style: pw.TextStyle(fontSize: 20, font: ttf)), - pw.SizedBox(height: 10), - pw.Text(_pubkey, - style: pw.TextStyle(fontSize: 15, font: ttf), - textAlign: pw.TextAlign.center), pw.SizedBox(height: 20), pw.Text("Phrase de restauration:", style: pw.TextStyle(fontSize: 20, font: ttf)), diff --git a/lib/models/myWallets.dart b/lib/models/myWallets.dart index f3a4ff1..7fefaac 100644 --- a/lib/models/myWallets.dart +++ b/lib/models/myWallets.dart @@ -73,7 +73,7 @@ class MyWalletsProvider with ChangeNotifier { Provider.of(context); return AlertDialog( title: Text( - 'Êtes-vous sûr de vouloir supprimer tous vos portefeuilles ?'), + 'Êtes-vous sûr de vouloir supprimer tous vos trousseaux ?'), content: SingleChildScrollView(child: Text('')), actions: [ TextButton( diff --git a/lib/screens/myWallets/confirmWalletStorage.dart b/lib/screens/myWallets/confirmWalletStorage.dart index b4b81bd..0130fa8 100644 --- a/lib/screens/myWallets/confirmWalletStorage.dart +++ b/lib/screens/myWallets/confirmWalletStorage.dart @@ -17,7 +17,6 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { NewWallet generatedWallet; TextEditingController _mnemonicController = TextEditingController(); - TextEditingController _pubkey = TextEditingController(); TextEditingController _inputRestoreWord = TextEditingController(); TextEditingController walletName = TextEditingController(); FocusNode _wordFocus = FocusNode(); @@ -30,7 +29,6 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { Provider.of(context); this._mnemonicController.text = generatedMnemonic; - this._pubkey.text = generatedWallet.publicKey; return WillPopScope( onWillPop: () { _generateWalletProvider.isAskedWordValid = false; @@ -49,38 +47,21 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { }), title: SizedBox( height: 22, - child: Text('Enregistrer ce portefeuille'), + child: Text('Enregistrer ce trousseau'), )), body: Center( child: Column(children: [ SizedBox(height: 15), - Text( - 'Votre clé publique est :', - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 17.0, - color: Colors.grey[600], - fontWeight: FontWeight.w400), - ), - TextField( - enabled: false, - controller: this._pubkey, - maxLines: 1, - textAlign: TextAlign.center, - decoration: InputDecoration(), - style: TextStyle( - fontSize: 14.0, - color: Colors.black, - fontWeight: FontWeight.bold)), - SizedBox(height: 12), - Text( - 'Quel est le ${_generateWalletProvider.nbrWord + 1}ème mot de votre phrase de restauration ?', - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 17.0, - color: Colors.grey[600], - fontWeight: FontWeight.w400), - ), + Container( + width: 360, + child: Text( + 'Quel est le ${_generateWalletProvider.nbrWord + 1}ème mot de votre phrase de restauration ?', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 17.0, + color: Colors.grey[600], + fontWeight: FontWeight.w400), + )), TextFormField( focusNode: _wordFocus, autofocus: true, @@ -99,14 +80,16 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { color: _generateWalletProvider.askedWordColor, fontWeight: FontWeight.w500)), SizedBox(height: 12), - Text( - 'Choisissez un nom pour votre portefeuille :', - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 17.0, - color: Colors.grey[600], - fontWeight: FontWeight.w400), - ), + Container( + width: 360, + child: Text( + 'Choisissez un nom pour votre premier portefeuille :', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 17.0, + color: Colors.grey[600], + fontWeight: FontWeight.w400), + )), TextFormField( focusNode: _generateWalletProvider.walletNameFocus, inputFormatters: [ diff --git a/lib/screens/myWallets/generateWallets.dart b/lib/screens/myWallets/generateWallets.dart index 6b0b4a9..6ce90a5 100644 --- a/lib/screens/myWallets/generateWallets.dart +++ b/lib/screens/myWallets/generateWallets.dart @@ -1,6 +1,4 @@ -import 'package:flutter/services.dart'; import 'package:gecko/models/generateWallets.dart'; -import 'package:gecko/models/walletOptions.dart'; import 'package:gecko/screens/myWallets/confirmWalletStorage.dart'; import 'package:flutter/material.dart'; import 'package:printing/printing.dart'; @@ -15,7 +13,6 @@ class GenerateWalletsScreen extends StatelessWidget { String currentText = ""; var pinColor = Colors.grey[300]; - GlobalKey _toolTipPubkey = GlobalKey(); GlobalKey _toolTipSentence = GlobalKey(); GlobalKey _toolTipSecret = GlobalKey(); @@ -23,8 +20,6 @@ class GenerateWalletsScreen extends StatelessWidget { Widget build(BuildContext context) { GenerateWalletsProvider _generateWalletProvider = Provider.of(context); - WalletOptionsProvider _walletOptions = - Provider.of(context); _generateWalletProvider.generateMnemonic(); print('IS GENERATED ? : ' + _generateWalletProvider.walletIsGenerated.toString()); @@ -32,7 +27,7 @@ class GenerateWalletsScreen extends StatelessWidget { appBar: AppBar( title: SizedBox( height: 22, - child: Text('Générer un portefeuille'), + child: Text('Générer un trousseau'), )), floatingActionButton: Container( height: 80.0, @@ -53,26 +48,6 @@ class GenerateWalletsScreen extends StatelessWidget { builder: (ctx) => SafeArea( child: Column(children: [ SizedBox(height: 20), - toolTips(_toolTipPubkey, 'Clé publique:', - "C'est votre RIB en Ğ1, les gens l'utiliseront pour vous payer"), - GestureDetector( - onTap: () { - Clipboard.setData(ClipboardData( - text: _generateWalletProvider.pubkey.text)); - _walletOptions.snackCopyKey(ctx); - }, - child: TextField( - enabled: false, - controller: _generateWalletProvider.pubkey, - maxLines: 1, - textAlign: TextAlign.center, - decoration: InputDecoration(), - style: TextStyle( - fontSize: 14.0, - color: Colors.black, - fontWeight: FontWeight.bold, - fontFamily: 'Monospace'))), - SizedBox(height: 8), toolTips(_toolTipSentence, 'Phrase de restauration:', "Notez et gardez cette phrase précieusement sur un papier, elle vous servira à restaurer votre portefeuille sur un autre appareil"), TextField( @@ -137,7 +112,7 @@ class GenerateWalletsScreen extends StatelessWidget { ); } : null, - child: Text('Enregistrer ce portefeuille', + child: Text('Enregistrer ce trousseau', style: TextStyle(fontSize: 20))), SizedBox(height: 20), GestureDetector( @@ -146,9 +121,7 @@ class GenerateWalletsScreen extends StatelessWidget { context, MaterialPageRoute(builder: (context) { return PrintWallet( - _generateWalletProvider.generatedMnemonic, - _generateWalletProvider - .actualWallet.publicKey); + _generateWalletProvider.generatedMnemonic); }), ); }, @@ -194,10 +167,9 @@ class GenerateWalletsScreen extends StatelessWidget { // ignore: must_be_immutable class PrintWallet extends StatelessWidget { - PrintWallet(this.sentence, this.pubkey); + PrintWallet(this.sentence); final String sentence; - final String pubkey; @override Widget build(BuildContext context) { @@ -205,10 +177,9 @@ class PrintWallet extends StatelessWidget { Provider.of(context); return MaterialApp( home: Scaffold( - appBar: AppBar(title: Text('Imprimer ce portefeuille')), + appBar: AppBar(title: Text('Imprimer ce trousseau')), body: PdfPreview( - build: (format) => - _generateWalletProvider.printWallet(sentence, pubkey), + build: (format) => _generateWalletProvider.printWallet(sentence), ), ), ); diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart index fa7da97..c88cd85 100644 --- a/lib/screens/myWallets/walletsHome.dart +++ b/lib/screens/myWallets/walletsHome.dart @@ -63,7 +63,7 @@ class WalletsHome extends StatelessWidget { return GenerateWalletsScreen(); }), ), - child: Text('Générer un portefeuille', + child: Text('Générer un trousseau', style: TextStyle(fontSize: 20))), SizedBox(height: 15), Center(