diff --git a/dist/dev.eden_emu.eden.metainfo.xml b/dist/dev.eden_emu.eden.metainfo.xml index cfd1741748..515238bbe9 100644 --- a/dist/dev.eden_emu.eden.metainfo.xml +++ b/dist/dev.eden_emu.eden.metainfo.xml @@ -1,20 +1,22 @@ + + - org.yuzu_emu.yuzu + org.eden_emu.eden CC0-1.0 - yuzu + eden Nintendo Switch emulator -

yuzu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.

-

The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.

-

For a full list of games yuzu support, please visit our Compatibility page.

-

Check out our website for the latest news on exciting features, monthly progress reports, and more!

+

Nintendo Switch video game console emulator

 Game @@ -24,16 +26,16 @@ SPDX-License-Identifier: CC0-1.0 switch emulator - https://yuzu-emu.org/ - https://github.com/yuzu-emu/yuzu/issues - https://yuzu-emu.org/wiki/faq/ - https://yuzu-emu.org/wiki/home/ - https://yuzu-emu.org/donate/ - https://www.transifex.com/projects/p/yuzu - https://community.citra-emu.org/ - https://github.com/yuzu-emu/yuzu - https://yuzu-emu.org/wiki/contributing/ - org.yuzu_emu.yuzu.desktop + https://eden-emu.dev/ + https://git.eden-emu.dev/eden-emu/eden/issues + https://eden-emu.dev/docs + https://eden-emu.dev/docs + https://eden-emu.dev/donations + https://explore.transifex.com/edenemu/eden-emulator + https://discord.gg/edenemu + https://git.eden-emu.dev + https://git.eden-emu.dev/eden-emu/eden + org.eden_emu.eden.desktop yuzu yuzu-cmd @@ -50,13 +52,6 @@ SPDX-License-Identifier: CC0-1.0 16384 GPL-3.0-or-later - yuzu Emulator Team + Eden Emulator Team - - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png - diff --git a/dist/dev.eden_emu.eden.svg b/dist/dev.eden_emu.eden.svg index eff6ccbb01..5448c488e0 100644 --- a/dist/dev.eden_emu.eden.svg +++ b/dist/dev.eden_emu.eden.svg @@ -1 +1,672 @@ - \ No newline at end of file + + + + + + New Year 2025 Logo + + + Madeline_Dev + mailto:madelvidel@gmail.com + + + 2025 + + 2025 Eden Emulator Project + https://git.eden-emu.dev + + + + diff --git a/dist/yuzu.bmp b/dist/eden.bmp similarity index 73% rename from dist/yuzu.bmp rename to dist/eden.bmp index 3cc1de5ea9..34d1ab616d 100644 Binary files a/dist/yuzu.bmp and b/dist/eden.bmp differ diff --git a/dist/eden.icns b/dist/eden.icns index 8082404da4..9aad627054 100644 Binary files a/dist/eden.icns and b/dist/eden.icns differ diff --git a/dist/eden.ico b/dist/eden.ico index 995c9d8942..fc579a29fe 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 4f366aa4bc..1ea2d8ea5d 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 cde7a80ce4..086d338112 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.icns b/dist/yuzu.icns deleted file mode 100644 index 8082404da4..0000000000 Binary files a/dist/yuzu.icns and /dev/null 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 514f17baa5..b9adec4b1b 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/drawable/ic_yuzu.png b/src/android/app/src/main/res/drawable/ic_yuzu.png new file mode 100644 index 0000000000..2a4a061a06 Binary files /dev/null and b/src/android/app/src/main/res/drawable/ic_yuzu.png differ diff --git a/src/android/app/src/main/res/drawable/ic_yuzu.xml b/src/android/app/src/main/res/drawable/ic_yuzu.xml deleted file mode 100644 index 4ddf362420..0000000000 --- a/src/android/app/src/main/res/drawable/ic_yuzu.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_full.xml b/src/android/app/src/main/res/drawable/ic_yuzu_full.xml deleted file mode 100644 index 680a5ff4f7..0000000000 --- a/src/android/app/src/main/res/drawable/ic_yuzu_full.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_icon.xml b/src/android/app/src/main/res/drawable/ic_yuzu_icon.xml deleted file mode 100644 index 24c71cad9b..0000000000 --- a/src/android/app/src/main/res/drawable/ic_yuzu_icon.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_named.png b/src/android/app/src/main/res/drawable/ic_yuzu_named.png new file mode 100644 index 0000000000..955b1e5114 Binary files /dev/null and b/src/android/app/src/main/res/drawable/ic_yuzu_named.png differ diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_splash.png b/src/android/app/src/main/res/drawable/ic_yuzu_splash.png new file mode 100644 index 0000000000..2c83b2e751 Binary files /dev/null and b/src/android/app/src/main/res/drawable/ic_yuzu_splash.png differ diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_title.xml b/src/android/app/src/main/res/drawable/ic_yuzu_title.xml deleted file mode 100644 index a58038a69a..0000000000 --- a/src/android/app/src/main/res/drawable/ic_yuzu_title.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml index 3583dad262..5fce46d1fd 100644 --- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml +++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml @@ -48,7 +48,7 @@ android:layout_height="200dp" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:src="@drawable/ic_yuzu_title" /> + android:src="@drawable/ic_yuzu_named" /> + android:src="@drawable/ic_yuzu_named" /> @@ -21,15 +21,17 @@ android:id="@+id/logo_image" android:layout_width="120dp" android:layout_height="120dp" - android:layout_marginVertical="48dp" + android:layout_marginTop="48dp" + android:layout_marginBottom="24dp" android:layout_gravity="center_horizontal" - android:src="@drawable/ic_yuzu_full" /> + android:src="@drawable/ic_yuzu" /> + android:layout_height="wrap_content" + android:clipToPadding="false" + android:nestedScrollingEnabled="false" /> 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 8b9410ee47..47c01ca67a 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 5eaf219060..45ea8ed60d 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 c8cf3251bb..a3fbc78281 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 50d9e2fa48..f49c76620c 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 d8c83af330..580e8aaf1f 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/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml index a0d194ab58..8e3200a5b3 100644 --- a/src/android/app/src/main/res/values/themes.xml +++ b/src/android/app/src/main/res/values/themes.xml @@ -3,7 +3,7 @@ diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index 458eaafc4c..a1f16be75c 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt @@ -37,7 +37,7 @@ if (MSVC) endif() target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) -create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") +create_resource("../../dist/eden.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2) diff --git a/tools/generate-legacy-icons.sh b/tools/generate-legacy-icons.sh deleted file mode 100755 index 3661a75bb8..0000000000 --- a/tools/generate-legacy-icons.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -e - -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project -# SPDX-License-Identifier: GPL-3.0-or-later - -# Generate SDK <26 icons for android -# requires imagemagick, inkscape - -ROOTDIR=$PWD - -cd src/android/app/src/main - -cd res/drawable -# convert vector to svg--needed to generate launcher png -cp ic_yuzu_icon.xml tmp - -python3 "$ROOTDIR"/tools/VectorDrawable2Svg.py tmp - -inkscape -w 768 -h 768 tmp.svg -o ic_tmp.png -magick ic_icon_bg_orig.png -resize 512x512 bg_tmp.png - -magick bg_tmp.png -strip -type TrueColor -depth 8 -colorspace sRGB -color-matrix "1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0" bg_tmp_rgb.png -magick -verbose bg_tmp_rgb.png ic_tmp.png -gravity center -composite -colorspace sRGB ic_launcher.png -echo - -rm ./*tmp* - -cd "$ROOTDIR" - -# TODO: add legacy icons diff --git a/tools/update-icons.sh b/tools/update-icons.sh index 2e685fdd87..1fcadbdf9f 100755 --- a/tools/update-icons.sh +++ b/tools/update-icons.sh @@ -5,33 +5,72 @@ # Updates main icons for eden -#which png2icns || (which yay && yay libicns) || exit which magick || exit +which optipng || exit -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" +VARIATION=${VARIATION:-base} -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 +EDEN_BASE_SVG="dist/icon_variations/${VARIATION}.svg" +EDEN_NAMED_SVG="dist/icon_variations/${VARIATION}_named.svg" +EDEN_BG_COLOR="dist/icon_variations/${VARIATION}_bgcolor" +# TODO: EDEN_MONOCHROME_SVG Variation -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 +[ -f "$EDEN_BASE_SVG" ] && [ -f "$EDEN_NAMED_SVG" ] && [ -f "$EDEN_BG_COLOR" ] || { echo "Error: missing ${VARIATION}.svg/${VARIATION}_named.svg/${VARIATION}_bgcolor" >&2; exit; } -# 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 +# Desktop / Windows / Qt icons + +EDEN_DESKTOP_SVG="dist/dev.eden_emu.eden.svg" + +cp "$EDEN_BASE_SVG" "$EDEN_DESKTOP_SVG" + +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/eden.bmp || exit + +magick -size 256x256 -background transparent "$EDEN_BASE_SVG" -resize 256x256 dist/qt_themes/default/icons/256x256/eden.png || exit +magick -size 256x256 -background transparent "$EDEN_NAMED_SVG" -resize 256x256 dist/qt_themes/default/icons/256x256/eden_named.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 +optipng -o7 dist/qt_themes/default/icons/256x256/eden_named.png -png2icns dist/eden.icns $TMP_PNG || echo 'non fatal' -cp dist/eden.icns dist/yuzu.icns -rm $TMP_PNG +# Android adaptive icon (API 26+) + +EDEN_ANDROID_RES="src/android/app/src/main/res" +EDEN_ANDROID_FG="$EDEN_ANDROID_RES/drawable/ic_launcher_foreground.png" +EDEN_ANDROID_BG_COLOR=$(cat $EDEN_BG_COLOR) + +# Update Icon Background Color +echo "${EDEN_ANDROID_BG_COLOR}" > "$EDEN_ANDROID_RES/values/colors.xml" + +magick -size 1080x1080 -background transparent "$EDEN_BASE_SVG" -gravity center -resize 660x660 -extent 1080x1080 "$EDEN_ANDROID_FG" || exit +magick -background transparent "$EDEN_BASE_SVG" -gravity center -resize 512x512 "$EDEN_ANDROID_RES/drawable/ic_yuzu.png" || exit +magick -size 512x512 -background transparent "$EDEN_BASE_SVG" -gravity center -resize 338x338 -extent 512x512 "$EDEN_ANDROID_RES/drawable/ic_yuzu_splash.png" || exit +magick -background transparent "$EDEN_NAMED_SVG" -gravity center -resize 512x512 "$EDEN_ANDROID_RES/drawable/ic_yuzu_named.png" || exit + +optipng -o7 "$EDEN_ANDROID_FG" +optipng -o7 "$EDEN_ANDROID_RES/drawable/ic_yuzu.png" +optipng -o7 "$EDEN_ANDROID_RES/drawable/ic_yuzu_splash.png" +optipng -o7 "$EDEN_ANDROID_RES/drawable/ic_yuzu_named.png" + +# Android legacy launcher icon (API <= 24) + +BASE_LEGACY="$EDEN_ANDROID_RES/mipmap-xxxhdpi/ic_launcher.png" + +magick -size 512x512 xc:${EDEN_ANDROID_BG_COLOR} "$EDEN_ANDROID_FG" -gravity center -resize 384x384 -composite "$BASE_LEGACY" || exit + +magick "$BASE_LEGACY" -resize 192x192 "$EDEN_ANDROID_RES/mipmap-xxhdpi/ic_launcher.png" +magick "$BASE_LEGACY" -resize 144x144 "$EDEN_ANDROID_RES/mipmap-xhdpi/ic_launcher.png" +magick "$BASE_LEGACY" -resize 96x96 "$EDEN_ANDROID_RES/mipmap-hdpi/ic_launcher.png" +magick "$BASE_LEGACY" -resize 72x72 "$EDEN_ANDROID_RES/mipmap-mdpi/ic_launcher.png" + +optipng -o7 "$EDEN_ANDROID_RES"/mipmap-*/ic_launcher.png + +# macOS +# TODO: Update Assets.car too + +TMP_PNG="dist/eden-tmp.png" + +magick -size 1024x1024 -background none "$EDEN_BASE_SVG" "$TMP_PNG" || exit + +png2icns dist/eden.icns "$TMP_PNG" || echo 'non fatal' + +rm "$TMP_PNG"