diff --git a/dist/dev.eden_emu.eden.svg b/dist/dev.eden_emu.eden.svg index eff6ccbb01..da683396bc 100644 --- a/dist/dev.eden_emu.eden.svg +++ b/dist/dev.eden_emu.eden.svg @@ -1 +1,106 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/eden.ico b/dist/eden.ico index 507cb23f6a..51e4060ea7 100644 Binary files a/dist/eden.ico and b/dist/eden.ico differ diff --git a/dist/eden_named.ico b/dist/eden_named.ico deleted file mode 100644 index 2ac236b508..0000000000 Binary files a/dist/eden_named.ico and /dev/null differ diff --git a/dist/eden_named.svg b/dist/eden_named.svg index f0dcb5dcf6..78fcaef5d9 100644 --- a/dist/eden_named.svg +++ b/dist/eden_named.svg @@ -1,9 +1,110 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/icon_variations/base.svg b/dist/icon_variations/base.svg new file mode 100644 index 0000000000..eff6ccbb01 --- /dev/null +++ b/dist/icon_variations/base.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dist/icon_variations/base_named.svg b/dist/icon_variations/base_named.svg new file mode 100644 index 0000000000..127bd05ae1 --- /dev/null +++ b/dist/icon_variations/base_named.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + diff --git a/dist/icon_variations/halloween2025.svg b/dist/icon_variations/halloween2025.svg new file mode 100644 index 0000000000..da683396bc --- /dev/null +++ b/dist/icon_variations/halloween2025.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/icon_variations/halloween2025_named.svg b/dist/icon_variations/halloween2025_named.svg new file mode 100644 index 0000000000..78fcaef5d9 --- /dev/null +++ b/dist/icon_variations/halloween2025_named.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/qt_themes/default/icons/256x256/eden.png b/dist/qt_themes/default/icons/256x256/eden.png index dee7b91dc7..58c0fd18bc 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 e4944d624d..e7db4d83f7 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 6b2b248cc3..a79af01370 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.png b/src/android/app/src/main/res/drawable/ic_launcher.png index 6b586fc757..d971bfcd16 100644 Binary files a/src/android/app/src/main/res/drawable/ic_launcher.png and b/src/android/app/src/main/res/drawable/ic_launcher.png differ diff --git a/tools/update-icons.sh b/tools/update-icons.sh index a2c1ae8ebf..132e62da86 100755 --- a/tools/update-icons.sh +++ b/tools/update-icons.sh @@ -5,19 +5,32 @@ # Updates main icons for eden -which png2icns || (which yay && yay libicns) || exit +#which png2icns || (which yay && yay libicns) || exit which magick || exit -export EDEN_SVG_ICO="dist/dev.eden_emu.eden.svg" -svgo --multipass $EDEN_SVG_ICO +EDEN_SVG_ICO="dist/dev.eden_emu.eden.svg" +EALT_SVG_ICO="dist/eden_named.svg" -magick -density 256x256 -background transparent $EDEN_SVG_ICO \ - -define icon:auto-resize -colors 256 dist/eden.ico || exit -convert -density 256x256 -resize 256x256 -background transparent $EDEN_SVG_ICO \ - dist/yuzu.bmp || exit +magick -density 256x256 -background transparent $EDEN_SVG_ICO -define icon:auto-resize -colors 256 dist/eden.ico || exit +convert -density 256x256 -resize 256x256 -background transparent $EDEN_SVG_ICO dist/yuzu.bmp || exit -export TMP_PNG="dist/eden-tmp.png" +magick -size 256x256 -background transparent $EDEN_SVG_ICO dist/qt_themes/default/icons/256x256/eden.png || exit +magick -size 256x256 -background transparent $EALT_SVG_ICO 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 + +# Now do more fancy things (like composition) +TMP_PNG="dist/eden-tmp.png" magick -size 1024x1024 -background transparent $EDEN_SVG_ICO $TMP_PNG || exit -png2icns dist/eden.icns $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 + +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 cp dist/eden.icns dist/yuzu.icns rm $TMP_PNG