diff --git a/android/app/build.gradle b/android/app/build.gradle
index 76c91a5..ecf1475 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -65,7 +65,7 @@ android {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.release //poka: comment this to build unsigned release, or set to signingConfigs.debug to sign with debug keys
+ signingConfig signingConfigs.debug //poka: comment this to build unsigned release, or set to signingConfigs.debug to sign with debug keys
useProguard true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
diff --git a/lib/main.dart b/lib/main.dart
index 60f4f68..1c4362b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -13,8 +13,6 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-// ignore_for_file: avoid_print
-
import 'dart:async';
import 'dart:io';
import 'package:flutter/services.dart';
@@ -44,7 +42,6 @@ import 'package:flutter/foundation.dart';
import 'package:responsive_framework/responsive_framework.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
-import 'package:window_size/window_size.dart';
import 'package:graphql_flutter/graphql_flutter.dart';
import 'package:easy_localization/easy_localization.dart';
@@ -53,17 +50,12 @@ const bool enableSentry = true;
Future main() async {
WidgetsFlutterBinding.ensureInitialized();
await EasyLocalization.ensureInitialized();
- if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS)) {
- setWindowTitle('Ğecko');
- setWindowMinSize(const Size(400, 700));
- setWindowMaxSize(const Size(800, 1000));
- }
- HomeProvider _homeProvider = HomeProvider();
+ HomeProvider homeProvider = HomeProvider();
// DuniterIndexer _duniterIndexer = DuniterIndexer();
await initHiveForFlutter();
- await _homeProvider.initHive();
- appVersion = await _homeProvider.getAppVersion();
+ await homeProvider.initHive();
+ appVersion = await homeProvider.getAppVersion();
prefs = await SharedPreferences.getInstance();
// Reset GraphQL cache
@@ -82,7 +74,7 @@ Future main() async {
await Hive.deleteBoxFromDisk('g1WalletsBox');
g1WalletsBox = await Hive.openBox("g1WalletsBox");
- await _homeProvider.getValidEndpoints();
+ await homeProvider.getValidEndpoints();
// await configBox.delete('isCacheChecked');
if (configBox.get('isCacheChecked') == null) {
configBox.put('isCacheChecked', false);
@@ -117,7 +109,7 @@ Future main() async {
),
);
} else {
- print('Debug mode enabled: No sentry alerte');
+ log.i('Debug mode enabled: No sentry alerte');
runApp(
EasyLocalization(
diff --git a/lib/models/stateful_wrapper.dart b/lib/models/stateful_wrapper.dart
index 5706812..3ce7df0 100644
--- a/lib/models/stateful_wrapper.dart
+++ b/lib/models/stateful_wrapper.dart
@@ -6,10 +6,10 @@ class StatefulWrapper extends StatefulWidget {
const StatefulWrapper({Key? key, required this.onInit, required this.child})
: super(key: key);
@override
- _StatefulWrapperState createState() => _StatefulWrapperState();
+ StatefulWrapperState createState() => StatefulWrapperState();
}
-class _StatefulWrapperState extends State {
+class StatefulWrapperState extends State {
@override
void initState() {
widget.onInit();
diff --git a/lib/providers/cesium_plus.dart b/lib/providers/cesium_plus.dart
index a50277b..06cb063 100644
--- a/lib/providers/cesium_plus.dart
+++ b/lib/providers/cesium_plus.dart
@@ -13,18 +13,18 @@ class CesiumPlusProvider with ChangeNotifier {
CancelToken avatarCancelToken = CancelToken();
- Future _buildQuery(_pubkey) async {
+ Future _buildQuery(pubkey) async {
var queryGetAvatar = json.encode({
"query": {
"bool": {
"should": [
{
"match": {
- '_id': {"query": _pubkey, "boost": 2}
+ '_id': {"query": pubkey, "boost": 2}
}
},
{
- "prefix": {'_id': _pubkey}
+ "prefix": {'_id': pubkey}
}
]
}
@@ -60,14 +60,14 @@ class CesiumPlusProvider with ChangeNotifier {
return [podRequest, queryGetAvatar, headers];
}
- Future getName(String? _pubkey) async {
- String? _name;
+ Future getName(String? pubkey) async {
+ String? name;
- if (g1WalletsBox.get(_pubkey)?.csName != null) {
- return g1WalletsBox.get(_pubkey)!.csName!;
+ if (g1WalletsBox.get(pubkey)?.csName != null) {
+ return g1WalletsBox.get(pubkey)!.csName!;
}
- List queryOptions = await _buildQuery(_pubkey);
+ List queryOptions = await _buildQuery(pubkey);
var dio = Dio();
late Response response;
@@ -90,28 +90,28 @@ class CesiumPlusProvider with ChangeNotifier {
if (response.data['hits']['hits'].toString() == '[]') {
return '';
}
- final bool _nameExist =
+ final bool nameExist =
response.data['hits']['hits'][0]['_source'].containsKey("title");
- if (!_nameExist) {
+ if (!nameExist) {
return '';
}
- _name = response.data['hits']['hits'][0]['_source']['title'];
+ name = response.data['hits']['hits'][0]['_source']['title'];
- _name ??= '';
- g1WalletsBox.get(_pubkey)!.csName = _name;
+ name ??= '';
+ g1WalletsBox.get(pubkey)!.csName = name;
- return _name;
+ return name;
}
- Future getAvatar(String? _pubkey, double size) async {
- if (g1WalletsBox.get(_pubkey)?.avatar != null) {
- return g1WalletsBox.get(_pubkey)!.avatar;
+ Future getAvatar(String? pubkey, double size) async {
+ if (g1WalletsBox.get(pubkey)?.avatar != null) {
+ return g1WalletsBox.get(pubkey)!.avatar;
}
var dio = Dio();
// log.d(_pubkey);
- List queryOptions = await _buildQuery(_pubkey);
+ List queryOptions = await _buildQuery(pubkey);
late Response response;
try {
@@ -138,12 +138,12 @@ class CesiumPlusProvider with ChangeNotifier {
return defaultAvatar(size);
}
- final _avatar =
+ final avatar =
response.data['hits']['hits'][0]['_source']['avatar']['_content'];
var avatarFile =
- File('${(await getTemporaryDirectory()).path}/avatar_$_pubkey.png');
- await avatarFile.writeAsBytes(base64.decode(_avatar));
+ File('${(await getTemporaryDirectory()).path}/avatar_$pubkey.png');
+ await avatarFile.writeAsBytes(base64.decode(avatar));
final finalAvatar = Image.file(
avatarFile,
@@ -151,7 +151,7 @@ class CesiumPlusProvider with ChangeNotifier {
fit: BoxFit.fitWidth,
);
- g1WalletsBox.get(_pubkey)!.avatar = finalAvatar;
+ g1WalletsBox.get(pubkey)!.avatar = finalAvatar;
return finalAvatar;
}
diff --git a/lib/providers/chest_provider.dart b/lib/providers/chest_provider.dart
index 3a11b88..0134e26 100644
--- a/lib/providers/chest_provider.dart
+++ b/lib/providers/chest_provider.dart
@@ -13,16 +13,16 @@ class ChestProvider with ChangeNotifier {
notifyListeners();
}
- Future deleteChest(context, ChestData _chest) async {
- final bool? _answer = await (_confirmDeletingChest(context, _chest.name));
- SubstrateSdk _sub = Provider.of(context, listen: false);
- if (_answer ?? false) {
- await _sub.deleteAccounts(getChestWallets(_chest));
- await chestBox.delete(_chest.key);
- MyWalletsProvider _myWalletProvider =
+ Future deleteChest(context, ChestData chest) async {
+ final bool? answer = await (_confirmDeletingChest(context, chest.name));
+ SubstrateSdk sub = Provider.of(context, listen: false);
+ if (answer ?? false) {
+ await sub.deleteAccounts(getChestWallets(chest));
+ await chestBox.delete(chest.key);
+ MyWalletsProvider myWalletProvider =
Provider.of(context, listen: false);
- _myWalletProvider.pinCode = '';
+ myWalletProvider.pinCode = '';
if (chestBox.isEmpty) {
await configBox.put('currentChest', 0);
@@ -39,24 +39,24 @@ class ChestProvider with ChangeNotifier {
}
}
- List getChestWallets(ChestData _chest) {
+ List getChestWallets(ChestData chest) {
List toDelete = [];
- log.d(_chest.key);
+ log.d(chest.key);
walletBox.toMap().forEach((key, WalletData value) {
- if (value.chest == _chest.key) {
+ if (value.chest == chest.key) {
toDelete.add(value.address!);
}
});
return toDelete;
}
- Future _confirmDeletingChest(context, String? _walletName) async {
+ Future _confirmDeletingChest(context, String? walletName) async {
return showDialog(
context: context,
barrierDismissible: true, // user must tap button!
builder: (BuildContext context) {
return AlertDialog(
- title: Text('areYouSureToDeleteWallet'.tr(args: [_walletName!])),
+ title: Text('areYouSureToDeleteWallet'.tr(args: [walletName!])),
actions: [
TextButton(
child: Text("no".tr(), key: const Key('cancelDeleting')),
diff --git a/lib/providers/duniter_indexer.dart b/lib/providers/duniter_indexer.dart
index 51075d8..fbe9c7a 100644
--- a/lib/providers/duniter_indexer.dart
+++ b/lib/providers/duniter_indexer.dart
@@ -33,10 +33,10 @@ class DuniterIndexer with ChangeNotifier {
Future checkIndexerEndpoint(String endpoint) async {
isLoadingIndexer = true;
notifyListeners();
- final _client = HttpClient();
- _client.connectionTimeout = const Duration(milliseconds: 4000);
+ final client = HttpClient();
+ client.connectionTimeout = const Duration(milliseconds: 4000);
try {
- final request = await _client.postUrl(Uri.parse('$endpoint/v1/graphql'));
+ final request = await client.postUrl(Uri.parse('$endpoint/v1/graphql'));
final response = await request.close();
if (response.statusCode != 200) {
log.d('INDEXER IS OFFILINE');
@@ -102,10 +102,10 @@ class DuniterIndexer with ChangeNotifier {
int i = 0;
// String _endpoint = '';
- int _statusCode = 0;
+ int statusCode = 0;
- final _client = HttpClient();
- _client.connectionTimeout = const Duration(milliseconds: 3000);
+ final client = HttpClient();
+ client.connectionTimeout = const Duration(milliseconds: 3000);
do {
int listLenght = listIndexerEndpoints.length;
@@ -114,8 +114,7 @@ class DuniterIndexer with ChangeNotifier {
indexerEndpoint = '';
break;
}
- log.d((i + 1).toString() +
- 'n indexer endpoint try: ${listIndexerEndpoints[i]}');
+ log.d('${i + 1}n indexer endpoint try: ${listIndexerEndpoints[i]}');
if (i != 0) {
await Future.delayed(const Duration(milliseconds: 300));
@@ -124,33 +123,33 @@ class DuniterIndexer with ChangeNotifier {
try {
String endpointPath = '${listIndexerEndpoints[i]}/v1/graphql';
- final request = await _client.postUrl(Uri.parse(endpointPath));
+ final request = await client.postUrl(Uri.parse(endpointPath));
final response = await request.close();
indexerEndpoint = listIndexerEndpoints[i];
await configBox.put('indexerEndpoint', listIndexerEndpoints[i]);
- _statusCode = response.statusCode;
+ statusCode = response.statusCode;
i++;
} on TimeoutException catch (_) {
log.e('This endpoint is timeout, next');
- _statusCode = 50;
+ statusCode = 50;
i++;
continue;
} on SocketException catch (_) {
log.e('This endpoint is a bad endpoint, next');
- _statusCode = 70;
+ statusCode = 70;
i++;
continue;
} on Exception {
log.e('Unknown error');
- _statusCode = 60;
+ statusCode = 60;
i++;
continue;
}
- } while (_statusCode != 200);
+ } while (statusCode != 200);
- log.i('INDEXER: ' + indexerEndpoint);
+ log.i('INDEXER: $indexerEndpoint');
return indexerEndpoint;
}
@@ -158,34 +157,34 @@ class DuniterIndexer with ChangeNotifier {
[WalletData? wallet,
double size = 20,
bool canEdit = false,
- Color _color = Colors.black,
+ Color color = Colors.black,
FontWeight fontWeight = FontWeight.w400,
FontStyle fontStyle = FontStyle.italic]) {
- WalletOptionsProvider _walletOptions =
+ WalletOptionsProvider walletOptions =
Provider.of(context, listen: false);
if (indexerEndpoint == '') {
if (wallet == null) {
return const SizedBox();
} else {
if (canEdit) {
- return _walletOptions.walletName(context, wallet, size, _color);
+ return walletOptions.walletName(context, wallet, size, color);
} else {
- return _walletOptions.walletNameController(context, wallet, size);
+ return walletOptions.walletNameController(context, wallet, size);
}
}
}
- final _httpLink = HttpLink(
+ final httpLink = HttpLink(
'$indexerEndpoint/v1/graphql',
);
- final _client = ValueNotifier(
+ final client = ValueNotifier(
GraphQLClient(
cache: GraphQLCache(store: HiveStore()),
- link: _httpLink,
+ link: httpLink,
),
);
return GraphQLProvider(
- client: _client,
+ client: client,
child: Query(
options: QueryOptions(
document: gql(
@@ -213,22 +212,21 @@ class DuniterIndexer with ChangeNotifier {
return const SizedBox();
} else {
if (canEdit) {
- return _walletOptions.walletName(
- context, wallet, size, _color);
+ return walletOptions.walletName(context, wallet, size, color);
} else {
- return _walletOptions.walletNameController(
+ return walletOptions.walletNameController(
context, wallet, size);
}
}
}
return Text(
- _color == Colors.grey[700]!
+ color == Colors.grey[700]!
? '(${walletNameIndexer[address]!})'
: truncate(walletNameIndexer[address]!, 20),
style: TextStyle(
fontSize: size,
- color: _color,
+ color: color,
fontWeight: fontWeight,
fontStyle: fontStyle,
),
@@ -240,28 +238,28 @@ class DuniterIndexer with ChangeNotifier {
Widget searchIdentity(BuildContext context, String name) {
// WalletOptionsProvider _walletOptions =
// Provider.of(context, listen: false);
- CesiumPlusProvider _cesiumPlusProvider =
+ CesiumPlusProvider cesiumPlusProvider =
Provider.of(context, listen: false);
- WalletsProfilesProvider _walletsProfiles =
+ WalletsProfilesProvider walletsProfiles =
Provider.of(context, listen: false);
if (indexerEndpoint == '') {
return const Text('Aucun résultat');
}
log.d(indexerEndpoint);
- final _httpLink = HttpLink(
+ final httpLink = HttpLink(
'$indexerEndpoint/v1/graphql',
);
- final _client = ValueNotifier(
+ final client = ValueNotifier(
GraphQLClient(
cache: GraphQLCache(
store: HiveStore()), // GraphQLCache(store: HiveStore())
- link: _httpLink,
+ link: httpLink,
),
);
return GraphQLProvider(
- client: _client,
+ client: client,
child: Query(
options: QueryOptions(
document: gql(
@@ -288,7 +286,7 @@ class DuniterIndexer with ChangeNotifier {
}
int keyID = 0;
- double _avatarSize = 55;
+ double avatarSize = 55;
return Expanded(
child: ListView(children: [
for (Map profile in identities)
@@ -298,7 +296,7 @@ class DuniterIndexer with ChangeNotifier {
key: Key('searchResult${keyID++}'),
horizontalTitleGap: 40,
contentPadding: const EdgeInsets.all(5),
- leading: _cesiumPlusProvider.defaultAvatar(_avatarSize),
+ leading: cesiumPlusProvider.defaultAvatar(avatarSize),
title: Row(children: [
Text(getShortPubkey(profile['id']),
style: const TextStyle(
@@ -322,7 +320,7 @@ class DuniterIndexer with ChangeNotifier {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
- _walletsProfiles.address = profile['id'];
+ walletsProfiles.address = profile['id'];
return WalletViewScreen(
pubkey: profile['id'],
username: g1WalletsBox
@@ -341,14 +339,14 @@ class DuniterIndexer with ChangeNotifier {
);
}
- List parseHistory(blockchainTX, _pubkey) {
+ List parseHistory(blockchainTX, pubkey) {
var transBC = [];
int i = 0;
for (final trans in blockchainTX) {
final transaction = trans['node'];
final direction =
- transaction['issuer_id'] != _pubkey ? 'RECEIVED' : 'SENT';
+ transaction['issuer_id'] != pubkey ? 'RECEIVED' : 'SENT';
transBC.add(i);
transBC[i] = [];
@@ -362,7 +360,7 @@ class DuniterIndexer with ChangeNotifier {
} else if (direction == "SENT") {
transBC[i].add(transaction['receiver_id']);
transBC[i].add(transaction['receiver']['identity']?['name'] ?? '');
- transBC[i].add('- ' + amount.toString());
+ transBC[i].add('- $amount');
}
// transBC[i].add(''); //transaction comment
@@ -371,7 +369,7 @@ class DuniterIndexer with ChangeNotifier {
return transBC;
}
- FetchMoreOptions? checkQueryResult(result, opts, _pubkey) {
+ FetchMoreOptions? checkQueryResult(result, opts, pubkey) {
final List? blockchainTX =
(result.data['transaction_connection']['edges'] as List?);
// final List mempoolTX =
@@ -402,9 +400,9 @@ class DuniterIndexer with ChangeNotifier {
as List
];
- log.d('repos: ' + previousResultData.toString());
- log.d('repos: ' + fetchMoreResultData.toString());
- log.d('repos: ' + repos.toString());
+ log.d('repos: $previousResultData');
+ log.d('repos: $fetchMoreResultData');
+ log.d('repos: $repos');
fetchMoreResultData['transaction_connection']['edges'] = repos;
return fetchMoreResultData;
@@ -415,7 +413,7 @@ class DuniterIndexer with ChangeNotifier {
log.d(
"###### DEBUG H Parse blockchainTX list. Cursor: $fetchMoreCursor ######");
if (fetchMoreCursor != null) {
- transBC = parseHistory(blockchainTX, _pubkey);
+ transBC = parseHistory(blockchainTX, pubkey);
} else {
log.i("###### DEBUG H - Début de l'historique");
}
diff --git a/lib/providers/generate_wallets.dart b/lib/providers/generate_wallets.dart
index fa4b869..6039e53 100644
--- a/lib/providers/generate_wallets.dart
+++ b/lib/providers/generate_wallets.dart
@@ -65,7 +65,7 @@ class GenerateWalletsProvider with ChangeNotifier {
if (chestNumber == 0) {
chestName = 'geckoChest'.tr();
} else {
- chestName = 'geckoChest'.tr() + '${chestNumber + 1}';
+ chestName = '${'geckoChest'.tr()}${chestNumber + 1}';
}
await configBox.put('currentChest', chestNumber);
@@ -81,8 +81,8 @@ class GenerateWalletsProvider with ChangeNotifier {
notifyListeners();
}
- void checkAskedWord(String inputWord, String _mnemo) {
- final expectedWord = _mnemo.split(' ')[nbrWord];
+ void checkAskedWord(String inputWord, String mnemo) {
+ final expectedWord = mnemo.split(' ')[nbrWord];
final normInputWord = unorm.nfkd(inputWord);
log.i("Is $expectedWord equal to input $normInputWord ?");
@@ -118,7 +118,7 @@ class GenerateWalletsProvider with ChangeNotifier {
return rng.nextInt(12);
}
- String? intToString(int _nbr) {
+ String? intToString(int nbr) {
Map nbrToString = {};
nbrToString[1] = '1th'.tr();
nbrToString[2] = '2th'.tr();
@@ -133,7 +133,7 @@ class GenerateWalletsProvider with ChangeNotifier {
nbrToString[11] = '11th'.tr();
nbrToString[12] = '12th'.tr();
- nbrWordAlpha = nbrToString[_nbr];
+ nbrWordAlpha = nbrToString[nbr];
return nbrWordAlpha;
}
@@ -222,12 +222,12 @@ class GenerateWalletsProvider with ChangeNotifier {
}
Future generateCesiumWalletPubkey(
- String _cesiumID, String _cesiumPWD) async {
- cesiumWallet = durt.CesiumWallet(_cesiumID, _cesiumPWD);
- String _walletPubkey = cesiumWallet.pubkey;
+ String cesiumID, String cesiumPWD) async {
+ cesiumWallet = durt.CesiumWallet(cesiumID, cesiumPWD);
+ String walletPubkey = cesiumWallet.pubkey;
- cesiumPubkey.text = _walletPubkey;
- log.d(_walletPubkey);
+ cesiumPubkey.text = walletPubkey;
+ log.d(walletPubkey);
}
void cesiumIDisVisible() {
@@ -248,19 +248,19 @@ class GenerateWalletsProvider with ChangeNotifier {
}
Future> generateWordList(BuildContext context) async {
- SubstrateSdk _sub = Provider.of(context, listen: false);
+ SubstrateSdk sub = Provider.of(context, listen: false);
- generatedMnemonic = await _sub.generateMnemonic(lang: appLang);
- List _wordsList = [];
+ generatedMnemonic = await sub.generateMnemonic(lang: appLang);
+ List wordsList = [];
String word;
- int _nbr = 1;
+ int nbr = 1;
for (word in generatedMnemonic!.split(' ')) {
- _wordsList.add("$_nbr:$word");
- _nbr++;
+ wordsList.add("$nbr:$word");
+ nbr++;
}
- return _wordsList;
+ return wordsList;
}
bool isBipWord(String word, [bool checkRedondance = true]) {
@@ -368,29 +368,29 @@ class GenerateWalletsProvider with ChangeNotifier {
Future scanDerivations(BuildContext context,
{int numberScan = 20}) async {
- SubstrateSdk _sub = Provider.of(context, listen: false);
+ SubstrateSdk sub = Provider.of(context, listen: false);
final currentChestNumber = configBox.get('currentChest');
bool isAlive = false;
scanedWalletNumber = 0;
notifyListeners();
- if (!_sub.nodeConnected) {
+ if (!sub.nodeConnected) {
return false;
}
- final hasRoot = await scanRootBalance(_sub, currentChestNumber);
+ final hasRoot = await scanRootBalance(sub, currentChestNumber);
if (hasRoot) {
scanedWalletNumber = 1;
isAlive = true;
}
for (var derivationNbr in [for (var i = 0; i < numberScan; i += 1) i]) {
- final addressData = await _sub.sdk.api.keyring.addressFromMnemonic(ss58,
+ final addressData = await sub.sdk.api.keyring.addressFromMnemonic(ss58,
cryptoType: CryptoType.sr25519,
mnemonic: generatedMnemonic!,
derivePath: '//$derivationNbr');
- final balance = await _sub.getBalance(addressData.address!).timeout(
+ final balance = await sub.getBalance(addressData.address!).timeout(
const Duration(seconds: 1),
onTimeout: () => 0,
);
@@ -401,8 +401,8 @@ class GenerateWalletsProvider with ChangeNotifier {
isAlive = true;
String walletName = scanedWalletNumber == 0
? 'currentWallet'.tr()
- : 'wallet'.tr() + ' ${scanedWalletNumber + 1}';
- await _sub.importAccount(
+ : '${'wallet'.tr()} ${scanedWalletNumber + 1}';
+ await sub.importAccount(
mnemonic: '',
fromMnemonic: true,
derivePath: '//$derivationNbr',
@@ -425,12 +425,11 @@ class GenerateWalletsProvider with ChangeNotifier {
return isAlive;
}
- Future scanRootBalance(
- SubstrateSdk _sub, int currentChestNumber) async {
- final addressData = await _sub.sdk.api.keyring.addressFromMnemonic(ss58,
+ Future scanRootBalance(SubstrateSdk sub, int currentChestNumber) async {
+ final addressData = await sub.sdk.api.keyring.addressFromMnemonic(ss58,
cryptoType: CryptoType.sr25519, mnemonic: generatedMnemonic!);
- final balance = await _sub.getBalance(addressData.address!).timeout(
+ final balance = await sub.getBalance(addressData.address!).timeout(
const Duration(seconds: 1),
onTimeout: () => 0,
);
@@ -438,7 +437,7 @@ class GenerateWalletsProvider with ChangeNotifier {
log.d(balance);
if (balance != 0) {
String walletName = 'myRootWallet'.tr();
- await _sub.importAccount(
+ await sub.importAccount(
mnemonic: '', fromMnemonic: true, password: pin.text);
WalletData myWallet = WalletData(
diff --git a/lib/providers/home.dart b/lib/providers/home.dart
index f957be1..d825863 100644
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
import 'dart:convert';
import 'dart:io';
import 'dart:math';
@@ -70,7 +72,7 @@ class HomeProvider with ChangeNotifier {
: (int.parse(packageInfo.buildNumber) - 1000).toString();
notifyListeners();
- return version + '+' + buildNumber;
+ return '$version+$buildNumber';
}
Future changeMessage(String newMessage, int seconds) async {
@@ -87,19 +89,19 @@ class HomeProvider with ChangeNotifier {
configBox.put('autoEndpoint', true);
}
- List _listEndpoints = [];
+ List listEndpoints = [];
if (!configBox.containsKey('endpoint') ||
configBox.get('endpoint') == [] ||
configBox.get('endpoint') == '') {
- _listEndpoints = await rootBundle
+ listEndpoints = await rootBundle
.loadString('config/gdev_endpoints.json')
.then((jsonStr) => jsonDecode(jsonStr));
- _listEndpoints.shuffle();
- configBox.put('endpoint', _listEndpoints);
+ listEndpoints.shuffle();
+ configBox.put('endpoint', listEndpoints);
}
- log.i('ENDPOINT: ' + _listEndpoints.toString());
- return _listEndpoints;
+ log.i('ENDPOINT: $listEndpoints');
+ return listEndpoints;
}
T getRandomElement(List list) {
@@ -119,17 +121,17 @@ class HomeProvider with ChangeNotifier {
// }
Widget bottomAppBar(BuildContext context) {
- MyWalletsProvider _myWalletProvider =
+ MyWalletsProvider myWalletProvider =
Provider.of(context, listen: false);
- WalletsProfilesProvider _historyProvider =
+ WalletsProfilesProvider historyProvider =
Provider.of(context, listen: false);
final size = MediaQuery.of(context).size;
- const bool _showBottomBar = true;
+ const bool showBottomBar = true;
return Visibility(
- visible: _showBottomBar,
+ visible: showBottomBar,
child: Container(
color: yellowC,
width: size.width,
@@ -171,7 +173,7 @@ class HomeProvider with ChangeNotifier {
context,
ModalRoute.withName('/'),
);
- _historyProvider.scan(homeContext);
+ historyProvider.scan(homeContext);
},
),
const Spacer(),
@@ -180,10 +182,10 @@ class HomeProvider with ChangeNotifier {
iconSize: 60,
icon: const Image(image: AssetImage('assets/wallet.png')),
onPressed: () async {
- WalletData? defaultWallet = _myWalletProvider.getDefaultWallet();
- String? _pin;
- if (_myWalletProvider.pinCode == '') {
- _pin = await Navigator.push(
+ WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
+ String? pin;
+ if (myWalletProvider.pinCode == '') {
+ pin = await Navigator.push(
context,
MaterialPageRoute(
builder: (homeContext) {
@@ -193,7 +195,7 @@ class HomeProvider with ChangeNotifier {
);
}
- if (_pin != null || _myWalletProvider.pinCode != '') {
+ if (pin != null || myWalletProvider.pinCode != '') {
Navigator.popUntil(
context,
ModalRoute.withName('/'),
diff --git a/lib/providers/my_wallets.dart b/lib/providers/my_wallets.dart
index 32715de..fd25eff 100644
--- a/lib/providers/my_wallets.dart
+++ b/lib/providers/my_wallets.dart
@@ -31,11 +31,11 @@ class MyWalletsProvider with ChangeNotifier {
}
}
- List readAllWallets([int? _chest]) {
- _chest = _chest ?? configBox.get('currentChest') ?? 0;
+ List readAllWallets([int? chest]) {
+ chest = chest ?? configBox.get('currentChest') ?? 0;
listWallets.clear();
walletBox.toMap().forEach((key, value) {
- if (value.chest == _chest) {
+ if (value.chest == chest) {
listWallets.add(value);
}
});
@@ -43,33 +43,33 @@ class MyWalletsProvider with ChangeNotifier {
return listWallets;
}
- WalletData? getWalletDataById(List _id) {
- if (_id.isEmpty) return WalletData();
- int? _chest = _id[0];
- int? _nbr = _id[1];
- WalletData? _targetedWallet;
+ WalletData? getWalletDataById(List id) {
+ if (id.isEmpty) return WalletData();
+ int? chest = id[0];
+ int? nbr = id[1];
+ WalletData? targetedWallet;
walletBox.toMap().forEach((key, value) {
- if (value.chest == _chest && value.number == _nbr) {
- _targetedWallet = value;
+ if (value.chest == chest && value.number == nbr) {
+ targetedWallet = value;
return;
}
});
- return _targetedWallet;
+ return targetedWallet;
}
WalletData? getWalletDataByAddress(String address) {
- WalletData? _targetedWallet;
+ WalletData? targetedWallet;
walletBox.toMap().forEach((key, value) {
if (value.address == address) {
- _targetedWallet = value;
+ targetedWallet = value;
return;
}
});
- return _targetedWallet;
+ return targetedWallet;
}
WalletData getDefaultWallet([int? chest]) {
@@ -84,21 +84,21 @@ class MyWalletsProvider with ChangeNotifier {
}
Future deleteAllWallet(context) async {
- SubstrateSdk _sub = Provider.of(context, listen: false);
- MyWalletsProvider _myWalletProvider =
+ SubstrateSdk sub = Provider.of(context, listen: false);
+ MyWalletsProvider myWalletProvider =
Provider.of(context, listen: false);
try {
log.w('DELETE ALL WALLETS ?');
- final bool? _answer =
+ final bool? answer =
await (confirmPopup(context, 'areYouSureForgetAllChests'.tr()));
- if (_answer!) {
+ if (answer!) {
await walletBox.clear();
await chestBox.clear();
await configBox.delete('defaultWallet');
- await _sub.deleteAllAccounts();
+ await sub.deleteAllAccounts();
- _myWalletProvider.pinCode = '';
+ myWalletProvider.pinCode = '';
await Navigator.of(context).pushNamedAndRemoveUntil(
'/',
@@ -111,32 +111,32 @@ class MyWalletsProvider with ChangeNotifier {
}
}
- Future generateNewDerivation(context, String _name,
+ Future generateNewDerivation(context, String name,
[int? number]) async {
isNewDerivationLoading = true;
notifyListeners();
final List idList = getNextWalletNumberAndDerivation();
- int _newWalletNbr = idList[0];
- int _newDerivationNbr = number ?? idList[1];
+ int newWalletNbr = idList[0];
+ int newDerivationNbr = number ?? idList[1];
- int? _chest = getCurrentChest();
+ int? chest = getCurrentChest();
- SubstrateSdk _sub = Provider.of(context, listen: false);
+ SubstrateSdk sub = Provider.of(context, listen: false);
WalletData defaultWallet = getDefaultWallet();
- final address = await _sub.derive(
- context, defaultWallet.address!, _newDerivationNbr, pinCode);
+ final address = await sub.derive(
+ context, defaultWallet.address!, newDerivationNbr, pinCode);
WalletData newWallet = WalletData(
version: dataVersion,
- chest: _chest,
+ chest: chest,
address: address,
- number: _newWalletNbr,
- name: _name,
- derivation: _newDerivationNbr,
- imageDefaultPath: '${_newWalletNbr % 4}.png');
+ number: newWalletNbr,
+ name: name,
+ derivation: newDerivationNbr,
+ imageDefaultPath: '${newWalletNbr % 4}.png');
await walletBox.add(newWallet);
@@ -144,37 +144,37 @@ class MyWalletsProvider with ChangeNotifier {
notifyListeners();
}
- Future generateRootWallet(context, String _name) async {
- MyWalletsProvider _myWalletProvider =
+ Future generateRootWallet(context, String name) async {
+ MyWalletsProvider myWalletProvider =
Provider.of(context, listen: false);
isNewDerivationLoading = true;
notifyListeners();
- int _newWalletNbr;
- int? _chest = getCurrentChest();
+ int newWalletNbr;
+ int? chest = getCurrentChest();
- List _walletConfig = readAllWallets(_chest);
+ List walletConfig = readAllWallets(chest);
- if (_walletConfig.isEmpty) {
- _newWalletNbr = 0;
+ if (walletConfig.isEmpty) {
+ newWalletNbr = 0;
} else {
- _newWalletNbr = _walletConfig.last.number! + 1;
+ newWalletNbr = walletConfig.last.number! + 1;
}
- SubstrateSdk _sub = Provider.of(context, listen: false);
+ SubstrateSdk sub = Provider.of(context, listen: false);
- WalletData defaultWallet = _myWalletProvider.getDefaultWallet();
+ WalletData defaultWallet = myWalletProvider.getDefaultWallet();
final address =
- await _sub.generateRootKeypair(defaultWallet.address!, pinCode);
+ await sub.generateRootKeypair(defaultWallet.address!, pinCode);
WalletData newWallet = WalletData(
version: dataVersion,
- chest: _chest,
+ chest: chest,
address: address,
- number: _newWalletNbr,
- name: _name,
+ number: newWalletNbr,
+ name: name,
derivation: -1,
- imageDefaultPath: '${_newWalletNbr % 4}.png');
+ imageDefaultPath: '${newWalletNbr % 4}.png');
await walletBox.add(newWallet);
@@ -184,29 +184,29 @@ class MyWalletsProvider with ChangeNotifier {
List getNextWalletNumberAndDerivation(
{int? chestNumber, bool isOneshoot = false}) {
- int _newDerivationNbr = 0;
- int _newWalletNbr = 0;
+ int newDerivationNbr = 0;
+ int newWalletNbr = 0;
chestNumber ??= getCurrentChest();
- List _walletConfig = readAllWallets(chestNumber);
+ List walletConfig = readAllWallets(chestNumber);
- if (_walletConfig.isEmpty) {
- _newDerivationNbr = 2;
+ if (walletConfig.isEmpty) {
+ newDerivationNbr = 2;
} else {
- WalletData _lastWallet = _walletConfig.reduce(
+ WalletData lastWallet = walletConfig.reduce(
(curr, next) => curr.derivation! > next.derivation! ? curr : next);
- if (_lastWallet.derivation == -1) {
- _newDerivationNbr = 2;
+ if (lastWallet.derivation == -1) {
+ newDerivationNbr = 2;
} else {
- _newDerivationNbr = _lastWallet.derivation! + (isOneshoot ? 1 : 2);
+ newDerivationNbr = lastWallet.derivation! + (isOneshoot ? 1 : 2);
}
- _newWalletNbr = _walletConfig.last.number! + 1;
+ newWalletNbr = walletConfig.last.number! + 1;
}
- return [_newWalletNbr, _newDerivationNbr];
+ return [newWalletNbr, newDerivationNbr];
}
int lockPin = 0;
diff --git a/lib/providers/search.dart b/lib/providers/search.dart
index 3be3ccf..5460e7a 100644
--- a/lib/providers/search.dart
+++ b/lib/providers/search.dart
@@ -68,12 +68,12 @@ class SearchProvider with ChangeNotifier {
// }
Future> searchAddress() async {
- final WalletsProfilesProvider _walletProfiles =
+ final WalletsProfilesProvider walletProfiles =
WalletsProfilesProvider('pubkey');
- if (_walletProfiles.isAddress(searchController.text)) {
- G1WalletsList _wallet = G1WalletsList(pubkey: searchController.text);
- return [_wallet];
+ if (walletProfiles.isAddress(searchController.text)) {
+ G1WalletsList wallet = G1WalletsList(pubkey: searchController.text);
+ return [wallet];
} else {
return [];
}
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index 46abbf2..1ad6a77 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_print
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -46,7 +44,7 @@ class SubstrateSdk with ChangeNotifier {
}
Future connectNode(BuildContext ctx) async {
- HomeProvider _homeProvider = Provider.of(ctx, listen: false);
+ HomeProvider homeProvider = Provider.of(ctx, listen: false);
// var connectivityResult = await (Connectivity().checkConnectivity());
// if (connectivityResult == ConnectivityResult.mobile ||
@@ -54,7 +52,7 @@ class SubstrateSdk with ChangeNotifier {
// _homeProvider.changeMessage("Vous n'êtes pas connecté à internet", 0);
// return;
// }
- _homeProvider.changeMessage("connectionPending".tr(), 0);
+ homeProvider.changeMessage("connectionPending".tr(), 0);
// configBox.delete('customEndpoint');
final List listEndpoints =
@@ -108,7 +106,7 @@ class SubstrateSdk with ChangeNotifier {
// log.d(sdk.api.connectedNode?.endpoint);
if (sdk.api.connectedNode?.endpoint == null) {
nodeConnected = false;
- _homeProvider.changeMessage("networkLost".tr(), 0);
+ homeProvider.changeMessage("networkLost".tr(), 0);
} else {
nodeConnected = true;
}
@@ -117,7 +115,7 @@ class SubstrateSdk with ChangeNotifier {
// currencyName = await getCurencyName();
notifyListeners();
- _homeProvider.changeMessage(
+ homeProvider.changeMessage(
"wellConnectedToNode"
.tr(args: [getConnectedEndpoint()!.split('/')[2]]),
5);
@@ -126,7 +124,7 @@ class SubstrateSdk with ChangeNotifier {
nodeConnected = false;
debugConnection = res.toString();
notifyListeners();
- _homeProvider.changeMessage("noDuniterEndointAvailable".tr(), 0);
+ homeProvider.changeMessage("noDuniterEndointAvailable".tr(), 0);
// snackNode(ctx, false);
}
@@ -136,10 +134,10 @@ class SubstrateSdk with ChangeNotifier {
List getDuniterBootstrap() {
List node = [];
- for (String _endpoint in configBox.get('endpoint')) {
+ for (String endpoint in configBox.get('endpoint')) {
final n = NetworkParams();
n.name = currencyName;
- n.endpoint = _endpoint;
+ n.endpoint = endpoint;
n.ss58 = ss58;
node.add(n);
}
@@ -199,7 +197,7 @@ class SubstrateSdk with ChangeNotifier {
notifyListeners();
});
if (json == null) return '';
- print(json);
+ log.d(json);
try {
await sdk.api.keyring.addAccount(
keyring,
@@ -209,7 +207,7 @@ class SubstrateSdk with ChangeNotifier {
);
// Clipboard.setData(ClipboardData(text: jsonEncode(acc.toJson())));
} catch (e) {
- print(e);
+ log.e(e);
importIsLoading = false;
notifyListeners();
}
@@ -247,11 +245,11 @@ class SubstrateSdk with ChangeNotifier {
.evalJavascript('api.query.identity.identityIndexOf("$address")');
// log.d('u32: ' + idtyIndex.toString());
- final _certsReceiver = await sdk.webView!
+ final certsReceiver = await sdk.webView!
.evalJavascript('api.query.cert.storageIdtyCertMeta($idtyIndex)') ??
[];
- return [_certsReceiver['receivedCount'], _certsReceiver['issuedCount']];
+ return [certsReceiver['receivedCount'], certsReceiver['issuedCount']];
}
Future