Remove old cake wallet logo (#2161)

* Remove old cake wallet logo * minor fix [skip ci]

Omar Hatem committed Apr 7, 2025 at 18:14 UTC 2d693f46ff4f33553a507511d701ad7462cfb9f0
61 files changed +218 -109
.gitignore
+22 -3
@@ -141,9 +141,28 @@ lib/wownero/wownero.dart
141 lib/zano/zano.dart
142 lib/decred/decred.dart
143
144 -ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_180.png
145 -ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_120.png
146 -ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
144 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png
145 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png
146 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png
147 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png
148 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png
149 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png
150 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png
151 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png
152 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png
153 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png
154 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png
155 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png
156 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png
157 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png
158 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png
159 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png
160 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png
161 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png
162 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png
163 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png
164 +ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png
165 +
166 ios/Runner/Info.plist
167 android/app/src/main/res/mipmap-*
168 android/app/src/main/res/drawable/ic_launcher.png
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@3x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@3x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@3x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@3x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@3x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@3x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@2x~car.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@2x~car.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@3x~car.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@3x~car.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon-83.5@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-83.5@2x~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x~ipad.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon@3x.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@3x.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ios-marketing.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ios-marketing.png differ
assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-20@3x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-20@3x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-20~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-20~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-29.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-29.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-29@3x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-29@3x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-29~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-29~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-40@3x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-40@3x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-40~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-40~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-60@2x~car.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-60@2x~car.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-60@3x~car.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-60@3x~car.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon-83.5@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon-83.5@2x~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon@2x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon@2x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon@2x~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon@2x~ipad.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon@3x.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon@3x.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon~ios-marketing.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon~ios-marketing.png differ
assets/images/ios_icons/monero_ios_icons/AppIcon~ipad.png
Binary files /dev/null and b/assets/images/ios_icons/monero_ios_icons/AppIcon~ipad.png differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+95 -75
@@ -1,114 +1,134 @@
1 {
2 - "images" : [
2 + "images": [
3 {
4 - "filename" : "Icon-App-40x40@1x.png",
5 - "idiom" : "iphone",
6 - "scale" : "2x",
7 - "size" : "20x20"
4 + "filename": "AppIcon@2x.png",
5 + "idiom": "iphone",
6 + "scale": "2x",
7 + "size": "60x60"
8 },
9 {
10 - "filename" : "Icon-App-20x20@3x.png",
11 - "idiom" : "iphone",
12 - "scale" : "3x",
13 - "size" : "20x20"
10 + "filename": "AppIcon@3x.png",
11 + "idiom": "iphone",
12 + "scale": "3x",
13 + "size": "60x60"
14 },
15 {
16 - "filename" : "Icon-App-29x29@2x 1.png",
17 - "idiom" : "iphone",
18 - "scale" : "2x",
19 - "size" : "29x29"
16 + "filename": "AppIcon~ipad.png",
17 + "idiom": "ipad",
18 + "scale": "1x",
19 + "size": "76x76"
20 },
21 {
22 - "filename" : "Icon-App-29x29@3x.png",
23 - "idiom" : "iphone",
24 - "scale" : "3x",
25 - "size" : "29x29"
22 + "filename": "AppIcon@2x~ipad.png",
23 + "idiom": "ipad",
24 + "scale": "2x",
25 + "size": "76x76"
26 },
27 {
28 - "idiom" : "iphone",
29 - "scale" : "2x",
30 - "size" : "40x40"
28 + "filename": "AppIcon-83.5@2x~ipad.png",
29 + "idiom": "ipad",
30 + "scale": "2x",
31 + "size": "83.5x83.5"
32 },
33 {
33 - "filename" : "Icon-App-40x40@3x.png",
34 - "idiom" : "iphone",
35 - "scale" : "3x",
36 - "size" : "40x40"
34 + "filename": "AppIcon-40@2x.png",
35 + "idiom": "iphone",
36 + "scale": "2x",
37 + "size": "40x40"
38 },
39 {
39 - "filename" : "app_icon_120.png",
40 - "idiom" : "iphone",
41 - "scale" : "2x",
42 - "size" : "60x60"
40 + "filename": "AppIcon-40@3x.png",
41 + "idiom": "iphone",
42 + "scale": "3x",
43 + "size": "40x40"
44 },
45 {
45 - "filename" : "app_icon_180.png",
46 - "idiom" : "iphone",
47 - "scale" : "3x",
48 - "size" : "60x60"
46 + "filename": "AppIcon-40~ipad.png",
47 + "idiom": "ipad",
48 + "scale": "1x",
49 + "size": "40x40"
50 },
51 {
51 - "filename" : "Icon-App-20x20@1x.png",
52 - "idiom" : "ipad",
53 - "scale" : "1x",
54 - "size" : "20x20"
52 + "filename": "AppIcon-40@2x~ipad.png",
53 + "idiom": "ipad",
54 + "scale": "2x",
55 + "size": "40x40"
56 },
57 {
57 - "filename" : "Icon-App-20x20@2x.png",
58 - "idiom" : "ipad",
59 - "scale" : "2x",
60 - "size" : "20x20"
58 + "filename": "AppIcon-20@2x.png",
59 + "idiom": "iphone",
60 + "scale": "2x",
61 + "size": "20x20"
62 },
63 {
63 - "filename" : "Icon-App-29x29@1x.png",
64 - "idiom" : "ipad",
65 - "scale" : "1x",
66 - "size" : "29x29"
64 + "filename": "AppIcon-20@3x.png",
65 + "idiom": "iphone",
66 + "scale": "3x",
67 + "size": "20x20"
68 },
69 {
69 - "filename" : "Icon-App-29x29@2x.png",
70 - "idiom" : "ipad",
71 - "scale" : "2x",
72 - "size" : "29x29"
70 + "filename": "AppIcon-20~ipad.png",
71 + "idiom": "ipad",
72 + "scale": "1x",
73 + "size": "20x20"
74 },
75 {
75 - "filename" : "Icon-App-40x40@1x 1.png",
76 - "idiom" : "ipad",
77 - "scale" : "1x",
78 - "size" : "40x40"
76 + "filename": "AppIcon-20@2x~ipad.png",
77 + "idiom": "ipad",
78 + "scale": "2x",
79 + "size": "20x20"
80 },
81 {
81 - "idiom" : "ipad",
82 - "scale" : "2x",
83 - "size" : "40x40"
82 + "filename": "AppIcon-29.png",
83 + "idiom": "iphone",
84 + "scale": "1x",
85 + "size": "29x29"
86 },
87 {
86 - "filename" : "Icon-App-76x76@1x.png",
87 - "idiom" : "ipad",
88 - "scale" : "1x",
89 - "size" : "76x76"
88 + "filename": "AppIcon-29@2x.png",
89 + "idiom": "iphone",
90 + "scale": "2x",
91 + "size": "29x29"
92 },
93 {
92 - "filename" : "Icon-App-76x76@2x.png",
93 - "idiom" : "ipad",
94 - "scale" : "2x",
95 - "size" : "76x76"
94 + "filename": "AppIcon-29@3x.png",
95 + "idiom": "iphone",
96 + "scale": "3x",
97 + "size": "29x29"
98 },
99 {
98 - "filename" : "Icon-App-83.5x83.5@2x.png",
99 - "idiom" : "ipad",
100 - "scale" : "2x",
101 - "size" : "83.5x83.5"
100 + "filename": "AppIcon-29~ipad.png",
101 + "idiom": "ipad",
102 + "scale": "1x",
103 + "size": "29x29"
104 },
105 {
104 - "filename" : "app_icon_1024.png",
105 - "idiom" : "ios-marketing",
106 - "scale" : "1x",
107 - "size" : "1024x1024"
106 + "filename": "AppIcon-29@2x~ipad.png",
107 + "idiom": "ipad",
108 + "scale": "2x",
109 + "size": "29x29"
110 + },
111 + {
112 + "filename": "AppIcon-60@2x~car.png",
113 + "idiom": "car",
114 + "scale": "2x",
115 + "size": "60x60"
116 + },
117 + {
118 + "filename": "AppIcon-60@3x~car.png",
119 + "idiom": "car",
120 + "scale": "3x",
121 + "size": "60x60"
122 + },
123 + {
124 + "filename": "AppIcon~ios-marketing.png",
125 + "idiom": "ios-marketing",
126 + "scale": "1x",
127 + "size": "1024x1024"
128 }
129 ],
110 - "info" : {
111 - "author" : "xcode",
112 - "version" : 1
130 + "info": {
131 + "author": "iconkitchen",
132 + "version": 1
133 }
114 -}
134 +}
\ No newline at end of file
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x 1.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x 1.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
lib/entities/provider_types.dart
+4 -7
@@ -6,7 +6,6 @@ import 'package:cake_wallet/buy/moonpay/moonpay_provider.dart';
6 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
7 import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
8 import 'package:cake_wallet/di.dart';
9 -import 'package:cw_core/wallet_type.dart';
9
10 enum ProviderType { robinhood, dfx, onramper, moonpay, meld, kriptonim }
11
@@ -47,7 +46,7 @@ extension ProviderTypeName on ProviderType {
46 }
47
48 class ProvidersHelper {
50 - static List<ProviderType> getAvailableBuyProviderTypes(WalletType walletType) => [
49 + static List<ProviderType> getAvailableBuyProviderTypes() => [
50 ProviderType.robinhood,
51 ProviderType.dfx,
52 ProviderType.onramper,
@@ -55,7 +54,7 @@ class ProvidersHelper {
54 ProviderType.kriptonim
55 ];
56
58 - static List<ProviderType> getAvailableSellProviderTypes(WalletType walletType) => [
57 + static List<ProviderType> getAvailableSellProviderTypes() => [
58 ProviderType.robinhood,
59 ProviderType.dfx,
60 ProviderType.onramper,
@@ -63,7 +62,7 @@ class ProvidersHelper {
62 ProviderType.kriptonim
63 ];
64
66 - static BuyProvider? getProviderByType(ProviderType type) {
65 + static BuyProvider getProviderByType(ProviderType type) {
66 switch (type) {
67 case ProviderType.robinhood:
68 return getIt.get<RobinhoodBuyProvider>();
@@ -77,8 +76,6 @@ class ProvidersHelper {
76 return getIt.get<MeldBuyProvider>();
77 case ProviderType.kriptonim:
78 return getIt.get<KryptonimBuyProvider>();
80 - default:
81 - return null;
82 - }
79 + }
80 }
81 }
lib/src/screens/backup/edit_backup_password_page.dart
+3 -2
@@ -1,5 +1,4 @@
1 import 'package:flutter/material.dart';
2 -import 'package:flutter/cupertino.dart';
2 import 'package:flutter_mobx/flutter_mobx.dart';
3 import 'package:cake_wallet/generated/i18n.dart';
4 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -68,7 +67,9 @@ class EditBackupPasswordPage extends BasePage {
67 actionRightButton: () async {
68 await editBackupPasswordViewModel.save();
69 Navigator.of(dialogContext).pop();
71 - Navigator.of(context).pop();
70 + if (context.mounted) {
71 + Navigator.of(context).pop();
72 + }
73 },
74 actionLeftButton: () => Navigator.of(dialogContext).pop());
75 });
lib/view_model/buy/buy_sell_view_model.dart
+2 -7
@@ -15,7 +15,6 @@ import 'package:cake_wallet/store/app_store.dart';
15 import 'package:cake_wallet/store/settings_store.dart';
16 import 'package:cake_wallet/themes/theme_base.dart';
17 import 'package:cw_core/crypto_currency.dart';
18 -import 'package:cw_core/currency_for_wallet_type.dart';
18 import 'package:flutter/cupertino.dart';
19 import 'package:intl/intl.dart';
20 import 'package:mobx/mobx.dart';
@@ -61,21 +60,17 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
60 late Timer bestRateSync;
61
62 List<BuyProvider> get availableBuyProviders {
64 - final providerTypes = ProvidersHelper.getAvailableBuyProviderTypes(
65 - walletTypeForCurrency(cryptoCurrency) ?? wallet.type);
63 + final providerTypes = ProvidersHelper.getAvailableBuyProviderTypes();
64 return providerTypes
65 .map((type) => ProvidersHelper.getProviderByType(type))
68 - .where((provider) => provider != null)
66 .cast<BuyProvider>()
67 .toList();
68 }
69
70 List<BuyProvider> get availableSellProviders {
74 - final providerTypes = ProvidersHelper.getAvailableSellProviderTypes(
75 - walletTypeForCurrency(cryptoCurrency) ?? wallet.type);
71 + final providerTypes = ProvidersHelper.getAvailableSellProviderTypes();
72 return providerTypes
73 .map((type) => ProvidersHelper.getProviderByType(type))
78 - .where((provider) => provider != null)
74 .cast<BuyProvider>()
75 .toList();
76 }
scripts/ios/app_icon.sh
+92 -15
@@ -1,24 +1,101 @@
1 #!/bin/sh
2
3 -ICON_120_PATH=""
4 -ICON_180_PATH=""
5 -ICON_1024_PATH=""
3 +ICON_2x_PATH=""
4 +ICON_2x_ipad_PATH=""
5 +ICON_3x_PATH=""
6 +ICON_20_2x_PATH=""
7 +ICON_20_2x_ipad_PATH=""
8 +ICON_20_3x_PATH=""
9 +ICON_20_ipad_PATH=""
10 +ICON_29_PATH=""
11 +ICON_29_2x_PATH=""
12 +ICON_29_2x_ipad_PATH=""
13 +ICON_29_3x_PATH=""
14 +ICON_29_3x_ipad_PATH=""
15 +ICON_29_ipad_PATH=""
16 +ICON_40_2x_PATH=""
17 +ICON_40_2x_ipad_PATH=""
18 +ICON_40_3x_PATH=""
19 +ICON_40_ipad_PATH=""
20 +ICON_60_2x_PATH=""
21 +ICON_60_3x_PATH=""
22 +ICON_83_2x_ipad_PATH=""
23 +ICON_marketing_PATH=""
24 +ICON_ipad_PATH=""
25 +
26 +ICON_DIRECTORY=""
27 +
28 DEST_DIR_PATH=`pwd`/../../ios/Runner/Assets.xcassets/AppIcon.appiconset
29
30 case $APP_IOS_TYPE in
31 "monero.com")
10 - ICON_120_PATH=`pwd`/../../assets/images/monero.com_icon_120.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;;
32 + ICON_DIRECTORY=monero_ios_icons;;
33 "cakewallet")
14 - ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
15 - ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
16 - ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
34 + ICON_DIRECTORY=cakewallet_ios_icons;;
35 esac
36
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
24 -ln -s $ICON_1024_PATH $DEST_DIR_PATH/app_icon_1024.png
\ No newline at end of file
37 +ICON_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@2x.png
38 +ICON_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@2x~ipad.png
39 +ICON_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@3x.png
40 +ICON_20_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@2x.png
41 +ICON_20_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@2x~ipad.png
42 +ICON_20_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@3x.png
43 +ICON_20_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20~ipad.png
44 +ICON_29_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29.png
45 +ICON_29_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@2x.png
46 +ICON_29_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@2x~ipad.png
47 +ICON_29_3x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@3x.png
48 +ICON_29_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29~ipad.png
49 +ICON_40_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@2x.png
50 +ICON_40_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@2x~ipad.png
51 +ICON_40_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@3x.png
52 +ICON_40_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40~ipad.png
53 +ICON_60_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-60@2x~car.png
54 +ICON_60_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-60@3x~car.png
55 +ICON_83_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-83.5@2x~ipad.png
56 +ICON_marketing_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon~ios-marketing.png
57 +ICON_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon~ipad.png
58 +
59 +rm $DEST_DIR_PATH/AppIcon@2x.png
60 +rm $DEST_DIR_PATH/AppIcon@2x~ipad.png
61 +rm $DEST_DIR_PATH/AppIcon@3x.png
62 +rm $DEST_DIR_PATH/AppIcon-20@2x.png
63 +rm $DEST_DIR_PATH/AppIcon-20@2x~ipad.png
64 +rm $DEST_DIR_PATH/AppIcon-20@3x.png
65 +rm $DEST_DIR_PATH/AppIcon-20~ipad.png
66 +rm $DEST_DIR_PATH/AppIcon-29.png
67 +rm $DEST_DIR_PATH/AppIcon-29@2x.png
68 +rm $DEST_DIR_PATH/AppIcon-29@2x~ipad.png
69 +rm $DEST_DIR_PATH/AppIcon-29@3x.png
70 +rm $DEST_DIR_PATH/AppIcon-29~ipad.png
71 +rm $DEST_DIR_PATH/AppIcon-40@2x.png
72 +rm $DEST_DIR_PATH/AppIcon-40@2x~ipad.png
73 +rm $DEST_DIR_PATH/AppIcon-40@3x.png
74 +rm $DEST_DIR_PATH/AppIcon-40~ipad.png
75 +rm $DEST_DIR_PATH/AppIcon-60@2x~car.png
76 +rm $DEST_DIR_PATH/AppIcon-60@3x~car.png
77 +rm $DEST_DIR_PATH/AppIcon-83.5@2x~ipad.png
78 +rm $DEST_DIR_PATH/AppIcon~ios-marketing.png
79 +rm $DEST_DIR_PATH/AppIcon~ipad.png
80 +
81 +ln -s $ICON_2x_PATH $DEST_DIR_PATH/AppIcon@2x.png
82 +ln -s $ICON_2x_ipad_PATH $DEST_DIR_PATH/AppIcon@2x~ipad.png
83 +ln -s $ICON_3x_PATH $DEST_DIR_PATH/AppIcon@3x.png
84 +ln -s $ICON_20_2x_PATH $DEST_DIR_PATH/AppIcon-20@2x.png
85 +ln -s $ICON_20_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-20@2x~ipad.png
86 +ln -s $ICON_20_3x_PATH $DEST_DIR_PATH/AppIcon-20@3x.png
87 +ln -s $ICON_20_ipad_PATH $DEST_DIR_PATH/AppIcon-20~ipad.png
88 +ln -s $ICON_29_PATH $DEST_DIR_PATH/AppIcon-29.png
89 +ln -s $ICON_29_2x_PATH $DEST_DIR_PATH/AppIcon-29@2x.png
90 +ln -s $ICON_29_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-29@2x~ipad.png
91 +ln -s $ICON_29_3x_ipad_PATH $DEST_DIR_PATH/AppIcon-29@3x.png
92 +ln -s $ICON_29_ipad_PATH $DEST_DIR_PATH/AppIcon-29~ipad.png
93 +ln -s $ICON_40_2x_PATH $DEST_DIR_PATH/AppIcon-40@2x.png
94 +ln -s $ICON_40_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-40@2x~ipad.png
95 +ln -s $ICON_40_3x_PATH $DEST_DIR_PATH/AppIcon-40@3x.png
96 +ln -s $ICON_40_ipad_PATH $DEST_DIR_PATH/AppIcon-40~ipad.png
97 +ln -s $ICON_60_2x_PATH $DEST_DIR_PATH/AppIcon-60@2x~car.png
98 +ln -s $ICON_60_3x_PATH $DEST_DIR_PATH/AppIcon-60@3x~car.png
99 +ln -s $ICON_83_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-83.5@2x~ipad.png
100 +ln -s $ICON_marketing_PATH $DEST_DIR_PATH/AppIcon~ios-marketing.png
101 +ln -s $ICON_ipad_PATH $DEST_DIR_PATH/AppIcon~ipad.png