Close Library panels when clicking on an anchor (#2403)

MozillaReality · Dec 9, 2019 · aee8a16 · aee8a16
1 parent 5ae1cbb
commit aee8a16
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/callbacks/BookmarksCallback.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/callbacks/BookmarksCallback.java
@@ -13,4 +13,5 @@ default void onFxALogin(@NonNull View view) {}
     default void onFxASynSettings(@NonNull View view) {}
     default void onShowContextMenu(@NonNull View view, Bookmark item, boolean isLastVisibleItem) {}
     default void onHideContextMenu(@NonNull View view) {}
+    default void onClickItem(@NonNull View view, Bookmark item) {}
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/callbacks/HistoryCallback.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/callbacks/HistoryCallback.java
@@ -13,4 +13,5 @@ default void onFxALogin(@NonNull View view) {}
     default void onFxASynSettings(@NonNull View view) {}
     default void onShowContextMenu(@NonNull View view, @NonNull VisitInfo item, boolean isLastVisibleItem) {}
     default void onHideContextMenu(@NonNull View view) {}
+    default void onClickItem(@NonNull View view, @NonNull VisitInfo item) {}
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/BookmarksView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/BookmarksView.java
@@ -159,6 +159,8 @@ public void onClick(@NonNull View view, @NonNull Bookmark item) {
 
             Session session = SessionStore.get().getActiveSession();
             session.loadUri(item.getUrl());
+
+            mBookmarksViewListeners.forEach((listener) -> listener.onClickItem(view, item));
         }
 
         @Override

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java
@@ -160,6 +160,8 @@ public void onClick(View view, VisitInfo item) {
 
             Session session = SessionStore.get().getActiveSession();
             session.loadUri(item.getUrl());
+
+            mHistoryViewListeners.forEach((listener) -> listener.onClickItem(view, item));
         }
 
         @Override

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -1439,6 +1439,11 @@ public void onHideContextMenu(@NonNull View view) {
         public void onFxALogin(@NonNull View view) {
             hideBookmarks();
         }
+
+        @Override
+        public void onClickItem(@NonNull View view, Bookmark item) {
+            hideBookmarks();
+        }
     };
 
     private HistoryCallback mHistoryListener = new HistoryCallback() {
@@ -1473,6 +1478,11 @@ public void onHideContextMenu(@NonNull View view) {
         public void onFxALogin(@NonNull View view) {
             hideHistory();
         }
+
+        @Override
+        public void onClickItem(@NonNull View view, @NonNull VisitInfo item) {
+            hideHistory();
+        }
     };
 
     private void hideContextMenus() {