Fix android app icon

M committed Jan 14, 2022 at 20:35 UTC 414ea8c4436de8b2f4395dc38d60bbe3f28d1889
35 files changed +22 -5
android/app/src/main/AndroidManifestBase.xml
+1
@@ -9,6 +9,7 @@
9 <application
10 android:name=".Application"
11 android:label="${APP_NAME}"
12 + android:icon="@mipmap/ic_launcher"
13 android:allowBackup="false"
14 android:fullBackupContent="false"
15 android:requestLegacyExternalStorage="true">
assets/images/cakewallet_android_icon/mipmap-anydpi-v26/ic_launcher.xml new
+5
@@ -0,0 +1,5 @@
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 + <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
4 + <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
5 +</adaptive-icon>
\ No newline at end of file
assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher.png differ
assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_back.png differ
assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_fore.png differ
assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher.png differ
assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_back.png differ
assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_fore.png differ
assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher.png differ
assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_back.png differ
assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ
assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher.png differ
assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ
assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ
assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher.png differ
assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ
assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ
assets/images/monerocom_android_icon/mipmap-anydpi-v26/ic_launcher.xml new
+5
@@ -0,0 +1,5 @@
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 + <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
4 + <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
5 +</adaptive-icon>
\ No newline at end of file
assets/images/monerocom_android_icon/mipmap-hdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-hdpi/ic_launcher.png differ
assets/images/monerocom_android_icon/mipmap-hdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-hdpi/ic_launcher_adaptive_back.png differ
assets/images/monerocom_android_icon/mipmap-hdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-hdpi/ic_launcher_adaptive_fore.png differ
assets/images/monerocom_android_icon/mipmap-mdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-mdpi/ic_launcher.png differ
assets/images/monerocom_android_icon/mipmap-mdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-mdpi/ic_launcher_adaptive_back.png differ
assets/images/monerocom_android_icon/mipmap-mdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-mdpi/ic_launcher_adaptive_fore.png differ
assets/images/monerocom_android_icon/mipmap-xhdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xhdpi/ic_launcher.png differ
assets/images/monerocom_android_icon/mipmap-xhdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xhdpi/ic_launcher_adaptive_back.png differ
assets/images/monerocom_android_icon/mipmap-xhdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ
assets/images/monerocom_android_icon/mipmap-xxhdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xxhdpi/ic_launcher.png differ
assets/images/monerocom_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ
assets/images/monerocom_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ
assets/images/monerocom_android_icon/mipmap-xxxhdpi/ic_launcher.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xxxhdpi/ic_launcher.png differ
assets/images/monerocom_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_back.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ
assets/images/monerocom_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png
Binary files /dev/null and b/assets/images/monerocom_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ
scripts/android/app_env.sh
+1 -1
@@ -20,7 +20,7 @@ MONERO_COM_PACKAGE="com.monero.app"
20
21 CAKEWALLET_NAME="Cake Wallet"
22 CAKEWALLET_VERSION="4.3.1"
23 -CAKEWALLET_BUILD_NUMBER=72
23 +CAKEWALLET_BUILD_NUMBER=74
24 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
25 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
26
scripts/android/app_icon.sh
+10 -4
@@ -4,23 +4,29 @@ APP_LOGO_DEST_PATH=`pwd`/../../assets/images/app_logo.png
4 ASSETS_DIR=`pwd`/../../assets
5 ANDROID_ICON_DIR=`pwd`/../../android/app/src/main/res/drawable
6 MONERO_COM_PATH=$ASSETS_DIR/images/monero.com_android_icon.png
7 +MONEROCOM_ICON_SET_PATH=$ASSETS_DIR/images/monerocom_android_icon
8 CAKEWALLET_PATH=$ASSETS_DIR/images/cakewallet_android_icon.png
9 +CAKEWALLET_ICON_SET_PATH=$ASSETS_DIR/images/cakewallet_android_icon
10 ANDROID_ICON=""
11 ANDROID_ICON_DEST_PATH=$ANDROID_ICON_DIR/ic_launcher.png
10 -
12 +ANDROID_ICON_SET=""
13 +ANDROID_ICON_SET_DEST_PATH=`pwd`/../../android/app/src/main/res
14
15 case $APP_ANDROID_TYPE in
16 "monero.com")
17 APP_LOGO=$ASSETS_DIR/images/monero.com_logo.png
18 ANDROID_ICON=$MONERO_COM_PATH
19 + ANDROID_ICON_SET=$MONEROCOM_ICON_SET_PATH
20 ;;
21 "cakewallet")
18 - APP_LOGO=$ASSETS_DIR/images/cakewallet_logo.png
19 - ANDROID_ICON=$CAKEWALLET_PATH
20 - ;;
22 + APP_LOGO=$ASSETS_DIR/images/cakewallet_logo.png
23 + ANDROID_ICON=$CAKEWALLET_PATH
24 + ANDROID_ICON_SET=$CAKEWALLET_ICON_SET_PATH
25 + ;;
26 esac
27
28 rm $APP_LOGO_DEST_PATH
29 rm $ANDROID_ICON_DEST_PATH
30 ln -s $APP_LOGO $APP_LOGO_DEST_PATH
31 ln -s $ANDROID_ICON $ANDROID_ICON_DEST_PATH
32 +cp -a $ANDROID_ICON_SET/. $ANDROID_ICON_SET_DEST_PATH/