diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-1024x1024@1x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-1024x1024@1x.png index 22457de82..6851810c4 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-1024x1024@1x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-1024x1024@1x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@2x.png index 8c4bbe034..c043cd7a5 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@3x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@3x.png index 3aa7fddd4..73a637deb 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@3x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-20x20@3x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@2x.png index 7a731e8e1..8187833e4 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@3x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@3x.png index 695c84b35..1a52a8066 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@3x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-29x29@3x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@2x.png index 1de240deb..d38ba9fbd 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@3x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@3x.png index 3f442b4f6..cc9801149 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@3x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-38x38@3x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@2x.png index 2e601f72a..1bef41674 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@3x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@3x.png index 42d3fb02d..161adf28c 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@3x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-40x40@3x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@2x.png index 42d3fb02d..161adf28c 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@3x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@3x.png index c71235f94..62ccc6e70 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@3x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-60x60@3x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@2x.png index ca679b267..d9e944e6e 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@3x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@3x.png index 165ccc537..133b7fbe4 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@3x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-64x64@3x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-68x68@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-68x68@2x.png index a216e8adf..886b4d6e2 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-68x68@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-68x68@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-76x76@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-76x76@2x.png index 34515e0c0..8a14cf1c3 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-76x76@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-76x76@2x.png differ diff --git a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-83.5x83.5@2x.png b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-83.5x83.5@2x.png index f107b9fdd..9413c4e77 100644 Binary files a/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-83.5x83.5@2x.png and b/assets/images/ios_icons/hashwallet_ios_icons/Icon-App-Tinted-83.5x83.5@2x.png differ diff --git a/pubspec_description.yaml b/pubspec_description.yaml index ede5c2e5c..d640f1fe4 100644 --- a/pubspec_description.yaml +++ b/pubspec_description.yaml @@ -1,6 +1,6 @@ name: hash_wallet description: Hash Bags — a noncustodial multi-currency wallet by Such Software LLC. -version: 1.0.0+6 +version: 1.0.0+7 publish_to: none environment: diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 2696bd697..9aba6285a 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -20,9 +20,14 @@ MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" +# Source CAKEWALLET version + build number from pubspec_description.yaml +# (single source of truth across iOS/Android). Without this, the hardcoded +# build number here would silently override pubspec via inject_app_details.sh +# and every Play Store upload would ship as versionCode 1. +_PUBSPEC_VERSION=$(awk -F': ' '/^version:/ {print $2; exit}' ../../pubspec_description.yaml) CAKEWALLET_NAME="Hash Bags" -CAKEWALLET_VERSION="1.0.0" -CAKEWALLET_BUILD_NUMBER=1 +CAKEWALLET_VERSION="${_PUBSPEC_VERSION%+*}" +CAKEWALLET_BUILD_NUMBER="${_PUBSPEC_VERSION#*+}" CAKEWALLET_BUNDLE_ID="com.suchsoftware.hashwallet" CAKEWALLET_PACKAGE="com.suchsoftware.hashwallet" CAKEWALLET_SCHEME="hashbags"