From cd088cd4fae4ad9d67ba253314f58f531f4d3fb4 Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Thu, 18 Apr 2019 23:44:15 -0500
Subject: [PATCH] [fenix] For 
 https://github.com/mozilla-mobile/fenix/issues/1555: Bookmark Overflow menu
 tap area should be larger

---
 app/src/main/java/org/mozilla/fenix/ext/View.kt   | 15 +++++++++------
 .../fenix/library/bookmarks/BookmarkAdapter.kt    |  2 +-
 app/src/main/res/layout/bookmark_row.xml          |  2 ++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/View.kt b/app/src/main/java/org/mozilla/fenix/ext/View.kt
index 2611647bc9..f944e8e8bf 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/View.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/View.kt
@@ -7,15 +7,18 @@ package org.mozilla.fenix.ext
 import android.graphics.Rect
 import android.view.TouchDelegate
 import android.view.View
+import mozilla.components.support.ktx.android.content.res.pxToDp
 
 fun View?.increaseTapArea(extraDps: Int) {
-    this!!.post {
+    val dips = this!!.resources.pxToDp(extraDps)
+    val parent = this.parent as View
+    parent.post {
         val touchRect = Rect()
         getHitRect(touchRect)
-        touchRect.top -= extraDps
-        touchRect.left -= extraDps
-        touchRect.right += extraDps
-        touchRect.bottom += extraDps
-        (parent as View).touchDelegate = TouchDelegate(touchRect, this)
+        touchRect.top -= dips
+        touchRect.left -= dips
+        touchRect.right += dips
+        touchRect.bottom += dips
+        parent.touchDelegate = TouchDelegate(touchRect, this)
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
index 0d136863ac..96435259ef 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
@@ -371,7 +371,7 @@ class BookmarkAdapter(val emptyView: View, val actionEmitter: Observer<BookmarkA
     }
 
     companion object {
-        private const val bookmarkOverflowExtraDips = 8
+        private const val bookmarkOverflowExtraDips = 16
     }
 
     enum class ViewType {
diff --git a/app/src/main/res/layout/bookmark_row.xml b/app/src/main/res/layout/bookmark_row.xml
index 13ef17ef05..809fab12ea 100644
--- a/app/src/main/res/layout/bookmark_row.xml
+++ b/app/src/main/res/layout/bookmark_row.xml
@@ -36,6 +36,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:lines="1"
         android:textSize="16sp"
@@ -56,6 +57,7 @@
         android:src="@drawable/ic_menu"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/bookmark_title"
         app:layout_constraintTop_toTopOf="parent" />
     
     <View