diff --git a/lib/globals.dart b/lib/globals.dart
index 69f5154d89aa4164a4505c836a8dffc6ceb7c6c3..1c7816f55200bb3890d6b2dd0a58c922da8d615b 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -24,6 +24,7 @@ late Box<ChestData> chestBox;
late Box configBox;
late Box<G1WalletsList> g1WalletsBox;
// late Box keystoreBox;
+late Directory imageDirectory;
// String cesiumPod = "https://g1.data.le-sou.org";
String cesiumPod = "https://g1.data.presles.fr";
diff --git a/lib/models/wallet_data.dart b/lib/models/wallet_data.dart
index c13b894a84c04646e8ffdfd17e7d4434eaeaf521..38c8c64e373dd10bde90293a6259954e857f897f 100644
--- a/lib/models/wallet_data.dart
+++ b/lib/models/wallet_data.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
import 'package:hive_flutter/hive_flutter.dart';
part 'wallet_data.g.dart';
@@ -23,10 +22,10 @@ class WalletData extends HiveObject {
int? derivation;
@HiveField(6)
- String? imageName;
+ String? imageDefaultPath;
@HiveField(7)
- File? imageFile;
+ String? imageCustomPath;
WalletData(
{this.version,
@@ -35,8 +34,8 @@ class WalletData extends HiveObject {
this.number,
this.name,
this.derivation,
- this.imageName,
- this.imageFile});
+ this.imageDefaultPath,
+ this.imageCustomPath});
// representation of WalletData when debugging
@override
@@ -46,7 +45,7 @@ class WalletData extends HiveObject {
// creates the ':'-separated string from the WalletData
String inLine() {
- return "$chest:$number:$name:$derivation:$imageName";
+ return "$chest:$number:$name:$derivation:$imageDefaultPath";
}
// returns only the id part of the ':'-separated string
diff --git a/lib/models/wallet_data.g.dart b/lib/models/wallet_data.g.dart
index b577e03e42f81f733ca934d277a1403f5fbc16c3..0ea0e8c7b8d17d21309740d17b41eba904ff181f 100644
--- a/lib/models/wallet_data.g.dart
+++ b/lib/models/wallet_data.g.dart
@@ -23,8 +23,8 @@ class WalletDataAdapter extends TypeAdapter<WalletData> {
number: fields[3] as int?,
name: fields[4] as String?,
derivation: fields[5] as int?,
- imageName: fields[6] as String?,
- imageFile: fields[7] as File?,
+ imageDefaultPath: fields[6] as String?,
+ imageCustomPath: fields[7] as String?,
);
}
@@ -45,9 +45,9 @@ class WalletDataAdapter extends TypeAdapter<WalletData> {
..writeByte(5)
..write(obj.derivation)
..writeByte(6)
- ..write(obj.imageName)
+ ..write(obj.imageDefaultPath)
..writeByte(7)
- ..write(obj.imageFile);
+ ..write(obj.imageCustomPath);
}
@override
diff --git a/lib/providers/generate_wallets.dart b/lib/providers/generate_wallets.dart
index 5cc67e38928d59ebd6722d5d422d5d886a264ce3..56d8127d8e4d57573578eae7e9017fdc0d3eddee 100644
--- a/lib/providers/generate_wallets.dart
+++ b/lib/providers/generate_wallets.dart
@@ -87,7 +87,7 @@ class GenerateWalletsProvider with ChangeNotifier {
number: 0,
name: _name,
derivation: 2,
- imageName: '0.png');
+ imageDefaultPath: '0.png');
await walletBox.add(myWallet);
await configBox.put('currentChest', chestKey);
diff --git a/lib/providers/home.dart b/lib/providers/home.dart
index 44ad2daf39826194863b7538523ada75f93846b2..d43e581cd3f87be3acc41f5667b0aff0b57c5d1c 100644
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@@ -16,6 +16,7 @@ import 'package:hive_flutter/hive_flutter.dart';
import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:path_provider/path_provider.dart' as pp;
import 'package:package_info_plus/package_info_plus.dart';
+import 'package:path_provider/path_provider.dart';
import 'package:provider/provider.dart';
class HomeProvider with ChangeNotifier {
@@ -47,6 +48,14 @@ class HomeProvider with ChangeNotifier {
} else {
await Hive.initFlutter();
}
+
+ // Init app folders
+ final documentDir = await getApplicationDocumentsDirectory();
+ imageDirectory = Directory('${documentDir.path}/images');
+
+ if (!await imageDirectory.exists()) {
+ await imageDirectory.create();
+ }
}
Future<String> getAppVersion() async {
diff --git a/lib/providers/my_wallets.dart b/lib/providers/my_wallets.dart
index 5049c5e5e9861dabed30e3d22646dc593f66317b..536295c62b4e2964e263506ada60fa1179487669 100644
--- a/lib/providers/my_wallets.dart
+++ b/lib/providers/my_wallets.dart
@@ -4,6 +4,7 @@ import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_data.dart';
import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/screens/common_elements.dart';
import 'package:provider/provider.dart';
class MyWalletsProvider with ChangeNotifier {
@@ -11,6 +12,7 @@ class MyWalletsProvider with ChangeNotifier {
late String pinCode;
late String mnemonic;
int? pinLenght;
+ bool isNewDerivationLoading = false;
int? getCurrentChest() {
if (configBox.get('currentChest') == null) {
@@ -71,7 +73,8 @@ class MyWalletsProvider with ChangeNotifier {
try {
log.w('DELETE ALL WALLETS ?');
- final bool? _answer = await (_confirmDeletingAllWallets(context));
+ final bool? _answer = await (confirmPopop(
+ context, 'Êtes-vous sûr de vouloir oublier tous vos coffres ?'));
if (_answer!) {
await walletBox.clear();
await chestBox.clear();
@@ -88,58 +91,13 @@ class MyWalletsProvider with ChangeNotifier {
}
}
- Future<bool?> _confirmDeletingAllWallets(context) async {
- return showDialog<bool>(
- context: context,
- barrierDismissible: true, // user must tap button!
- builder: (BuildContext context) {
- return AlertDialog(
- backgroundColor: backgroundColor,
- content: const Text(
- 'Êtes-vous sûr de vouloir oublier tous vos coffres ?',
- textAlign: TextAlign.center,
- style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500),
- ),
- actions: <Widget>[
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- TextButton(
- key: const Key('confirmDeletingAllWallets'),
- child: const Text(
- "Oui",
- style: TextStyle(
- fontSize: 20,
- color: Color(0xffD80000),
- ),
- ),
- onPressed: () {
- Navigator.pop(context, true);
- },
- ),
- const SizedBox(width: 20),
- TextButton(
- child: const Text(
- "Non",
- style: TextStyle(fontSize: 20),
- ),
- onPressed: () {
- Navigator.pop(context, false);
- },
- ),
- const SizedBox(height: 120)
- ],
- )
- ],
- );
- },
- );
- }
-
Future<void> generateNewDerivation(context, String _name) async {
+ isNewDerivationLoading = true;
+ notifyListeners();
int _newDerivationNbr;
int _newWalletNbr;
int? _chest = getCurrentChest();
+
List<WalletData> _walletConfig = readAllWallets(_chest);
if (_walletConfig.isEmpty) {
@@ -168,10 +126,11 @@ class MyWalletsProvider with ChangeNotifier {
number: _newWalletNbr,
name: _name,
derivation: _newDerivationNbr,
- imageName: '${_newWalletNbr % 4}.png');
+ imageDefaultPath: '${_newWalletNbr % 4}.png');
await walletBox.add(newWallet);
+ isNewDerivationLoading = false;
notifyListeners();
}
diff --git a/lib/providers/wallet_options.dart b/lib/providers/wallet_options.dart
index 553f149f9a5ae03a54732d35f253d1d0f0da07be..c60ef938b875d4ce76638752423ceed3ed3c717b 100644
--- a/lib/providers/wallet_options.dart
+++ b/lib/providers/wallet_options.dart
@@ -5,6 +5,7 @@ import 'package:gecko/globals.dart';
import 'package:gecko/providers/my_wallets.dart';
import 'package:gecko/models/wallet_data.dart';
import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/screens/common_elements.dart';
import 'package:image_picker/image_picker.dart';
import 'package:provider/provider.dart';
@@ -57,7 +58,8 @@ class WalletOptionsProvider with ChangeNotifier {
}
Future<int> deleteWallet(context, WalletData wallet) async {
- final bool? _answer = await (_confirmDeletingWallet(context, wallet.name));
+ final bool? _answer = await (confirmPopop(context,
+ 'Êtes-vous sûr de vouloir oublier le portefeuille "${wallet.name}" ?'));
if (_answer!) {
await walletBox.delete(wallet.key);
@@ -71,61 +73,40 @@ class WalletOptionsProvider with ChangeNotifier {
return 0;
}
- Future<bool?> _confirmDeletingWallet(context, _walletName) async {
- return showDialog<bool>(
- context: context,
- barrierDismissible: true, // user must tap button!
- builder: (BuildContext context) {
- return AlertDialog(
- title: Text(
- 'Êtes-vous sûr de vouloir supprimer le portefeuille "$_walletName" ?'),
- content: SingleChildScrollView(
- child: ListBody(
- children: const <Widget>[
- Text('Vous pourrez restaurer ce portefeuille plus tard.'),
- ],
- ),
- ),
- actions: <Widget>[
- TextButton(
- child: const Text("Non", key: Key('cancelDeleting')),
- onPressed: () {
- Navigator.pop(context, false);
- },
- ),
- TextButton(
- child: const Text("Oui", key: Key('confirmDeleting')),
- onPressed: () {
- Navigator.pop(context, true);
- },
- ),
- ],
- );
- },
- );
- }
-
void bluringBalance() {
isBalanceBlur = !isBalanceBlur;
notifyListeners();
}
- Future changeAvatar() async {
- File _image;
+ Future<String> changeAvatar() async {
+ // File _image;
final picker = ImagePicker();
XFile? pickedFile = await picker.pickImage(source: ImageSource.gallery);
if (pickedFile != null) {
- _image = File(pickedFile.path);
-
////TODO: Store image on disk, store path in walletBox.imagePath
- log.i(pickedFile.path);
- return _image;
+ File imageFile = File(pickedFile.path);
+ if (!await imageDirectory.exists()) {
+ log.e("Image folder doesn't exist");
+ return '';
+ }
+
+ final newPath = "${imageDirectory.path}/${pickedFile.name}";
+
+ await imageFile.copy(newPath);
+ // final File newImage = File(newPath);
+
+ // await newImage.writeAsBytes(await pickedFile.readAsBytes());
+ // await pickedFile.saveTo(newPath);
+ // await Future.delayed(const Duration(milliseconds: 100));
+
+ log.i(newPath);
+ return newPath;
} else {
log.w('No image selected.');
- return null;
+ return '';
}
}
@@ -269,7 +250,8 @@ class WalletOptionsProvider with ChangeNotifier {
Map<String, String> balanceCache = {};
-Widget balance(BuildContext context, String address, double size) {
+Widget balance(BuildContext context, String address, double size,
+ [Color _color = Colors.black]) {
return Column(children: <Widget>[
Consumer<SubstrateSdk>(builder: (context, _sdk, _) {
return FutureBuilder(
@@ -280,8 +262,7 @@ Widget balance(BuildContext context, String address, double size) {
if (balanceCache[address] != null) {
return Text(balanceCache[address]!,
style: TextStyle(
- fontSize: isTall ? size : size * 0.9,
- ));
+ fontSize: isTall ? size : size * 0.9, color: _color));
} else {
return SizedBox(
height: 15,
@@ -298,6 +279,7 @@ Widget balance(BuildContext context, String address, double size) {
balanceCache[address]!,
style: TextStyle(
fontSize: isTall ? size : size * 0.9,
+ color: _color,
),
);
});
diff --git a/lib/screens/common_elements.dart b/lib/screens/common_elements.dart
index 9aef3b683b571cb7009d08448a9f39c315287eb5..f9daa8f7d9f1995bfb6b874dd2d2889dd95c3f18 100644
--- a/lib/screens/common_elements.dart
+++ b/lib/screens/common_elements.dart
@@ -192,6 +192,54 @@ class FaderTransition extends PageRouteBuilder {
);
}
+Future<bool?> confirmPopop(BuildContext context, String title) async {
+ return showDialog<bool>(
+ context: context,
+ barrierDismissible: true, // user must tap button!
+ builder: (BuildContext context) {
+ return AlertDialog(
+ backgroundColor: backgroundColor,
+ content: Text(
+ title,
+ textAlign: TextAlign.center,
+ style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
+ ),
+ actions: <Widget>[
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ TextButton(
+ key: const Key('confirmPopop'),
+ child: const Text(
+ "Oui",
+ style: TextStyle(
+ fontSize: 21,
+ color: Color(0xffD80000),
+ ),
+ ),
+ onPressed: () {
+ Navigator.pop(context, true);
+ },
+ ),
+ const SizedBox(width: 20),
+ TextButton(
+ child: const Text(
+ "Non",
+ style: TextStyle(fontSize: 21),
+ ),
+ onPressed: () {
+ Navigator.pop(context, false);
+ },
+ ),
+ const SizedBox(height: 120)
+ ],
+ )
+ ],
+ );
+ },
+ );
+ }
+
// Widget geckoAppBar() {
// return AppBar(
// toolbarHeight: 60 * ratio,
diff --git a/lib/screens/myWallets/choose_wallet.dart b/lib/screens/myWallets/choose_wallet.dart
index 86fc4e0f3d4d9df142f0f98f977539431de36d1c..cdd600083d971d7e6d4621d223554b11e7b2fd1a 100644
--- a/lib/screens/myWallets/choose_wallet.dart
+++ b/lib/screens/myWallets/choose_wallet.dart
@@ -152,14 +152,14 @@ class ChooseWalletScreen extends StatelessWidget {
const Color(0xFFE7E7A6),
],
)),
- child: _repository.imageFile == null
+ child: _repository.imageCustomPath == null
? Image.asset(
- 'assets/avatars/${_repository.imageName}',
+ 'assets/avatars/${_repository.imageDefaultPath}',
alignment: Alignment.bottomCenter,
scale: 0.5,
)
- : Image.file(
- _repository.imageFile!,
+ : Image.asset(
+ _repository.imageCustomPath!,
alignment: Alignment.bottomCenter,
scale: 0.5,
),
diff --git a/lib/screens/myWallets/unlocking_wallet.dart b/lib/screens/myWallets/unlocking_wallet.dart
index 210d26879e54fc5fe08774bb1de5e68983a3210c..a898567893a10c620b1edc300472515ed51772ff 100644
--- a/lib/screens/myWallets/unlocking_wallet.dart
+++ b/lib/screens/myWallets/unlocking_wallet.dart
@@ -189,7 +189,7 @@ class UnlockingWallet extends StatelessWidget {
enableActiveFill: false,
errorAnimationController: errorController,
controller: _enterPin,
- keyboardType: TextInputType.text,
+ keyboardType: TextInputType.visiblePassword,
boxShadows: const [
BoxShadow(
offset: Offset(0, 1),
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index 7e313c9b9c2d83041fa5a26ca77f4b8e22f7f9a7..05346fc407640cf865d3395e647b6f83263e51d5 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -1,4 +1,5 @@
import 'dart:async';
+import 'dart:io';
import 'package:flutter/material.dart';
import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_data.dart';
@@ -42,6 +43,7 @@ class WalletOptions extends StatelessWidget {
onWillPop: () {
_walletOptions.isEditing = false;
_walletOptions.isBalanceBlur = false;
+ _myWalletProvider.rebuildWidget();
Navigator.pop(context);
return Future<bool>.value(true);
},
@@ -55,13 +57,14 @@ class WalletOptions extends StatelessWidget {
onPressed: () {
_walletOptions.isEditing = false;
_walletOptions.isBalanceBlur = false;
+ _myWalletProvider.rebuildWidget();
Navigator.pop(context);
}),
title: SizedBox(
height: 22,
child: Consumer<WalletOptionsProvider>(
builder: (context, walletProvider, _) {
- return Text(_walletOptions.nameController.text);
+ return Text(wallet.name!);
}),
),
),
@@ -146,20 +149,31 @@ class WalletOptions extends StatelessWidget {
children: <Widget>[
InkWell(
onTap: () async {
- wallet.imageFile = await (walletProvider.changeAvatar());
- if (wallet.imageFile != null) {
+ final _newPath = await (walletProvider.changeAvatar());
+ if (_newPath != '') {
+ wallet.imageCustomPath = _newPath;
walletBox.put(wallet.key, wallet);
}
walletProvider.reloadBuild();
},
- child: wallet.imageFile == null
+ child: wallet.imageCustomPath == null || wallet.imageCustomPath == ''
? Image.asset(
- 'assets/avatars/${wallet.imageName}',
+ 'assets/avatars/${wallet.imageDefaultPath}',
width: 110,
)
- : Image.file(
- wallet.imageFile!,
- width: 110,
+ : Container(
+ width: 120,
+ height: 120,
+ decoration: BoxDecoration(
+ shape: BoxShape.circle,
+ color: Colors.transparent,
+ image: DecorationImage(
+ fit: BoxFit.contain,
+ image: FileImage(
+ File(wallet.imageCustomPath!),
+ ),
+ ),
+ ),
),
),
Positioned(
@@ -167,7 +181,7 @@ class WalletOptions extends StatelessWidget {
top: 0,
child: InkWell(
onTap: () async {
- wallet.imageFile = await (walletProvider.changeAvatar());
+ wallet.imageCustomPath = await (walletProvider.changeAvatar());
walletProvider.reloadBuild();
},
child: Image.asset(
@@ -182,12 +196,10 @@ class WalletOptions extends StatelessWidget {
Widget walletName(WalletOptionsProvider walletProvider,
WalletOptionsProvider _walletOptions) {
- bool _isNewNameValid = false;
- if (_isNewNameValid == false) {
+ WidgetsBinding.instance.addPostFrameCallback((_) {
_walletOptions.nameController.text = wallet.name!;
- } else {
- wallet.name = _walletOptions.nameController.text;
- }
+ // _walletOptions.reloadBuild();
+ });
return SizedBox(
width: 260,
@@ -219,8 +231,8 @@ class WalletOptions extends StatelessWidget {
child: InkWell(
key: const Key('renameWallet'),
onTap: () async {
- _isNewNameValid =
- walletProvider.editWalletName(wallet.id(), isCesium: false);
+ // _isNewNameValid =
+ walletProvider.editWalletName(wallet.id(), isCesium: false);
await Future.delayed(const Duration(milliseconds: 30));
walletProvider.walletNameFocus.requestFocus();
},
@@ -309,13 +321,13 @@ class WalletOptions extends StatelessWidget {
MaterialPageRoute(builder: (context) {
return HistoryScreen(
pubkey: walletProvider.address.text,
- avatar: wallet.imageFile == null
+ avatar: wallet.imageCustomPath == null
? Image.asset(
- 'assets/avatars/${wallet.imageName}',
+ 'assets/avatars/${wallet.imageDefaultPath}',
width: 110,
)
- : Image.file(
- wallet.imageFile!,
+ : Image.asset(
+ wallet.imageCustomPath!,
width: 110,
));
}),
diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart
index f00d707fe651b3a26e4ec64553539a743aff2e57..cd08c67bd8c7de6a8947ce5a433e50dacd8f09af 100644
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
import 'package:flutter/services.dart';
import 'package:gecko/globals.dart';
import 'package:gecko/models/chest_data.dart';
@@ -65,12 +67,6 @@ class WalletsHome extends StatelessWidget {
);
}
- // Widget cesiumWalletOptions(BuildContext context) {
- // return Column(children: const [
- // Center(child: Text('This is a Cesium wallet')),
- // ]);
- // }
-
Widget chestOptions(
BuildContext context, MyWalletsProvider _myWalletProvider) {
return Column(children: [
@@ -171,6 +167,7 @@ class WalletsHome extends StatelessWidget {
return CustomScrollView(slivers: <Widget>[
const SliverToBoxAdapter(child: SizedBox(height: 20)),
+
SliverGrid.count(
key: const Key('listWallets'),
crossAxisCount: nTule,
@@ -227,19 +224,29 @@ class WalletsHome extends StatelessWidget {
child:
// SvgPicture.asset('assets/chopp-gecko2.png',
// semanticsLabel: 'Gecko', height: 48),
- _repository.imageFile == null
+ _repository.imageCustomPath == null ||
+ _repository.imageCustomPath == ''
? Image.asset(
- 'assets/avatars/${_repository.imageName}',
+ 'assets/avatars/${_repository.imageDefaultPath}',
alignment: Alignment.bottomCenter,
scale: 0.5,
)
- : Image.file(
- _repository.imageFile!,
- alignment: Alignment.bottomCenter,
- scale: 0.5,
+ : Container(
+ decoration: BoxDecoration(
+ shape: BoxShape.circle,
+ color: Colors.transparent,
+ image: DecorationImage(
+ fit: BoxFit.contain,
+ image: FileImage(
+ File(
+ _repository.imageCustomPath!),
+ ),
+ ),
+ ),
),
)),
- // balanceBuilder(context, _walletOptions.pubkey.text),
+ balanceBuilder(context, _repository.address!,
+ _repository.id()[1] == defaultWallet!.id()[1]),
ListTile(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
@@ -308,36 +315,24 @@ class WalletsHome extends StatelessWidget {
]);
}
- Widget balanceBuilder(context, String _pubkey) {
- return Query(
- options: QueryOptions(
- document: gql(getBalance),
- variables: {
- 'pubkey': _pubkey,
- },
- // pollInterval: Duration(seconds: 1),
- ),
- builder: (QueryResult result,
- {VoidCallback? refetch, FetchMore? fetchMore}) {
- if (result.hasException) {
- return Text(result.exception.toString());
- }
-
- if (result.isLoading) {
- return const Text('Loading');
- }
- String wBalanceUD;
- if (result.data!['balance'] == null) {
- wBalanceUD = '0.0';
- } else {
- int wBalanceG1 = result.data!['balance']['amount'];
- int currentUD = result.data!['currentUd']['amount'];
- double wBalanceUDBrut = wBalanceG1 / currentUD; // .toString();
- wBalanceUD =
- double.parse((wBalanceUDBrut).toStringAsFixed(2)).toString();
- }
- return Text(wBalanceUD);
- });
+ Widget balanceBuilder(context, String _address, bool isDefault) {
+ return Container(
+ width: double.infinity,
+ color: isDefault ? orangeC : yellowC,
+ child: SizedBox(
+ height: 25,
+ child: Column(children: [
+ const Spacer(),
+ // Text(
+ // '0.0 gd',
+ // textAlign: TextAlign.center,
+ // style: TextStyle(color: isDefault ? Colors.white : Colors.black),
+ // ),
+ balance(
+ context, _address, 15, isDefault ? Colors.white : Colors.black)
+ ]),
+ ),
+ );
}
Widget addNewDerivation(context) {
@@ -355,21 +350,32 @@ class WalletsHome extends StatelessWidget {
child: InkWell(
key: const Key('addDerivation'),
onTap: () async {
- await _myWalletProvider.generateNewDerivation(
- context, _newDerivationName);
+ if (!_myWalletProvider.isNewDerivationLoading) {
+ await _myWalletProvider.generateNewDerivation(
+ context, _newDerivationName);
+ }
},
child: Container(
width: double.infinity,
height: double.infinity,
decoration: BoxDecoration(color: floattingYellow),
- child: const Center(
- child: Text(
- '+',
- style: TextStyle(
- fontSize: 150,
- fontWeight: FontWeight.w700,
- color: Color(0xFFFCB437)),
- )),
+ child: Center(
+ child: _myWalletProvider.isNewDerivationLoading
+ ? SizedBox(
+ height: 60,
+ width: 60,
+ child: CircularProgressIndicator(
+ color: orangeC,
+ strokeWidth: 7,
+ ),
+ )
+ : const Text(
+ '+',
+ style: TextStyle(
+ fontSize: 150,
+ fontWeight: FontWeight.w700,
+ color: Color(0xFFFCB437)),
+ )),
)),
),
])));
diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart
index ff99af32bd7e80aaee0549372fc13064c418030d..12f1204de485ba911d8a8246349fa1f6c92bdb29 100644
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@@ -116,7 +116,7 @@ class OnboardingStepTen extends StatelessWidget {
enableActiveFill: false,
errorAnimationController: errorController,
controller: _enterPin,
- keyboardType: TextInputType.text,
+ keyboardType: TextInputType.visiblePassword,
boxShadows: const [
BoxShadow(
offset: Offset(0, 1),
diff --git a/pubspec.lock b/pubspec.lock
index 3a70454c36b2a404e1979c0d98d8deea91b646f2..9fe5831dc7c849854a25100ad3bce69ab6427064 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -588,13 +588,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.3"
- image_gallery_saver:
- dependency: "direct main"
- description:
- name: image_gallery_saver
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.7.1"
image_picker:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8294cd6794c1c08cf4ea9715d0939dddb0c99dab..21c7e01f95701c1ff179b7f8106b40454b60e1cc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ description: Pay with G1.
# 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
-version: 0.0.6+8
+version: 0.0.7+1
environment:
sdk: '>=2.12.0 <3.0.0'
@@ -36,7 +36,7 @@ dependencies:
hive: ^2.0.4
hive_flutter: ^1.1.0
http: ^0.13.4
- image_gallery_saver: ^1.6.9
+ # image_gallery_saver: ^1.6.9
image_picker: ^0.8.4
infinite_scroll_pagination: ^3.1.0
intl: ^0.17.0