When user tries to edit query by using the edit icon, modify the quer… (#890)

Author: marcosholgado

app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt

@@ -85,7 +85,7 @@ class SystemSearchViewModelTest {
 
         val viewState = testee.onboardingViewState.value
         assertFalse(viewState!!.visible)
-        assertFalse(viewState!!.expanded)
+        assertFalse(viewState.expanded)
     }
 
     @Test
@@ -95,7 +95,7 @@ class SystemSearchViewModelTest {
 
         val viewState = testee.onboardingViewState.value
         assertTrue(viewState!!.visible)
-        assertFalse(viewState!!.expanded)
+        assertFalse(viewState.expanded)
     }
 
     @Test
@@ -263,6 +263,14 @@ class SystemSearchViewModelTest {
         assertEquals(Command.ShowAppNotFoundMessage(deviceApp.shortName), commandCaptor.lastValue)
     }
 
+    @Test
+    fun whenUserSelectedToUpdateQueryThenEditQueryCommandSent() {
+        val query = "test"
+        testee.onUserSelectedToEditQuery(query)
+        verify(commandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
+        assertEquals(Command.EditQuery(query), commandCaptor.lastValue)
+    }
+
     private suspend fun whenOnboardingShowing() {
         whenever(mockUserStageStore.getUserAppStage()).thenReturn(AppStage.NEW)
         testee.resetViewState()

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt

@@ -129,7 +129,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
                 viewModel.userSubmittedAutocompleteResult(it.phrase)
             },
             editableSearchClickListener = {
-                viewModel.userUpdatedQuery(it.phrase)
+                viewModel.onUserSelectedToEditQuery(it.phrase)
             }
         )
         autocompleteSuggestions.adapter = autocompleteSuggestionsAdapter
@@ -222,9 +222,17 @@ class SystemSearchActivity : DuckDuckGoActivity() {
             is DismissKeyboard -> {
                 omnibarTextInput.hideKeyboard()
             }
+            is EditQuery -> {
+                editQuery(command.query)
+            }
         }
     }
 
+    private fun editQuery(query: String) {
+        omnibarTextInput.setText(query)
+        omnibarTextInput.setSelection(query.length)
+    }
+
     private fun launchDuckDuckGo() {
         startActivity(BrowserActivity.intent(this))
         finish()

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt

@@ -67,6 +67,7 @@ class SystemSearchViewModel(
         data class LaunchDeviceApplication(val deviceApp: DeviceApp) : Command()
         data class ShowAppNotFoundMessage(val appName: String) : Command()
         object DismissKeyboard : Command()
+        data class EditQuery(val query: String) : Command()
     }
 
     val onboardingViewState: MutableLiveData<OnboardingViewState> = MutableLiveData()
@@ -149,6 +150,10 @@ class SystemSearchViewModel(
         }
     }
 
+    fun onUserSelectedToEditQuery(query: String) {
+        command.value = Command.EditQuery(query)
+    }
+
     fun userUpdatedQuery(query: String) {
         appsJob?.cancel()
 

app/src/main/res/layout/item_autocomplete_search_suggestion.xml

@@ -59,6 +59,7 @@
         android:padding="6dp"
         android:paddingStart="16dp"
         android:paddingEnd="14dp"
+        android:background="?selectableItemBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">