refactoring

Author: laramcd

app/src/main/java/com/nlinterface/activities/GroceryListActivity.kt

@@ -56,12 +56,9 @@ class GroceryListActivity : AppCompatActivity(), GroceryListCallback {
             window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         }
 
-        viewModel.initTTS()
-        viewModel.initSTT()
-
         configureUI()
-
-        configureVoiceControl()
+        configureTTS()
+        configureSTT()
     }
 
     private fun configureUI() {
@@ -145,14 +142,22 @@ class GroceryListActivity : AppCompatActivity(), GroceryListCallback {
         viewModel.storeGroceryList()
     }
 
-    private fun configureVoiceControl() {
+    private fun configureTTS() {
+
+        viewModel.initTTS()
 
         val ttsInitializedObserver = Observer<Boolean> { _ ->
             viewModel.say(resources.getString(R.string.grocery_list))
         }
 
         viewModel.ttsInitialized.observe(this, ttsInitializedObserver)
 
+    }
+
+    private fun configureSTT() {
+
+        viewModel.initSTT()
+
         val sttIsListeningObserver = Observer<Boolean> { isListening ->
             if (isListening) {
                 voiceActivationButton.setImageResource(R.drawable.ic_mic_green)

app/src/main/java/com/nlinterface/activities/MainActivity.kt

@@ -45,21 +45,16 @@ class MainActivity : AppCompatActivity() {
 
         GlobalParameters.instance!!.loadPreferences(this)
 
-        viewModel.initTTS()
-
         verifyAudioPermissions()
-
         configureUI()
-
-        configureVoiceControl()
-
-        viewModel.initSTT()
+        configureTTS()
+        configureSTT()
     }
 
     override fun onStart() {
         super.onStart()
 
-        viewModel.say(resources.getString(R.string.main_activity))
+        viewModel.say(resources.getString(R.string.main_menu))
 
         // process keep screen on settings
         if (GlobalParameters.instance!!.keepScreenOnSwitch == GlobalParameters.KeepScreenOn.YES) {
@@ -72,14 +67,22 @@ class MainActivity : AppCompatActivity() {
         GlobalParameters.instance!!.updateTheme()
     }
 
-    private fun configureVoiceControl() {
+    private fun configureTTS() {
+
+        viewModel.initTTS()
 
         val ttsInitializedObserver = Observer<Boolean> { _ ->
             viewModel.say(resources.getString(R.string.main_menu))
         }
 
         viewModel.ttsInitialized.observe(this, ttsInitializedObserver)
 
+    }
+
+    private fun configureSTT() {
+
+        viewModel.initSTT()
+
         val sttIsListeningObserver = Observer<Boolean> { isListening ->
             if (isListening) {
                 voiceActivationButton.setImageResource(R.drawable.ic_mic_green)
@@ -95,6 +98,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         viewModel.command.observe(this, commandObserver)
+
     }
 
     private fun executeCommand(command: ArrayList<String>?) {

app/src/main/java/com/nlinterface/activities/PlaceDetailsActivity.kt

@@ -48,22 +48,29 @@ class PlaceDetailsActivity: AppCompatActivity(), PlaceDetailsItemCallback {
 
         viewModel.fetchPlaceDetailsItemList()
 
-        viewModel.initTTS()
-        viewModel.initSTT()
-
         configureUI()
         configureAutocompleteFragment()
-        configureVoiceControl()
+        configureTTS()
+        configureSTT()
 
     }
 
-    private fun configureVoiceControl() {
+    private fun configureTTS() {
+
+        viewModel.initTTS()
+
         val ttsInitializedObserver = Observer<Boolean> { _ ->
             viewModel.say(resources.getString(R.string.place_details))
         }
 
         viewModel.ttsInitialized.observe(this, ttsInitializedObserver)
 
+    }
+
+    private fun configureSTT() {
+
+        viewModel.initSTT()
+
         val sttIsListeningObserver = Observer<Boolean> { isListening ->
             if (isListening) {
                 voiceActivationButton.setImageResource(R.drawable.ic_mic_green)
@@ -79,6 +86,7 @@ class PlaceDetailsActivity: AppCompatActivity(), PlaceDetailsItemCallback {
         }
 
         viewModel.command.observe(this, commandObserver)
+
     }
 
     private fun executeCommand(command: ArrayList<String>?) {

app/src/main/java/com/nlinterface/activities/SettingsActivity.kt

@@ -61,12 +61,10 @@ class SettingsActivity : AppCompatActivity() {
             themeOptions.add(option)
         }
 
-        viewModel.initTTS()
-        viewModel.initSTT()
-
         configureUI()
 
-        configureVoiceControl()
+        configureTTS()
+        configureSTT()
     }
 
     private fun configureUI() {
@@ -151,13 +149,22 @@ class SettingsActivity : AppCompatActivity() {
         }
     }
 
-    private fun configureVoiceControl() {
+    private fun configureTTS() {
+
+        viewModel.initTTS()
 
         val ttsInitializedObserver = Observer<Boolean> { _ ->
             viewModel.say(resources.getString(R.string.settings))
         }
+
         viewModel.ttsInitialized.observe(this, ttsInitializedObserver)
 
+    }
+
+    private fun configureSTT() {
+
+        viewModel.initSTT()
+
         val sttIsListeningObserver = Observer<Boolean> { isListening ->
             if (isListening) {
                 voiceActivationButton.setImageResource(R.drawable.ic_mic_green)
@@ -173,6 +180,7 @@ class SettingsActivity : AppCompatActivity() {
         }
 
         viewModel.command.observe(this, commandObserver)
+
     }
 
     private fun readSettings(all: Boolean = false, screen: Boolean = false, theme: Boolean = false) {