Remove old cake wallet logo (#2161)

* Remove old cake wallet logo

* minor fix [skip ci]

.gitignore

@@ -141,9 +141,28 @@ lib/wownero/wownero.dart
 lib/zano/zano.dart
 lib/decred/decred.dart
 
-ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_180.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_120.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png
+
 ios/Runner/Info.plist
 android/app/src/main/res/mipmap-*
 android/app/src/main/res/drawable/ic_launcher.png

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,114 +1,134 @@
 {
   "images": [
     {
-      "filename" : "Icon-App-40x40@1x.png",
+      "filename": "AppIcon@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x 1.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "app_icon_120.png",
       "idiom": "iphone",
       "scale": "2x",
       "size": "60x60"
     },
     {
-      "filename" : "app_icon_180.png",
+      "filename": "AppIcon@3x.png",
       "idiom": "iphone",
       "scale": "3x",
       "size": "60x60"
     },
     {
-      "filename" : "Icon-App-20x20@1x.png",
+      "filename": "AppIcon~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40@1x 1.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-76x76@1x.png",
       "idiom": "ipad",
       "scale": "1x",
       "size": "76x76"
     },
     {
-      "filename" : "Icon-App-76x76@2x.png",
+      "filename": "AppIcon@2x~ipad.png",
       "idiom": "ipad",
       "scale": "2x",
       "size": "76x76"
     },
     {
-      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "filename": "AppIcon-83.5@2x~ipad.png",
       "idiom": "ipad",
       "scale": "2x",
       "size": "83.5x83.5"
     },
     {
-      "filename" : "app_icon_1024.png",
+      "filename": "AppIcon-40@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
+    },
+    {
+      "filename": "AppIcon-40@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
+    },
+    {
+      "filename": "AppIcon-40~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
+    },
+    {
+      "filename": "AppIcon-40@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
+    },
+    {
+      "filename": "AppIcon-20@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
+    },
+    {
+      "filename": "AppIcon-20@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
+    },
+    {
+      "filename": "AppIcon-20~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
+    },
+    {
+      "filename": "AppIcon-20@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
+    },
+    {
+      "filename": "AppIcon-29.png",
+      "idiom": "iphone",
+      "scale": "1x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-29@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-29@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-29~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-29@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-60@2x~car.png",
+      "idiom": "car",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
+      "filename": "AppIcon-60@3x~car.png",
+      "idiom": "car",
+      "scale": "3x",
+      "size": "60x60"
+    },
+    {
+      "filename": "AppIcon~ios-marketing.png",
       "idiom": "ios-marketing",
       "scale": "1x",
       "size": "1024x1024"
     }
   ],
   "info": {
-    "author" : "xcode",
+    "author": "iconkitchen",
     "version": 1
   }
 }

lib/entities/provider_types.dart

@@ -6,7 +6,6 @@ import 'package:cake_wallet/buy/moonpay/moonpay_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
 import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
 import 'package:cake_wallet/di.dart';
-import 'package:cw_core/wallet_type.dart';
 
 enum ProviderType { robinhood, dfx, onramper, moonpay, meld, kriptonim }
 
@@ -47,7 +46,7 @@ extension ProviderTypeName on ProviderType {
 }
 
 class ProvidersHelper {
-  static List<ProviderType> getAvailableBuyProviderTypes(WalletType walletType) => [
+  static List<ProviderType> getAvailableBuyProviderTypes() => [
     ProviderType.robinhood,
     ProviderType.dfx,
     ProviderType.onramper,
@@ -55,7 +54,7 @@ class ProvidersHelper {
     ProviderType.kriptonim
   ];
 
-  static List<ProviderType> getAvailableSellProviderTypes(WalletType walletType) => [
+  static List<ProviderType> getAvailableSellProviderTypes() => [
     ProviderType.robinhood,
     ProviderType.dfx,
     ProviderType.onramper,
@@ -63,7 +62,7 @@ class ProvidersHelper {
     ProviderType.kriptonim
   ];
 
-  static BuyProvider? getProviderByType(ProviderType type) {
+  static BuyProvider getProviderByType(ProviderType type) {
     switch (type) {
       case ProviderType.robinhood:
         return getIt.get<RobinhoodBuyProvider>();
@@ -77,8 +76,6 @@ class ProvidersHelper {
         return getIt.get<MeldBuyProvider>();
       case ProviderType.kriptonim:
         return getIt.get<KryptonimBuyProvider>();
-      default:
-        return null;
       }
   }
 }

lib/src/screens/backup/edit_backup_password_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -68,7 +67,9 @@ class EditBackupPasswordPage extends BasePage {
               actionRightButton: () async {
                 await editBackupPasswordViewModel.save();
                 Navigator.of(dialogContext).pop();
+                if (context.mounted) {
                   Navigator.of(context).pop();
+                }
               },
               actionLeftButton: () => Navigator.of(dialogContext).pop());
         });

lib/view_model/buy/buy_sell_view_model.dart

@@ -15,7 +15,6 @@ import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/currency_for_wallet_type.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
@@ -61,21 +60,17 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
   late Timer bestRateSync;
 
   List<BuyProvider> get availableBuyProviders {
-    final providerTypes = ProvidersHelper.getAvailableBuyProviderTypes(
+    final providerTypes = ProvidersHelper.getAvailableBuyProviderTypes();
-        walletTypeForCurrency(cryptoCurrency) ?? wallet.type);
     return providerTypes
         .map((type) => ProvidersHelper.getProviderByType(type))
-        .where((provider) => provider != null)
         .cast<BuyProvider>()
         .toList();
   }
 
   List<BuyProvider> get availableSellProviders {
-    final providerTypes = ProvidersHelper.getAvailableSellProviderTypes(
+    final providerTypes = ProvidersHelper.getAvailableSellProviderTypes();
-        walletTypeForCurrency(cryptoCurrency) ?? wallet.type);
     return providerTypes
         .map((type) => ProvidersHelper.getProviderByType(type))
-        .where((provider) => provider != null)
         .cast<BuyProvider>()
         .toList();
   }

scripts/ios/app_icon.sh

@@ -1,24 +1,101 @@
 #!/bin/sh
 
-ICON_120_PATH=""
+ICON_2x_PATH=""
-ICON_180_PATH=""
+ICON_2x_ipad_PATH=""
-ICON_1024_PATH=""
+ICON_3x_PATH=""
+ICON_20_2x_PATH=""
+ICON_20_2x_ipad_PATH=""
+ICON_20_3x_PATH=""
+ICON_20_ipad_PATH=""
+ICON_29_PATH=""
+ICON_29_2x_PATH=""
+ICON_29_2x_ipad_PATH=""
+ICON_29_3x_PATH=""
+ICON_29_3x_ipad_PATH=""
+ICON_29_ipad_PATH=""
+ICON_40_2x_PATH=""
+ICON_40_2x_ipad_PATH=""
+ICON_40_3x_PATH=""
+ICON_40_ipad_PATH=""
+ICON_60_2x_PATH=""
+ICON_60_3x_PATH=""
+ICON_83_2x_ipad_PATH=""
+ICON_marketing_PATH=""
+ICON_ipad_PATH=""
+
+ICON_DIRECTORY=""
+
 DEST_DIR_PATH=`pwd`/../../ios/Runner/Assets.xcassets/AppIcon.appiconset
 
 case $APP_IOS_TYPE in
 	"monero.com")
-	ICON_120_PATH=`pwd`/../../assets/images/monero.com_icon_120.png
+    ICON_DIRECTORY=monero_ios_icons;;
-	ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png
-	ICON_1024_PATH=`pwd`/../../assets/images/monero.com_icon_1024.png;;
 	"cakewallet")
-	ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
+    ICON_DIRECTORY=cakewallet_ios_icons;;
-    ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
-    ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
 esac
 
-rm $DEST_DIR_PATH/app_icon_120.png
+ICON_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@2x.png
-rm $DEST_DIR_PATH/app_icon_180.png
+ICON_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@2x~ipad.png
-rm $DEST_DIR_PATH/app_icon_1024.png
+ICON_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@3x.png
-ln -s $ICON_120_PATH $DEST_DIR_PATH/app_icon_120.png
+ICON_20_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@2x.png
-ln -s $ICON_180_PATH $DEST_DIR_PATH/app_icon_180.png
+ICON_20_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@2x~ipad.png
-ln -s $ICON_1024_PATH $DEST_DIR_PATH/app_icon_1024.png
+ICON_20_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@3x.png
+ICON_20_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20~ipad.png
+ICON_29_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29.png
+ICON_29_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@2x.png
+ICON_29_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@2x~ipad.png
+ICON_29_3x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@3x.png
+ICON_29_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29~ipad.png
+ICON_40_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@2x.png
+ICON_40_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@2x~ipad.png
+ICON_40_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@3x.png
+ICON_40_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40~ipad.png
+ICON_60_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-60@2x~car.png
+ICON_60_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-60@3x~car.png
+ICON_83_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-83.5@2x~ipad.png
+ICON_marketing_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon~ios-marketing.png
+ICON_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon~ipad.png
+
+rm $DEST_DIR_PATH/AppIcon@2x.png
+rm $DEST_DIR_PATH/AppIcon@2x~ipad.png
+rm $DEST_DIR_PATH/AppIcon@3x.png
+rm $DEST_DIR_PATH/AppIcon-20@2x.png
+rm $DEST_DIR_PATH/AppIcon-20@2x~ipad.png
+rm $DEST_DIR_PATH/AppIcon-20@3x.png
+rm $DEST_DIR_PATH/AppIcon-20~ipad.png
+rm $DEST_DIR_PATH/AppIcon-29.png
+rm $DEST_DIR_PATH/AppIcon-29@2x.png
+rm $DEST_DIR_PATH/AppIcon-29@2x~ipad.png
+rm $DEST_DIR_PATH/AppIcon-29@3x.png
+rm $DEST_DIR_PATH/AppIcon-29~ipad.png
+rm $DEST_DIR_PATH/AppIcon-40@2x.png
+rm $DEST_DIR_PATH/AppIcon-40@2x~ipad.png
+rm $DEST_DIR_PATH/AppIcon-40@3x.png
+rm $DEST_DIR_PATH/AppIcon-40~ipad.png
+rm $DEST_DIR_PATH/AppIcon-60@2x~car.png
+rm $DEST_DIR_PATH/AppIcon-60@3x~car.png
+rm $DEST_DIR_PATH/AppIcon-83.5@2x~ipad.png
+rm $DEST_DIR_PATH/AppIcon~ios-marketing.png
+rm $DEST_DIR_PATH/AppIcon~ipad.png
+
+ln -s $ICON_2x_PATH $DEST_DIR_PATH/AppIcon@2x.png
+ln -s $ICON_2x_ipad_PATH $DEST_DIR_PATH/AppIcon@2x~ipad.png
+ln -s $ICON_3x_PATH $DEST_DIR_PATH/AppIcon@3x.png
+ln -s $ICON_20_2x_PATH $DEST_DIR_PATH/AppIcon-20@2x.png
+ln -s $ICON_20_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-20@2x~ipad.png
+ln -s $ICON_20_3x_PATH $DEST_DIR_PATH/AppIcon-20@3x.png
+ln -s $ICON_20_ipad_PATH $DEST_DIR_PATH/AppIcon-20~ipad.png
+ln -s $ICON_29_PATH $DEST_DIR_PATH/AppIcon-29.png
+ln -s $ICON_29_2x_PATH $DEST_DIR_PATH/AppIcon-29@2x.png
+ln -s $ICON_29_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-29@2x~ipad.png
+ln -s $ICON_29_3x_ipad_PATH $DEST_DIR_PATH/AppIcon-29@3x.png
+ln -s $ICON_29_ipad_PATH $DEST_DIR_PATH/AppIcon-29~ipad.png
+ln -s $ICON_40_2x_PATH $DEST_DIR_PATH/AppIcon-40@2x.png
+ln -s $ICON_40_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-40@2x~ipad.png
+ln -s $ICON_40_3x_PATH $DEST_DIR_PATH/AppIcon-40@3x.png
+ln -s $ICON_40_ipad_PATH $DEST_DIR_PATH/AppIcon-40~ipad.png
+ln -s $ICON_60_2x_PATH $DEST_DIR_PATH/AppIcon-60@2x~car.png
+ln -s $ICON_60_3x_PATH $DEST_DIR_PATH/AppIcon-60@3x~car.png
+ln -s $ICON_83_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-83.5@2x~ipad.png
+ln -s $ICON_marketing_PATH $DEST_DIR_PATH/AppIcon~ios-marketing.png
+ln -s $ICON_ipad_PATH $DEST_DIR_PATH/AppIcon~ipad.png