From 96d4b90ad3f489fc26817f0f7db915d41adf4496 Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Wed, 5 Jan 2022 19:49:13 +0200
Subject: [PATCH] Fixes for android app icons

---
 .../images/cakewallet_android_icon.png        | Bin
 assets/images/monero.com_android_icon.png     | Bin 0 -> 3814 bytes
 scripts/android/app_config.sh                 |   3 +-
 scripts/android/app_icon.sh                   |  27 ++++++++++++------
 4 files changed, 21 insertions(+), 9 deletions(-)
 rename android/app/src/main/res/drawable/ic_launcher.png => assets/images/cakewallet_android_icon.png (100%)
 create mode 100644 assets/images/monero.com_android_icon.png

diff --git a/android/app/src/main/res/drawable/ic_launcher.png b/assets/images/cakewallet_android_icon.png
similarity index 100%
rename from android/app/src/main/res/drawable/ic_launcher.png
rename to assets/images/cakewallet_android_icon.png
diff --git a/assets/images/monero.com_android_icon.png b/assets/images/monero.com_android_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..af47453c1010b05881f1471620927e77fd85cc21
GIT binary patch
literal 3814
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
F`9BK~AbkJ;

literal 0
HcmV?d00001

diff --git a/scripts/android/app_config.sh b/scripts/android/app_config.sh
index 9b01e3a29..6a28eebfe 100755
--- a/scripts/android/app_config.sh
+++ b/scripts/android/app_config.sh
@@ -6,4 +6,5 @@ if [ -z "$APP_ANDROID_TYPE" ]; then
 fi
 
 sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./../../pubspec.yaml 
-sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./../../android/app/src/main/AndroidManifest.xml
\ No newline at end of file
+sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./../../android/app/src/main/AndroidManifest.xml
+./app_icon.sh
\ No newline at end of file
diff --git a/scripts/android/app_icon.sh b/scripts/android/app_icon.sh
index 966b75b9a..c362b335b 100755
--- a/scripts/android/app_icon.sh
+++ b/scripts/android/app_icon.sh
@@ -1,15 +1,26 @@
 #!/bin/sh
-ICON_PATH=""
-DEST_PATH=`pwd`/../../assets/images/app_logo.png
+APP_LOGO=""
+APP_LOGO_DEST_PATH=`pwd`/../../assets/images/app_logo.png
+ASSETS_DIR=`pwd`/../../assets
+ANDROID_ICON_DIR=`pwd`/../../android/app/src/main/res/drawable
+MONERO_COM_PATH=$ASSETS_DIR/images/monero.com_android_icon.png
+CAKEWALLET_PATH=$ASSETS_DIR/images/cakewallet_android_icon.png
+ANDROID_ICON=""
+ANDROID_ICON_DEST_PATH=$ANDROID_ICON_DIR/ic_launcher.png
+
 
 case $APP_ANDROID_TYPE in
 	"monero.com")
-	ICON_PATH=`pwd`/../../assets/images/monero.com_logo.png;;
+	APP_LOGO=$ASSETS_DIR/images/monero.com_logo.png
+	ANDROID_ICON=$MONERO_COM_PATH
+	;;
 	"cakewallet")
-        ICON_PATH=`pwd`/../../assets/images/cakewallet_logo.png;;
+    APP_LOGO=$ASSETS_DIR/images/cakewallet_logo.png
+    ANDROID_ICON=$CAKEWALLET_PATH
+    ;;
 esac
 
-rm $DEST_PATH
-ln -s $ICON_PATH $DEST_PATH
-
-
+rm $APP_LOGO_DEST_PATH
+rm $ANDROID_ICON_DEST_PATH
+ln -s $APP_LOGO $APP_LOGO_DEST_PATH
+ln -s $ANDROID_ICON $ANDROID_ICON_DEST_PATH