Merge branch '01-12-feature/david/ads/system_search' of github.com:du…

…ckduckgo/Android into 01-12-feature/david/ads/system_search
duckduckgo · Jan 12, 2023 · c745005 · c745005
2 parents 80605f3 + b2423b2
commit c745005
Show file tree

Hide file tree

Showing 41 changed files with 134 additions and 171 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())
         }
     }
@@ -162,29 +164,27 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     private fun configureObservers() {
         viewModel.onboardingViewState.observe(
             this,
-            {
-                it?.let { renderOnboardingViewState(it) }
-            },
-        )
+        ) {
+            it?.let { renderOnboardingViewState(it) }
+        }
         viewModel.resultsViewState.observe(
             this,
-            {
-                when (it) {
-                    is SystemSearchViewModel.Suggestions.SystemSearchResultsViewState -> {
-                        renderResultsViewState(it)
-                    }
-                    is SystemSearchViewModel.Suggestions.QuickAccessItems -> {
-                        renderQuickAccessItems(it)
-                    }
+        ) {
+            when (it) {
+                is SystemSearchViewModel.Suggestions.SystemSearchResultsViewState -> {
+                    renderResultsViewState(it)
                 }
-            },
-        )
+
+                is SystemSearchViewModel.Suggestions.QuickAccessItems -> {
+                    renderQuickAccessItems(it)
+                }
+            }
+        }
         viewModel.command.observe(
             this,
-            {
-                processCommand(it)
-            },
-        )
+        ) {
+            processCommand(it)
+        }
     }
 
     private fun configureOnboarding() {

diff --git a/app/src/main/res/drawable/ic_find_search_20_dark.xml b/app/src/main/res/drawable/ic_find_search_20_dark.xml
diff --git a/app/src/main/res/drawable/search_widget_background_black.xml b/app/src/main/res/drawable/search_widget_background_black.xml
diff --git a/app/src/main/res/drawable/search_widget_background_dark.xml b/app/src/main/res/drawable/search_widget_background_dark.xml
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,17 @@
                         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>
+                        app:layout_constraintTop_toTopOf="parent"/>
 
                     <ImageView
                         android:id="@+id/voiceSearchButton"
@@ -103,6 +97,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/activity_user_survey.xml b/app/src/main/res/layout/activity_user_survey.xml
@@ -18,40 +18,48 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context="com.duckduckgo.app.feedback.ui.common.FeedbackActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/surveyActivityContainerViewGroup"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/survey_background">
 
-        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+        <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
-            android:layout_height="56dp"
-            android:gravity="center"
-            android:paddingStart="@dimen/keyline_4"
-            android:paddingEnd="@dimen/keyline_4"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_horizontal"
+            android:letterSpacing="0.18"
+            android:paddingStart="30dp"
+            android:paddingEnd="30dp"
+            android:paddingTop="22dp"
+            android:paddingBottom="22dp"
             android:text="@string/surveyTitle"
-            android:textColor="?daxColorWhite"
+            android:textAllCaps="true"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:textStyle="normal"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:typography="h2" />
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <com.duckduckgo.mobile.android.ui.view.button.IconButton
             android:id="@+id/dismissButton"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="@dimen/keyline_4"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            app:srcCompat="@drawable/ic_close_24"
+            app:backgroundTint="@color/carolinaBlue"
             app:contentDescription="@string/surveyDismissContentDescription"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/title"
-            app:srcCompat="@drawable/ic_close_24"
-            app:tint="?attr/daxColorWhite" />
+            app:layout_constraintTop_toTopOf="@id/title" />
 
         <WebView
             android:id="@+id/webView"
@@ -64,12 +72,12 @@
 
         <ProgressBar
             android:id="@+id/progress"
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminateTint="?daxColorWhite"
+            android:indeterminateTint="@color/white"
             android:indeterminateTintMode="src_in"
-            android:secondaryProgressTint="?daxColorWhite"
-            android:visibility="gone"
+            android:secondaryProgressTint="@color/white"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -78,36 +86,42 @@
 
         <LinearLayout
             android:id="@+id/errorView"
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingStart="30dp"
             android:paddingTop="16dp"
             android:paddingEnd="30dp"
             android:paddingBottom="16dp"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title"
             app:layout_constraintVertical_bias="0.34">
 
-            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
+                android:fontFamily="sans-serif-medium"
+                android:lineSpacingExtra="-4sp"
                 android:text="@string/surveyLoadingErrorTitle"
                 android:textAlignment="center"
-                android:textColor="?daxColorWhite"
-                app:typography="h1" />
+                android:textColor="@color/white"
+                android:textSize="28sp"
+                android:textStyle="normal" />
 
-            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:lineSpacingExtra="8sp"
                 android:text="@string/surveyLoadingErrorText"
                 android:textAlignment="center"
-                android:textColor="?daxColorWhite"
-                app:typography="body1" />
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:textStyle="normal" />
 
         </LinearLayout>
 

diff --git a/app/src/main/res/layout/dialog_edit_whitelist.xml b/app/src/main/res/layout/dialog_edit_whitelist.xml
@@ -14,11 +14,18 @@
   ~ limitations under the License.
   -->
 
+<<<<<<<< HEAD:app/src/main/res/drawable/search_widget_background_black.xml
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/gray90" />
+    <corners android:radius="@dimen/smallShapeCornerRadius" />
+</shape>
+========
 <com.duckduckgo.mobile.android.ui.view.text.DaxTextInput
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/customDialogTextInput"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/keyline_4"
     android:hint="@string/whitelistDomainHint"
-    android:inputType="textUri" />
+    android:inputType="textUri" />
+>>>>>>>> b2423b2b1700a02c181894f3851cbfee41776afd:app/src/main/res/layout/dialog_edit_whitelist.xml
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -124,6 +124,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
+            app:typography="body2"
             android:drawableStart="@drawable/ic_success"
             android:drawablePadding="12dp"
             android:text="@string/systemSearchOnboardingFeatureThreeText"/>

diff --git a/app/src/main/res/layout/search_favorites_widget_search_bar_dark.xml b/app/src/main/res/layout/search_favorites_widget_search_bar_dark.xml
@@ -15,9 +15,10 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/widgetSearchBarContainer"
     style="@style/SearchWithFavoritesWidgetSearchBarContainer"
-    android:background="@drawable/search_widget_background_dark">
+    android:background="@drawable/search_widget_background">
 
     <ImageView
         android:id="@+id/logo"
@@ -30,17 +31,17 @@
         android:layout_toStartOf="@+id/search"
         android:layout_toEndOf="@+id/logo"
         android:text="@string/searchWidgetTextHint"
-        android:textColor="@color/white60" />
+        android:textColor="@color/white" />
 
     <ImageView
         android:id="@+id/voiceSearch"
         style="@style/SearchWidgetSearchIcon"
         android:src="@drawable/ic_microphone_dark"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <ImageView
         android:id="@+id/search"
         style="@style/SearchWidgetSearchIcon"
-        android:src="@drawable/ic_find_search_20_dark"
-        android:visibility="gone" />
+        android:src="@drawable/ic_find_search_24"
+        app:tint="@color/white84" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/search_favorites_widget_search_bar_daynight.xml b/app/src/main/res/layout/search_favorites_widget_search_bar_daynight.xml
@@ -14,10 +14,10 @@
   ~ limitations under the License.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widgetSearchBarContainer"
+<RelativeLayout android:id="@+id/widgetSearchBarContainer"
     style="@style/SearchWithFavoritesWidgetSearchBarContainer"
-    android:background="@drawable/search_widget_background_daynight">
+    android:background="@drawable/search_widget_background_daynight"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ImageView
         android:id="@+id/logo"
@@ -36,10 +36,10 @@
         android:id="@+id/voiceSearch"
         style="@style/SearchWidgetSearchIcon"
         android:src="@drawable/ic_microphone_widget_daynight"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <ImageView
         android:id="@+id/search"
         style="@style/SearchWidgetSearchIcon"
-        android:src="@drawable/ic_find_search_20_daynight" />
+        android:src="@drawable/ic_find_search_24" />
 </RelativeLayout>