From 3e207b5549e055fbf612e471cd4ff37815248046 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sat, 15 Aug 2020 21:49:39 -0400
Subject: [PATCH] Broadcast for Android

---
 android/app/build.gradle                      |   1 +
 android/app/src/main/AndroidManifest.xml      |   3 +-
 .../src/main/java/com/rusefi/app/rusEFI.java  |  11 +-
 .../app/src/main/res/layout/activity_usb.xml  | 100 ++++++++++--------
 .../app/src/main/res/values-v21/styles.xml    |   8 ++
 android/app/src/main/res/values/styles.xml    |   4 +
 6 files changed, 79 insertions(+), 48 deletions(-)
 create mode 100644 android/app/src/main/res/values-v21/styles.xml
 create mode 100644 android/app/src/main/res/values/styles.xml

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 56b13634b4..baf28ad1f7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -47,6 +47,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
     implementation 'androidx.navigation:navigation-ui:2.1.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index aef76cad14..691aebb33c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,7 +3,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rusefi.app">
 
-    <application android:label="@string/app_name">
+    <application android:label="@string/app_name"
+        android:theme="@style/AppTheme">
 
         <!--
             The USB_DEVICE_ATTACHED intent is always sent to an activity.
diff --git a/android/app/src/main/java/com/rusefi/app/rusEFI.java b/android/app/src/main/java/com/rusefi/app/rusEFI.java
index 394c1f62f1..94d8a6c549 100644
--- a/android/app/src/main/java/com/rusefi/app/rusEFI.java
+++ b/android/app/src/main/java/com/rusefi/app/rusEFI.java
@@ -35,6 +35,8 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.google.android.material.snackbar.BaseTransientBottomBar;
+import com.google.android.material.snackbar.Snackbar;
 import com.rusefi.Callable;
 import com.rusefi.app.serial.AndroidSerial;
 import com.rusefi.auth.AutoTokenUtil;
@@ -211,8 +213,11 @@ public class rusEFI extends Activity {
             soundBroadcast.start();
         } else if (view.getId() == R.id.buttonBroadcast) {
             AndroidSerial serial = AndroidSerial.getAndroidSerial(mStatusView, mResultView, usbManager);
-            if (serial == null)
+            if (serial == null) {
+                Snackbar mySnackbar = Snackbar.make(view, "No ECU detected", BaseTransientBottomBar.LENGTH_LONG);
+                mySnackbar.show();
                 return;
+            }
 
             LinkManager linkManager = new LinkManager();
             linkManager.setConnector(new StreamConnector(linkManager, new Callable<IoStream>() {
@@ -232,6 +237,10 @@ public class rusEFI extends Activity {
                     mResultView.append("On connection failed\n");
                 }
             });
+
+            Snackbar mySnackbar = Snackbar.make(view, "Broadcasting with " + AutoTokenUtil.getAuthToken(), BaseTransientBottomBar.LENGTH_LONG);
+            mySnackbar.show();
+
         }
     }
 
diff --git a/android/app/src/main/res/layout/activity_usb.xml b/android/app/src/main/res/layout/activity_usb.xml
index 1713237c57..ce6461f396 100644
--- a/android/app/src/main/res/layout/activity_usb.xml
+++ b/android/app/src/main/res/layout/activity_usb.xml
@@ -1,54 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/myCoordinatorLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
+    android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/text_status"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearanceMedium"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="16dp">
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:onClick="sendMessage"
-        android:text="DFU" />
-
-    <EditText
-        android:id="@+id/authToken"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:inputType="text"
-        android:text="Auth Token" />
-
-    <Button
-        android:id="@+id/buttonSound"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:onClick="sendMessage"
-        android:text="Sound" />
-
-    <Button
-        android:id="@+id/buttonBroadcast"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:onClick="sendMessage"
-        android:text="Broadcast" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
         <TextView
-            android:id="@+id/text_result"
+            android:id="@+id/text_status"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-    </ScrollView>
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:textAppearanceMedium" />
 
-</LinearLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="sendMessage"
+            android:text="DFU" />
+
+        <EditText
+            android:id="@+id/authToken"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="text"
+            android:text="Auth Token" />
+
+        <Button
+            android:id="@+id/buttonSound"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="sendMessage"
+            android:text="Sound" />
+
+        <Button
+            android:id="@+id/buttonBroadcast"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="sendMessage"
+            android:text="Broadcast" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/text_result"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </ScrollView>
+
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-v21/styles.xml b/android/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000000..3501f20a0e
--- /dev/null
+++ b/android/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,8 @@
+<!--
+https://stackoverflow.com/questions/47090526/caused-by-java-lang-unsupportedoperationexception-failed-to-resolve-attribute/47090603
+https://stackoverflow.com/questions/27780713/do-i-need-to-use-a-theme-appcompat-theme-or-descendant-for-v21-styles-too
+-->
+<resources>
+    <style name="AppTheme" parent="AppBaseTheme">
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..2b2bd50b43
--- /dev/null
+++ b/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,4 @@
+<resources>
+    <style name="AppBaseTheme" parent="Theme.AppCompat"></style>
+    <style name="AppTheme" parent="AppBaseTheme"></style>
+</resources>
\ No newline at end of file