diff --git a/assets/OOPetris.svg b/assets/OOPetris.svg
new file mode 100644
index 00000000..0e32e25b
--- /dev/null
+++ b/assets/OOPetris.svg
@@ -0,0 +1,23094 @@
+
+
+
+
diff --git a/assets/icon/OOPetris.svg b/assets/icon/OOPetris.svg
new file mode 100644
index 00000000..0c9e6e4c
--- /dev/null
+++ b/assets/icon/OOPetris.svg
@@ -0,0 +1,18274 @@
+
+
+
+
diff --git a/assets/icon/icon_128.png b/assets/icon/icon_128.png
new file mode 100644
index 00000000..6142f088
Binary files /dev/null and b/assets/icon/icon_128.png differ
diff --git a/assets/icon/icon_144.png b/assets/icon/icon_144.png
new file mode 100644
index 00000000..57d9e571
Binary files /dev/null and b/assets/icon/icon_144.png differ
diff --git a/assets/icon/icon_160.png b/assets/icon/icon_160.png
new file mode 100644
index 00000000..5bdacd0c
Binary files /dev/null and b/assets/icon/icon_160.png differ
diff --git a/assets/icon/icon_192.png b/assets/icon/icon_192.png
new file mode 100644
index 00000000..3b9a6bce
Binary files /dev/null and b/assets/icon/icon_192.png differ
diff --git a/assets/icon/icon_24.png b/assets/icon/icon_24.png
new file mode 100644
index 00000000..81450e0e
Binary files /dev/null and b/assets/icon/icon_24.png differ
diff --git a/assets/icon/icon_256.png b/assets/icon/icon_256.png
new file mode 100644
index 00000000..0031bff8
Binary files /dev/null and b/assets/icon/icon_256.png differ
diff --git a/assets/icon/icon_48.png b/assets/icon/icon_48.png
new file mode 100644
index 00000000..7db2984b
Binary files /dev/null and b/assets/icon/icon_48.png differ
diff --git a/assets/icon/icon_512.png b/assets/icon/icon_512.png
new file mode 100644
index 00000000..8330e695
Binary files /dev/null and b/assets/icon/icon_512.png differ
diff --git a/assets/icon/icon_64.png b/assets/icon/icon_64.png
new file mode 100644
index 00000000..b54156a5
Binary files /dev/null and b/assets/icon/icon_64.png differ
diff --git a/assets/icon/icon_72.png b/assets/icon/icon_72.png
new file mode 100644
index 00000000..8a9981b2
Binary files /dev/null and b/assets/icon/icon_72.png differ
diff --git a/assets/icon/icon_96.png b/assets/icon/icon_96.png
new file mode 100644
index 00000000..6ffbbe4f
Binary files /dev/null and b/assets/icon/icon_96.png differ
diff --git a/assets/icon/test_192.png b/assets/icon/test_192.png
deleted file mode 100644
index 959c384b..00000000
Binary files a/assets/icon/test_192.png and /dev/null differ
diff --git a/assets/icon/test_96.png b/assets/icon/test_96.png
deleted file mode 100644
index a336ad5c..00000000
Binary files a/assets/icon/test_96.png and /dev/null differ
diff --git a/meson.build b/meson.build
index d43e9dc7..0ca23cd1 100644
--- a/meson.build
+++ b/meson.build
@@ -166,7 +166,11 @@ deps += dependency(
default_options: ['tests=false'],
)
-deps += dependency('nlohmann_json', required: true, native: native)
+deps += dependency(
+ 'nlohmann_json',
+ required: true,
+ native: native,
+)
deps += dependency(
'tl-optional',
@@ -185,7 +189,7 @@ deps += dependency(
required: true,
fallback: ['magic_enum'],
native: native,
- default_options:['test=false']
+ default_options: ['test=false'],
)
deps += dependency(
'argparse',
@@ -219,7 +223,11 @@ if (meson.is_cross_build() and host_machine.system() == 'switch')
library_dirs = meson.get_external_property('library_dirs')
foreach dep : switch_dependencies
- deps += cpp.find_library(dep, required: true, dirs: library_dirs)
+ deps += cpp.find_library(
+ dep,
+ required: true,
+ dirs: library_dirs,
+ )
endforeach
@@ -325,13 +333,18 @@ elif meson.is_cross_build() and host_machine.system() == 'switch'
default_icon = meson.get_external_property('libnx') / 'default_icon.jpg'
- APP_ICON = meson.get_external_property('APP_ICON', default_icon)
+ app_icon = meson.get_external_property('APP_ICON', default_icon)
+
+ if not fs.exists(app_icon)
+ error('APP_ICON should exist, but doesn\'t: \'' + app_icon + '\'')
+ endif
- if not fs.exists(APP_ICON)
- error('APP_ICON should exist, but doesn\'t: \'' + APP_ICON + '\'')
+ if not fs.is_absolute(app_icon)
+ app_icon = meson.project_source_root() / app_icon
endif
- NROFLAGS += '--icon=' + APP_ICON
+
+ NROFLAGS += '--icon=' + app_icon
romfs_dir = meson.get_external_property('romfs_dir')
diff --git a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index d50bdaae..00000000
Binary files a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 0a299eb3..00000000
Binary files a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index a336ad5c..00000000
Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index d423dac2..00000000
Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 959c384b..00000000
Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/platforms/build-android.sh b/platforms/build-android.sh
index 987bf683..73715ddc 100755
--- a/platforms/build-android.sh
+++ b/platforms/build-android.sh
@@ -235,3 +235,20 @@ done
# TODO only copy the supported music ones (atm we need both for i686 flac is needed!)
cp -r ./assets/ platforms/android/app/src/main
+
+# copy icons to correct dir
+
+DESC_ARRAY=(m h xh xxh xxxh)
+RES_ARRAY=(48 72 96 144 192)
+
+for IDX in "${!DESC_ARRAY[@]}"; do
+
+ DESC="${DESC_ARRAY[$IDX]}"
+ RES="${RES_ARRAY[$IDX]}"
+
+ export DESC_DIR="platforms/android/app/src/main/res/mipmap-${DESC}dpi"
+
+ mkdir -p "$DESC_DIR"
+ cp -r "./assets/icon/icon_$RES.png" "${DESC_DIR}/ic_launcher.png"
+
+done
diff --git a/platforms/build-switch.sh b/platforms/build-switch.sh
index 78089684..c4e43d96 100755
--- a/platforms/build-switch.sh
+++ b/platforms/build-switch.sh
@@ -86,6 +86,7 @@ needs_exe_wrapper = true
library_dirs= ['$LIBNX_LIB', '$PORTLIBS_LIB']
romfs_dir='$ROMFS'
libnx='$LIBNX'
+APP_ICON='$ROMFS/assets/icon/icon_512.png'
USE_NACP = true
APP_TITLE = 'oopetris'
diff --git a/platforms/flatpak-icon-helper.sh b/platforms/flatpak-icon-helper.sh
index 8a8783d1..7b2fc49b 100644
--- a/platforms/flatpak-icon-helper.sh
+++ b/platforms/flatpak-icon-helper.sh
@@ -1,17 +1,19 @@
#!/usr/bin/env bash
+APP_NAME="com.github.mgerhold.OOPetris"
+
function process_icon() {
SRC=$1
RES=$(echo "$SRC" | awk -F_ '{ print $2 }' | awk -F. '{ print $1 }' | awk '{ print $1 }')
DEST_DIR="/app/share/icons/hicolor/${RES}x${RES}/apps"
mkdir -p "$DEST_DIR"
- cp "$SRC" "$DEST_DIR/com.github.mgerhold.OOPetris.png"
+ cp "$SRC" "$DEST_DIR/$APP_NAME.png"
}
export -f process_icon
-#TODO get real logo and use more sizes!
-find ../assets/icon/ -name "test_*.png" -exec bash -c 'process_icon "$@";' -- {} \;
+find ../assets/icon/ -name "icon_*.png" -exec bash -c 'process_icon "$@";' -- {} \;
-## TODO svg /app/share/icons/hicolor/scalable/apps/com.github.mgerhold.OOPetris.svg
+mkdir -p "/app/share/icons/hicolor/scalable/apps/"
+cp "../assets/icon/OOPetris.svg" "/app/share/icons/hicolor/scalable/apps/$APP_NAME.svg"
diff --git a/platforms/make-icons.sh b/platforms/make-icons.sh
new file mode 100755
index 00000000..b7f7b59c
--- /dev/null
+++ b/platforms/make-icons.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+for RES in 24 48 64 72 96 128 144 160 192 256 512; do
+
+ inkscape "--export-width=$RES" "--export-height=$RES" --export-type=png "--export-filename=../assets/icon/icon_$RES.png" "../assets/OOPetris.svg"
+
+done
+
+#TODO: this doesn't work correctly!
+MAX_RES="4096"
+inkscape "--export-width=$MAX_RES" "--export-height=$MAX_RES" --export-type=svg "--export-filename=../assets/icon/OOPetris.svg" "../assets/OOPetris.svg"