diff --git a/dist/eden.ico b/dist/eden.ico index d71959004d..2c11831a4a 100644 Binary files a/dist/eden.ico and b/dist/eden.ico differ diff --git a/dist/qt_themes/default/icons/256x256/eden.png b/dist/qt_themes/default/icons/256x256/eden.png index 8678cf7abb..bfb8057dbc 100644 Binary files a/dist/qt_themes/default/icons/256x256/eden.png and b/dist/qt_themes/default/icons/256x256/eden.png differ diff --git a/dist/qt_themes/default/icons/256x256/eden_named.png b/dist/qt_themes/default/icons/256x256/eden_named.png index 6b451aacb3..d95d0e7510 100644 Binary files a/dist/qt_themes/default/icons/256x256/eden_named.png and b/dist/qt_themes/default/icons/256x256/eden_named.png differ diff --git a/dist/yuzu.bmp b/dist/yuzu.bmp index d33d8d5acb..906a944847 100644 Binary files a/dist/yuzu.bmp and b/dist/yuzu.bmp differ diff --git a/src/android/app/src/main/res/drawable/ic_launcher_foreground.png b/src/android/app/src/main/res/drawable/ic_launcher_foreground.png index 0754f6bede..ed2d5cc8dc 100644 Binary files a/src/android/app/src/main/res/drawable/ic_launcher_foreground.png and b/src/android/app/src/main/res/drawable/ic_launcher_foreground.png differ diff --git a/src/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2c20b1625..b7eaf19d26 100644 Binary files a/src/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index ce48cda7d1..5b17040ad4 100644 Binary files a/src/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 99fc744147..aff7a1fe5e 100644 Binary files a/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 06529aed05..ad6d2e1638 100644 Binary files a/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 352aee74fd..b0366881ea 100644 Binary files a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/tools/update-icons.sh b/tools/update-icons.sh index 8e84e4443d..2e685fdd87 100755 --- a/tools/update-icons.sh +++ b/tools/update-icons.sh @@ -5,68 +5,33 @@ # Updates main icons for eden +#which png2icns || (which yay && yay libicns) || exit which magick || exit -which optipng || exit -VARIATION=${VARIATION:-base} +EDEN_BASE_SVG="dist/icon_variations/base.svg" +#EDEN_SMALL_SVG="dist/icon_variations/base_small.svg" +EDEN_NAMED_SVG="dist/icon_variations/base_named.svg" -EDEN_BASE_SVG="dist/icon_variations/${VARIATION}.svg" -EDEN_NAMED_SVG="dist/icon_variations/${VARIATION}_named.svg" -ANDROID_BG_COLOR=$(cat "dist/icon_variations/${VARIATION}_bgcolor") - -[ -f "$EDEN_BASE_SVG" ] && [ -f "$EDEN_NAMED_SVG" ] || { echo "Error: missing SVG" >&2; exit; } - -# DraVee: 'VARIATION=newyear2025' needs a slight adjutment -#EDEN_BASE_ADJUSTED="tmp_adjusted.svg" -#cp ${EDEN_BASE_SVG} ${EDEN_BASE_ADJUSTED} -#magick mogrify -roll -15-5 "${EDEN_BASE_ADJUSTED}" -#EDEN_BASE_SVG="${EDEN_BASE_ADJUSTED}" - -# Desktop / Windows / Qt icons - -magick -density 256x256 -background transparent "$EDEN_BASE_SVG" -define icon:auto-resize -colors 256 dist/eden.ico || exit -magick -density 256x256 -background transparent "$EDEN_BASE_SVG" -resize 256x256 dist/yuzu.bmp || exit - -magick -size 256x256 -background transparent "$EDEN_BASE_SVG" dist/qt_themes/default/icons/256x256/eden.png || exit -magick -size 256x256 -background transparent "$EDEN_NAMED_SVG" dist/qt_themes/default/icons/256x256/eden_named.png || exit +magick -density 256x256 -background transparent $EDEN_BASE_SVG -define icon:auto-resize -colors 256 dist/eden.ico || exit +convert -density 256x256 -resize 256x256 -background transparent $EDEN_BASE_SVG dist/yuzu.bmp || exit +magick -size 256x256 -background transparent $EDEN_BASE_SVG dist/qt_themes/default/icons/256x256/eden.png || exit +magick -size 256x256 -background transparent $EDEN_NAMED_SVG dist/qt_themes/default/icons/256x256/eden_named.png || exit magick dist/qt_themes/default/icons/256x256/eden.png -resize 256x256! dist/qt_themes/default/icons/256x256/eden.png || exit magick dist/qt_themes/default/icons/256x256/eden_named.png -resize 256x256! dist/qt_themes/default/icons/256x256/eden_named.png || exit -optipng -o7 dist/qt_themes/default/icons/256x256/eden*.png - -# Android adaptive icon (API 26+) - -ANDROID_RES="src/android/app/src/main/res" -ANDROID_FG="$ANDROID_RES/drawable/ic_launcher_foreground.png" - -echo "${ANDROID_BG_COLOR}" > "$ANDROID_RES/values/colors.xml" - -magick -size 1080x1080 -background transparent "$EDEN_BASE_SVG" -gravity center -resize 660x660 -extent 1080x1080 "${ANDROID_FG}" || exit - -optipng -o7 "$ANDROID_FG" - -# Android legacy launcher icon (API <= 24) - -BASE_LEGACY="$ANDROID_RES/mipmap-xxxhdpi/ic_launcher.png" - -magick -size 512x512 xc:${ANDROID_BG_COLOR} "$ANDROID_FG" -gravity center -resize 384x384 -composite "$BASE_LEGACY" || exit - -magick "$BASE_LEGACY" -resize 192x192 "$ANDROID_RES/mipmap-xxhdpi/ic_launcher.png" -magick "$BASE_LEGACY" -resize 144x144 "$ANDROID_RES/mipmap-xhdpi/ic_launcher.png" -magick "$BASE_LEGACY" -resize 96x96 "$ANDROID_RES/mipmap-hdpi/ic_launcher.png" -magick "$BASE_LEGACY" -resize 72x72 "$ANDROID_RES/mipmap-mdpi/ic_launcher.png" - -optipng -o7 "$ANDROID_RES"/mipmap-*/ic_launcher.png - -# macOS - +# Now do more fancy things (like composition) TMP_PNG="dist/eden-tmp.png" +magick -size 1024x1024 -background transparent $EDEN_BASE_SVG $TMP_PNG || exit +composite $TMP_PNG -gravity center -geometry 2048x2048+0+0 \ + src/android/app/src/main/res/drawable/ic_icon_bg_orig.png \ + src/android/app/src/main/res/drawable/ic_launcher.png || exit +magick src/android/app/src/main/res/drawable/ic_launcher.png -resize 512x512! src/android/app/src/main/res/drawable/ic_launcher.png || exit -magick -size 1024x1024 -background none "$EDEN_BASE_SVG" "$TMP_PNG" || exit +optipng -o7 src/android/app/src/main/res/drawable/ic_launcher.png +optipng -o7 dist/qt_themes/default/icons/256x256/eden_named.png +optipng -o7 dist/qt_themes/default/icons/256x256/eden.png -png2icns dist/eden.icns "$TMP_PNG" || echo 'non fatal' +png2icns dist/eden.icns $TMP_PNG || echo 'non fatal' cp dist/eden.icns dist/yuzu.icns - -rm "$TMP_PNG" -#rm "${EDEN_BASE_ADJUSTED}" +rm $TMP_PNG