Bug 1981453 - Handle voice search button interactions in bookmarks and history also r=android-reviewers,harrisono

Differential Revision: https://phabricator.services.mozilla.com/D260246

Author: Mugurell

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarkFragment.kt

@@ -4,10 +4,13 @@
 
 package org.mozilla.fenix.bookmarks
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.content.getSystemService
@@ -25,17 +28,20 @@ import mozilla.components.compose.browser.toolbar.store.EnvironmentCleared
 import mozilla.components.compose.browser.toolbar.store.EnvironmentRehydrated
 import mozilla.components.compose.browser.toolbar.store.Mode
 import mozilla.components.concept.engine.EngineSession
+import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.StoreProvider
+import org.mozilla.fenix.components.VoiceSearchFeature
 import org.mozilla.fenix.components.accounts.FenixFxAEntryPoint
 import org.mozilla.fenix.components.appstate.qrScanner.QrScannerBinding
 import org.mozilla.fenix.components.metrics.MetricsUtils
 import org.mozilla.fenix.components.search.BOOKMARKS_SEARCH_ENGINE_ID
 import org.mozilla.fenix.components.toolbar.BrowserToolbarEnvironment
 import org.mozilla.fenix.ext.bookmarkStorage
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.hideToolbar
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
@@ -54,6 +60,7 @@ import org.mozilla.fenix.search.createInitialSearchFragmentState
 import org.mozilla.fenix.tabstray.Page
 import org.mozilla.fenix.theme.FirefoxTheme
 import org.mozilla.fenix.utils.lastSavedFolderCache
+import kotlin.getValue
 
 /**
  * The screen that displays the user's bookmark list in their Library.
@@ -63,6 +70,14 @@ class BookmarkFragment : Fragment() {
 
     private val verificationResultLauncher = registerForVerification()
 
+    private val voiceSearchFeature by lazy(LazyThreadSafetyMode.NONE) {
+        ViewBoundFeatureWrapper<VoiceSearchFeature>()
+    }
+    private val voiceSearchLauncher: ActivityResultLauncher<Intent> =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            voiceSearchFeature.get()?.handleVoiceSearchResult(result.resultCode, result.data)
+        }
+
     @Suppress("LongMethod")
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -193,6 +208,15 @@ class BookmarkFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         if (requireContext().settings().shouldUseComposableToolbar) {
             QrScannerBinding.register(this)
+            voiceSearchFeature.set(
+                feature = VoiceSearchFeature(
+                    context = requireContext(),
+                    appStore = requireContext().components.appStore,
+                    voiceSearchLauncher = voiceSearchLauncher,
+                ),
+                owner = viewLifecycleOwner,
+                view = view,
+            )
         }
     }
 

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt

@@ -17,6 +17,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioGroup
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.background
@@ -92,6 +93,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.addons.showSnackBar
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.components.StoreProvider
+import org.mozilla.fenix.components.VoiceSearchFeature
 import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.components.appstate.qrScanner.QrScannerBinding
 import org.mozilla.fenix.components.history.DefaultPagedHistoryProvider
@@ -126,6 +128,7 @@ import org.mozilla.fenix.search.SearchFragmentStore
 import org.mozilla.fenix.search.createInitialSearchFragmentState
 import org.mozilla.fenix.tabstray.Page
 import org.mozilla.fenix.theme.FirefoxTheme
+import kotlin.getValue
 import org.mozilla.fenix.GleanMetrics.History as GleanHistory
 
 private const val MATERIAL_DESIGN_SCRIM = "#52000000"
@@ -161,6 +164,14 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler,
     private var verificationResultLauncher: ActivityResultLauncher<Intent> =
         registerForVerification(onVerified = ::openHistoryInPrivate)
 
+    private val voiceSearchFeature by lazy(LazyThreadSafetyMode.NONE) {
+        ViewBoundFeatureWrapper<VoiceSearchFeature>()
+    }
+    private val voiceSearchLauncher: ActivityResultLauncher<Intent> =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            voiceSearchFeature.get()?.handleVoiceSearchResult(result.resultCode, result.data)
+        }
+
     private val menuBinding by lazy {
         MenuBinding(
             store = historyStore,
@@ -245,6 +256,15 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler,
         if (requireContext().settings().shouldUseComposableToolbar) {
             toolbarStore = buildToolbarStore()
             QrScannerBinding.register(this)
+            voiceSearchFeature.set(
+                feature = VoiceSearchFeature(
+                    context = requireContext(),
+                    appStore = requireContext().components.appStore,
+                    voiceSearchLauncher = voiceSearchLauncher,
+                ),
+                owner = viewLifecycleOwner,
+                view = view,
+            )
         }
 
         consumeFrom(historyStore) {