From 694437b188e49176bdc7111ea080e37522b47411 Mon Sep 17 00:00:00 2001 From: poka Date: Fri, 12 Nov 2021 01:35:38 +0100 Subject: [PATCH] WIP: Change defaultWallet Methode --- lib/globals.dart | 1 - lib/main.dart | 3 --- lib/models/chestData.dart | 5 ++++- lib/models/chestData.g.dart | 7 +++++-- lib/models/myWallets.dart | 6 +++--- lib/screens/myWallets/confirmWalletStorage.dart | 1 - lib/screens/myWallets/walletOptions.dart | 2 -- lib/screens/onBoarding/12.dart | 1 - scripts/generatePartFiles.sh | 4 ++++ 9 files changed, 16 insertions(+), 14 deletions(-) create mode 100755 scripts/generatePartFiles.sh diff --git a/lib/globals.dart b/lib/globals.dart index 5bd9c9c..e573a7a 100644 --- a/lib/globals.dart +++ b/lib/globals.dart @@ -9,7 +9,6 @@ import 'package:shared_preferences/shared_preferences.dart'; // Files paths Directory appPath; -WalletData defaultWallet; String appVersion; SharedPreferences prefs; String endPointGVA; diff --git a/lib/main.dart b/lib/main.dart index 5ed289e..36cfc48 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -44,7 +44,6 @@ Future main() async { WidgetsFlutterBinding.ensureInitialized(); HomeProvider _homeProvider = HomeProvider(); - MyWalletsProvider _walletsProvider = MyWalletsProvider(); appPath = await getApplicationDocumentsDirectory(); await _homeProvider.createDefaultAvatar(); appVersion = await _homeProvider.getAppVersion(); @@ -58,8 +57,6 @@ Future main() async { chestBox = await Hive.openBox("chestBox"); configBox = await Hive.openBox("configBox"); - _walletsProvider.getDefaultWallet(); - // final HiveStore _store = // await HiveStore.open(path: '${appPath.path}/gqlCache'); diff --git a/lib/models/chestData.dart b/lib/models/chestData.dart index e506add..c8a410f 100644 --- a/lib/models/chestData.dart +++ b/lib/models/chestData.dart @@ -10,7 +10,10 @@ class ChestData extends HiveObject { @HiveField(2) String name; - ChestData({this.dewif, this.name}); + @HiveField(3) + int defaultWallet; + + ChestData({this.dewif, this.name, this.defaultWallet}); // representation of WalletData when debugging @override diff --git a/lib/models/chestData.g.dart b/lib/models/chestData.g.dart index 095f182..812e2dd 100644 --- a/lib/models/chestData.g.dart +++ b/lib/models/chestData.g.dart @@ -19,17 +19,20 @@ class ChestDataAdapter extends TypeAdapter { return ChestData( dewif: fields[0] as String, name: fields[2] as String, + defaultWallet: fields[3] as int, ); } @override void write(BinaryWriter writer, ChestData obj) { writer - ..writeByte(2) + ..writeByte(3) ..writeByte(0) ..write(obj.dewif) ..writeByte(2) - ..write(obj.name); + ..write(obj.name) + ..writeByte(3) + ..write(obj.defaultWallet); } @override diff --git a/lib/models/myWallets.dart b/lib/models/myWallets.dart index 44303a6..99b3e8b 100644 --- a/lib/models/myWallets.dart +++ b/lib/models/myWallets.dart @@ -59,11 +59,11 @@ class MyWalletsProvider with ChangeNotifier { return _targetedWallet; } - void getDefaultWallet() { + void getDefaultWallet(int chest) { MyWalletsProvider myWalletsProvider = MyWalletsProvider(); - if (configBox.get('defaultWallet') == null) { - configBox.put('defaultWallet', [getCurrentChest(), 0]); + if (configBox.get('defaultWallet')[chest] == null) { + configBox.put('defaultWallet', [chest, 0]); } defaultWallet = myWalletsProvider diff --git a/lib/screens/myWallets/confirmWalletStorage.dart b/lib/screens/myWallets/confirmWalletStorage.dart index 0125c55..02b0298 100644 --- a/lib/screens/myWallets/confirmWalletStorage.dart +++ b/lib/screens/myWallets/confirmWalletStorage.dart @@ -146,7 +146,6 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { _myWalletProvider.listWallets = _myWalletProvider .readAllWallets(_currentChest); - _myWalletProvider.getDefaultWallet(); scheduleMicrotask(() { _walletOptions.reloadBuild(); _myWalletProvider.rebuildWidget(); diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart index aca0df7..a0d7cff 100644 --- a/lib/screens/myWallets/walletOptions.dart +++ b/lib/screens/myWallets/walletOptions.dart @@ -47,8 +47,6 @@ class WalletOptions extends StatelessWidget { _walletOptions.walletID = [0, wallet.number]; - _myWalletProvider.getDefaultWallet(); - _walletOptions.isDefaultWallet = (defaultWallet.id()[1] == _walletOptions.walletID[1]); diff --git a/lib/screens/onBoarding/12.dart b/lib/screens/onBoarding/12.dart index 732b22a..ce6361f 100644 --- a/lib/screens/onBoarding/12.dart +++ b/lib/screens/onBoarding/12.dart @@ -122,7 +122,6 @@ class OnboardingStepFourteen extends StatelessWidget { _generateWalletProvider.storeHDWChest( generatedWallet, 'Mon portefeuille courant', context); _myWalletProvider.readAllWallets(_currentChest); - _myWalletProvider.getDefaultWallet(); scheduleMicrotask(() { _walletOptions.reloadBuild(); _myWalletProvider.rebuildWidget(); diff --git a/scripts/generatePartFiles.sh b/scripts/generatePartFiles.sh new file mode 100755 index 0000000..05b776a --- /dev/null +++ b/scripts/generatePartFiles.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +flutter packages pub run build_runner build --delete-conflicting-outputs +