add voice mode setting to settings. ask for permission in android and iOS

patjackson52 · patjackson52 · commit 69bd20cd44b7 · 2019-04-16T16:31:41.000-04:00
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.willowtreeapps.namegame">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:name=".NameGameApp"
diff --git a/android/src/main/java/com/willowtreeapps/namegame/MainActivity.kt b/android/src/main/java/com/willowtreeapps/namegame/MainActivity.kt
@@ -14,6 +14,10 @@ class MyAppGlideModule : AppGlideModule()
 
 class MainActivity : AppCompatActivity() {
 
+    companion object {
+        const val RECORD_REQUEST_CODE = 52
+    }
+
     interface IOnBackPressed {
         fun onBackPressed(): Boolean
     }
@@ -37,4 +41,6 @@ class MainActivity : AppCompatActivity() {
 //            (currentFragment as IOnBackPressed).onBackPressed()
         super.onBackPressed()
     }
+
+
 }
diff --git a/android/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt b/android/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt
@@ -2,12 +2,13 @@ package com.willowtreeapps.namegame.store
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
+import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewTreeObserver
+import android.speech.RecognitionListener
+import android.speech.RecognizerIntent
+import android.speech.SpeechRecognizer
+import android.view.*
 import android.view.animation.BounceInterpolator
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.willowtreeapps.common.QuestionViewState
@@ -21,6 +22,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.willowtreeapps.common.Logger
 import com.willowtreeapps.common.ui.QuestionPresenter
 import com.willowtreeapps.namegame.*
+import java.util.*
 
 
 class QuestionFragment : BaseNameGameViewFragment<QuestionPresenter>(), QuestionView, MainActivity.IOnBackPressed {
@@ -344,4 +346,53 @@ class QuestionFragment : BaseNameGameViewFragment<QuestionPresenter>(), Question
         4 -> button4
         else -> null//throw IllegalStateException("Invalid button index")
     }
+
+
+    private fun startSpeechToText() {
+
+        val speechRecognizer = SpeechRecognizer.createSpeechRecognizer(activity!!)
+        val speechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
+        speechRecognizerIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+        speechRecognizerIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
+
+        speechRecognizer.setRecognitionListener(object : RecognitionListener {
+            override fun onReadyForSpeech(bundle: Bundle) {}
+
+            override fun onBeginningOfSpeech() {}
+
+            override fun onRmsChanged(v: Float) {}
+
+            override fun onBufferReceived(bytes: ByteArray) {}
+
+            override fun onEndOfSpeech() {}
+
+            override fun onError(i: Int) {}
+
+            override fun onResults(bundle: Bundle) {
+                val matches = bundle.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)//getting all the matches
+                //displaying the first match
+//                if (matches != null)
+            }
+
+            override fun onPartialResults(bundle: Bundle) {}
+
+            override fun onEvent(i: Int, bundle: Bundle) {}
+        })
+
+        btn_end_game.setOnTouchListener { view, motionEvent ->
+            when (motionEvent.action) {
+                MotionEvent.ACTION_UP -> {
+                    speechRecognizer.stopListening()
+//                    editText.hint = getString(R.string.text_hint)
+                }
+
+                MotionEvent.ACTION_DOWN -> {
+                    speechRecognizer.startListening(speechRecognizerIntent)
+//                    editText.setText("")
+//                    editText.hint = "Listening..."
+                }
+            }
+            false
+        }
+    }
 }
diff --git a/android/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt b/android/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt
@@ -1,19 +1,24 @@
 package com.willowtreeapps.namegame.store
 
+import android.Manifest
+import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
+import com.willowtreeapps.common.Logger
 import com.willowtreeapps.common.QuestionCategoryId
 import com.willowtreeapps.common.SettingsViewState
 import com.willowtreeapps.common.ui.SettingsPresenter
 import com.willowtreeapps.common.ui.SettingsView
+import com.willowtreeapps.namegame.MainActivity
 import com.willowtreeapps.namegame.NameGameApp
 import com.willowtreeapps.namegame.R
 import kotlinx.android.synthetic.main.fragment_settings.*
 
-class SettingsDialogFragment: DialogFragment(), SettingsView {
+class SettingsDialogFragment : DialogFragment(), SettingsView {
 
     override lateinit var presenter: SettingsPresenter
 
@@ -42,6 +47,9 @@ class SettingsDialogFragment: DialogFragment(), SettingsView {
             presenter.categoryChanged(QuestionCategoryId.fromOrdinal(newVal))
         }
         btn_ok.setOnClickListener { dismiss() }
+        switch_mic.setOnCheckedChangeListener { buttonView, isChecked ->
+            presenter.microphoneModeChanged(isChecked)
+        }
     }
 
     override fun onResume() {
@@ -58,4 +66,37 @@ class SettingsDialogFragment: DialogFragment(), SettingsView {
         numberPicker.value = viewState.numQuestions
         categoryPicker.value = QuestionCategoryId.values().indexOf(viewState.categoryId)
     }
+
+    override fun askForMicPermissions() {
+        setupPermissions()
+    }
+
+    private fun setupPermissions() {
+        val permission = ContextCompat.checkSelfPermission(activity!!,
+                Manifest.permission.RECORD_AUDIO)
+
+        if (permission != PackageManager.PERMISSION_GRANTED) {
+            Logger.d("Permission to record denied")
+            makeRequest()
+        }
+    }
+
+    private fun makeRequest() {
+        requestPermissions(
+                arrayOf(Manifest.permission.RECORD_AUDIO),
+                MainActivity.RECORD_REQUEST_CODE)
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int,
+                                            permissions: Array<String>, grantResults: IntArray) {
+        when (requestCode) {
+            MainActivity.RECORD_REQUEST_CODE -> {
+                if (grantResults.isEmpty() || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+                    presenter.microphonePermissionDenied()
+                } else {
+                    presenter.microphonePermissionGranted()
+                }
+            }
+        }
+    }
 }
diff --git a/android/src/main/res/layout/fragment_settings.xml b/android/src/main/res/layout/fragment_settings.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="300dp"
-    android:layout_height="400dp"
+    android:layout_height="450dp"
     android:minWidth="300dp"
     android:minHeight="400dp">
 
@@ -39,26 +39,37 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        style="@style/SettingsLabelText"
-        android:id="@+id/txt_num_questions"
-        android:layout_width="70dp"
+    <Switch
+        android:id="@+id/switch_mic"
+        android:layout_width="180dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:gravity="center"
-        android:text="Number of Questions"
-        app:layout_constraintEnd_toEndOf="@+id/numberPicker"
-        app:layout_constraintStart_toStartOf="@+id/numberPicker"
-        app:layout_constraintTop_toBottomOf="@+id/numberPicker" />
+        android:layout_marginTop="16dp"
+        android:text="Voice mode"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/txt_num_questions" />
 
     <TextView
-        style="@style/SettingsLabelText"
         android:id="@+id/txt_num_questions2"
+        style="@style/SettingsLabelText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Category"
         app:layout_constraintEnd_toEndOf="@+id/categoryPicker"
         app:layout_constraintStart_toStartOf="@+id/categoryPicker"
         app:layout_constraintTop_toBottomOf="@+id/categoryPicker" />
+
+    <TextView
+        android:id="@+id/txt_num_questions"
+        style="@style/SettingsLabelText"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        android:text="Number of Questions"
+        app:layout_constraintEnd_toEndOf="@+id/numberPicker"
+        app:layout_constraintStart_toStartOf="@+id/numberPicker"
+        app:layout_constraintTop_toBottomOf="@+id/numberPicker" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt b/android/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt
@@ -134,7 +134,15 @@ class ReducersTest {
         val final = reducer(initial, Actions.ChangeNumQuestionsSettingsAction(10))
 
         assertEquals(10, final.settings.numQuestions)
+    }
+
+    @Test
+    fun `ChangeMicrophoneModeAction should update settings`() {
+        val initial = generateInitialTestState()
+
+        val final = reducer(initial, Actions.ChangeMicrophoneModeSettingsAction(true))
 
+        assertEquals(true, final.settings.microphoneMode)
     }
 
     private fun generateInitialTestState(): AppState {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt
@@ -29,6 +29,7 @@ sealed class Actions : Action {
     class SettingsLoadedAction(val settings: UserSettings)
     class ChangeNumQuestionsSettingsAction(val num: Int)
     class ChangeCategorySettingsAction(val categoryId: QuestionCategoryId)
+    class ChangeMicrophoneModeSettingsAction(val enabled: Boolean)
 
 }
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt
@@ -63,7 +63,6 @@ data class Item(val id: ItemId,
     fun matches(name: String): Boolean {
         return displayName() == name
     }
-
 }
 
 enum class QuestionCategoryId(val displayName: String) {
@@ -81,7 +80,8 @@ enum class QuestionCategoryId(val displayName: String) {
 }
 
 data class UserSettings(val numQuestions: Int,
-                        val categoryId: QuestionCategoryId) {
+                        val categoryId: QuestionCategoryId,
+                        val microphoneMode: Boolean = false) {
     companion object {
         fun defaults() = UserSettings(3, categoryId = QuestionCategoryId.CATS)
     }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt
@@ -38,4 +38,4 @@ class GameEngine(navigator: Navigator,
     fun <T : Presenter<*>> attachView(view: View<T>) = presenterFactory.attachView(view as View<Presenter<*>>)
 
     fun detachView(view: View<*>) = presenterFactory.detachView(view)
-}
+}
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt
@@ -44,6 +44,7 @@ fun reducer(state: AppState, action: Any): AppState =
 
             is ChangeNumQuestionsSettingsAction -> state.copy(settings = state.settings.copy(numQuestions = action.num))
             is ChangeCategorySettingsAction -> state.copy(settings = state.settings.copy(categoryId = action.categoryId))
+            is ChangeMicrophoneModeSettingsAction -> state.copy(settings = state.settings.copy(microphoneMode = action.enabled))
             is SettingsLoadedAction -> state.copy(settings = action.settings)
 
             else -> throw AssertionError("Action ${action::class.simpleName} not handled")
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/LoggingMiddleware.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/LoggingMiddleware.kt
@@ -7,6 +7,6 @@ import com.willowtreeapps.common.Logger
 
 fun loggerMiddleware(store: Store<AppState>, nextDispatcher: (Any) -> Any, action: Any): Any {
     val result = nextDispatcher(action)
-    Logger.d("DISPATCH action: ${action::class.simpleName}")
+    Logger.d("DISPATCH action: ${action::class.simpleName}: $action")
     return result
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/SettingsMiddleware.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/SettingsMiddleware.kt
@@ -31,6 +31,8 @@ internal class SettingsMiddleware(private val settings: LocalStorageSettingsRepo
                     val settings = UserSettings(numQuestions = settings.numRounds, categoryId = settings.categoryId)
                     store.dispatch(Actions.SettingsLoadedAction(settings))
                 }
+
+                is Actions.ChangeMicrophoneModeSettingsAction ->  settings.microphoneMode = action.enabled
             }
         }
         return nextDispatcher(action)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/SettingsRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/SettingsRepository.kt
@@ -4,25 +4,33 @@ import com.russhwolf.settings.Settings
 import com.russhwolf.settings.get
 import com.russhwolf.settings.set
 import com.willowtreeapps.common.QuestionCategoryId
+import com.willowtreeapps.common.repo.LocalStorageSettingsRepository.Keys.*
 
 expect fun userSettings(context: Any? = null): Settings
 
 class LocalStorageSettingsRepository(private val settings: Settings) {
 
     var numRounds: Int
-        get() = settings.getInt(NUM_ROUNDS, 4)
+        get() = settings.getInt(NUM_ROUNDS.toString(), 4)
         set(numRounds) {
-            settings[NUM_ROUNDS] = numRounds
+            settings[NUM_ROUNDS.toString()] = numRounds
         }
 
     var categoryId: QuestionCategoryId
-        get() = QuestionCategoryId.valueOf(settings.getString(CATEGORY_ID, QuestionCategoryId.CATS.toString()))
+        get() = QuestionCategoryId.valueOf(settings.getString(CATEGORY_ID.toString(), QuestionCategoryId.CATS.toString()))
         set(categoryId) {
-            settings[CATEGORY_ID] = categoryId.toString()
+            settings[CATEGORY_ID.toString()] = categoryId.toString()
         }
 
-    companion object {
-        private const val NUM_ROUNDS = "NUM_ROUNDS"
-        private const val CATEGORY_ID = "CATEGORY_ID"
+    var microphoneMode: Boolean
+        get() = settings.getBoolean(MICROPHONE_MODE.toString(), false)
+        set(categoryId) {
+            settings[MICROPHONE_MODE.toString()] = categoryId
+        }
+
+    enum class Keys {
+        NUM_ROUNDS,
+        CATEGORY_ID,
+        MICROPHONE_MODE
     }
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsPresenter.kt
@@ -25,4 +25,20 @@ class SettingsPresenter(val store: Store<AppState>): Presenter<SettingsView>() {
     fun categoryChanged(categoryId: QuestionCategoryId) {
         store.dispatch(Actions.ChangeCategorySettingsAction(categoryId))
     }
+
+    fun microphoneModeChanged(enabled: Boolean) {
+        if (enabled) {
+            view?.askForMicPermissions()
+        } else {
+            store.dispatch(Actions.ChangeMicrophoneModeSettingsAction(false))
+        }
+    }
+
+    fun microphonePermissionGranted() {
+        store.dispatch(Actions.ChangeMicrophoneModeSettingsAction(true))
+    }
+
+    fun microphonePermissionDenied() {
+        store.dispatch(Actions.ChangeMicrophoneModeSettingsAction(false))
+    }
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsView.kt
@@ -5,4 +5,5 @@ import com.willowtreeapps.common.View
 
 interface SettingsView: View<SettingsPresenter> {
     fun showSettings(viewState: SettingsViewState)
+    fun askForMicPermissions()
 }
diff --git a/iOS/NameGame/NameGame/Base.lproj/Main.storyboard b/iOS/NameGame/NameGame/Base.lproj/Main.storyboard
diff --git a/iOS/NameGame/NameGame/Info.plist b/iOS/NameGame/NameGame/Info.plist
diff --git a/iOS/NameGame/NameGame/SettingsViewController.swift b/iOS/NameGame/NameGame/SettingsViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ class MyAppGlideModule : AppGlideModule()`
`14`	`14`
`15`	`15`	`class MainActivity : AppCompatActivity() {`
`16`	`16`
	`17`	`+ companion object {`
	`18`	`+ const val RECORD_REQUEST_CODE = 52`
	`19`	`+ }`
	`20`	`+`
`17`	`21`	`interface IOnBackPressed {`
`18`	`22`	`fun onBackPressed(): Boolean`
`19`	`23`	`}`
`@@ -37,4 +41,6 @@ class MainActivity : AppCompatActivity() {`
`37`	`41`	`// (currentFragment as IOnBackPressed).onBackPressed()`
`38`	`42`	`super.onBackPressed()`
`39`	`43`	`}`
	`44`	`+`
	`45`	`+`
`40`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ sealed class Actions : Action {`
`29`	`29`	`class SettingsLoadedAction(val settings: UserSettings)`
`30`	`30`	`class ChangeNumQuestionsSettingsAction(val num: Int)`
`31`	`31`	`class ChangeCategorySettingsAction(val categoryId: QuestionCategoryId)`
	`32`	`+ class ChangeMicrophoneModeSettingsAction(val enabled: Boolean)`
`32`	`33`
`33`	`34`	`}`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ data class Item(val id: ItemId,`
`63`	`63`	`fun matches(name: String): Boolean {`
`64`	`64`	`return displayName() == name`
`65`	`65`	`}`
`66`		`-`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`enum class QuestionCategoryId(val displayName: String) {`
`@@ -81,7 +80,8 @@ enum class QuestionCategoryId(val displayName: String) {`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`data class UserSettings(val numQuestions: Int,`
`84`		`- val categoryId: QuestionCategoryId) {`
	`83`	`+ val categoryId: QuestionCategoryId,`
	`84`	`+ val microphoneMode: Boolean = false) {`
`85`	`85`	`companion object {`
`86`	`86`	`fun defaults() = UserSettings(3, categoryId = QuestionCategoryId.CATS)`
`87`	`87`	`}`