Fixes for unspent coins box initialization. Change cakewallet icons. Add wallet naming for new wallets.

This commit is contained in:
M 2022-01-08 16:33:17 +02:00
parent afa0f23fa7
commit 67ad389caf
8 changed files with 14 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View file

@ -36,6 +36,7 @@ import 'package:cake_wallet/src/screens/root/root.dart';
import 'package:uni_links/uni_links.dart'; import 'package:uni_links/uni_links.dart';
import 'package:cw_core/unspent_coins_info.dart'; import 'package:cw_core/unspent_coins_info.dart';
import 'package:cake_wallet/monero/monero.dart'; import 'package:cake_wallet/monero/monero.dart';
import 'package:cake_wallet/wallet_type_utils.dart';
final navigatorKey = GlobalKey<NavigatorState>(); final navigatorKey = GlobalKey<NavigatorState>();
final rootKey = GlobalKey<RootState>(); final rootKey = GlobalKey<RootState>();
@ -84,6 +85,10 @@ Future<void> main() async {
Hive.registerAdapter(OrderAdapter()); Hive.registerAdapter(OrderAdapter());
} }
if (!isMoneroOnly && !Hive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {
Hive.registerAdapter(UnspentCoinsInfoAdapter());
}
final secureStorage = FlutterSecureStorage(); final secureStorage = FlutterSecureStorage();
final transactionDescriptionsBoxKey = await getEncryptionKey( final transactionDescriptionsBoxKey = await getEncryptionKey(
secureStorage: secureStorage, forKey: TransactionDescription.boxKey); secureStorage: secureStorage, forKey: TransactionDescription.boxKey);

View file

@ -95,8 +95,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
builder: (_) => getIt.get<NewWalletTypePage>( builder: (_) => getIt.get<NewWalletTypePage>(
param1: (BuildContext context, WalletType type) => param1: (BuildContext context, WalletType type) =>
Navigator.of(context) Navigator.of(context)
.pushNamed(Routes.preSeed, arguments: type), .pushNamed(Routes.newWallet, arguments: type),
param2: true)); param2: false));
case Routes.newWallet: case Routes.newWallet:
final type = settings.arguments as WalletType; final type = settings.arguments as WalletType;

View file

@ -2,19 +2,23 @@
ICON_120_PATH="" ICON_120_PATH=""
ICON_180_PATH="" ICON_180_PATH=""
ICON_1024_PATH=""
DEST_DIR_PATH=`pwd`/../../ios/Runner/Assets.xcassets/AppIcon.appiconset DEST_DIR_PATH=`pwd`/../../ios/Runner/Assets.xcassets/AppIcon.appiconset
case $APP_IOS_TYPE in case $APP_IOS_TYPE in
"monero.com") "monero.com")
ICON_120_PATH=`pwd`/../../assets/images/monero.com_icon_120.png ICON_120_PATH=`pwd`/../../assets/images/monero.com_icon_120.png
ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png;; ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png
ICON_1024_PATH=`pwd`/../../assets/images/monero.com_icon_1024.png;;
"cakewallet") "cakewallet")
ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png;; ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
esac esac
rm $DEST_DIR_PATH/app_icon_120.png rm $DEST_DIR_PATH/app_icon_120.png
rm $DEST_DIR_PATH/app_icon_180.png rm $DEST_DIR_PATH/app_icon_180.png
rm $DEST_DIR_PATH/app_icon_1024.png
ln -s $ICON_120_PATH $DEST_DIR_PATH/app_icon_120.png ln -s $ICON_120_PATH $DEST_DIR_PATH/app_icon_120.png
ln -s $ICON_180_PATH $DEST_DIR_PATH/app_icon_180.png ln -s $ICON_180_PATH $DEST_DIR_PATH/app_icon_180.png
ln -s $ICON_1024_PATH $DEST_DIR_PATH/app_icon_1024.png