axiom-team
/
gecko
6
1
Fork 1
Code Issues Pull Requests Projects Releases 11 Wiki Activity

Replace prints by debugs logs

This commit is contained in:
poka 2021-04-02 12:05:37 +02:00
parent 794d24e235
commit b6703f48e6
18 changed files with 41 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/globals.dart
View File

@ -22,4 +22,4 @@ bool isTall;
double ratio; double ratio;
// Logger // Logger
var logger = Logger(); var log = Logger();

14
lib/models/cesiumPlus.dart
View File

@ -68,7 +68,6 @@ class CesiumPlusProvider with ChangeNotifier {
List queryOptions = await _buildQuery(_pubkey); List queryOptions = await _buildQuery(_pubkey);
final response = await http.post((Uri.parse(queryOptions[0])), final response = await http.post((Uri.parse(queryOptions[0])),
body: queryOptions[1], headers: queryOptions[2]); body: queryOptions[1], headers: queryOptions[2]);
// print('RESULT CESIUM QUERY: ${response.body}'); //For debug
final responseJson = json.decode(response.body); final responseJson = json.decode(response.body);
if (responseJson['hits']['hits'].toString() == '[]') { if (responseJson['hits']['hits'].toString() == '[]') {
return ''; return '';
@ -79,7 +78,6 @@ class CesiumPlusProvider with ChangeNotifier {
return ''; return '';
} }
_name = responseJson['hits']['hits'][0]['_source']['title']; _name = responseJson['hits']['hits'][0]['_source']['title'];
print(_name);
return _name; return _name;
} }
@ -88,7 +86,6 @@ class CesiumPlusProvider with ChangeNotifier {
List queryOptions = await _buildQuery(_pubkey); List queryOptions = await _buildQuery(_pubkey);
final response = await http.post((Uri.parse(queryOptions[0])), final response = await http.post((Uri.parse(queryOptions[0])),
body: queryOptions[1], headers: queryOptions[2]); body: queryOptions[1], headers: queryOptions[2]);
// print('RESULT CESIUM QUERY: ${response.body}'); //For debug
final responseJson = json.decode(response.body); final responseJson = json.decode(response.body);
if (responseJson['hits']['hits'].toString() == '[]') { if (responseJson['hits']['hits'].toString() == '[]') {
return [File(appPath.path + '/default_avatar.png')]; return [File(appPath.path + '/default_avatar.png')];
@ -103,21 +100,10 @@ class CesiumPlusProvider with ChangeNotifier {
var avatarFile = var avatarFile =
File('${(await getTemporaryDirectory()).path}/avatar$iAvatar.png'); File('${(await getTemporaryDirectory()).path}/avatar$iAvatar.png');
// final bool _isAvatarExist = await avatarFile.exists();
// if (_isAvatarExist) {
// await avatarFile.delete();
// }
await avatarFile.writeAsBytes(base64.decode(_avatar)); await avatarFile.writeAsBytes(base64.decode(_avatar));
iAvatar++; iAvatar++;
isComplete = true; isComplete = true;
return [avatarFile]; return [avatarFile];
} }
// isNameComplete() {
// while (isComplete == false) {
// print(isComplete);
// Duration(milliseconds: 50);
// }
// }
} }

3
lib/models/changePin.dart
View File

@ -27,7 +27,7 @@ class ChangePinProvider with ChangeNotifier {
notifyListeners(); notifyListeners();
return newWalletFile; return newWalletFile;
} catch (e) { } catch (e) {
print('Impossible de changer le code PIN.'); log.e('Impossible de changer le code PIN.');
return badWallet; return badWallet;
} }
} }
@ -36,7 +36,6 @@ class ChangePinProvider with ChangeNotifier {
final Directory walletNameDirectory = final Directory walletNameDirectory =
Directory('${walletsDirectory.path}/$_name'); Directory('${walletsDirectory.path}/$_name');
final walletFile = File('${walletNameDirectory.path}/wallet.dewif'); final walletFile = File('${walletNameDirectory.path}/wallet.dewif');
print(_newWalletFile);
walletFile.writeAsString('${_newWalletFile.dewif}'); walletFile.writeAsString('${_newWalletFile.dewif}');
Navigator.pop(context); Navigator.pop(context);

19
lib/models/generateWallets.dart
View File

@ -79,8 +79,6 @@ class GenerateWalletsProvider with ChangeNotifier {
final runesAsked = _mnemo.split(' ')[nbrWord].runes; final runesAsked = _mnemo.split(' ')[nbrWord].runes;
List<int> runesAskedUnaccent = []; List<int> runesAskedUnaccent = [];
print(runesAsked);
print(value.runes);
for (int i in runesAsked) { for (int i in runesAsked) {
if (i == 768 || i == 769 || i == 770 || i == 771) { if (i == 768 || i == 769 || i == 770 || i == 771) {
continue; continue;
@ -92,11 +90,11 @@ class GenerateWalletsProvider with ChangeNotifier {
utf8.decode(runesAskedUnaccent).toLowerCase(); utf8.decode(runesAskedUnaccent).toLowerCase();
final String unaccentedInputWord = removeDiacritics(value).toLowerCase(); final String unaccentedInputWord = removeDiacritics(value).toLowerCase();
print("Is $unaccentedAskedWord equal to input $unaccentedInputWord ?"); log.i("Is $unaccentedAskedWord equal to input $unaccentedInputWord ?");
if (unaccentedAskedWord == unaccentedInputWord || if (unaccentedAskedWord == unaccentedInputWord ||
value == 'triche' || value == 'triche' ||
value == '3.14') { value == '3.14') {
print('Word is OK'); log.d('Word is OK');
isAskedWordValid = true; isAskedWordValid = true;
askedWordColor = Colors.green[600]; askedWordColor = Colors.green[600];
// walletNameFocus.nextFocus(); // walletNameFocus.nextFocus();
@ -155,7 +153,7 @@ class GenerateWalletsProvider with ChangeNotifier {
this.actualWallet = await generateWallet(this.generatedMnemonic); this.actualWallet = await generateWallet(this.generatedMnemonic);
walletIsGenerated = true; walletIsGenerated = true;
} catch (e) { } catch (e) {
print(e); log.e(e);
} }
return generatedMnemonic; return generatedMnemonic;
} }
@ -168,7 +166,7 @@ class GenerateWalletsProvider with ChangeNotifier {
secretCodeType: SecretCodeType.letters, secretCodeType: SecretCodeType.letters,
); );
} catch (e) { } catch (e) {
print(e); log.e(e);
} }
mnemonicController.text = generatedMnemonic; mnemonicController.text = generatedMnemonic;
@ -240,7 +238,7 @@ class GenerateWalletsProvider with ChangeNotifier {
cesiumPubkey.text = _walletPubkey; cesiumPubkey.text = _walletPubkey;
pin.text = actualWallet.pin; pin.text = actualWallet.pin;
isPinChanged = true; isPinChanged = true;
print(_walletPubkey); log.d(_walletPubkey);
} }
Future importWallet(context, _cesiumID, _cesiumPWD) async { Future importWallet(context, _cesiumID, _cesiumPWD) async {
@ -291,20 +289,13 @@ class GenerateWalletsProvider with ChangeNotifier {
int _nbr = 1; int _nbr = 1;
for (word in _sentance.split(' ')) { for (word in _sentance.split(' ')) {
// print(word);
_wordsList.add("$_nbr:$word"); _wordsList.add("$_nbr:$word");
_nbr++; _nbr++;
} }
// notifyListeners();
return _wordsList; return _wordsList;
} }
// void makeError() {
// var tata = File(appPath.path + '/ddfhjftjfg');
// tata.readAsLinesSync();
// }
void reloadBuild() { void reloadBuild() {
notifyListeners(); notifyListeners();
} }

13
lib/models/history.dart
View File

@ -36,7 +36,7 @@ class HistoryProvider with ChangeNotifier {
try { try {
barcode = await scanner.scan(); barcode = await scanner.scan();
} catch (e) { } catch (e) {
print(e); log.e(e);
return 'false'; return 'false';
} }
if (barcode != null) { if (barcode != null) {
@ -72,7 +72,7 @@ class HistoryProvider with ChangeNotifier {
if (regExp.hasMatch(pubkey) == true && if (regExp.hasMatch(pubkey) == true &&
pubkey.length > 42 && pubkey.length > 42 &&
pubkey.length < 45) { pubkey.length < 45) {
print("C'est une pubkey !!!"); log.d("C'est une pubkey !!!");
this.pubkey = pubkey; this.pubkey = pubkey;
getShortPubkey(pubkey); getShortPubkey(pubkey);
@ -157,8 +157,6 @@ class HistoryProvider with ChangeNotifier {
final date = formatter.format(dateBrut); final date = formatter.format(dateBrut);
transBC[i].add(transaction['writtenTime']); transBC[i].add(transaction['writtenTime']);
transBC[i].add(date); transBC[i].add(date);
// print(
// "DEBUG date et comment: ${date.toString()} -- ${transaction['comment'].toString()}");
final int amountBrut = int.parse(output.split(':')[0]); final int amountBrut = int.parse(output.split(':')[0]);
final base = int.parse(output.split(':')[1]); final base = int.parse(output.split(':')[1]);
final int applyBase = base - currentBase; final int applyBase = base - currentBase;
@ -191,9 +189,6 @@ class HistoryProvider with ChangeNotifier {
pageInfo = result.data['txsHistoryBc']['both']['pageInfo']; pageInfo = result.data['txsHistoryBc']['both']['pageInfo'];
fetchMoreCursor = pageInfo['endCursor']; fetchMoreCursor = pageInfo['endCursor'];
print('hasPreviousPage: ' + pageInfo['hasPreviousPage'].toString());
print('hasNextPage: ' + pageInfo['hasNextPage'].toString());
if (fetchMoreCursor != null) { if (fetchMoreCursor != null) {
opts = FetchMoreOptions( opts = FetchMoreOptions(
variables: {'cursor': fetchMoreCursor}, variables: {'cursor': fetchMoreCursor},
@ -211,12 +206,12 @@ class HistoryProvider with ChangeNotifier {
); );
} }
print( log.d(
"###### DEBUG H Parse blockchainTX list. Cursor: $fetchMoreCursor ######"); "###### DEBUG H Parse blockchainTX list. Cursor: $fetchMoreCursor ######");
if (fetchMoreCursor != null) { if (fetchMoreCursor != null) {
transBC = parseHistory(blockchainTX, _pubkey); transBC = parseHistory(blockchainTX, _pubkey);
} else { } else {
print("###### DEBUG H - Début de l'historique"); log.i("###### DEBUG H - Début de l'historique");
} }
return opts; return opts;

14
lib/models/home.dart
View File

@ -53,10 +53,10 @@ class HomeProvider with ChangeNotifier {
do { do {
i++; i++;
print(i.toString() + ' ème essai de recherche de endpoint GVA.'); log.d(i.toString() + ' ème essai de recherche de endpoint GVA.');
print('Try GVA endpoint: ${_listEndpoints[i]}'); log.d('Try GVA endpoint: ${_listEndpoints[i]}');
if (i > 2) { if (i > 2) {
print('NO VALID GVA ENDPOINT FOUND'); log.e('NO VALID GVA ENDPOINT FOUND');
_endpoint = 'HS'; _endpoint = 'HS';
break; break;
} }
@ -71,21 +71,21 @@ class HomeProvider with ChangeNotifier {
_endpoint = _listEndpoints[i]; _endpoint = _listEndpoints[i];
_statusCode = response.statusCode; _statusCode = response.statusCode;
} on TimeoutException catch (_) { } on TimeoutException catch (_) {
print('This endpoint is timeout, next'); log.e('This endpoint is timeout, next');
_statusCode = 50; _statusCode = 50;
continue; continue;
} on SocketException catch (_) { } on SocketException catch (_) {
print('This endpoint is a bad endpoint, next'); log.e('This endpoint is a bad endpoint, next');
_statusCode = 70; _statusCode = 70;
continue; continue;
} on Exception { } on Exception {
print('Unknown error'); log.e('Unknown error');
_statusCode = 60; _statusCode = 60;
continue; continue;
} }
} while (_statusCode != 400); } while (_statusCode != 400);
print('ENDPOINT: ' + _endpoint); log.i('ENDPOINT: ' + _endpoint);
return _endpoint; return _endpoint;
} }

19
lib/models/myWallets.dart
View File

@ -51,37 +51,30 @@ class MyWalletsProvider with ChangeNotifier {
final List _walletList = readAllWallets(0); final List _walletList = readAllWallets(0);
if (_walletList.isEmpty) { if (_walletList.isEmpty) {
print('No wallets detected'); log.i('No wallets detected');
return false; return false;
} else { } else {
print('Some wallets have been detected.'); log.i('Some wallets have been detected.');
return true; return true;
} }
} }
List readAllWallets(int _chest) { List readAllWallets(int _chest) {
print(walletsDirectory.path); log.d(walletsDirectory.path);
listWallets = []; listWallets = [];
// int i = 0;
File _walletConfig = File('${walletsDirectory.path}/$_chest/list.conf'); File _walletConfig = File('${walletsDirectory.path}/$_chest/list.conf');
_walletConfig.readAsLinesSync().forEach((element) { _walletConfig.readAsLinesSync().forEach((element) {
print(element); log.i(element);
listWallets.add(WalletData(element)); listWallets.add(WalletData(element));
// listWallets += "${element.split(':')[0]}:${element.split(':')[1]}:${element.split(':')[2]}"
}); });
// listWallets.forEach((e) {
// print(e.name);
// });
// print(listWallets);
return listWallets; return listWallets;
} }
WalletData getWalletData(String _id) { WalletData getWalletData(String _id) {
int chest = int.parse(_id.split(':')[0]); int chest = int.parse(_id.split(':')[0]);
// int nbr = int.parse(_id.split(':')[1]);
final _walletConfig = File('${walletsDirectory.path}/$chest/list.conf'); final _walletConfig = File('${walletsDirectory.path}/$chest/list.conf');
return WalletData(_walletConfig return WalletData(_walletConfig
@ -97,12 +90,11 @@ class MyWalletsProvider with ChangeNotifier {
} }
defaultWallet = getWalletData(defaultWalletFile.readAsStringSync()); defaultWallet = getWalletData(defaultWalletFile.readAsStringSync());
print("found default wallet $defaultWallet");
} }
Future<int> deleteAllWallet(context) async { Future<int> deleteAllWallet(context) async {
try { try {
print('DELETE THAT ?: $walletsDirectory'); log.w('DELETE THAT ?: $walletsDirectory');
final bool _answer = await _confirmDeletingAllWallets(context); final bool _answer = await _confirmDeletingAllWallets(context);
@ -176,7 +168,6 @@ class MyWalletsProvider with ChangeNotifier {
'\n0:$_newWalletNbr:$_name:$_newDerivationNbr', '\n0:$_newWalletNbr:$_name:$_newDerivationNbr',
mode: FileMode.append); mode: FileMode.append);
print(await _walletConfig.readAsString());
notifyListeners(); notifyListeners();
Navigator.pop(context); Navigator.pop(context);

17
lib/models/walletOptions.dart
View File

@ -38,9 +38,7 @@ class WalletOptionsProvider with ChangeNotifier {
); );
if (regExp.hasMatch(_pin) == true && _pin.length == _pinLenght) { if (regExp.hasMatch(_pin) == true && _pin.length == _pinLenght) {
print("Le format du code PIN est correct.");
} else { } else {
print('Format de code PIN invalide');
return 'false'; return 'false';
} }
if (derivation != -1) { if (derivation != -1) {
@ -53,8 +51,7 @@ class WalletOptionsProvider with ChangeNotifier {
return _pubkey; return _pubkey;
} catch (e) { } catch (e) {
print('Bad PIN code !'); log.w('Bad PIN code !\n' + e);
print(e);
notifyListeners(); notifyListeners();
return 'false'; return 'false';
@ -66,8 +63,7 @@ class WalletOptionsProvider with ChangeNotifier {
notifyListeners(); notifyListeners();
return _pubkey; return _pubkey;
} catch (e) { } catch (e) {
print('Bad PIN code !'); log.w('Bad PIN code !\n' + e);
print(e);
notifyListeners(); notifyListeners();
return 'false'; return 'false';
@ -96,7 +92,7 @@ class WalletOptionsProvider with ChangeNotifier {
throw 'Bad pubkey'; throw 'Bad pubkey';
} }
} catch (e) { } catch (e) {
print('ERROR READING FILE: $e'); log.e('ERROR READING FILE: $e');
this.pubkey.clear(); this.pubkey.clear();
// notifyListeners(); // notifyListeners();
return 'bad'; return 'bad';
@ -113,7 +109,7 @@ class WalletOptionsProvider with ChangeNotifier {
throw false; throw false;
} }
} catch (e) { } catch (e) {
print('ERROR READING FILE: $e'); log.e('ERROR READING FILE: $e');
return false; return false;
} }
} }
@ -299,7 +295,7 @@ class WalletOptionsProvider with ChangeNotifier {
// notifyListeners(); // notifyListeners();
return newWalletFile; return newWalletFile;
} catch (e) { } catch (e) {
print('Impossible de changer le code PIN.'); log.e('Impossible de changer le code PIN.');
return badWallet; return badWallet;
} }
} }
@ -308,7 +304,6 @@ class WalletOptionsProvider with ChangeNotifier {
final Directory walletNameDirectory = final Directory walletNameDirectory =
Directory('${walletsDirectory.path}/$_name'); Directory('${walletsDirectory.path}/$_name');
final walletFile = File('${walletNameDirectory.path}/wallet.dewif'); final walletFile = File('${walletNameDirectory.path}/wallet.dewif');
print(_newWalletFile);
walletFile.writeAsString('${_newWalletFile.dewif}'); walletFile.writeAsString('${_newWalletFile.dewif}');
Navigator.pop(context); Navigator.pop(context);
@ -365,7 +360,7 @@ class WalletOptionsProvider with ChangeNotifier {
_image = File(pickedFile.path); _image = File(pickedFile.path);
return _image; return _image;
} else { } else {
print('No image selected.'); log.w('No image selected.');
} }
} }

12
lib/screens/history.dart
View File

@ -34,8 +34,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context); HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
HomeProvider _homeProvider = Provider.of<HomeProvider>(context); HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
this._outputPubkey.text = _historyProvider.pubkey; this._outputPubkey.text = _historyProvider.pubkey;
print('Build pubkey : ' + _historyProvider.pubkey); log.i('Build pubkey : ' + _historyProvider.pubkey);
// _historyProvider.snackNode(context);
WidgetsBinding.instance.addPostFrameCallback((_) {}); WidgetsBinding.instance.addPostFrameCallback((_) {});
return Scaffold( return Scaffold(
@ -58,7 +57,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
autofocus: true, autofocus: true,
controller: _homeProvider.searchQuery, controller: _homeProvider.searchQuery,
onChanged: (text) { onChanged: (text) {
print("Clé tappé: $text"); log.d("Clé tappé: $text");
final String searchResult = final String searchResult =
_historyProvider.isPubkey(context, text); _historyProvider.isPubkey(context, text);
if (searchResult != '') { if (searchResult != '') {
@ -114,7 +113,6 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
// HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context); // HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
CesiumPlusProvider _cesiumPlusProvider = CesiumPlusProvider _cesiumPlusProvider =
Provider.of<CesiumPlusProvider>(context); Provider.of<CesiumPlusProvider>(context);
print("I'M HERE 1");
bool _isFirstExec = true; bool _isFirstExec = true;
return Expanded( return Expanded(
child: Column( child: Column(
@ -131,18 +129,14 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
}, },
), ),
builder: (QueryResult result, {fetchMore, refetch}) { builder: (QueryResult result, {fetchMore, refetch}) {
print("I'M HERE 2 ! $_isFirstExec");
// print(result.source.isEager);
if (result.isLoading && result.data == null) { if (result.isLoading && result.data == null) {
print("I'M HERE 3 !");
return const Center( return const Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
); );
} }
if (result.hasException) { if (result.hasException) {
print('Error GVA: ' + result.exception.toString()); log.e('Error GVA: ' + result.exception.toString());
return Column(children: <Widget>[ return Column(children: <Widget>[
SizedBox(height: 50), SizedBox(height: 50),
Text( Text(

2
lib/screens/home.dart
View File

@ -97,7 +97,7 @@ class HomeScreen extends StatelessWidget {
autofocus: true, autofocus: true,
controller: _homeProvider.searchQuery, controller: _homeProvider.searchQuery,
onChanged: (text) { onChanged: (text) {
print("Clé tappé: $text"); log.d("Clé tappé: $text");
final String searchResult = final String searchResult =
_historyProvider.isPubkey(context, text); _historyProvider.isPubkey(context, text);
if (searchResult != '') { if (searchResult != '') {

3
lib/screens/myWallets/generateWallets.dart
View File

@ -24,9 +24,6 @@ class GenerateWalletsScreen extends StatelessWidget {
Provider.of<GenerateWalletsProvider>(context); Provider.of<GenerateWalletsProvider>(context);
_generateWalletProvider.generateMnemonic(); _generateWalletProvider.generateMnemonic();
// _generateWalletProvider.makeError();
print('IS GENERATED ? : ' +
_generateWalletProvider.walletIsGenerated.toString());
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: SizedBox( title: SizedBox(

2
lib/screens/myWallets/importWallet.dart
View File

@ -48,7 +48,6 @@ class ImportWalletScreen extends StatelessWidget {
_debounce.cancel(); _debounce.cancel();
_debounce = _debounce =
Timer(const Duration(milliseconds: 200), () { Timer(const Duration(milliseconds: 200), () {
print("ID Cesium tappé: $text");
_generateWalletProvider _generateWalletProvider
.generateCesiumWalletPubkey(text, .generateCesiumWalletPubkey(text,
_generateWalletProvider.cesiumPWD.text) _generateWalletProvider.cesiumPWD.text)
@ -86,7 +85,6 @@ class ImportWalletScreen extends StatelessWidget {
_debounce.cancel(); _debounce.cancel();
_debounce = _debounce =
Timer(const Duration(milliseconds: 200), () { Timer(const Duration(milliseconds: 200), () {
print("ID Cesium tappé: $text");
_generateWalletProvider _generateWalletProvider
.generateCesiumWalletPubkey( .generateCesiumWalletPubkey(
_generateWalletProvider.cesiumID.text, _generateWalletProvider.cesiumID.text,

6
lib/screens/myWallets/unlockingWallet.dart
View File

@ -9,8 +9,7 @@ import 'package:flutter/material.dart';
import 'package:gecko/screens/myWallets/walletOptions.dart'; import 'package:gecko/screens/myWallets/walletOptions.dart';
import 'package:pin_code_fields/pin_code_fields.dart'; import 'package:pin_code_fields/pin_code_fields.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
// import 'package:gecko/models/home.dart'; import 'package:gecko/globals.dart';
// import 'package:provider/provider.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class UnlockingWallet extends StatelessWidget { class UnlockingWallet extends StatelessWidget {
@ -125,7 +124,7 @@ class UnlockingWallet extends StatelessWidget {
) )
], ],
onCompleted: (_pin) async { onCompleted: (_pin) async {
print("Completed"); log.d("Completed");
final resultWallet = await _walletOptions.readLocalWallet( final resultWallet = await _walletOptions.readLocalWallet(
context, this.wallet, _pin.toUpperCase(), _pinLenght); context, this.wallet, _pin.toUpperCase(), _pinLenght);
if (resultWallet == 'bad') { if (resultWallet == 'bad') {
@ -149,7 +148,6 @@ class UnlockingWallet extends StatelessWidget {
if (pinColor != Color(0xFFA4B600)) { if (pinColor != Color(0xFFA4B600)) {
pinColor = Color(0xFFA4B600); pinColor = Color(0xFFA4B600);
} }
print(value);
}, },
)), )),
); );

6
lib/screens/myWallets/walletOptions-old.dart
View File

@ -5,6 +5,7 @@ import 'package:gecko/models/walletOptions.dart';
import 'dart:async'; import 'dart:async';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class WalletOptionsOld extends StatelessWidget with ChangeNotifier { class WalletOptionsOld extends StatelessWidget with ChangeNotifier {
@ -21,15 +22,12 @@ class WalletOptionsOld extends StatelessWidget with ChangeNotifier {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
print("Build walletOptions"); log.d("Build walletOptions");
WalletOptionsProvider _walletOptions = WalletOptionsProvider _walletOptions =
Provider.of<WalletOptionsProvider>(context); Provider.of<WalletOptionsProvider>(context);
MyWalletsProvider _myWalletProvider = MyWalletsProvider _myWalletProvider =
Provider.of<MyWalletsProvider>(context); Provider.of<MyWalletsProvider>(context);
// _walletOptions.isWalletUnlock = false;
print("Is unlock ? ${_walletOptions.isWalletUnlock}");
final int _currentChest = _myWalletProvider.getCurrentChest(); final int _currentChest = _myWalletProvider.getCurrentChest();
return WillPopScope( return WillPopScope(

13
lib/screens/myWallets/walletOptions.dart
View File

@ -22,7 +22,7 @@ class WalletOptions extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
print("Build walletOptions"); log.d("Build walletOptions");
WalletOptionsProvider _walletOptions = WalletOptionsProvider _walletOptions =
Provider.of<WalletOptionsProvider>(context); Provider.of<WalletOptionsProvider>(context);
MyWalletsProvider _myWalletProvider = MyWalletsProvider _myWalletProvider =
@ -55,10 +55,7 @@ class WalletOptions extends StatelessWidget {
int currentChest = _myWalletProvider.getCurrentChest(); int currentChest = _myWalletProvider.getCurrentChest();
print('roooooooooooooo'); log.d("$currentChest:${wallet.number}");
print("$currentChest:${wallet.number}");
// print(_walletOptions.generateQRcode(_walletOptions.pubkey.text));
return WillPopScope( return WillPopScope(
onWillPop: () { onWillPop: () {
@ -111,7 +108,6 @@ class WalletOptions extends StatelessWidget {
InkWell( InkWell(
onTap: () async { onTap: () async {
await _walletOptions.changeAvatar(); await _walletOptions.changeAvatar();
print('CHANGE AVATAR');
}, },
child: Image.asset( child: Image.asset(
'assets/chopp-gecko2.png', 'assets/chopp-gecko2.png',
@ -119,7 +115,6 @@ class WalletOptions extends StatelessWidget {
InkWell( InkWell(
onTap: () async { onTap: () async {
await _walletOptions.changeAvatar(); await _walletOptions.changeAvatar();
print('CHANGE AVATAR');
}, },
child: Column(children: <Widget>[ child: Column(children: <Widget>[
Image.asset( Image.asset(
@ -127,14 +122,12 @@ class WalletOptions extends StatelessWidget {
), ),
SizedBox(height: 100) SizedBox(height: 100)
])), ])),
// SizedBox(width: 20),
Column(children: <Widget>[ Column(children: <Widget>[
Row(children: <Widget>[ Row(children: <Widget>[
Column(children: <Widget>[ Column(children: <Widget>[
SizedBox( SizedBox(
width: 260, width: 260,
child: TextField( child: TextField(
// autofocus: true,
focusNode: _walletOptions.walletNameFocus, focusNode: _walletOptions.walletNameFocus,
enabled: _walletOptions.isEditing, enabled: _walletOptions.isEditing,
controller: _walletOptions.nameController, controller: _walletOptions.nameController,
@ -172,8 +165,6 @@ class WalletOptions extends StatelessWidget {
return Text('Loading'); return Text('Loading');
} }
print(result);
// List repositories = result.data['viewer']['repositories']['nodes']; // List repositories = result.data['viewer']['repositories']['nodes'];
String wBalanceUD; String wBalanceUD;
if (result.data['balance'] == null) { if (result.data['balance'] == null) {

4
lib/screens/myWallets/walletsHome.dart
View File

@ -88,10 +88,6 @@ class WalletsHome extends StatelessWidget {
} }
List _listWallets = _myWalletProvider.listWallets; List _listWallets = _myWalletProvider.listWallets;
// final int nbrOfWallets = _listWallets.length;
// print(_listWallets);
// print("${_listWallets[0].split(':')[0]}:${_listWallets[0].split(':')[2]}");
// print(defaultWallet);
return GridView.count( return GridView.count(
crossAxisCount: 2, crossAxisCount: 2,

5
lib/screens/onBoarding/12.dart
View File

@ -110,14 +110,10 @@ class OnboardingStepFourteen extends StatelessWidget {
) )
], ],
onCompleted: (_pin) async { onCompleted: (_pin) async {
print("Completed");
// final resultWallet = await _walletOptions.readLocalWallet(
// _walletNbr, _pin.toUpperCase(), _pinLenght, _derivation);
final bool resultWallet = await _walletOptions.checkPinOK( final bool resultWallet = await _walletOptions.checkPinOK(
generatedWallet.dewif, _pin.toUpperCase(), _pinLenght); generatedWallet.dewif, _pin.toUpperCase(), _pinLenght);
if (resultWallet) { if (resultWallet) {
pinColor = Colors.green[500]; pinColor = Colors.green[500];
print(generatedWallet.pin);
await _generateWalletProvider.storeHDWChest( await _generateWalletProvider.storeHDWChest(
generatedWallet, 'Mon portefeuille courant', context); generatedWallet, 'Mon portefeuille courant', context);
_myWalletProvider.readAllWallets(_currentChest); _myWalletProvider.readAllWallets(_currentChest);
@ -140,7 +136,6 @@ class OnboardingStepFourteen extends StatelessWidget {
if (pinColor != Color(0xFFA4B600)) { if (pinColor != Color(0xFFA4B600)) {
pinColor = Color(0xFFA4B600); pinColor = Color(0xFFA4B600);
} }
print(value);
}, },
)), )),
); );

3
lib/screens/settings.dart
View File

@ -5,6 +5,7 @@ import 'package:gecko/models/myWallets.dart';
import 'package:gecko/screens/myWallets/generateWallets.dart'; import 'package:gecko/screens/myWallets/generateWallets.dart';
import 'dart:io'; import 'dart:io';
import 'package:gecko/screens/myWallets/importWallet.dart'; import 'package:gecko/screens/myWallets/importWallet.dart';
import 'package:gecko/globals.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class SettingsScreen extends StatelessWidget { class SettingsScreen extends StatelessWidget {
@ -85,7 +86,7 @@ class SettingsScreen extends StatelessWidget {
onPrimary: Colors.black, // foreground onPrimary: Colors.black, // foreground
), ),
onPressed: () async => { onPressed: () async => {
print('Suppression de tous les wallets'), log.i('Suppression de tous les wallets'),
await _myWallets.deleteAllWallet(context) await _myWallets.deleteAllWallet(context)
}, },
child: Text( child: Text(