From 0bfb13f678b97e99295d5e374e57309701e9d7b5 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Thu, 6 Dec 2018 21:29:05 +0100
Subject: [PATCH] little changes

---
 .idea/caches/build_file_checksums.ser         | Bin 548 -> 537 bytes
 .../java/adrienmalin/pingpoints/SttDialog.kt  |  67 ++++++------------
 .../main/res/layout-land/activity_match.xml   |   3 +-
 app/src/main/res/layout/activity_match.xml    |   6 +-
 app/src/main/res/layout/dialog_stt.xml        |   8 ++-
 5 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 70efde614d804122d23da0e44cccd16e0f880517..ed34ff93c3f22873acad0d6ff4a3760741859be4 100644
GIT binary patch
delta 85
zcmV-b0IL6_1epYonFHOoB$1r?Ar6hOEI^y9s`i#H*Tr0_S#$s>Lpoelb7gXKTw!Es
rZDEta0VEmJ9gNwJ0I~$>fC-rF_(Fbk01;<$VPtG&lYjvglM@0FPT?b6

delta 90
zcmV-g0Hyz#1f&FznF9jJ=8>HFEcJEJ`0TiS?g<q5uh8@dN^}4-Lpoelb7gXKTw!E#
wX=QFMZDDL_ZfA03d6TvQBoo=(bT)Dms(R}B{rHDmj01E45tF|G8<PkE5u#KmTL1t6

diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
index e431744..30825a0 100644
--- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
@@ -9,65 +9,37 @@ import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
 import android.support.v4.app.DialogFragment
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.ImageView
 import android.widget.TextView
 import java.util.*
+import kotlin.math.max
+import kotlin.math.min
 
 class SttDialog : DialogFragment() {
-    var partialResultsTextView: TextView? = null
     var matchActivity: MatchActivity? = null
+    var partialResultsTextView: TextView? = null
+    var icStt: ImageView? = null
     var stt: SpeechRecognizer? = null
     var sttIntent: Intent? = null
 
     inner class SttListener : RecognitionListener {
-        val LOG_TAG: String = "SttListener"
+        var minRms: Float = 0f
+        var maxRms: Float = 0f
 
-        override fun onBeginningOfSpeech() {
-            Log.i(LOG_TAG, "onBeginningOfSpeech")
-        }
-
-        override fun onBufferReceived(buffer: ByteArray?) {
-            Log.i(LOG_TAG, "onBufferReceived: $buffer");
-        }
-
-        override fun onEndOfSpeech() {
-            Log.i(LOG_TAG, "onEndOfSpeech")
-        }
-
-        override fun onError(errorCode: Int) {
-            val errorMessage: String = when (errorCode) {
-                SpeechRecognizer.ERROR_AUDIO -> "Audio recording error"
-                SpeechRecognizer.ERROR_CLIENT -> "Client side error"
-                SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS -> "Insufficient permissions"
-                SpeechRecognizer.ERROR_NETWORK -> "Network error"
-                SpeechRecognizer.ERROR_NETWORK_TIMEOUT -> "Network timeout"
-                SpeechRecognizer.ERROR_NO_MATCH -> "No match"
-                SpeechRecognizer.ERROR_RECOGNIZER_BUSY -> "RecognitionService busy"
-                SpeechRecognizer.ERROR_SERVER -> "error from server"
-                SpeechRecognizer.ERROR_SPEECH_TIMEOUT -> "No speech input"
-                else -> "Didn't understand, please try again."
-            }
-            Log.d(LOG_TAG, "FAILED $errorMessage")
-            stt?.startListening(sttIntent)
-        }
-
-        override fun onEvent(arg0: Int, arg1: Bundle?) {
-            Log.i(LOG_TAG, "onEvent")
+        override fun onRmsChanged(rmsdB: Float) {
+            minRms = min(rmsdB, minRms)
+            maxRms = max(rmsdB, maxRms)
+            if (minRms != maxRms)
+                icStt?.alpha = 0.5f + rmsdB / (2*(maxRms - minRms))
         }
 
         override fun onPartialResults(data: Bundle) {
-            //Log.i(LOG_TAG, "onPartialResults")
             partialResultsTextView?.text = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)[0]
         }
 
-        override fun onReadyForSpeech(arg0: Bundle?) {
-            Log.i(LOG_TAG, "onReadyForSpeech")
-        }
-
         override fun onResults(data: Bundle) {
-            Log.i(LOG_TAG, "onResults");
             val results: ArrayList<String> = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
             var understood = false
 
@@ -86,16 +58,22 @@ class SttDialog : DialogFragment() {
                         if (understood) break
                     }
                     if (!understood) {
-                        partialResultsTextView?.text = getString(R.string.not_understood)
-                        stt?.startListening(sttIntent)
+                        onError(0)
                     }
                 }
             }
         }
 
-        override fun onRmsChanged(rmsdB: Float) {
-            //Log.i(LOG_TAG, "onRmsChanged: $rmsdB")
+        override fun onError(errorCode: Int) {
+            partialResultsTextView?.text = getString(R.string.not_understood)
+            stt?.startListening(sttIntent)
         }
+
+        override fun onEvent(arg0: Int, arg1: Bundle?) {}
+        override fun onReadyForSpeech(arg0: Bundle?) {}
+        override fun onBeginningOfSpeech() {}
+        override fun onBufferReceived(buffer: ByteArray?) {}
+        override fun onEndOfSpeech() {}
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?) = AlertDialog.Builder(activity).apply {
@@ -104,6 +82,7 @@ class SttDialog : DialogFragment() {
             null
         )
         partialResultsTextView = view.findViewById(R.id.partialResultTextView)
+        icStt = view.findViewById(R.id.icStt)
 
         setView(view)
 
diff --git a/app/src/main/res/layout-land/activity_match.xml b/app/src/main/res/layout-land/activity_match.xml
index 6e9eb6f..bc61c48 100644
--- a/app/src/main/res/layout-land/activity_match.xml
+++ b/app/src/main/res/layout-land/activity_match.xml
@@ -5,7 +5,8 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:keepScreenOn="true">
 
     <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_match.xml b/app/src/main/res/layout/activity_match.xml
index 38ae79c..f479883 100644
--- a/app/src/main/res/layout/activity_match.xml
+++ b/app/src/main/res/layout/activity_match.xml
@@ -5,7 +5,8 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:keepScreenOn="true">
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -80,7 +81,7 @@
                     app:layout_constraintStart_toEndOf="@+id/imgService0"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="@string/button_text" android:layout_margin="8dp" android:layout_weight="1"
-                    android:theme="@style/ScoreButton"/>
+                    android:theme="@style/ScoreButton" android:layout_marginLeft="8dp"/>
 
             <Button
                     android:id="@+id/buttonPlayer1"
@@ -126,7 +127,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/iconCredits"
-                app:layout_constraintTop_toBottomOf="@+id/PingPointsCredit"
                 app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/dialog_stt.xml b/app/src/main/res/layout/dialog_stt.xml
index 916fac9..bb061a2 100644
--- a/app/src/main/res/layout/dialog_stt.xml
+++ b/app/src/main/res/layout/dialog_stt.xml
@@ -13,12 +13,14 @@
         <ImageView
                 app:srcCompat="@drawable/ic_stt"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" android:id="@+id/imageView" android:layout_margin="8dp"/>
+                android:layout_height="wrap_content" android:id="@+id/icStt" android:layout_margin="8dp"
+                android:contentDescription="@string/STT"/>
         <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/STT_hint" android:id="@+id/sttHintTextView" android:layout_margin="8dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:gravity="center"/>
+                android:text="@string/STT_hint" android:id="@+id/sttHintTextView"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:gravity="center"
+                android:layout_marginLeft="8dp" android:layout_marginRight="8dp"/>
         <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" android:id="@+id/partialResultTextView"