Merge branch 'omega-hotfix' into omega-master

Omega-Numworks · Dec 30, 2019 · b9b4ca7 · b9b4ca7
2 parents 114c97c + ecf2933
commit b9b4ca7
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 60 deletions.
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.numworks.calculator"
+  package="io.github.omega.simulator"
   android:installLocation="auto">
 
   <uses-feature android:glEsVersion="0x00020000" />
@@ -18,7 +18,7 @@
     android:theme="@style/AppTheme"
     android:hardwareAccelerated="true" >
 
-    <activity android:name="EpsilonActivity"
+    <activity android:name="OmegaActivity"
       android:label="@string/app_name"
       android:alwaysRetainTaskState="true"
       android:launchMode="singleInstance"

diff --git a/ion/src/simulator/android/src/cpp/images.cpp b/ion/src/simulator/android/src/cpp/images.cpp
@@ -7,7 +7,7 @@ SDL_Texture * IonSimulatorLoadImage(SDL_Renderer * renderer, const char * identi
   JNIEnv * env = static_cast<JNIEnv *>(SDL_AndroidGetJNIEnv());
   jobject activity = static_cast<jobject>(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
diff --git a/.../numworks/calculator/EpsilonActivity.java → ...github/omega/simulator/OmegaActivity.java b/.../numworks/calculator/EpsilonActivity.java → ...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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="yellow">#FFB734</color>
+  <color name="yellow">#C03535</color>
   <color name="lightGray">#F7F7F7</color>
 </resources>
diff --git a/ion/src/simulator/assets/logo.svg b/ion/src/simulator/assets/logo.svg
diff --git a/ion/src/simulator/ios/Info.plist b/ion/src/simulator/ios/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Epsilon</string>
     <key>CFBundleIdentifier</key>
-    <string>com.numworks.calculator</string>
+    <string>io.github.omega.simulator</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

diff --git a/ion/src/simulator/macos/Info.plist b/ion/src/simulator/macos/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleIconFile</key>
     <string>app.icns</string>
     <key>CFBundleIdentifier</key>
-    <string>com.numworks.calculator</string>
+    <string>io.github.omega.simulator</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

diff --git 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
@@ -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
@@ -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);