ADS: System Search (#2634)

Task/Issue URL: https://app.asana.com/0/inbox/1157893581871899/1203455585574665/1203472619504664 ### Description System Search changes Co-authored-by: Noelia Alcala <nalcalag@gmail.com>
duckduckgo · Dec 19, 2022 · 5de1130 · 5de1130
1 parent 8e2790f
commit 5de1130
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 37 deletions.
diff --git a/app/src/main/res/drawable/ic_find_search_20.xml b/app/src/main/res/drawable/ic_find_search_20.xml
@@ -22,6 +22,5 @@
   <path
       android:pathData="M9,2C5.134,2 2,5.134 2,9C2,12.866 5.134,16 9,16C10.645,16 12.157,15.433 13.352,14.483L16.634,17.766C16.947,18.078 17.453,18.078 17.766,17.766C18.078,17.453 18.078,16.947 17.766,16.634L14.483,13.352C15.433,12.157 16,10.645 16,9C16,5.134 12.866,2 9,2ZM3.6,9C3.6,6.018 6.018,3.6 9,3.6C11.982,3.6 14.4,6.018 14.4,9C14.4,11.982 11.982,14.4 9,14.4C6.018,14.4 3.6,11.982 3.6,9Z"
       android:fillColor="?attr/daxColorPrimaryIcon"
-      android:fillAlpha="0.5"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_find_search_20_a05.xml b/app/src/main/res/drawable/ic_find_search_20_a05.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (c) 2022 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M9,2C5.134,2 2,5.134 2,9C2,12.866 5.134,16 9,16C10.645,16 12.157,15.433 13.352,14.483L16.634,17.766C16.947,18.078 17.453,18.078 17.766,17.766C18.078,17.453 18.078,16.947 17.766,16.634L14.483,13.352C15.433,12.157 16,10.645 16,9C16,5.134 12.866,2 9,2ZM3.6,9C3.6,6.018 6.018,3.6 9,3.6C11.982,3.6 14.4,6.018 14.4,9C14.4,11.982 11.982,14.4 9,14.4C6.018,14.4 3.6,11.982 3.6,9Z"
+      android:fillColor="?attr/daxColorPrimaryIcon"
+      android:fillAlpha="0.5"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
@@ -44,7 +44,6 @@
                 app:layout_constraintEnd_toStartOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/Widget.DuckDuckGo.PopUpOverflowMenu">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -69,27 +68,17 @@
 
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/omnibarTextInput"
-                        style="@style/Base.V7.Widget.AppCompat.EditText"
+                        style="@style/Widget.DuckDuckGo.SearchInput"
                         android:layout_width="0dp"
                         android:layout_height="0dp"
-                        android:layout_marginStart="8dp"
-                        android:background="@null"
-                        android:fontFamily="sans-serif"
+                        android:layout_marginStart="4dp"
                         android:hint="@string/systemSearchOmnibarInputHint"
                         android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
                         android:inputType="textUri|textNoSuggestions"
-                        android:maxLines="1"
-                        android:selectAllOnFocus="true"
-                        android:textColor="?attr/daxColorPrimaryText"
-                        android:textColorHint="?attr/daxColorSecondaryText"
-                        android:textCursorDrawable="@drawable/text_cursor"
-                        android:textSize="16sp"
-                        android:textStyle="normal"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/voiceSearchButton"
                         app:layout_constraintStart_toEndOf="@id/logo"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="https://duckduckgo.com/?q=areallylongexampleexample">
+                        app:layout_constraintTop_toTopOf="parent">
 
                         <requestFocus />
 

diff --git a/app/src/main/res/layout/include_find_in_page.xml b/app/src/main/res/layout/include_find_in_page.xml
@@ -33,8 +33,7 @@
         android:importantForAccessibility="no"
         android:gravity="center"
         android:layout_marginStart="20dp"
-        android:alpha="0.5"
-        android:src="@drawable/ic_find_search_20" />
+        android:src="@drawable/ic_find_search_20_a05" />
 
     <EditText
         android:id="@+id/findInPageInput"

diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -82,7 +82,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent">
@@ -91,30 +90,30 @@
                             android:id="@+id/daxIcon"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:importantForAccessibility="no"
                             android:gravity="center"
+                            android:importantForAccessibility="no"
                             android:padding="4dp"
                             android:src="@drawable/ic_ddg_logo"
-                            android:visibility="gone" />
+                            android:visibility="gone"/>
 
                         <ImageView
                             android:id="@+id/searchIcon"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:importantForAccessibility="no"
                             android:gravity="center"
+                            android:importantForAccessibility="no"
                             android:padding="6dp"
-                            android:src="@drawable/ic_find_search_20" />
+                            android:src="@drawable/ic_find_search_20_a05"/>
 
                         <FrameLayout
+                            android:id="@+id/scene_root"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="start|center_vertical"
-                            android:visibility="gone"
                             android:layout_marginStart="17dp"
                             android:layout_marginEnd="4dp"
-                            android:id="@+id/scene_root">
-                            <include layout="@layout/cookie_scene_1" />
+                            android:visibility="gone">
+                            <include layout="@layout/cookie_scene_1"/>
                         </FrameLayout>
 
                         <!-- Placeholder should have same size a sibling ImageViews. size = image_width + padding -->
@@ -126,7 +125,6 @@
                             android:visibility="invisible"/>
 
                     </FrameLayout>
-
                     <View
                         android:id="@+id/cookieDummyView"
                         android:layout_width="@dimen/omnibarCookieAnimationBannerHeight"
@@ -174,8 +172,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/voiceSearchButton"
                         app:layout_constraintStart_toEndOf="@id/omnibarIconContainer"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="https://duckduckgo.com/?q=areallylongexampleexample" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <com.duckduckgo.mobile.android.ui.view.button.IconButton
                         android:id="@+id/voiceSearchButton"

diff --git a/app/src/main/res/layout/include_omnibar_toolbar_mockup.xml b/app/src/main/res/layout/include_omnibar_toolbar_mockup.xml
@@ -47,20 +47,20 @@
                 android:id="@+id/searchIconMockup"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:importantForAccessibility="no"
                 android:gravity="center"
-                android:padding="4dp"
-                android:src="@drawable/ic_find_search_20" />
+                android:importantForAccessibility="no"
+                android:padding="6dp"
+                android:src="@drawable/ic_find_search_20_a05"/>
 
             <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/omnibarTextInputMockup"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="@string/omnibarInputHint"
-                android:maxLines="1"
                 android:gravity="start|center"
+                android:maxLines="1"
                 android:paddingStart="37dp"
                 android:paddingEnd="8dp"
+                android:text="@string/omnibarInputHint"
                 android:textColor="?attr/daxColorSecondaryText"/>
 
         </FrameLayout>
@@ -86,7 +86,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/browserPopupMenu"
                 android:padding="@dimen/toolbarIconPadding"
-                android:src="@drawable/ic_fire" />
+                android:src="@drawable/ic_fire"/>
         </FrameLayout>
 
         <com.duckduckgo.app.browser.TabSwitcherButton
@@ -95,11 +95,11 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/keyline_2"
             android:layout_marginEnd="@dimen/keyline_2"
-            android:background="?selectableItemBackgroundBorderless"
+            android:padding="@dimen/toolbarIconPadding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/browserMenuMockup"
             app:layout_constraintStart_toEndOf="@id/fireIconMenuMockup"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <FrameLayout
             android:id="@+id/browserMenuMockup"
@@ -119,7 +119,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/browserPopupMenu"
                 android:padding="@dimen/toolbarIconPadding"
-                android:src="@drawable/ic_menu_vertical_24" />
+                android:src="@drawable/ic_menu_vertical_24"/>
 
         </FrameLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>