diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index 8a0f059ede..cc21ee48a6 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -205,6 +205,12 @@ class Core( url = "", icon = getDrawable(context, R.drawable.ic_bookmarks_search)?.toBitmap()!!, ), + createApplicationSearchEngine( + id = TABS_SEARCH_ENGINE_ID, + name = context.getString(R.string.preferences_tabs), + url = "", + icon = getDrawable(context, R.drawable.ic_tabs_search)?.toBitmap()!!, + ), createApplicationSearchEngine( id = HISTORY_SEARCH_ENGINE_ID, name = context.getString(R.string.library_history), @@ -521,6 +527,7 @@ class Core( private const val CONTILE_MAX_CACHE_AGE = 60L // 60 minutes const val HISTORY_SEARCH_ENGINE_ID = "history_search_engine_id" const val BOOKMARKS_SEARCH_ENGINE_ID = "bookmarks_search_engine_id" + const val TABS_SEARCH_ENGINE_ID = "tabs_search_engine_id" // Maximum number of suggestions returned from the history search engine source. const val METADATA_HISTORY_SUGGESTION_LIMIT = 100 diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt index c49d43c511..1a57a21728 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt @@ -205,6 +205,9 @@ class SearchDialogController( && searchEngine.id == Core.BOOKMARKS_SEARCH_ENGINE_ID -> { fragmentStore.dispatch(SearchFragmentAction.SearchBookmarksEngineSelected(searchEngine)) } + searchEngine.type == SearchEngine.Type.APPLICATION && searchEngine.id == Core.TABS_SEARCH_ENGINE_ID -> { + fragmentStore.dispatch(SearchFragmentAction.SearchTabsEngineSelected(searchEngine)) + } searchEngine == store.state.search.selectedOrDefaultSearchEngine -> { fragmentStore.dispatch(SearchFragmentAction.SearchDefaultEngineSelected(searchEngine, settings)) } diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt index 007b91e6fa..4f5bbeb11f 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt @@ -61,6 +61,11 @@ sealed class SearchEngineSource { * Search engine for bookmarks */ data class Bookmarks(override val searchEngine: SearchEngine) : SearchEngineSource() + + /** + * Search engine for tabs + */ + data class Tabs(override val searchEngine: SearchEngine) : SearchEngineSource() } /** @@ -180,6 +185,11 @@ sealed class SearchFragmentAction : Action { */ data class SearchBookmarksEngineSelected(val engine: SearchEngine) : SearchFragmentAction() + /** + * Action when tabs search engine is selected. + */ + data class SearchTabsEngineSelected(val engine: SearchEngine) : SearchFragmentAction() + /** * Action when search engine picker is selected. */ @@ -271,6 +281,17 @@ private fun searchStateReducer(state: SearchFragmentState, action: SearchFragmen showSyncedTabsSuggestions = false, showSessionSuggestions = false, ) + is SearchFragmentAction.SearchTabsEngineSelected -> + state.copy( + searchEngineSource = SearchEngineSource.Tabs(action.engine), + showSearchSuggestions = false, + showSearchShortcuts = false, + showClipboardSuggestions = false, + showHistorySuggestions = false, + showBookmarkSuggestions = false, + showSyncedTabsSuggestions = true, + showSessionSuggestions = true, + ) is SearchFragmentAction.ShowSearchShortcutEnginePicker -> state.copy(showSearchShortcuts = action.show && state.areShortcutsAvailable) is SearchFragmentAction.UpdateQuery -> diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt index 8ccf722520..858352fbf1 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt @@ -285,6 +285,7 @@ class AwesomeBarView( ) is SearchEngineSource.History -> emptyList() is SearchEngineSource.Bookmarks -> emptyList() + is SearchEngineSource.Tabs -> emptyList() is SearchEngineSource.None -> emptyList() } } diff --git a/app/src/main/res/drawable/ic_tabs_search.xml b/app/src/main/res/drawable/ic_tabs_search.xml new file mode 100644 index 0000000000..4d4f0a05a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_tabs_search.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt index dd2c86374a..e73dd0c45e 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt @@ -407,6 +407,31 @@ class SearchDialogControllerTest { assertEquals("application", eventExtra["engine"]) } + @Test + fun `WHEN tabs search engine is selected THEN dispatch correct action`() { + val searchEngine: SearchEngine = mockk(relaxed = true) + every { searchEngine.type } returns SearchEngine.Type.APPLICATION + every { searchEngine.id } returns Core.TABS_SEARCH_ENGINE_ID + + var focusToolbarInvoked = false + createController( + focusToolbar = { + focusToolbarInvoked = true + } + ).handleSearchShortcutEngineSelected(searchEngine) + + assertTrue(focusToolbarInvoked) + verify { store.dispatch(SearchFragmentAction.SearchTabsEngineSelected(searchEngine)) } + + assertTrue(SearchShortcuts.selected.testHasValue()) + val recordedEvents = SearchShortcuts.selected.testGetValue() + assertEquals(1, recordedEvents.size) + val eventExtra = recordedEvents.single().extra + assertNotNull(eventExtra) + assertTrue(eventExtra!!.containsKey("engine")) + assertEquals("application", eventExtra["engine"]) + } + @Test fun handleClickSearchEngineSettings() { val directions: NavDirections = actionGlobalSearchEngineFragment() diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt index 08245b8b26..809feaf348 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt @@ -185,6 +185,16 @@ class SearchFragmentStoreTest { assertEquals(SearchEngineSource.Bookmarks(searchEngine), store.state.searchEngineSource) } + @Test + fun `WHEN tabs engine selected action dispatched THEN update search engine source`() = runTest { + val initialState = emptyDefaultState() + val store = SearchFragmentStore(initialState) + + store.dispatch(SearchFragmentAction.SearchTabsEngineSelected(searchEngine)).join() + assertNotSame(initialState, store.state) + assertEquals(SearchEngineSource.Tabs(searchEngine), store.state.searchEngineSource) + } + @Test fun showSearchShortcutEnginePicker() = runTest { val initialState = emptyDefaultState()