ADS: System Search (#2714)

Task/Issue URL: https://app.asana.com/0/0/1203455585574665/f ### Description This PR fixes the search interstitial screen ### UI changes | Before | After | | ------ | ----- | ![Screenshot_20230112_163749](https://user-images.githubusercontent.com/531613/212278920-8745b185-aa86-48c1-ab15-c45038c66483.png)|![Screenshot_20230112_163728](https://user-images.githubusercontent.com/531613/212278939-5b3fd40a-32d6-4e29-a87e-8ce81a0f40d4.png)|
duckduckgo · Jan 16, 2023 · 2f5c355 · 2f5c355
1 parent b12d750
commit 2f5c355
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -106,6 +106,8 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     private val textChangeWatcher = object : TextChangedWatcher() {
         override fun afterTextChanged(editable: Editable) {
             showOmnibar()
+            val searchQuery = omnibarTextInput.text.toString()
+            binding.clearTextButton.isVisible = searchQuery.isNotEmpty()
             viewModel.userUpdatedQuery(omnibarTextInput.text.toString())
         }
     }

diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
@@ -66,23 +66,21 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <androidx.appcompat.widget.AppCompatEditText
+                    <EditText
                         android:id="@+id/omnibarTextInput"
                         style="@style/Widget.DuckDuckGo.SearchInput"
                         android:layout_width="0dp"
                         android:layout_height="0dp"
                         android:layout_marginStart="4dp"
                         android:hint="@string/systemSearchOmnibarInputHint"
-                        android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
-                        android:inputType="textUri|textNoSuggestions"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/voiceSearchButton"
                         app:layout_constraintStart_toEndOf="@id/logo"
                         app:layout_constraintTop_toTopOf="parent">
 
                         <requestFocus />
 
-                    </androidx.appcompat.widget.AppCompatEditText>
+                    </EditText>
 
                     <ImageView
                         android:id="@+id/voiceSearchButton"
@@ -103,6 +101,7 @@
                         android:background="?selectableItemBackground"
                         android:contentDescription="@string/clearButtonContentDescription"
                         android:padding="@dimen/toolbarIconPadding"
+                        android:visibility="invisible"
                         android:src="@drawable/ic_close_24"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -64,6 +64,7 @@
     <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/onboardingText"
         android:layout_width="0dp"
+        app:typography="body2"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="6dp"
@@ -124,6 +125,7 @@
             android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
             android:drawableStart="@drawable/ic_success"
+            app:typography="body2"
             android:drawablePadding="12dp"
             android:text="@string/systemSearchOnboardingFeatureThreeText"/>
     </LinearLayout>

diff --git a/common-ui/src/main/res/drawable/cookies_dummy_background.xml b/common-ui/src/main/res/drawable/cookies_dummy_background.xml
@@ -10,7 +10,7 @@
   ~ 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
+  ~ See the License for the specific language governaing permissions and
   ~ limitations under the License.
   -->