Removed unneeded quick insert items.

duckduckgo · Oct 10, 2024 · 6ea7cc9 · 6ea7cc9
1 parent 06df3f4
commit 6ea7cc9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 62 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt b/app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt
@@ -101,9 +101,7 @@ class HistorySuggestionViewHolderFactory(private val omnibarPosition: OmnibarPos
         searchSuggestionViewHolder.bind(
             suggestion as AutoCompleteHistorySuggestion,
             immediateSearchClickListener,
-            editableSearchClickListener,
             longPressClickListener,
-            omnibarPosition,
         )
     }
 }
@@ -157,8 +155,6 @@ class BookmarkSuggestionViewHolderFactory(private val omnibarPosition: OmnibarPo
         bookmarkSuggestionViewHolder.bind(
             suggestion as AutoCompleteBookmarkSuggestion,
             immediateSearchClickListener,
-            editableSearchClickListener,
-            omnibarPosition,
         )
     }
 }
@@ -305,43 +301,29 @@ sealed class AutoCompleteViewHolder(itemView: View) : RecyclerView.ViewHolder(it
         fun bind(
             item: AutoCompleteBookmarkSuggestion,
             immediateSearchListener: (AutoCompleteSuggestion) -> Unit,
-            editableSearchClickListener: (AutoCompleteSuggestion) -> Unit,
-            omnibarPosition: OmnibarPosition,
         ) = with(binding) {
             title.text = item.title
             url.text = item.phrase
 
             bookmarkIndicator.setImageResource(if (item.isFavorite) R.drawable.ic_bookmark_favorite_20 else R.drawable.ic_bookmark_20)
-            goToBookmarkImage.setOnClickListener { editableSearchClickListener(item) }
             root.setOnClickListener { immediateSearchListener(item) }
-
-            if (omnibarPosition == OmnibarPosition.BOTTOM) {
-                goToBookmarkImage.setImageResource(R.drawable.ic_autocomplete_down_20dp)
-            }
         }
     }
 
     class HistorySuggestionViewHolder(val binding: ItemAutocompleteHistorySuggestionBinding) : AutoCompleteViewHolder(binding.root) {
         fun bind(
             item: AutoCompleteHistorySuggestion,
             immediateSearchListener: (AutoCompleteSuggestion) -> Unit,
-            editableSearchClickListener: (AutoCompleteSuggestion) -> Unit,
             longPressClickListener: (AutoCompleteSuggestion) -> Unit,
-            omnibarPosition: OmnibarPosition,
         ) = with(binding) {
             title.text = item.title
             url.text = item.phrase
 
-            goToSuggestionImage.setOnClickListener { editableSearchClickListener(item) }
             root.setOnClickListener { immediateSearchListener(item) }
             root.setOnLongClickListener {
                 longPressClickListener(item)
                 true
             }
-
-            if (omnibarPosition == OmnibarPosition.BOTTOM) {
-                goToSuggestionImage.setImageResource(R.drawable.ic_autocomplete_down_20dp)
-            }
         }
     }
 

diff --git a/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml b/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
@@ -47,7 +47,7 @@
         android:includeFontPadding="false"
         android:gravity="center_vertical|start"
         android:maxLines="1"
-        app:layout_constraintEnd_toStartOf="@id/goToBookmarkImage"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bookmarkIndicator"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="phrase or URL suggestion"/>
@@ -62,23 +62,10 @@
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:maxLines="1"
-        app:layout_constraintEnd_toStartOf="@id/goToBookmarkImage"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bookmarkIndicator"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title"
         tools:text="phrase or URL suggestion"/>
 
-    <ImageView
-        android:id="@+id/goToBookmarkImage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/editQueryBeforeSubmitting"
-        android:padding="3dp"
-        android:src="@drawable/ic_autocomplete_20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_autocomplete_history_suggestion.xml b/app/src/main/res/layout/item_autocomplete_history_suggestion.xml
@@ -48,7 +48,7 @@
         android:gravity="center_vertical|start"
         android:maxLines="1"
         android:textAlignment="textStart"
-        app:layout_constraintEnd_toStartOf="@id/goToSuggestionImage"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/historyIndicator"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="phrase or URL suggestion"/>
@@ -64,23 +64,10 @@
         android:gravity="center_vertical|start"
         android:maxLines="1"
         android:textAlignment="textStart"
-        app:layout_constraintEnd_toStartOf="@id/goToSuggestionImage"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/historyIndicator"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title"
         tools:text="phrase or URL suggestion"/>
 
-    <ImageView
-        android:id="@+id/goToSuggestionImage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/editQueryBeforeSubmitting"
-        android:padding="3dp"
-        android:src="@drawable/ic_autocomplete_20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_autocomplete_switch_to_tab_suggestion.xml b/app/src/main/res/layout/item_autocomplete_switch_to_tab_suggestion.xml
@@ -46,7 +46,7 @@
         android:gravity="center_vertical|start"
         android:includeFontPadding="false"
         android:maxLines="1"
-        app:layout_constraintEnd_toStartOf="@id/goToTabImage"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/switchToTabIndicator"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="phrase or URL suggestion" />
@@ -60,23 +60,11 @@
         android:gravity="center_vertical|start"
         android:maxLines="1"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/goToTabImage"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/switchToTabIndicator"
         app:layout_constraintTop_toBottomOf="@id/title"
         app:textType="secondary"
         app:typography="body2"
         tools:text="phrase or URL suggestion" />
 
-    <ImageView
-        android:id="@+id/goToTabImage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/editQueryBeforeSubmitting"
-        android:padding="3dp"
-        android:src="@drawable/ic_autocomplete_20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>