From 16d194693440b7490a79b39b3624161c53b36e58 Mon Sep 17 00:00:00 2001 From: Yaya-Cout Date: Thu, 6 Jun 2024 11:18:02 +0200 Subject: [PATCH] [Simulator/Android] Rename to Upsilon and other improvements --- ion/src/shared/events_keyboard.cpp | 8 +- ion/src/simulator/android/Makefile | 6 +- ion/src/simulator/android/build.gradle | 2 +- .../simulator/android/src/AndroidManifest.xml | 10 +- .../android/src/cpp/haptics_enabled.cpp | 2 +- .../android/src/cpp/platform_images.cpp | 2 +- .../android/src/cpp/platform_language.cpp | 2 +- .../simulator/UpsilonActivity.java} | 4 +- .../src/res/mipmap-v26/ic_launcher.xml | 1 + .../android/src/res/values/colors.xml | 2 +- .../android/src/res/values/strings.xml | 2 +- ion/src/simulator/assets/logo.svg | 100 +++++++++--------- ion/src/simulator/assets/logo_monochrome.svg | 44 ++++++++ 13 files changed, 113 insertions(+), 72 deletions(-) rename ion/src/simulator/android/src/java/io/github/{omega/simulator/OmegaActivity.java => upsilon/simulator/UpsilonActivity.java} (95%) create mode 100644 ion/src/simulator/assets/logo_monochrome.svg diff --git a/ion/src/shared/events_keyboard.cpp b/ion/src/shared/events_keyboard.cpp index 6d281c482..3fe943fd2 100644 --- a/ion/src/shared/events_keyboard.cpp +++ b/ion/src/shared/events_keyboard.cpp @@ -51,10 +51,6 @@ void resetLongRepetition() { ComputeAndSetRepetitionFactor(sEventRepetitionCount); } -static Keyboard::Key keyFromState(Keyboard::State state) { - return static_cast(63 - __builtin_clzll(state)); -} - static inline Event innerGetEvent(int * timeout) { assert(*timeout > delayBeforeRepeat); assert(*timeout > delayBetweenRepeat); @@ -96,7 +92,7 @@ static inline Event innerGetEvent(int * timeout) { } bool lock = isLockActive(); - + if ( key == Keyboard::Key::Left || key == Keyboard::Key::Right || key == Keyboard::Key::Up @@ -108,7 +104,7 @@ static inline Event innerGetEvent(int * timeout) { // shift = false; } } - + Event event(key, shift, alpha, lock); sLastEventShift = shift; sLastEventAlpha = alpha; diff --git a/ion/src/simulator/android/Makefile b/ion/src/simulator/android/Makefile index 0af9abb97..121fa7122 100644 --- a/ion/src/simulator/android/Makefile +++ b/ion/src/simulator/android/Makefile @@ -36,6 +36,10 @@ $(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_foreground.png: ion/src/simulator/as $(call rule_label,CONVERT) $(Q) convert -background none $< -resize 1024x1024 -gravity center -background none -extent 1024x1024 $@ +$(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_monochrome.png: ion/src/simulator/assets/logo_monochrome.svg | $$(@D)/. + $(call rule_label,CONVERT) + $(Q) convert -background none $< -resize 1024x1024 -gravity center -background none -extent 1024x1024 $@ + $(BUILD_DIR)/app/res/%.xml: ion/src/simulator/android/src/res/%.xml | $$(@D)/. $(call rule_label,COPY) $(Q) cp $< $@ @@ -58,7 +62,7 @@ $(foreach ARCH,$(ARCHS),$(eval $(call rule_for_arch_jni_lib,$(ARCH)))) apk_deps = $(foreach ARCH,$(ARCHS),$(call path_for_arch_jni_lib,$(ARCH))) apk_deps += $(subst ion/src/simulator/android/src/res,$(BUILD_DIR)/app/res,$(wildcard ion/src/simulator/android/src/res/*/*)) -apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/ic_launcher_foreground.png) +apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/ic_launcher_foreground.png mipmap-v26/ic_launcher_monochrome.png) .PRECIOUS: $(apk_deps) diff --git a/ion/src/simulator/android/build.gradle b/ion/src/simulator/android/build.gradle index c2e36530e..51db00a13 100644 --- a/ion/src/simulator/android/build.gradle +++ b/ion/src/simulator/android/build.gradle @@ -34,7 +34,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 defaultConfig { - applicationId "io.github.omega.simulator" + applicationId "io.github.upsilon.simulator" minSdkVersion 16 targetSdkVersion 29 def (major, minor, patch) = System.getenv('OMEGA_VERSION').toLowerCase().tokenize('.').collect{it.toInteger()} diff --git a/ion/src/simulator/android/src/AndroidManifest.xml b/ion/src/simulator/android/src/AndroidManifest.xml index 061134649..6472b33c2 100644 --- a/ion/src/simulator/android/src/AndroidManifest.xml +++ b/ion/src/simulator/android/src/AndroidManifest.xml @@ -1,16 +1,16 @@ - + - - + + - (SDL_AndroidGetJNIEnv()); jobject activity = static_cast(SDL_AndroidGetActivity()); - jclass j_class = env->FindClass("io/github/omega/simulator/OmegaActivity"); + jclass j_class = env->FindClass("io/github/upsilon/simulator/UpsilonActivity"); jmethodID j_methodId = env->GetMethodID(j_class,"hapticFeedbackIsEnabled", "()Z"); assert(j_methodId != 0); bool result = (env->CallBooleanMethod(activity, j_methodId) != JNI_FALSE); diff --git a/ion/src/simulator/android/src/cpp/platform_images.cpp b/ion/src/simulator/android/src/cpp/platform_images.cpp index 86ed18060..5a5535bec 100644 --- a/ion/src/simulator/android/src/cpp/platform_images.cpp +++ b/ion/src/simulator/android/src/cpp/platform_images.cpp @@ -12,7 +12,7 @@ SDL_Texture * loadImage(SDL_Renderer * renderer, const char * identifier) { JNIEnv * env = static_cast(SDL_AndroidGetJNIEnv()); jobject activity = static_cast(SDL_AndroidGetActivity()); - jclass j_class = env->FindClass("io/github/omega/simulator/OmegaActivity"); + jclass j_class = env->FindClass("io/github/upsilon/simulator/UpsilonActivity"); jmethodID j_methodId = env->GetMethodID( j_class, "retrieveBitmapAsset", diff --git a/ion/src/simulator/android/src/cpp/platform_language.cpp b/ion/src/simulator/android/src/cpp/platform_language.cpp index 7aa29c2ee..6d1b3ed1f 100644 --- a/ion/src/simulator/android/src/cpp/platform_language.cpp +++ b/ion/src/simulator/android/src/cpp/platform_language.cpp @@ -12,7 +12,7 @@ const char * languageCode() { JNIEnv * env = static_cast(SDL_AndroidGetJNIEnv()); jobject activity = static_cast(SDL_AndroidGetActivity()); - jclass j_class = env->FindClass("io/github/omega/simulator/OmegaActivity"); + jclass j_class = env->FindClass("io/github/upsilon/simulator/UpsilonActivity"); jmethodID j_methodId = env->GetMethodID( j_class, "retrieveLanguage", diff --git a/ion/src/simulator/android/src/java/io/github/omega/simulator/OmegaActivity.java b/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java similarity index 95% rename from ion/src/simulator/android/src/java/io/github/omega/simulator/OmegaActivity.java rename to ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java index 317847f3a..f1d3716b6 100644 --- a/ion/src/simulator/android/src/java/io/github/omega/simulator/OmegaActivity.java +++ b/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java @@ -1,4 +1,4 @@ -package io.github.omega.simulator; +package io.github.upsilon.simulator; import java.util.Locale; @@ -18,7 +18,7 @@ import com.google.android.gms.analytics.HitBuilders; import org.libsdl.app.SDLActivity; import org.libsdl.app.SDL; -public class OmegaActivity extends SDLActivity { +public class UpsilonActivity extends SDLActivity { protected String[] getLibraries() { return new String[] { "epsilon" diff --git a/ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml b/ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml index 166130012..58012921e 100644 --- a/ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml +++ b/ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml @@ -2,4 +2,5 @@ + diff --git a/ion/src/simulator/android/src/res/values/colors.xml b/ion/src/simulator/android/src/res/values/colors.xml index e59207b60..84a334839 100644 --- a/ion/src/simulator/android/src/res/values/colors.xml +++ b/ion/src/simulator/android/src/res/values/colors.xml @@ -1,5 +1,5 @@ - #C03535 + #5c83ab #F7F7F7 diff --git a/ion/src/simulator/android/src/res/values/strings.xml b/ion/src/simulator/android/src/res/values/strings.xml index c0e35bc17..4c9d2fd28 100644 --- a/ion/src/simulator/android/src/res/values/strings.xml +++ b/ion/src/simulator/android/src/res/values/strings.xml @@ -1,3 +1,3 @@ - Omega + Upsilon diff --git a/ion/src/simulator/assets/logo.svg b/ion/src/simulator/assets/logo.svg index 2790b3071..0132bc2dc 100644 --- a/ion/src/simulator/assets/logo.svg +++ b/ion/src/simulator/assets/logo.svg @@ -1,60 +1,56 @@ - - - - image/svg+xml - - - - - + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + id="defs1" /> - - + inkscape:current-layer="svg" /> + + + + + diff --git a/ion/src/simulator/assets/logo_monochrome.svg b/ion/src/simulator/assets/logo_monochrome.svg new file mode 100644 index 000000000..606e4b553 --- /dev/null +++ b/ion/src/simulator/assets/logo_monochrome.svg @@ -0,0 +1,44 @@ + + + + + + + +