From 2e9d69b055410883299cbf970501b66c824d3d21 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Fri, 27 Sep 2019 12:53:53 +0200
Subject: [PATCH] Increase click target size for buttons inside Library views
 (#1873)

* Increase click target size for buttons inside Library views

* Rebase fixes
---
 .../vrbrowser/ui/views/LibraryItemContextMenu.java  |  6 +++---
 app/src/main/res/layout/bookmark_item.xml           | 13 ++++++-------
 app/src/main/res/layout/history_item.xml            | 13 ++++++-------
 .../main/res/layout/library_item_context_menu.xml   |  4 ++--
 app/src/main/res/values/dimen.xml                   |  7 ++++---
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/LibraryItemContextMenu.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/LibraryItemContextMenu.java
index 4cd5fd593..eed9b09b2 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/LibraryItemContextMenu.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/LibraryItemContextMenu.java
@@ -104,14 +104,14 @@ public int getMenuHeight() {
             case BOOKMARKS:
                 mBinding.bookmarkLayout.setVisibility(GONE);
                 mBinding.newWindowLayout.setBackgroundResource(R.drawable.library_context_menu_item_background_single);
-                return WidgetPlacement.dpDimension(getContext(), R.dimen.library_item_row_height);
+                return WidgetPlacement.dpDimension(getContext(), R.dimen.library_context_menu_height);
             case HISTORY:
                 mBinding.bookmarkLayout.setVisibility(VISIBLE);
                 mBinding.newWindowLayout.setBackgroundResource(R.drawable.library_context_menu_item_background_top);
-                return WidgetPlacement.dpDimension(getContext(), R.dimen.library_item_row_height) * 2;
+                return WidgetPlacement.dpDimension(getContext(), R.dimen.library_context_menu_height) * 2;
         }
 
-        return WidgetPlacement.dpDimension(getContext(), R.dimen.library_item_row_height) * 2;
+        return WidgetPlacement.dpDimension(getContext(), R.dimen.library_context_menu_height) * 2;
     }
 
 }
diff --git a/app/src/main/res/layout/bookmark_item.xml b/app/src/main/res/layout/bookmark_item.xml
index 7138e9451..0011f4334 100644
--- a/app/src/main/res/layout/bookmark_item.xml
+++ b/app/src/main/res/layout/bookmark_item.xml
@@ -95,13 +95,12 @@
 
                     <ImageView
                         android:id="@+id/trash"
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
+                        android:layout_width="@dimen/library_item_row_height"
+                        android:layout_height="@dimen/library_item_row_height"
                         android:layout_gravity="center_vertical|end"
-                        android:layout_marginEnd="10dp"
                         android:focusable="false"
                         android:focusableInTouchMode="false"
-                        android:padding="@dimen/settings_icon_padding_max"
+                        android:padding="@dimen/library_icon_padding_max"
                         android:soundEffectsEnabled="false"
                         android:src="@drawable/ic_icon_trash"
                         android:tint="@color/library_panel_icon_color"
@@ -110,12 +109,12 @@
 
                     <ImageView
                         android:id="@+id/more"
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
+                        android:layout_width="@dimen/library_item_row_height"
+                        android:layout_height="@dimen/library_item_row_height"
                         android:layout_gravity="center_vertical|end"
                         android:focusable="false"
                         android:focusableInTouchMode="false"
-                        android:padding="@dimen/settings_icon_padding_max"
+                        android:padding="@dimen/library_icon_padding_max"
                         android:soundEffectsEnabled="false"
                         android:src="@drawable/ic_icon_more_options"
                         android:tint="@color/library_panel_icon_color"
diff --git a/app/src/main/res/layout/history_item.xml b/app/src/main/res/layout/history_item.xml
index a2bd4bf51..ad0c9edcb 100644
--- a/app/src/main/res/layout/history_item.xml
+++ b/app/src/main/res/layout/history_item.xml
@@ -108,13 +108,12 @@
 
                     <ImageView
                         android:id="@+id/trash"
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
+                        android:layout_width="@dimen/library_item_row_height"
+                        android:layout_height="@dimen/library_item_row_height"
                         android:layout_gravity="center_vertical|end"
-                        android:layout_marginEnd="10dp"
                         android:focusable="false"
                         android:focusableInTouchMode="false"
-                        android:padding="@dimen/settings_icon_padding_max"
+                        android:padding="@dimen/library_icon_padding_max"
                         android:soundEffectsEnabled="false"
                         android:src="@drawable/ic_icon_trash"
                         android:tint="@color/library_panel_icon_color"
@@ -123,12 +122,12 @@
 
                     <ImageView
                         android:id="@+id/more"
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
+                        android:layout_width="@dimen/library_item_row_height"
+                        android:layout_height="@dimen/library_item_row_height"
                         android:layout_gravity="center_vertical|end"
                         android:focusable="false"
                         android:focusableInTouchMode="false"
-                        android:padding="@dimen/settings_icon_padding_max"
+                        android:padding="@dimen/library_icon_padding_max"
                         android:soundEffectsEnabled="false"
                         android:src="@drawable/ic_icon_more_options"
                         android:tint="@color/library_panel_icon_color"
diff --git a/app/src/main/res/layout/library_item_context_menu.xml b/app/src/main/res/layout/library_item_context_menu.xml
index f61f2eb83..01fd971fc 100644
--- a/app/src/main/res/layout/library_item_context_menu.xml
+++ b/app/src/main/res/layout/library_item_context_menu.xml
@@ -26,7 +26,7 @@
         <FrameLayout
             android:id="@+id/new_window_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/library_item_row_height"
+            android:layout_height="@dimen/library_context_menu_height"
             android:padding="15dp"
             android:background="@drawable/library_context_menu_item_background_top"
             android:clickable="true"
@@ -58,7 +58,7 @@
         <FrameLayout
             android:id="@+id/bookmark_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/library_item_row_height"
+            android:layout_height="@dimen/library_context_menu_height"
             android:padding="15dp"
             android:background="@drawable/library_context_menu_item_background_bottom"
             android:clickable="true"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 6e9475779..d0d4441e5 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -198,13 +198,13 @@
     <dimen name="settings_icon_padding_min">0dp</dimen>
 
     <!-- Library -->
-    <dimen name="library_item_row_height">55dp</dimen>
+    <dimen name="library_item_row_height">38dp</dimen>
     <dimen name="library_section_text_size">18sp</dimen>
     <dimen name="library_item_title_text_size">20sp</dimen>
     <dimen name="library_item_url_text_size">16sp</dimen>
     <dimen name="library_item_date_text_size">16sp</dimen>
-    <dimen name="library_icon_padding_max">2dp</dimen>
-    <dimen name="library_icon_padding_min">0dp</dimen>
+    <dimen name="library_icon_padding_max">10dp</dimen>
+    <dimen name="library_icon_padding_min">8dp</dimen>
     <dimen name="library_notification_font_size">13sp</dimen>
 
     <!-- Language -->
@@ -219,6 +219,7 @@
 
     <!-- Library Menu -->
     <dimen name="library_context_menu_width">320dp</dimen>
+    <dimen name="library_context_menu_height">55dp</dimen>
     <dimen name="library_context_menu_top_margin">4dp</dimen>
     <item name="library_context_menu_z_distance" format="float" type="dimen">0.12</item>