Fixed the bookmarks item delete button state (#2470)

* Fixed the bookmarks item delete button state * Un-hover when touch action is cancelled
MozillaReality · Dec 24, 2019 · e3645a4 · e3645a4
1 parent 777a0ae
commit e3645a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java
@@ -215,6 +215,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                         return true;
 
                     case MotionEvent.ACTION_CANCEL:
+                        binding.setIsHovered(false);
                         binding.more.setImageState(new int[]{android.R.attr.state_active},true);
                         return false;
                 }
@@ -237,6 +238,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                         return true;
 
                     case MotionEvent.ACTION_CANCEL:
+                        binding.setIsHovered(false);
                         binding.trash.setImageState(new int[]{android.R.attr.state_active},true);
                         return false;
                 }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java
@@ -186,17 +186,18 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                         return true;
 
                     case MotionEvent.ACTION_CANCEL:
+                        binding.setIsHovered(false);
                         binding.more.setImageState(new int[]{android.R.attr.state_active},true);
                         return false;
                 }
                 return false;
             });
             binding.trash.setOnHoverListener(mIconHoverListener);
             binding.trash.setOnTouchListener((view, motionEvent) -> {
+                binding.setIsHovered(true);
                 int ev = motionEvent.getActionMasked();
                 switch (ev) {
                     case MotionEvent.ACTION_UP:
-                        binding.setIsHovered(true);
                         if (mHistoryItemCallback != null) {
                             mHistoryItemCallback.onDelete(view, binding.getItem());
                         }
@@ -208,6 +209,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                         return true;
 
                     case MotionEvent.ACTION_CANCEL:
+                        binding.setIsHovered(false);
                         binding.trash.setImageState(new int[]{android.R.attr.state_active},true);
                         return false;
                 }

diff --git a/app/src/main/res/layout/bookmark_item.xml b/app/src/main/res/layout/bookmark_item.xml
@@ -51,6 +51,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:gravity="center_vertical"
+                android:layout_toStartOf="@id/buttons_container"
                 android:orientation="@{isNarrow ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL}">
 
                 <TextView