v4.13.0 and v1.10.0 (#1265)

* New versions

* Minor fix [skip ci]

* Minor UI enhancement for balance card

* Minor UI enhancement

* Add Monero build configs for MacOS [skip ci]

* Add rest of Macos Configs [skip ci]

* Delete empty file
Save and report restore from backup exceptions [skip ci]

* Minor fixes
This commit is contained in:
Omar Hatem
2024-01-16 02:02:10 +02:00
committed by GitHub
parent fe2e26f146
commit d8f1cdc7ef
33 changed files with 155 additions and 56 deletions
+4 -4
View File
@@ -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"
+4 -4
View File
@@ -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"
+10 -1
View File
@@ -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
cd $DIR
$DIR/app_icon.sh
+15 -4
View File
@@ -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
+44
View File
@@ -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