From b57de85ffa6f06f14c1512ef4e894101785064bb Mon Sep 17 00:00:00 2001
From: Mathieu <m4th1eu@protonmail.com>
Date: Sat, 16 Oct 2021 10:56:31 +0200
Subject: [PATCH] "Jarvis?" Working pretty much perfectly

---
 .idea/misc.xml                                | 60 ++++++++++---------
 app/src/main/AndroidManifest.xml              | 11 ++--
 .../jarvis/android/ListeningActivity.java     |  3 +-
 .../jarvis/android/PorcupineService.java      |  1 -
 ...ity_listening.xml => dialog_listening.xml} |  0
 app/src/main/res/values/styles.xml            |  9 ---
 6 files changed, 39 insertions(+), 45 deletions(-)
 rename app/src/main/res/layout/{activity_listening.xml => dialog_listening.xml} (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d61f88c..49d53af 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-    <component name="DesignSurface">
-        <option name="filePathToZoomLevelMap">
-            <map>
-                <entry key="../../../../../layout/custom_preview.xml" value="0.5354166666666667" />
-                <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml"
-                    value="0.36614583333333334" />
-                <entry key="app/src/main/res/drawable/circle.xml" value="0.346875" />
-                <entry key="app/src/main/res/drawable/ic_launcher_background.xml"
-                    value="0.36614583333333334" />
-                <entry key="app/src/main/res/drawable/mic.xml" value="0.346875" />
-                <entry key="app/src/main/res/drawable/microphone.xml" value="0.346875" />
-                <entry key="app/src/main/res/drawable/round_button.xml" value="0.346875" />
-                <entry key="app/src/main/res/drawable/rounded_white_on_top.xml"
-                    value="0.36614583333333334" />
-                <entry key="app/src/main/res/layout/activity_listening.xml" value="0.536" />
-                <entry key="app/src/main/res/layout/activity_main.xml" value="0.35" />
-                <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml"
-                    value="0.36614583333333334" />
-            </map>
-        </option>
-    </component>
-    <component name="ExternalStorageConfigurationManager" enabled="true" />
-    <component name="ProjectRootManager" default="true" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK"
-        project-jdk-type="JavaSDK" version="2">
-        <output url="file://$PROJECT_DIR$/build/classes" />
-    </component>
-    <component name="ProjectType">
-        <option name="id" value="Android" />
-    </component>
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../../../../layout/custom_preview.xml" value="0.5354166666666667" />
+        <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.36614583333333334" />
+        <entry key="app/src/main/res/drawable/circle.xml" value="0.346875" />
+        <entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.36614583333333334" />
+        <entry key="app/src/main/res/drawable/mic.xml" value="0.346875" />
+        <entry key="app/src/main/res/drawable/microphone.xml" value="0.346875" />
+        <entry key="app/src/main/res/drawable/round_button.xml" value="0.346875" />
+        <entry key="app/src/main/res/drawable/rounded_white_on_top.xml" value="0.36614583333333334" />
+        <entry key="app/src/main/res/layout/activity_listening.xml" value="0.16315431679129844" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.35" />
+        <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.36614583333333334" />
+      </map>
+    </option>
+  </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.16315431679129844" />
+      </ProjectState>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07e5ff1..41144ec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,20 +12,23 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
         android:showOnLockScreen="true"
+        android:supportsRtl="true"
         android:theme="@style/Theme.JarvisClientAndroid">
 
 
         <service
             android:name=".PorcupineService"
             android:enabled="true"
-            android:exported="false"/>
+            android:exported="false" />
 
-        <activity android:name=".ListeningActivity"
+        <activity
+            android:name=".ListeningActivity"
+            android:excludeFromRecents="true"
             android:theme="@style/Theme.Transparent" />
 
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java b/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java
index 7e8f705..2066735 100644
--- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java
+++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java
@@ -27,8 +27,7 @@ public class ListeningActivity extends AppCompatActivity {
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
-
-        setContentView(R.layout.activity_listening);
+        setContentView(R.layout.dialog_listening);
 
     }
 
diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java b/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java
index b6ca96a..19a8da4 100644
--- a/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java
+++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java
@@ -41,7 +41,6 @@ public class PorcupineService extends Service {
                                 dialogIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                                 startActivity(dialogIntent);
 
-
                                 Toast.makeText(this, "Wake-word detected!", Toast.LENGTH_SHORT).show();
                             });
             porcupineManager.start();
diff --git a/app/src/main/res/layout/activity_listening.xml b/app/src/main/res/layout/dialog_listening.xml
similarity index 100%
rename from app/src/main/res/layout/activity_listening.xml
rename to app/src/main/res/layout/dialog_listening.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5a924ea..11dbfbd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.AppCompat.Transparent.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
     <style name="Theme.Transparent" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>