Merge pull request #14 from algolia/refactor/optionalSuggestions

refactor: optional suggestions

Author: q-litzler

ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/VoiceAndroidView.kt

@@ -24,14 +24,15 @@ class VoiceAndroidView(
     }
 
     override fun setSuggestions(suggestions: Array<out String>) {
-        val formattedSuggestions = suggestions.joinToString("") { formatterSuggestion(it) }
-        val html = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Html.fromHtml(formattedSuggestions, Html.FROM_HTML_MODE_LEGACY)
-        } else {
-            Html.fromHtml(formattedSuggestions)
+        view.suggestions?.let {
+            val formattedSuggestions = suggestions.joinToString("") { formatterSuggestion(it) }
+            val html = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                Html.fromHtml(formattedSuggestions, Html.FROM_HTML_MODE_LEGACY)
+            } else {
+                Html.fromHtml(formattedSuggestions)
+            }
+            it.text = html
         }
-
-        view.suggestions.text = html
     }
 
     override fun setTitle(title: VoiceUI.Title) {
@@ -47,7 +48,7 @@ class VoiceAndroidView(
     }
 
     override fun setSuggestionVisibility(isVisible: Boolean) {
-        view.voiceInput.suggestions.visibility = if (isVisible) View.VISIBLE else View.INVISIBLE
+        view.voiceInput.suggestions?.visibility = if (isVisible) View.VISIBLE else View.INVISIBLE
     }
 
     override fun setHintVisibility(isVisible: Boolean) {

ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/VoiceInputDialogFragment.kt

@@ -72,12 +72,14 @@ class VoiceInputDialogFragment : DialogFragment() {
                 VoiceMicrophone.State.Deactivated -> speechRecognizer.start()
             }
         })
-        suggestions?.let(androidView::setSuggestions)
+        suggestions?.let {
+            androidView.setSuggestions(it)
+            androidView.setSubtitle(resources.getString(R.string.input_subtitle_listening))
+        }
         speechRecognizer.setRecognitionListener(presenter)
         speechRecognizer.stateListener = presenter
     }
 
-
     override fun onResume() {
         super.onResume()
         if (autoStart) start()

ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/VoicePresenter.kt

@@ -16,12 +16,15 @@ class VoicePresenter(
         onResults(results.resultsRecognition)
     }
 
+    private var hasPartialResults: Boolean = false
+
     override fun onPartialResults(partialResults: Bundle) {
         val matches = partialResults.resultsRecognition
 
         ui.setSuggestionVisibility(false)
         ui.setTitle(VoiceUI.Title.Listen)
         matches.firstOrNull()?.capitalize()?.let(ui::setSubtitle)
+        hasPartialResults = true
     }
 
     override fun isListening(isListening: Boolean) {
@@ -33,7 +36,9 @@ class VoicePresenter(
             ui.setSubtitle(VoiceUI.Subtitle.Listen)
             ui.setMicrophoneState(VoiceMicrophone.State.Activated)
         } else {
-            ui.setHintVisibility(true)
+            if (!hasPartialResults) {
+                ui.setHintVisibility(true)
+            }
             ui.setRippleActivity(false)
             ui.setMicrophoneState(VoiceMicrophone.State.Deactivated)
         }
@@ -46,6 +51,7 @@ class VoicePresenter(
         ui.setMicrophoneState(VoiceMicrophone.State.Deactivated)
         ui.setTitle(VoiceUI.Title.Error)
         ui.setSubtitle(VoiceUI.Subtitle.Error)
+        hasPartialResults = false
     }
 
     override fun onReadyForSpeech(params: Bundle) = Unit

ui/src/main/res/values/strings.xml

@@ -1,7 +1,8 @@
 <resources>
     <!-- region VoiceInputDialogFragment -->
     <string name="input_title_listening">Listening…</string>
-    <string name="input_subtitle_listening">Say something like:</string>
+    <string name="input_subtitle_listening">Say something</string>
+    <string name="input_subtitle_suggestions">Say something like:</string>
     <string name="input_title_error">Sorry, we didn\'t quite get that.</string>
     <string name="input_subtitle_error">Try repeating your request.</string>
     <string name="input_hint_error">Try again</string>