Add translations for open tabs in search autosuggest (#5065)

Task/Issue URL: https://app.asana.com/0/1200581511062568/1208400325419530/f ### Description Translations. ### Steps to test this PR - [x] Install from this branch. - [x] Open a few tabs. E.g `www.gardenersworld.com` - [x] Search for something that will match an open tab. E.g `garden` - [x] Notice the "Switch to Tab · " text before the URL in the suggestion. ### UI changes (Added Switch to Tab string) | Before | After | | ------ | ----- | |![switch_to_tab_before](https://github.com/user-attachments/assets/c2f2187d-7efe-4b2d-bc2f-31907c248726)|![switch_to_tab_after](https://github.com/user-attachments/assets/d0553336-b395-4576-a90d-58258d6f152b)| --------- Co-authored-by: Dax The Translator <[email protected]>
duckduckgo · Oct 22, 2024 · d2c56c7 · d2c56c7
1 parent 82707b3
commit d2c56c7
Show file tree

Hide file tree

Showing 60 changed files with 1,150 additions and 775 deletions.
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -45,6 +45,7 @@ import com.duckduckgo.adclick.api.AdClickManager
 import com.duckduckgo.app.ValueCaptorObserver
 import com.duckduckgo.app.accessibility.data.AccessibilitySettingsDataStore
 import com.duckduckgo.app.accessibility.data.AccessibilitySettingsSharedPreferences
+import com.duckduckgo.app.autocomplete.AutocompleteTabsFeature
 import com.duckduckgo.app.autocomplete.api.AutoComplete
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteDefaultSuggestion
@@ -236,9 +237,6 @@ import com.duckduckgo.sync.api.favicons.FaviconsFetchingPrompt
 import com.duckduckgo.voice.api.VoiceSearchAvailability
 import com.duckduckgo.voice.api.VoiceSearchAvailabilityPixelLogger
 import dagger.Lazy
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.observers.TestObserver
 import java.io.File
 import java.math.BigInteger
 import java.security.cert.X509Certificate
@@ -249,6 +247,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -487,6 +486,7 @@ class BrowserTabViewModelTest {
     private val mockUserBrowserProperties: UserBrowserProperties = mock()
     private val mockAutoCompleteRepository: AutoCompleteRepository = mock()
     private val changeOmnibarPositionFeature: ChangeOmnibarPositionFeature = mock()
+    private val mockAutocompleteTabsFeature: AutocompleteTabsFeature = mock()
 
     @Before
     fun before() = runTest {
@@ -506,6 +506,7 @@ class BrowserTabViewModelTest {
             mockTabRepository,
             mockUserStageStore,
             coroutineRule.testDispatcherProvider,
+            mockAutocompleteTabsFeature,
         )
         val fireproofWebsiteRepositoryImpl = FireproofWebsiteRepositoryImpl(
             fireproofWebsiteDao,
@@ -532,6 +533,8 @@ class BrowserTabViewModelTest {
         whenever(mockDuckPlayer.isDuckPlayerUri(anyString())).thenReturn(false)
         whenever(mockDuckPlayer.getDuckPlayerState()).thenReturn(ENABLED)
         whenever(changeOmnibarPositionFeature.refactor()).thenReturn(mockEnabledToggle)
+        whenever(mockAutocompleteTabsFeature.self()).thenReturn(mockEnabledToggle)
+        whenever(mockAutocompleteTabsFeature.self().isEnabled()).thenReturn(true)
 
         remoteMessagingModel = givenRemoteMessagingModel(mockRemoteMessagingRepository, mockPixel, coroutineRule.testDispatcherProvider)
 
@@ -1387,8 +1390,8 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenTriggeringAutocompleteThenAutoCompleteSuggestionsShown() {
-        whenever(mockAutoCompleteService.autoComplete("foo")).thenReturn(Observable.just(emptyList()))
+    fun whenTriggeringAutocompleteThenAutoCompleteSuggestionsShown() = runTest {
+        whenever(mockAutoCompleteService.autoComplete("foo")).thenReturn(emptyList())
         doReturn(true).whenever(mockSettingsStore).autoCompleteSuggestionsEnabled
         testee.triggerAutocomplete("foo", true, hasQueryChanged = true)
         assertTrue(autoCompleteViewState().showSuggestions)
@@ -1447,18 +1450,18 @@ class BrowserTabViewModelTest {
     @Test
     fun wheneverAutoCompleteIsGoneAndHistoryIAMHasBeenShownThenNotifyUserSeenIAM() {
         runTest {
-            whenever(mockAutoCompleteService.autoComplete("title")).thenReturn(Observable.just(emptyList()))
-            whenever(mockSavedSitesRepository.getBookmarksObservable()).thenReturn(
-                Single.just(listOf(Bookmark("abc", "title", "https://example.com", lastModified = null))),
+            whenever(mockAutoCompleteService.autoComplete("title")).thenReturn(emptyList())
+            whenever(mockSavedSitesRepository.getBookmarks()).thenReturn(
+                flowOf(listOf(Bookmark("abc", "title", "https://example.com", lastModified = null))),
             )
-            whenever(mockSavedSitesRepository.getFavoritesObservable()).thenReturn(
-                Single.just(listOf(Favorite("abc", "title", "https://example.com", position = 1, lastModified = null))),
+            whenever(mockSavedSitesRepository.getFavorites()).thenReturn(
+                flowOf(listOf(Favorite("abc", "title", "https://example.com", position = 1, lastModified = null))),
             )
-            whenever(mockNavigationHistory.getHistorySingle()).thenReturn(
-                Single.just(listOf(VisitedPage("https://foo.com".toUri(), "title", listOf(LocalDateTime.now())))),
+            whenever(mockNavigationHistory.getHistory()).thenReturn(
+                flowOf(listOf(VisitedPage("https://foo.com".toUri(), "title", listOf(LocalDateTime.now())))),
             )
-            whenever(mockTabRepository.getTabsObservable()).thenReturn(
-                Single.just(listOf(TabEntity(tabId = "1", position = 1, url = "https://example.com", title = "title"))),
+            whenever(mockTabRepository.flowTabs).thenReturn(
+                flowOf(listOf(TabEntity(tabId = "1", position = 1, url = "https://example.com", title = "title"))),
             )
             doReturn(true).whenever(mockSettingsStore).autoCompleteSuggestionsEnabled
 
@@ -1467,7 +1470,9 @@ class BrowserTabViewModelTest {
             whenever(mockAutoCompleteScorer.score("title", "https://foo.com".toUri(), 1, "title")).thenReturn(1)
             whenever(mockUserStageStore.getUserAppStage()).thenReturn(ESTABLISHED)
 
-            testee.autoCompletePublishSubject.accept("title")
+            testee.onAutoCompleteSuggestionsChanged()
+            testee.autoCompleteStateFlow.value = "title"
+            delay(500)
             testee.autoCompleteSuggestionsGone()
             verify(mockAutoCompleteRepository).submitUserSeenHistoryIAM()
             verify(mockPixel).fire(AUTOCOMPLETE_BANNER_SHOWN)
@@ -1477,16 +1482,16 @@ class BrowserTabViewModelTest {
     @Test
     fun wheneverAutoCompleteIsGoneAndHistoryIAMHasNotBeenShownThenDoNotNotifyUserSeenIAM() {
         runTest {
-            whenever(mockAutoCompleteService.autoComplete("query")).thenReturn(Observable.just(emptyList()))
-            whenever(mockSavedSitesRepository.getBookmarksObservable()).thenReturn(
-                Single.just(listOf(Bookmark("abc", "title", "https://example.com", lastModified = null))),
+            whenever(mockAutoCompleteService.autoComplete("query")).thenReturn(emptyList())
+            whenever(mockSavedSitesRepository.getBookmarks()).thenReturn(
+                flowOf(listOf(Bookmark("abc", "title", "https://example.com", lastModified = null))),
             )
-            whenever(mockSavedSitesRepository.getFavoritesObservable()).thenReturn(
-                Single.just(listOf(Favorite("abc", "title", "https://example.com", position = 1, lastModified = null))),
+            whenever(mockSavedSitesRepository.getFavorites()).thenReturn(
+                flowOf(listOf(Favorite("abc", "title", "https://example.com", position = 1, lastModified = null))),
             )
-            whenever(mockNavigationHistory.getHistorySingle()).thenReturn(Single.just(listOf()))
+            whenever(mockNavigationHistory.getHistory()).thenReturn(flowOf(emptyList()))
             doReturn(true).whenever(mockSettingsStore).autoCompleteSuggestionsEnabled
-            testee.autoCompletePublishSubject.accept("query")
+            testee.autoCompleteStateFlow.value = "query"
             testee.autoCompleteSuggestionsGone()
             verify(mockAutoCompleteRepository, never()).submitUserSeenHistoryIAM()
             verify(mockPixel, never()).fire(AUTOCOMPLETE_BANNER_SHOWN)
@@ -5865,15 +5870,11 @@ class BrowserTabViewModelTest {
         val suggestion = AutoCompleteHistorySuggestion(phrase = "phrase", title = "title", url = "url", isAllowedInTopHits = false)
         val omnibarText = "foo"
 
-        val testObserver = TestObserver.create<String>()
-        testee.autoCompletePublishSubject.subscribe(testObserver)
-
         testee.onRemoveSearchSuggestionConfirmed(suggestion, omnibarText)
 
         verify(mockPixel).fire(AppPixelName.AUTOCOMPLETE_RESULT_DELETED)
         verify(mockPixel).fire(AppPixelName.AUTOCOMPLETE_RESULT_DELETED_DAILY, type = Daily())
         verify(mockNavigationHistory).removeHistoryEntryByUrl(suggestion.url)
-        testObserver.assertValue(omnibarText)
         assertCommandIssued<Command.AutocompleteItemRemoved>()
     }
 
@@ -5882,15 +5883,11 @@ class BrowserTabViewModelTest {
         val suggestion = AutoCompleteHistorySearchSuggestion(phrase = "phrase", isAllowedInTopHits = false)
         val omnibarText = "foo"
 
-        val testObserver = TestObserver.create<String>()
-        testee.autoCompletePublishSubject.subscribe(testObserver)
-
         testee.onRemoveSearchSuggestionConfirmed(suggestion, omnibarText)
 
         verify(mockPixel).fire(AppPixelName.AUTOCOMPLETE_RESULT_DELETED)
         verify(mockPixel).fire(AppPixelName.AUTOCOMPLETE_RESULT_DELETED_DAILY, type = Daily())
         verify(mockNavigationHistory).removeHistoryEntryByQuery(suggestion.phrase)
-        testObserver.assertValue(omnibarText)
         assertCommandIssued<Command.AutocompleteItemRemoved>()
     }
 

diff --git a/app/src/main/java/com/duckduckgo/app/autocomplete/AutocompleteTabsFeature.kt b/app/src/main/java/com/duckduckgo/app/autocomplete/AutocompleteTabsFeature.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.autocomplete
+
+import com.duckduckgo.anvil.annotations.ContributesRemoteFeature
+import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.feature.toggles.api.Toggle
+
+@ContributesRemoteFeature(
+    scope = AppScope::class,
+    featureName = "autocompleteTabs",
+)
+interface AutocompleteTabsFeature {
+    @Toggle.DefaultValue(false)
+    fun self(): Toggle
+}