merge from develop 1.4.0

victordiaz · Jan 12, 2021 · 8021b0e · 8021b0e
2 parents 0f7d2ff + d56a4dd
commit 8021b0e
Show file tree

Hide file tree

Showing 101 changed files with 2,409 additions and 1,834 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,9 +10,9 @@ buildscript {
 }
 
 project.ext {
-    versionCode = 134
-    versionName = "1.3.2"
-    compileSdkVersion = 29
+    versionCode = 140
+    versionName = "1.4.0"
+    compileSdkVersion = 30
     targetSdkVersion = 29
     minSdkVersion = 16
 }

diff --git a/phonk_app/build.gradle b/phonk_app/build.gradle
@@ -32,7 +32,7 @@ android {
         }
 
         aaptOptions {
-          noCompress "tflite"
+            noCompress "tflite"
         }
     }
 
@@ -47,7 +47,7 @@ android {
 
     buildTypes {
         release {
-        	minifyEnabled false
+            minifyEnabled false
             debuggable false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             signingConfig signingConfigs.releaseConfig
@@ -106,7 +106,11 @@ dependencies {
     implementation project(path: ':phonk_apprunner')
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.preference:preference:1.1.1'
+    // implementation 'androidx.emoji:emoji-bundled:1.0.0'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+    implementation 'org.reactivestreams:reactive-streams:1.0.3'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
 }
diff --git a/phonk_app/src/main/AndroidManifest.xml b/phonk_app/src/main/AndroidManifest.xml
@@ -22,9 +22,9 @@
   -->
 
 <manifest
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:tools="http://schemas.android.com/tools"
-     package="io.phonk">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="io.phonk">
 
     <!-- android:resizeableActivity = "true" -->
 
@@ -100,13 +100,13 @@
         </activity>
 
         <activity
-            android:name="io.phonk.WelcomeActivity"
+            android:name="io.phonk.gui.WelcomeActivity"
             android:theme="@style/PhonkAppTheme"
             android:label="@string/welcome_activity_name" >
         </activity>
         <activity
             android:name="io.phonk.gui.settings.SettingsActivity"
-            android:theme="@style/PhonkAppTheme"
+            android:theme="@style/PhonkAppThemePreferences"
             android:label="@string/settings_activity_name" >
         </activity>
         <activity
@@ -162,6 +162,8 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".NewMainActivity" />
+
         <service
             android:name="io.phonk.server.PhonkServerService"
             android:exported="false">
@@ -191,6 +193,15 @@
             </intent-filter>
         </receiver>
 
+        <!-- New signature permission to ensure only systemui can bind to these services -->
+        <service android:name="io.phonk.MyCustomControlService" android:label="@string/app_name"
+            android:permission="android.permission.BIND_CONTROLS">
+            <intent-filter>
+                <action android:name="android.service.controls.ControlsProviderService" />
+            </intent-filter>
+        </service>
+
+
         <!--
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -206,7 +217,7 @@
         -->
 
     </application>
-    
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 </manifest>
diff --git a/phonk_app/src/main/assets/changelog.txt b/phonk_app/src/main/assets/changelog.txt
@@ -1,3 +1,8 @@
+1.4.0
+- Updated app design
+- Some app refactor that will help future development
+- Small fixes in the PHONK app and the Web Editor
+
 1.3.2
 - Ask permission for background location
 - Settings has a new entry that redirects to app permissions

diff --git a/phonk_app/src/main/java/io/phonk/App.java b/phonk_app/src/main/java/io/phonk/App.java
@@ -22,16 +22,16 @@
 
 package io.phonk;
 
-import android.app.Application;
-
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
+import io.phonk.gui.connectionInfo.EventManager;
 import io.phonk.runner.base.utils.TimerUtils;
 
 public class App extends MultiDexApplication {
 
     public static MyLifecycleHandler myLifecycleHandler;
+    public EventManager eventManager;
 
     @Override
     public void onCreate() {
@@ -49,20 +49,13 @@ public void onCreate() {
         registerActivityLifecycleCallbacks(myLifecycleHandler);
         TimerUtils.stamp("registerActivityLifecycleCallbacks");
 
-        // Fabric.with(this, new Crashlytics());
-
-        /*
-        final Fabric fabric = new Fabric.Builder(this)
-                .kits(new Crashlytics())
-                .logger(new DefaultLogger(Log.VERBOSE))
-                .debuggable(true)
-                .build();
-
-        Fabric.with(fabric);
-        */
-
         if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof PhonkExceptionHandler)) {
             Thread.setDefaultUncaughtExceptionHandler(new PhonkExceptionHandler());
         }
+
+        eventManager = new EventManager(getApplicationContext());
+
+        // EmojiCompat.Config config = new BundledEmojiCompatConfig(this);
+        // EmojiCompat.init(config);
     }
 }
diff --git a/phonk_app/src/main/java/io/phonk/LauncherActivity.java b/phonk_app/src/main/java/io/phonk/LauncherActivity.java
@@ -28,9 +28,9 @@
 import android.os.Bundle;
 import android.widget.Toast;
 
-import io.phonk.gui.AboutActivity;
 import io.phonk.gui.UpdateActivity;
-import io.phonk.runner.base.utils.MLog;
+import io.phonk.gui.WelcomeActivity;
+import io.phonk.gui.settings.SettingsActivity;
 
 public class LauncherActivity extends Activity {
 
@@ -69,6 +69,8 @@ public void onCreate(Bundle savedInstanceState) {
             intent = new Intent(this, UpdateActivity.class);
         } else {
             intent = new Intent(this, MainActivity.class);
+            // intent = new Intent(this, NewMainActivity.class);
+            // intent = new Intent(this, SettingsActivity.class);
             // intent.putExtras();
         }