diff --git a/.gitignore b/.gitignore index 0a883dd18d..2ffb86d766 100644 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,12 @@ assets/images/app_logo.png macos/Runner/Info.plist macos/Runner/DebugProfile.entitlements macos/Runner/Release.entitlements + +macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png +macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png +macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png +macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png +macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png +macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png +macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png +macos/Runner/Configs/AppInfo.xcconfig diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png similarity index 100% rename from macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png similarity index 100% rename from macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png similarity index 100% rename from macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png similarity index 100% rename from macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png similarity index 100% rename from macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png similarity index 100% rename from macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png similarity index 100% rename from macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png diff --git a/assets/images/macos_icons/monero_macos_icons/monero_macos_1024.png b/assets/images/macos_icons/monero_macos_icons/monero_macos_1024.png new file mode 100644 index 0000000000..f3f91af956 Binary files /dev/null and b/assets/images/macos_icons/monero_macos_icons/monero_macos_1024.png differ diff --git a/assets/images/macos_icons/monero_macos_icons/monero_macos_128.png b/assets/images/macos_icons/monero_macos_icons/monero_macos_128.png new file mode 100644 index 0000000000..48a1906e17 Binary files /dev/null and b/assets/images/macos_icons/monero_macos_icons/monero_macos_128.png differ diff --git a/assets/images/macos_icons/monero_macos_icons/monero_macos_16.png b/assets/images/macos_icons/monero_macos_icons/monero_macos_16.png new file mode 100644 index 0000000000..5104ea7d34 Binary files /dev/null and b/assets/images/macos_icons/monero_macos_icons/monero_macos_16.png differ diff --git a/assets/images/macos_icons/monero_macos_icons/monero_macos_256.png b/assets/images/macos_icons/monero_macos_icons/monero_macos_256.png new file mode 100644 index 0000000000..6ae8b769b9 Binary files /dev/null and b/assets/images/macos_icons/monero_macos_icons/monero_macos_256.png differ diff --git a/assets/images/macos_icons/monero_macos_icons/monero_macos_32.png b/assets/images/macos_icons/monero_macos_icons/monero_macos_32.png new file mode 100644 index 0000000000..60c30c609e Binary files /dev/null and b/assets/images/macos_icons/monero_macos_icons/monero_macos_32.png differ diff --git a/assets/images/macos_icons/monero_macos_icons/monero_macos_512.png b/assets/images/macos_icons/monero_macos_icons/monero_macos_512.png new file mode 100644 index 0000000000..7072c07e74 Binary files /dev/null and b/assets/images/macos_icons/monero_macos_icons/monero_macos_512.png differ diff --git a/assets/images/macos_icons/monero_macos_icons/monero_macos_64.png b/assets/images/macos_icons/monero_macos_icons/monero_macos_64.png new file mode 100644 index 0000000000..74aa4e2ade Binary files /dev/null and b/assets/images/macos_icons/monero_macos_icons/monero_macos_64.png differ diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index 9b6348a764..2715bdeeea 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -1,4 +1,3 @@ -Polyseed enhancements -New on-ramp provider DFX -Usability enhancements -Bug fixes \ No newline at end of file +On-ramp flow fixes and enhancements +UI enhancements +Generic enhancements and bug fixes \ No newline at end of file diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 515a0333e2..90428c2abc 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,2 +1,6 @@ -Support multiple address types for Bitcoin Cash -Bug fixes \ No newline at end of file +Add new Off-ramp providers (DFX, OnRamper) +On-ramp flow fixes and enhancements +Ethereum and WalletConnect fixes and improvements +Nano enhancements +UI enhancements +Generic enhancements and bug fixes \ No newline at end of file diff --git a/cw_nano/pubspec.lock b/cw_nano/pubspec.lock index 4a5496fa6c..a42bb9ab4c 100644 --- a/cw_nano/pubspec.lock +++ b/cw_nano/pubspec.lock @@ -471,6 +471,15 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + nanoutil: + dependency: "direct main" + description: + path: "." + ref: c37e72817cf0a28162f43124f79661d6c8e0098f + resolved-ref: c37e72817cf0a28162f43124f79661d6c8e0098f + url: "https://github.com/perishllc/nanoutil.git" + source: git + version: "1.0.0" package_config: dependency: transitive description: @@ -764,15 +773,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" - tor: - dependency: transitive - description: - path: "." - ref: main - resolved-ref: "09ba92cb11d4e3cacf97256e57863b805f79f2e5" - url: "https://github.com/cake-tech/tor.git" - source: git - version: "0.0.1" typed_data: dependency: transitive description: diff --git a/cw_polygon/lib/polygon_wallet.dart b/cw_polygon/lib/polygon_wallet.dart index 5749a95ac4..13ee13f015 100644 --- a/cw_polygon/lib/polygon_wallet.dart +++ b/cw_polygon/lib/polygon_wallet.dart @@ -102,8 +102,12 @@ abstract class PolygonWalletBase final Completer _sharedPrefs = Completer(); Future init() async { - polygonErc20TokensBox = await CakeHive.openBox( - "${walletInfo.name.replaceAll(" ", "_")}_${Erc20Token.polygonBoxName}"); + final boxName = "${walletInfo.name.replaceAll(" ", "_")}_ ${Erc20Token.polygonBoxName}"; + if (await CakeHive.boxExists(boxName)) { + polygonErc20TokensBox = await CakeHive.openBox(boxName); + } else { + polygonErc20TokensBox = await CakeHive.openBox(boxName.replaceAll(" ", "")); + } await walletAddresses.init(); await transactionHistory.init(); _polygonPrivateKey = await getPrivateKey( diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3118e6ad79..2545e90ce9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -102,11 +102,11 @@ PODS: - DKImagePickerController/PhotoGallery - Flutter - Flutter (1.0.0) - - flutter_inappwebview (0.0.1): + - flutter_inappwebview_ios (0.0.1): - Flutter - - flutter_inappwebview/Core (= 0.0.1) + - flutter_inappwebview_ios/Core (= 0.0.1) - OrderedSet (~> 5.0) - - flutter_inappwebview/Core (0.0.1): + - flutter_inappwebview_ios/Core (0.0.1): - Flutter - OrderedSet (~> 5.0) - flutter_mailer (0.0.1): @@ -169,7 +169,7 @@ DEPENDENCIES: - devicelocale (from `.symlinks/plugins/devicelocale/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) + - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`) - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) @@ -224,8 +224,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/file_picker/ios" Flutter: :path: Flutter - flutter_inappwebview: - :path: ".symlinks/plugins/flutter_inappwebview/ios" + flutter_inappwebview_ios: + :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" flutter_mailer: :path: ".symlinks/plugins/flutter_mailer/ios" flutter_secure_storage: @@ -274,29 +274,29 @@ SPEC CHECKSUMS: DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf + flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0 flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83 flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0 in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d - local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605 + local_auth_ios: 1ba1475238daa33a6ffa2a29242558437be435ac MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6 sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986 share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 uni_links: d97da20c7701486ba192624d99bffaaffcfc298a UnstoppableDomainsResolution: c3c67f4d0a5e2437cb00d4bd50c2e00d6e743841 - url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b + url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47 workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6 diff --git a/lib/entities/provider_types.dart b/lib/entities/provider_types.dart index ced79eae71..a3c2039601 100644 --- a/lib/entities/provider_types.dart +++ b/lib/entities/provider_types.dart @@ -74,8 +74,6 @@ class ProvidersHelper { static List getAvailableSellProviderTypes(WalletType walletType) { switch (walletType) { - case WalletType.monero: - return [ProviderType.askEachTime, ProviderType.dfx]; case WalletType.bitcoin: case WalletType.ethereum: return [ProviderType.askEachTime, ProviderType.onramper, @@ -83,6 +81,7 @@ class ProvidersHelper { case WalletType.litecoin: case WalletType.bitcoinCash: return [ProviderType.askEachTime, ProviderType.moonpaySell]; + case WalletType.monero: case WalletType.nano: case WalletType.banano: case WalletType.none: diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart index 59c31aa62e..f3dd2427d4 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart @@ -123,8 +123,8 @@ class _DesktopWalletSelectionDropDownState extends State Navigator.of(context).pop(false), - actionRightButton: () => Navigator.of(context).pop(true)); + actionLeftButton: () => Navigator.of(dialogContext).pop(false), + actionRightButton: () => Navigator.of(dialogContext).pop(true)); }) ?? false; diff --git a/lib/src/screens/dashboard/pages/balance_page.dart b/lib/src/screens/dashboard/pages/balance_page.dart index 6ddd8f6e1d..453adccf56 100644 --- a/lib/src/screens/dashboard/pages/balance_page.dart +++ b/lib/src/screens/dashboard/pages/balance_page.dart @@ -265,7 +265,7 @@ class BalanceRowWidget extends StatelessWidget { color: Theme.of(context).extension()!.syncedBackgroundColor, ), child: Container( - margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24), + margin: const EdgeInsets.only(top: 16, left: 24, right: 8, bottom: 16), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -329,7 +329,7 @@ class BalanceRowWidget extends StatelessWidget { ), ), SizedBox( - width: MediaQuery.of(context).size.width * 0.18, + width: min(MediaQuery.of(context).size.width * 0.2, 100), child: Center( child: Column( children: [ @@ -337,8 +337,8 @@ class BalanceRowWidget extends StatelessWidget { ? Container( child: Image.asset( currency.iconPath!, - height: 30.0, - width: 30.0, + height: 40.0, + width: 40.0, ), ) : Container( @@ -359,7 +359,7 @@ class BalanceRowWidget extends StatelessWidget { Text( currency.title, style: TextStyle( - fontSize: 18, + fontSize: 15, fontFamily: 'Lato', fontWeight: FontWeight.w800, color: Theme.of(context).extension()!.assetTitleColor, diff --git a/lib/src/screens/restore/widgets/backup_file_button.dart b/lib/src/screens/restore/widgets/backup_file_button.dart deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lib/view_model/restore_from_backup_view_model.dart b/lib/view_model/restore_from_backup_view_model.dart index 403ae3ff17..365afb1fa7 100644 --- a/lib/view_model/restore_from_backup_view_model.dart +++ b/lib/view_model/restore_from_backup_view_model.dart @@ -1,5 +1,7 @@ import 'dart:io'; import 'package:cake_wallet/core/execution_state.dart'; +import 'package:cake_wallet/utils/exception_handler.dart'; +import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; import 'package:mobx/mobx.dart'; import 'package:cake_wallet/main.dart'; @@ -60,11 +62,17 @@ abstract class RestoreFromBackupViewModelBase with Store { }); state = ExecutedSuccessfullyState(); - } catch (e) { + } catch (e, s) { var msg = e.toString(); if (msg.toLowerCase().contains("message authentication code (mac)")) { msg = 'Incorrect backup password'; + } else { + ExceptionHandler.onError(FlutterErrorDetails( + exception: e, + stack: s, + library: this.toString(), + )); } state = FailureState(msg); diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 3297320755..c158c737e9 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -23,11 +23,15 @@ PODS: - FlutterMacOS - devicelocale (0.0.1): - FlutterMacOS + - flutter_inappwebview_macos (0.0.1): + - FlutterMacOS + - OrderedSet (~> 5.0) - flutter_secure_storage_macos (6.1.1): - FlutterMacOS - FlutterMacOS (1.0.0) - in_app_review (0.2.0): - FlutterMacOS + - OrderedSet (5.0.0) - package_info (0.0.1): - FlutterMacOS - package_info_plus (0.0.1): @@ -51,6 +55,7 @@ DEPENDENCIES: - cw_monero (from `Flutter/ephemeral/.symlinks/plugins/cw_monero/macos`) - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`) + - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`) - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`) @@ -64,6 +69,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - OrderedSet - ReachabilitySwift EXTERNAL SOURCES: @@ -75,6 +81,8 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos devicelocale: :path: Flutter/ephemeral/.symlinks/plugins/devicelocale/macos + flutter_inappwebview_macos: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos flutter_secure_storage_macos: :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos FlutterMacOS: @@ -101,15 +109,17 @@ SPEC CHECKSUMS: cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4 device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225 + flutter_inappwebview_macos: 9600c9df9fdb346aaa8933812009f8d94304203d flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0 + OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c package_info: 6eba2fd8d3371dda2d85c8db6fe97488f24b74b2 package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269 diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfoBase.xcconfig similarity index 85% rename from macos/Runner/Configs/AppInfo.xcconfig rename to macos/Runner/Configs/AppInfoBase.xcconfig index 84f96bff73..aabf7b387b 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfoBase.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = Cake Wallet +PRODUCT_NAME = ${PRODUCT_NAME} // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet +PRODUCT_BUNDLE_IDENTIFIER = ${PRODUCT_BUNDLE_IDENTIFIER} // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2022 com.fotolockr. All rights reserved. diff --git a/macos/Runner/InfoBase.plist b/macos/Runner/InfoBase.plist index 98d0ea9eea..c849a42c7b 100644 --- a/macos/Runner/InfoBase.plist +++ b/macos/Runner/InfoBase.plist @@ -12,8 +12,10 @@ $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 + CFBundleDisplayName + Cake Wallet CFBundleName - $(PRODUCT_NAME) + Cake Wallet CFBundlePackageType APPL CFBundleShortVersionString diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 5feae289ed..163f178f31 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.9.0" -MONERO_COM_BUILD_NUMBER=71 +MONERO_COM_VERSION="1.10.0" +MONERO_COM_BUILD_NUMBER=72 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.12.1" -CAKEWALLET_BUILD_NUMBER=188 +CAKEWALLET_VERSION="4.13.0" +CAKEWALLET_BUILD_NUMBER=189 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_SCHEME="cakewallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index ee59e837c7..9920b1e54e 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.9.0" -MONERO_COM_BUILD_NUMBER=69 +MONERO_COM_VERSION="1.10.0" +MONERO_COM_BUILD_NUMBER=70 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.12.1" -CAKEWALLET_BUILD_NUMBER=206 +CAKEWALLET_VERSION="4.13.0" +CAKEWALLET_BUILD_NUMBER=208 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/macos/app_config.sh b/scripts/macos/app_config.sh index 2e6a945bfc..cda367b9c9 100755 --- a/scripts/macos/app_config.sh +++ b/scripts/macos/app_config.sh @@ -1,5 +1,6 @@ #!/bin/bash +MONERO_COM="monero.com" CAKEWALLET="cakewallet" DIR=`pwd` @@ -10,6 +11,8 @@ fi cd ../.. # go to root cp -rf ./macos/Runner/InfoBase.plist ./macos/Runner/Info.plist +/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName ${APP_MACOS_NAME}" ./macos/Runner/Info.plist +/usr/libexec/PlistBuddy -c "Set :CFBundleName ${APP_MACOS_NAME}" ./macos/Runner/Info.plist /usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier ${APP_MACOS_BUNDLE_ID}" ./macos/Runner/Info.plist /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${APP_MACOS_VERSION}" ./macos/Runner/Info.plist /usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${APP_MACOS_BUILD_NUMBER}" ./macos/Runner/Info.plist @@ -17,11 +20,16 @@ cp -rf ./macos/Runner/InfoBase.plist ./macos/Runner/Info.plist # Fill entitlements Bundle ID cp -rf ./macos/Runner/DebugProfileBase.entitlements ./macos/Runner/DebugProfile.entitlements cp -rf ./macos/Runner/ReleaseBase.entitlements ./macos/Runner/Release.entitlements +cp -rf ./macos/Runner/Configs/AppInfoBase.xcconfig ./macos/Runner/Configs/AppInfo.xcconfig sed -i '' "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/DebugProfile.entitlements sed -i '' "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/Release.entitlements +sed -i '' "s/\${PRODUCT_NAME}/${APP_MACOS_NAME}/g" ./macos/Runner/Configs/AppInfo.xcconfig +sed -i '' "s/\${PRODUCT_BUNDLE_IDENTIFIER}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/Configs/AppInfo.xcconfig CONFIG_ARGS="" case $APP_MACOS_TYPE in + $MONERO_COM) + CONFIG_ARGS="--monero";; $CAKEWALLET) CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash";; #--haven esac @@ -31,4 +39,5 @@ flutter pub get flutter pub run tool/generate_pubspec.dart flutter pub get flutter packages pub run tool/configure.dart $CONFIG_ARGS -cd $DIR \ No newline at end of file +cd $DIR +$DIR/app_icon.sh \ No newline at end of file diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index a37d67a827..fa040dfeef 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -5,18 +5,24 @@ APP_MACOS_VERSION="" APP_MACOS_BUILD_VERSION="" APP_MACOS_BUNDLE_ID="" +MONERO_COM="monero.com" CAKEWALLET="cakewallet" -TYPES=($CAKEWALLET) -APP_MACOS_TYPE=$CAKEWALLET +TYPES=($MONERO_COM $CAKEWALLET) +APP_MACOS_TYPE=$1 if [ -n "$1" ]; then APP_MACOS_TYPE=$1 fi +MONERO_COM_NAME="Monero.com" +MONERO_COM_VERSION="1.0.0" +MONERO_COM_BUILD_NUMBER=1 +MONERO_COM_BUNDLE_ID="com.cakewallet.monero" + CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.5.1" -CAKEWALLET_BUILD_NUMBER=48 +CAKEWALLET_VERSION="1.6.0" +CAKEWALLET_BUILD_NUMBER=50 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then @@ -25,6 +31,11 @@ if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then fi case $APP_MACOS_TYPE in + $MONERO_COM) + APP_MACOS_NAME=$MONERO_COM_NAME + APP_MACOS_VERSION=$MONERO_COM_VERSION + APP_MACOS_BUILD_NUMBER=$MONERO_COM_BUILD_NUMBER + APP_MACOS_BUNDLE_ID=$MONERO_COM_BUNDLE_ID;; $CAKEWALLET) APP_MACOS_NAME=$CAKEWALLET_NAME APP_MACOS_VERSION=$CAKEWALLET_VERSION diff --git a/scripts/macos/app_icon.sh b/scripts/macos/app_icon.sh new file mode 100755 index 0000000000..28ca9c17be --- /dev/null +++ b/scripts/macos/app_icon.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +ICON_16_PATH="" +ICON_32_PATH="" +ICON_64_PATH="" +ICON_128_PATH="" +ICON_256_PATH="" +ICON_1024_PATH="" +DEST_DIR_PATH=`pwd`/../../macos/Runner/Assets.xcassets/AppIcon.appiconset + +case $APP_MACOS_TYPE in + "monero.com") + ICON_16_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_16.png + ICON_32_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_32.png + ICON_64_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_64.png + ICON_128_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_128.png + ICON_256_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_256.png + ICON_512_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_512.png + ICON_1024_PATH=`pwd`/../../assets/images/macos_icons/monero_macos_icons/monero_macos_1024.png;; + "cakewallet") + ICON_16_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png + ICON_32_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png + ICON_64_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png + ICON_128_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png + ICON_256_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png + ICON_512_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png + ICON_1024_PATH=`pwd`/../../assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png;; +esac + +rm $DEST_DIR_PATH/app_icon_16.png +rm $DEST_DIR_PATH/app_icon_32.png +rm $DEST_DIR_PATH/app_icon_64.png +rm $DEST_DIR_PATH/app_icon_128.png +rm $DEST_DIR_PATH/app_icon_256.png +rm $DEST_DIR_PATH/app_icon_512.png +rm $DEST_DIR_PATH/app_icon_1024.png + +ln -s $ICON_16_PATH $DEST_DIR_PATH/app_icon_16.png +ln -s $ICON_32_PATH $DEST_DIR_PATH/app_icon_32.png +ln -s $ICON_64_PATH $DEST_DIR_PATH/app_icon_64.png +ln -s $ICON_128_PATH $DEST_DIR_PATH/app_icon_128.png +ln -s $ICON_256_PATH $DEST_DIR_PATH/app_icon_256.png +ln -s $ICON_512_PATH $DEST_DIR_PATH/app_icon_512.png +ln -s $ICON_1024_PATH $DEST_DIR_PATH/app_icon_1024.png \ No newline at end of file