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

use Durt 0.1.5; Split files between models and proviers; Use new appVersion getter for all plateform

This commit is contained in:
poka 2021-12-23 15:13:58 +01:00
parent bb090b62ce
commit 33c1149987
34 changed files with 123 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/globals.dart
View File

@ -10,10 +10,11 @@ import 'package:shared_preferences/shared_preferences.dart';
// Files paths // Files paths
Directory? appPath; Directory? appPath;
String? appVersion; late String appVersion;
SharedPreferences? prefs; late SharedPreferences prefs;
String? endPointGVA; late String endPointGVA;
int? ramSys; const int pinLength = 5;
late Box<WalletData> walletBox; late Box<WalletData> walletBox;
late Box<ChestData> chestBox; late Box<ChestData> chestBox;
late Box configBox; late Box configBox;

18
lib/main.dart
View File

@ -19,18 +19,18 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/cesium_plus.dart'; import 'package:gecko/providers/cesium_plus.dart';
import 'package:gecko/models/change_pin.dart'; import 'package:gecko/providers/change_pin.dart';
import 'package:gecko/models/chest_data.dart'; import 'package:gecko/models/chest_data.dart';
import 'package:gecko/models/chest_provider.dart'; import 'package:gecko/providers/chest_provider.dart';
import 'package:gecko/models/g1_wallets_list.dart'; import 'package:gecko/models/g1_wallets_list.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:gecko/models/home.dart'; import 'package:gecko/providers/home.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/search.dart'; import 'package:gecko/providers/search.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/models/wallet_options.dart'; import 'package:gecko/providers/wallet_options.dart';
import 'package:gecko/screens/home.dart'; import 'package:gecko/screens/home.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/screens/myWallets/wallets_home.dart'; import 'package:gecko/screens/myWallets/wallets_home.dart';

0
lib/models/cesium_plus.dart → lib/providers/cesium_plus.dart
View File

22
lib/models/change_pin.dart → lib/providers/change_pin.dart
View File

@ -9,16 +9,22 @@ class ChangePinProvider with ChangeNotifier {
NewWallet? get badWallet => null; NewWallet? get badWallet => null;
NewWallet? changePin(String _oldPin, {String? newCustomPin}) { Future<NewWallet?> changePin(String _oldPin, {String? newCustomPin}) async {
final NewWallet newWalletFile;
try { try {
final _dewif = chestBox.get(configBox.get('currentChest'))!.dewif!; final _chest = chestBox.get(configBox.get('currentChest'))!;
// TODO: Durt: Detect if CesiumWallet
NewWallet newWalletFile = Dewif().changePassword(
dewif: _dewif,
oldPassword: _oldPin.toUpperCase(),
newPassword: newCustomPin);
if (_chest.isCesium!) {
newWalletFile = await Dewif().changeCesiumPassword(
dewif: _chest.dewif!,
oldPassword: _oldPin.toUpperCase(),
newPassword: newCustomPin);
} else {
newWalletFile = await Dewif().changePassword(
dewif: _chest.dewif!,
oldPassword: _oldPin.toUpperCase(),
newPassword: newCustomPin);
}
newPin.text = pinToGive = newWalletFile.password; newPin.text = pinToGive = newWalletFile.password;
ischangedPin = true; ischangedPin = true;
// notifyListeners(); // notifyListeners();

0
lib/models/chest_provider.dart → lib/providers/chest_provider.dart
View File

8
lib/models/generate_wallets.dart → lib/providers/generate_wallets.dart
View File

@ -155,8 +155,8 @@ class GenerateWalletsProvider with ChangeNotifier {
Future<NewWallet?> generateWallet(String generatedMnemonic, Future<NewWallet?> generateWallet(String generatedMnemonic,
{required bool isImport}) async { {required bool isImport}) async {
try { try {
actualWallet = Dewif().generateDewif( actualWallet = await Dewif().generateDewif(
generatedMnemonic, randomSecretCode(5), generatedMnemonic, randomSecretCode(pinLength),
lang: 'french'); lang: 'french');
} catch (e) { } catch (e) {
log.e(e); log.e(e);
@ -172,7 +172,7 @@ class GenerateWalletsProvider with ChangeNotifier {
} }
String changePinCode({required bool reload}) { String changePinCode({required bool reload}) {
pin.text = randomSecretCode(5); pin.text = randomSecretCode(pinLength);
if (reload) { if (reload) {
notifyListeners(); notifyListeners();
} }
@ -258,7 +258,7 @@ class GenerateWalletsProvider with ChangeNotifier {
log.d(pin.text); log.d(pin.text);
NewWallet cesiumDewif = NewWallet cesiumDewif =
Dewif().generateCesiumDewif(cesiumWallet.seed, pin.text); await Dewif().generateCesiumDewif(cesiumWallet.seed, pin.text);
ChestData cesiumChest = ChestData( ChestData cesiumChest = ChestData(
dewif: cesiumDewif.dewif, dewif: cesiumDewif.dewif,

15
lib/models/home.dart → lib/providers/home.dart
View File

@ -8,9 +8,9 @@ import 'package:flutter/services.dart';
import 'dart:async'; import 'dart:async';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:hive_flutter/hive_flutter.dart'; import 'package:hive_flutter/hive_flutter.dart';
import 'package:package_info/package_info.dart';
import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:path_provider/path_provider.dart' as pp; import 'package:path_provider/path_provider.dart' as pp;
import 'package:package_info_plus/package_info_plus.dart';
class HomeProvider with ChangeNotifier { class HomeProvider with ChangeNotifier {
bool? isSearching; bool? isSearching;
@ -49,14 +49,9 @@ class HomeProvider with ChangeNotifier {
Future<String> getAppVersion() async { Future<String> getAppVersion() async {
String version; String version;
String buildNumber; String buildNumber;
if (kIsWeb || Platform.isLinux) { PackageInfo packageInfo = await PackageInfo.fromPlatform();
version = "undefined"; version = packageInfo.version;
buildNumber = "undefined"; buildNumber = packageInfo.buildNumber;
} else {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
version = packageInfo.version;
buildNumber = packageInfo.buildNumber;
}
notifyListeners(); notifyListeners();
return version + '+' + buildNumber; return version + '+' + buildNumber;
@ -151,7 +146,7 @@ class HomeProvider with ChangeNotifier {
_message = _message =
"Aucun noeud Duniter disponible, veuillez réessayer ultérieurement"; "Aucun noeud Duniter disponible, veuillez réessayer ultérieurement";
} else { } else {
_message = "Vous êtes connecté au noeud\n${endPointGVA!.split('/')[2]}"; _message = "Vous êtes connecté au noeud\n${endPointGVA.split('/')[2]}";
} }
final snackBar = SnackBar( final snackBar = SnackBar(
content: Text(_message), duration: const Duration(seconds: 2)); content: Text(_message), duration: const Duration(seconds: 2));

0
lib/models/my_wallets.dart → lib/providers/my_wallets.dart
View File

2
lib/models/search.dart → lib/providers/search.dart
View File

@ -2,7 +2,7 @@ import 'package:dio/dio.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/g1_wallets_list.dart'; import 'package:gecko/models/g1_wallets_list.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
class SearchProvider with ChangeNotifier { class SearchProvider with ChangeNotifier {
TextEditingController searchController = TextEditingController(); TextEditingController searchController = TextEditingController();

12
lib/models/wallet_options.dart → lib/providers/wallet_options.dart
View File

@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
import 'dart:async'; import 'dart:async';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_data.dart'; import 'package:gecko/models/chest_data.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:truncate/truncate.dart'; import 'package:truncate/truncate.dart';
@ -94,7 +94,7 @@ class WalletOptionsProvider with ChangeNotifier {
} }
int getPinLenght(_walletNbr) { int getPinLenght(_walletNbr) {
// TODO: Get real Dewif lenght // TODOo: Get real Dewif lenght
// String _localDewif; // String _localDewif;
// if (_walletNbr is int || _walletNbr == null) { // if (_walletNbr is int || _walletNbr == null) {
// _localDewif = chestBox.get(configBox.get('currentChest')).dewif; // _localDewif = chestBox.get(configBox.get('currentChest')).dewif;
@ -105,10 +105,11 @@ class WalletOptionsProvider with ChangeNotifier {
// final int _pinLenght = DubpRust.getDewifSecretCodeLen( // final int _pinLenght = DubpRust.getDewifSecretCodeLen(
// dewif: _localDewif, secretCodeType: SecretCodeType.letters); // dewif: _localDewif, secretCodeType: SecretCodeType.letters);
return 5; return pinLength;
} }
void _renameWallet(List<int?> _walletID, _newName, {required bool isCesium}) async { void _renameWallet(List<int?> _walletID, _newName,
{required bool isCesium}) async {
if (isCesium) { if (isCesium) {
ChestData _chestTarget = chestBox.get(_walletID[0])!; ChestData _chestTarget = chestBox.get(_walletID[0])!;
_chestTarget.name = _newName; _chestTarget.name = _newName;
@ -144,7 +145,8 @@ class WalletOptionsProvider with ChangeNotifier {
} }
Future<int> deleteWallet(context, WalletData wallet) async { Future<int> deleteWallet(context, WalletData wallet) async {
final bool _answer = await (_confirmDeletingWallet(context, wallet.name) as FutureOr<bool>); final bool _answer =
await (_confirmDeletingWallet(context, wallet.name) as FutureOr<bool>);
if (_answer) { if (_answer) {
walletBox.delete(wallet.key); walletBox.delete(wallet.key);

4
lib/models/wallets_profiles.dart → lib/providers/wallets_profiles.dart
View File

@ -3,7 +3,7 @@ import 'dart:io';
import 'package:durt/durt.dart'; import 'package:durt/durt.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/screens/wallet_view.dart'; import 'package:gecko/screens/wallet_view.dart';
import 'package:graphql_flutter/graphql_flutter.dart'; import 'package:graphql_flutter/graphql_flutter.dart';
@ -73,7 +73,7 @@ class WalletsProfilesProvider with ChangeNotifier {
derivation = defaultWallet!.derivation; derivation = defaultWallet!.derivation;
} }
String result = await Gva(node: endPointGVA!).pay( String result = await Gva(node: endPointGVA).pay(
recipient: pubkey!, recipient: pubkey!,
amount: double.parse(payAmount.text), amount: double.parse(payAmount.text),
dewif: dewif, dewif: dewif,

4
lib/screens/history.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/cesium_plus.dart'; import 'package:gecko/providers/cesium_plus.dart';
import 'package:gecko/models/queries.dart'; import 'package:gecko/models/queries.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/screens/avatar_fullscreen.dart'; import 'package:gecko/screens/avatar_fullscreen.dart';
import 'package:gecko/screens/wallet_view.dart'; import 'package:gecko/screens/wallet_view.dart';

8
lib/screens/home.dart
View File

@ -1,10 +1,10 @@
import 'package:bubble/bubble.dart'; import 'package:bubble/bubble.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_provider.dart'; import 'package:gecko/providers/chest_provider.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/models/home.dart'; import 'package:gecko/providers/home.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/screens/myWallets/restore_chest.dart'; import 'package:gecko/screens/myWallets/restore_chest.dart';
import 'package:gecko/screens/myWallets/unlocking_wallet.dart'; import 'package:gecko/screens/myWallets/unlocking_wallet.dart';

8
lib/screens/myWallets/cesium_wallet_options.dart
View File

@ -4,11 +4,11 @@ import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_data.dart'; import 'package:gecko/models/chest_data.dart';
import 'package:gecko/models/chest_provider.dart'; import 'package:gecko/providers/chest_provider.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/queries.dart'; import 'package:gecko/models/queries.dart';
import 'package:gecko/models/wallet_options.dart'; import 'package:gecko/providers/wallet_options.dart';
import 'package:gecko/screens/history.dart'; import 'package:gecko/screens/history.dart';
import 'package:gecko/screens/myWallets/change_pin.dart'; import 'package:gecko/screens/myWallets/change_pin.dart';
import 'package:graphql_flutter/graphql_flutter.dart'; import 'package:graphql_flutter/graphql_flutter.dart';

16
lib/screens/myWallets/change_pin.dart
View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:durt/durt.dart'; import 'package:durt/durt.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/change_pin.dart'; import 'package:gecko/providers/change_pin.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'dart:io'; import 'dart:io';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -49,7 +49,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
child: Column(children: <Widget>[ child: Column(children: <Widget>[
StatefulWrapper( StatefulWrapper(
onInit: () { onInit: () {
_changePin.newPin.text = randomSecretCode(5); _changePin.newPin.text = randomSecretCode(pinLength);
}, },
child: Container(), child: Container(),
), ),
@ -80,7 +80,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
icon: const Icon(Icons.replay), icon: const Icon(Icons.replay),
color: orangeC, color: orangeC,
onPressed: () async { onPressed: () async {
_changePin.newPin.text = randomSecretCode(5); _changePin.newPin.text = randomSecretCode(pinLength);
}, },
), ),
], ],
@ -95,12 +95,12 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
primary: Colors.green[400], //smoothYellow, // background primary: Colors.green[400], //smoothYellow, // background
onPrimary: Colors.black, // foreground onPrimary: Colors.black, // foreground
), ),
onPressed: () { onPressed: () async {
NewWallet _newWalletFile = _changePin.changePin( NewWallet? _newWalletFile = await _changePin.changePin(
walletProvider.pinCode, walletProvider.pinCode,
newCustomPin: _changePin.newPin.text)!; newCustomPin: _changePin.newPin.text);
_changePin.newPin.text = ''; _changePin.newPin.text = '';
_changePin.storeNewPinChest(context, _newWalletFile); _changePin.storeNewPinChest(context, _newWalletFile!);
walletProvider.pinCode = _changePin.newPin.text; walletProvider.pinCode = _changePin.newPin.text;
}, },
child: const Text( child: const Text(

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

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_data.dart'; import 'package:gecko/models/chest_data.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/models/chest_provider.dart'; import 'package:gecko/providers/chest_provider.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/screens/myWallets/change_pin.dart'; import 'package:gecko/screens/myWallets/change_pin.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

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

@ -1,6 +1,6 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/screens/myWallets/generate_wallets.dart'; import 'package:gecko/screens/myWallets/generate_wallets.dart';

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

@ -3,8 +3,8 @@ import 'package:durt/durt.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/screens/myWallets/unlocking_wallet.dart'; import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

8
lib/screens/myWallets/generate_wallets.dart
View File

@ -1,7 +1,7 @@
import 'package:durt/durt.dart'; import 'package:durt/durt.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/screens/myWallets/confirm_wallet_storage.dart'; import 'package:gecko/screens/myWallets/confirm_wallet_storage.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:printing/printing.dart'; import 'package:printing/printing.dart';
@ -31,7 +31,7 @@ class GenerateFastChestScreen extends StatelessWidget {
_generateWalletProvider.generateWordList(); _generateWalletProvider.generateWordList();
_generateWalletProvider.mnemonicController.text = _generateWalletProvider.mnemonicController.text =
_generateWalletProvider.generatedMnemonic!; _generateWalletProvider.generatedMnemonic!;
_generateWalletProvider.pin.text = randomSecretCode(5); _generateWalletProvider.pin.text = randomSecretCode(pinLength);
} }
return Scaffold( return Scaffold(
@ -115,8 +115,8 @@ class GenerateFastChestScreen extends StatelessWidget {
? () async { ? () async {
_generateWalletProvider.nbrWord = _generateWalletProvider.nbrWord =
_generateWalletProvider.getRandomInt(); _generateWalletProvider.getRandomInt();
_generateWalletProvider.actualWallet = Dewif() _generateWalletProvider.actualWallet =
.generateDewif( await Dewif().generateDewif(
_generateWalletProvider _generateWalletProvider
.generatedMnemonic!, .generatedMnemonic!,
_generateWalletProvider.pin.text, _generateWalletProvider.pin.text,

8
lib/screens/myWallets/import_cesium_wallet.dart
View File

@ -2,11 +2,11 @@ import 'dart:async';
import 'package:durt/durt.dart'; import 'package:durt/durt.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/models/wallet_options.dart'; import 'package:gecko/providers/wallet_options.dart';
import 'package:gecko/screens/myWallets/unlocking_wallet.dart'; import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -25,7 +25,7 @@ class ImportWalletScreen extends StatelessWidget {
MyWalletsProvider _myWalletProvider = MyWalletsProvider _myWalletProvider =
Provider.of<MyWalletsProvider>(context, listen: false); Provider.of<MyWalletsProvider>(context, listen: false);
_generateWalletProvider.pin.text = randomSecretCode(5); _generateWalletProvider.pin.text = randomSecretCode(pinLength);
return WillPopScope( return WillPopScope(
onWillPop: () { onWillPop: () {
_generateWalletProvider.resetCesiumImportView(); _generateWalletProvider.resetCesiumImportView();

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

@ -2,7 +2,7 @@ import 'package:bubble/bubble.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/common_elements.dart';
import 'package:gecko/screens/onBoarding/11.dart'; import 'package:gecko/screens/onBoarding/11.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

34
lib/screens/myWallets/unlocking_wallet.dart
View File

@ -1,10 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/models/chest_data.dart'; import 'package:gecko/models/chest_data.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/models/wallet_options.dart'; import 'package:gecko/providers/wallet_options.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/screens/myWallets/cesium_wallet_options.dart'; import 'package:gecko/screens/myWallets/cesium_wallet_options.dart';
import 'package:gecko/screens/myWallets/choose_chest.dart'; import 'package:gecko/screens/myWallets/choose_chest.dart';
@ -52,21 +52,22 @@ class UnlockingWallet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Stack(children: <Widget>[ Stack(children: <Widget>[
Positioned( Positioned(
top: statusBarHeight + 10, top: statusBarHeight + 10,
left: 15, left: 15,
child: Builder( child: Builder(
builder: (context) => IconButton( builder: (context) => IconButton(
key: const Key('popButton'), key: const Key('popButton'),
icon: const Icon( icon: const Icon(
Icons.arrow_back, Icons.arrow_back,
color: Colors.black, color: Colors.black,
size: 25, size: 25,
),
onPressed: () => Navigator.pop(context),
), ),
onPressed: () => Navigator.pop(context),
), ),
), ),
),Column(children: <Widget>[ Column(children: <Widget>[
SizedBox(height: isTall ? 100 : 20), SizedBox(height: isTall ? 100 : 20),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -129,7 +130,8 @@ class UnlockingWallet extends StatelessWidget {
), ),
)), )),
]), ]),
]),]), ]),
]),
)); ));
} }

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

@ -3,11 +3,11 @@ import 'dart:io';
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/queries.dart'; import 'package:gecko/models/queries.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/models/wallet_options.dart'; import 'package:gecko/providers/wallet_options.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:gecko/screens/history.dart'; import 'package:gecko/screens/history.dart';
import 'package:graphql_flutter/graphql_flutter.dart'; import 'package:graphql_flutter/graphql_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

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

@ -1,7 +1,7 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_data.dart'; import 'package:gecko/models/chest_data.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/queries.dart'; import 'package:gecko/models/queries.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

2
lib/screens/onBoarding/11.dart
View File

@ -2,7 +2,7 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/common_elements.dart';
import 'package:gecko/screens/onBoarding/12.dart'; import 'package:gecko/screens/onBoarding/12.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

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

@ -5,9 +5,9 @@ import 'package:durt/durt.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_options.dart'; import 'package:gecko/providers/wallet_options.dart';
import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/common_elements.dart';
import 'package:gecko/screens/onBoarding/13_congratulations.dart'; import 'package:gecko/screens/onBoarding/13_congratulations.dart';
import 'package:pin_code_fields/pin_code_fields.dart'; import 'package:pin_code_fields/pin_code_fields.dart';
@ -111,17 +111,17 @@ class OnboardingStepFourteen extends StatelessWidget {
blurRadius: 10, blurRadius: 10,
) )
], ],
onCompleted: (_pin) { onCompleted: (_pin) async {
_myWalletProvider.pinCode = _pin; _myWalletProvider.pinCode = _pin;
_myWalletProvider.pinLenght = _pinLenght; _myWalletProvider.pinLenght = _pinLenght;
log.d(_pin + ' || ' + _generateWalletProvider.pin.text); log.d(_pin + ' || ' + _generateWalletProvider.pin.text);
if (_pin.toUpperCase() == _generateWalletProvider.pin.text) { if (_pin.toUpperCase() == _generateWalletProvider.pin.text) {
pinColor = Colors.green[500]; pinColor = Colors.green[500];
NewWallet generatedWallet = Dewif().generateDewif( NewWallet generatedWallet = await Dewif().generateDewif(
_generateWalletProvider.generatedMnemonic!, _generateWalletProvider.generatedMnemonic!,
_generateWalletProvider.pin.text, _generateWalletProvider.pin.text,
lang: 'french'); lang: 'french');
_generateWalletProvider.storeHDWChest( await _generateWalletProvider.storeHDWChest(
generatedWallet, 'Mon portefeuille courant', context); generatedWallet, 'Mon portefeuille courant', context);
_myWalletProvider.readAllWallets(_currentChest); _myWalletProvider.readAllWallets(_currentChest);
scheduleMicrotask(() { scheduleMicrotask(() {

2
lib/screens/onBoarding/7.dart
View File

@ -3,7 +3,7 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/common_elements.dart';
import 'package:gecko/screens/onBoarding/8.dart'; import 'package:gecko/screens/onBoarding/8.dart';
import 'package:printing/printing.dart'; import 'package:printing/printing.dart';

2
lib/screens/onBoarding/8.dart
View File

@ -2,7 +2,7 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/common_elements.dart';
import 'package:gecko/screens/onBoarding/9.dart'; import 'package:gecko/screens/onBoarding/9.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

2
lib/screens/search.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/models/search.dart'; import 'package:gecko/providers/search.dart';
import 'package:gecko/screens/search_result.dart'; import 'package:gecko/screens/search_result.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
// import 'package:gecko/models/home.dart'; // import 'package:gecko/models/home.dart';

6
lib/screens/search_result.dart
View File

@ -1,10 +1,10 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/models/cesium_plus.dart'; import 'package:gecko/providers/cesium_plus.dart';
import 'package:gecko/models/g1_wallets_list.dart'; import 'package:gecko/models/g1_wallets_list.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:gecko/models/search.dart'; import 'package:gecko/providers/search.dart';
import 'package:gecko/screens/wallet_view.dart'; import 'package:gecko/screens/wallet_view.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

2
lib/screens/settings.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:durt/durt.dart'; import 'package:durt/durt.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/screens/myWallets/generate_wallets.dart'; import 'package:gecko/screens/myWallets/generate_wallets.dart';
import 'dart:io'; import 'dart:io';
import 'package:gecko/screens/myWallets/import_cesium_wallet.dart'; import 'package:gecko/screens/myWallets/import_cesium_wallet.dart';

6
lib/screens/wallet_view.dart
View File

@ -1,10 +1,10 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:gecko/globals.dart'; import 'package:gecko/globals.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gecko/models/cesium_plus.dart'; import 'package:gecko/providers/cesium_plus.dart';
import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/providers/wallets_profiles.dart';
import 'package:gecko/models/queries.dart'; import 'package:gecko/models/queries.dart';
import 'package:gecko/screens/avatar_fullscreen.dart'; import 'package:gecko/screens/avatar_fullscreen.dart';
import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/common_elements.dart';

11
pubspec.lock
View File

@ -301,7 +301,7 @@ packages:
name: durt name: durt
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4" version: "0.1.5"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
@ -696,15 +696,8 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.2" version: "2.0.2"
package_info:
dependency: "direct main"
description:
name: package_info
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
package_info_plus: package_info_plus:
dependency: transitive dependency: "direct main"
description: description:
name: package_info_plus name: package_info_plus
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"

6
pubspec.yaml
View File

@ -5,7 +5,7 @@ description: Pay with G1.
# pub.dev using `pub publish`. This is preferred for private packages. # 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 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 0.0.4+4 version: 0.0.4+5
environment: environment:
sdk: '>=2.12.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'
@ -39,7 +39,6 @@ dependencies:
intl: ^0.17.0 intl: ^0.17.0
jdenticon_dart: ^2.0.0 jdenticon_dart: ^2.0.0
logger: ^1.1.0 logger: ^1.1.0
package_info: ^2.0.2
path_provider: ^2.0.3 path_provider: ^2.0.3
pdf: ^3.5.0 pdf: ^3.5.0
permission_handler: ^8.3.0 permission_handler: ^8.3.0
@ -63,7 +62,8 @@ dependencies:
pull_to_refresh: ^2.0.0 pull_to_refresh: ^2.0.0
dio: ^4.0.4 dio: ^4.0.4
desktop_window: ^0.4.0 desktop_window: ^0.4.0
durt: ^0.1.4 durt: ^0.1.5
package_info_plus: ^1.3.0
flutter_icons: flutter_icons:
android: "ic_launcher" android: "ic_launcher"