diff --git a/ion/src/simulator/android/Makefile b/ion/src/simulator/android/Makefile index 04d8dad46b2..3b56131b575 100644 --- a/ion/src/simulator/android/Makefile +++ b/ion/src/simulator/android/Makefile @@ -1,6 +1,5 @@ ion_src += $(addprefix ion/src/simulator/android/src/cpp/, \ images.cpp \ - telemetry.cpp \ ) ion_src += $(addprefix ion/src/simulator/shared/, \ diff --git a/ion/src/simulator/android/build.gradle b/ion/src/simulator/android/build.gradle index eb4c8e1608b..6a40c2927b9 100644 --- a/ion/src/simulator/android/build.gradle +++ b/ion/src/simulator/android/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 defaultConfig { - applicationId "com.numworks.calculator" + applicationId "io.github.omega.simulator" minSdkVersion 16 targetSdkVersion 28 def (major, minor, patch) = System.getenv('EPSILON_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 5eb032ad227..0611346495f 100644 --- a/ion/src/simulator/android/src/AndroidManifest.xml +++ b/ion/src/simulator/android/src/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -18,7 +18,7 @@ android:theme="@style/AppTheme" android:hardwareAccelerated="true" > - (SDL_AndroidGetJNIEnv()); jobject activity = static_cast(SDL_AndroidGetActivity()); - jclass j_class = env->FindClass("com/numworks/calculator/EpsilonActivity"); + jclass j_class = env->FindClass("io/github/omega/simulator/OmegaActivity"); jmethodID j_methodId = env->GetMethodID( j_class, "retrieveBitmapAsset", diff --git a/ion/src/simulator/android/src/cpp/telemetry.cpp b/ion/src/simulator/android/src/cpp/telemetry.cpp deleted file mode 100644 index 62e7b89678d..00000000000 --- a/ion/src/simulator/android/src/cpp/telemetry.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "../../../shared/platform.h" -#include -#include - -void IonSimulatorTelemetryInit() { - JNIEnv * env = static_cast(SDL_AndroidGetJNIEnv()); - jobject activity = static_cast(SDL_AndroidGetActivity()); - - jclass j_class = env->FindClass("com/numworks/calculator/EpsilonActivity"); - jmethodID j_methodId = env->GetMethodID(j_class,"telemetryInit", "()V"); - - env->CallVoidMethod(activity, j_methodId); -} - -void IonSimulatorTelemetryEvent(const char * eventName) { - JNIEnv * env = static_cast(SDL_AndroidGetJNIEnv()); - jobject activity = static_cast(SDL_AndroidGetActivity()); - - jclass j_class = env->FindClass("com/numworks/calculator/EpsilonActivity"); - jmethodID j_methodId = env->GetMethodID(j_class,"telemetryEvent", "(Ljava/lang/String;)V"); - - jstring j_eventName = env->NewStringUTF(eventName); - - env->CallVoidMethod(activity, j_methodId, j_eventName); -} - -void IonSimulatorTelemetryDeinit() { -} diff --git a/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java b/ion/src/simulator/android/src/java/io/github/omega/simulator/OmegaActivity.java similarity index 68% rename from ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java rename to ion/src/simulator/android/src/java/io/github/omega/simulator/OmegaActivity.java index eef6676f8d7..1839e020855 100644 --- a/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java +++ b/ion/src/simulator/android/src/java/io/github/omega/simulator/OmegaActivity.java @@ -1,4 +1,4 @@ -package com.numworks.calculator; +package io.github.omega.simulator; import java.util.Locale; @@ -14,10 +14,7 @@ import org.libsdl.app.SDLActivity; -public class EpsilonActivity extends SDLActivity { - private static GoogleAnalytics sAnalytics; - private static Tracker sTracker; - +public class OmegaActivity extends SDLActivity { protected String[] getLibraries() { return new String[] { "epsilon" @@ -42,14 +39,4 @@ public Bitmap retrieveBitmapAsset(String identifier) { } return bitmap; } - - public void telemetryInit() { - sAnalytics = GoogleAnalytics.getInstance(this); - sTracker = sAnalytics.newTracker("UA-93775823-3"); - } - - public void telemetryEvent(String eventName) { - sTracker.setScreenName(eventName); - sTracker.send(new HitBuilders.ScreenViewBuilder().build()); - } } diff --git a/ion/src/simulator/android/src/res/values/colors.xml b/ion/src/simulator/android/src/res/values/colors.xml index d51632f1ef9..e59207b60c3 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 @@ - #FFB734 + #C03535 #F7F7F7 diff --git a/ion/src/simulator/assets/logo.svg b/ion/src/simulator/assets/logo.svg index ef4c71e7e43..7c4db408668 100644 --- a/ion/src/simulator/assets/logo.svg +++ b/ion/src/simulator/assets/logo.svg @@ -1,3 +1,36 @@ - - + + + + + + image/svg+xml + + + + + + + + diff --git a/ion/src/simulator/ios/Info.plist b/ion/src/simulator/ios/Info.plist index 33cac31ee13..244f1c4d3a7 100644 --- a/ion/src/simulator/ios/Info.plist +++ b/ion/src/simulator/ios/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable Epsilon CFBundleIdentifier - com.numworks.calculator + io.github.omega.simulator CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/ion/src/simulator/macos/Info.plist b/ion/src/simulator/macos/Info.plist index 43a8402cb04..fc8d2aab299 100644 --- a/ion/src/simulator/macos/Info.plist +++ b/ion/src/simulator/macos/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile app.icns CFBundleIdentifier - com.numworks.calculator + io.github.omega.simulator CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/ion/src/simulator/shared/events_keyboard.cpp b/ion/src/simulator/shared/events_keyboard.cpp index 19f6e43a6cc..7a7de192c1c 100644 --- a/ion/src/simulator/shared/events_keyboard.cpp +++ b/ion/src/simulator/shared/events_keyboard.cpp @@ -198,7 +198,7 @@ Event getPlatformEvent() { return eventFromSDLTextInputEvent(event.text); } if (event.type == SDL_APP_WILLENTERFOREGROUND) { - IonSimulatorTelemetryEvent("Calculator"); + // IonSimulatorTelemetryEvent("Calculator"); return None; } } diff --git a/ion/src/simulator/shared/main_sdl.cpp b/ion/src/simulator/shared/main_sdl.cpp index 06652578c94..b19d43f2f1b 100644 --- a/ion/src/simulator/shared/main_sdl.cpp +++ b/ion/src/simulator/shared/main_sdl.cpp @@ -56,12 +56,12 @@ int main(int argc, char * argv[]) { arguments.push_back(language); } - IonSimulatorTelemetryInit(); + // IonSimulatorTelemetryInit(); Ion::Simulator::Main::init(); - IonSimulatorTelemetryEvent("Calculator"); + // IonSimulatorTelemetryEvent("Calculator"); ion_main(arguments.size(), &arguments[0]); Ion::Simulator::Main::quit(); - IonSimulatorTelemetryDeinit(); + // IonSimulatorTelemetryDeinit(); return 0; } diff --git a/ion/src/simulator/shared/platform.h b/ion/src/simulator/shared/platform.h index 740eb4b0f9d..ba6748ad4b2 100644 --- a/ion/src/simulator/shared/platform.h +++ b/ion/src/simulator/shared/platform.h @@ -13,9 +13,9 @@ extern "C" { SDL_Texture * IonSimulatorLoadImage(SDL_Renderer * renderer, const char * identifier); char * IonSimulatorGetLanguageCode(); -void IonSimulatorTelemetryInit(); -void IonSimulatorTelemetryEvent(const char * eventName); -void IonSimulatorTelemetryDeinit(); +// void IonSimulatorTelemetryInit(); +// void IonSimulatorTelemetryEvent(const char * eventName); +// void IonSimulatorTelemetryDeinit(); void IonSimulatorKeyboardKeyDown(int keyNumber); void IonSimulatorKeyboardKeyUp(int keyNumber);