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

M committed Jan 8, 2022 at 16:33 UTC 67ad389cafa16d223cb15a93945195758a425c9e
8 files changed +14 -5
assets/images/cakewallet_app_logo.png
Binary files /dev/null and b/assets/images/cakewallet_app_logo.png differ
assets/images/cakewallet_icon_1024.png
Binary files /dev/null and b/assets/images/cakewallet_icon_1024.png differ
assets/images/cakewallet_icon_120.png
Binary files a/assets/images/cakewallet_icon_120.png and b/assets/images/cakewallet_icon_120.png differ
assets/images/cakewallet_icon_180.png
Binary files a/assets/images/cakewallet_icon_180.png and b/assets/images/cakewallet_icon_180.png differ
assets/images/monero.com_icon_1024.png
Binary files /dev/null and b/assets/images/monero.com_icon_1024.png differ
lib/main.dart
+5
@@ -36,6 +36,7 @@ import 'package:cake_wallet/src/screens/root/root.dart';
36 import 'package:uni_links/uni_links.dart';
37 import 'package:cw_core/unspent_coins_info.dart';
38 import 'package:cake_wallet/monero/monero.dart';
39 +import 'package:cake_wallet/wallet_type_utils.dart';
40
41 final navigatorKey = GlobalKey<NavigatorState>();
42 final rootKey = GlobalKey<RootState>();
@@ -84,6 +85,10 @@ Future<void> main() async {
85 Hive.registerAdapter(OrderAdapter());
86 }
87
88 + if (!isMoneroOnly && !Hive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {
89 + Hive.registerAdapter(UnspentCoinsInfoAdapter());
90 + }
91 +
92 final secureStorage = FlutterSecureStorage();
93 final transactionDescriptionsBoxKey = await getEncryptionKey(
94 secureStorage: secureStorage, forKey: TransactionDescription.boxKey);
lib/router.dart
+2 -2
@@ -95,8 +95,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
95 builder: (_) => getIt.get<NewWalletTypePage>(
96 param1: (BuildContext context, WalletType type) =>
97 Navigator.of(context)
98 - .pushNamed(Routes.preSeed, arguments: type),
99 - param2: true));
98 + .pushNamed(Routes.newWallet, arguments: type),
99 + param2: false));
100
101 case Routes.newWallet:
102 final type = settings.arguments as WalletType;
scripts/ios/app_icon.sh
+7 -3
@@ -2,19 +2,23 @@
2
3 ICON_120_PATH=""
4 ICON_180_PATH=""
5 +ICON_1024_PATH=""
6 DEST_DIR_PATH=`pwd`/../../ios/Runner/Assets.xcassets/AppIcon.appiconset
7
8 case $APP_IOS_TYPE in
9 "monero.com")
10 ICON_120_PATH=`pwd`/../../assets/images/monero.com_icon_120.png
10 - ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png;;
11 + ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png
12 + ICON_1024_PATH=`pwd`/../../assets/images/monero.com_icon_1024.png;;
13 "cakewallet")
14 ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
13 - ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png;;
15 + ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
16 + ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
17 esac
18
19 rm $DEST_DIR_PATH/app_icon_120.png
20 rm $DEST_DIR_PATH/app_icon_180.png
21 +rm $DEST_DIR_PATH/app_icon_1024.png
22 ln -s $ICON_120_PATH $DEST_DIR_PATH/app_icon_120.png
23 ln -s $ICON_180_PATH $DEST_DIR_PATH/app_icon_180.png
20 -
24 +ln -s $ICON_1024_PATH $DEST_DIR_PATH/app_icon_1024.png
\ No newline at end of file