Dismiss library panels explicitly (MozillaReality#2353)

lissyx · Jan 21, 2020 · dd92f6e · dd92f6e
1 parent 806c107
commit dd92f6e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 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 onItemClicked(@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 onItemClicked(@NonNull View view, 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
@@ -155,6 +155,8 @@ public void onClick(@NonNull View view, @NonNull Bookmark item) {
 
             Session session = SessionStore.get().getActiveSession();
             session.loadUri(item.getUrl());
+
+            mBookmarksViewListeners.forEach((listener) -> listener.onItemClicked(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
@@ -158,6 +158,8 @@ public void onClick(View view, VisitInfo item) {
 
             Session session = SessionStore.get().getActiveSession();
             session.loadUri(item.getUrl());
+
+            mHistoryViewListeners.forEach((listener) -> listener.onItemClicked(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
@@ -1420,6 +1420,11 @@ public void onFxASynSettings(@NonNull View view) {
         public void onHideContextMenu(@NonNull View view) {
             hideContextMenus();
         }
+
+        @Override
+        public void onItemClicked(@NonNull View view, Bookmark item) {
+            hideBookmarks();
+        }
     };
 
     private HistoryCallback mHistoryListener = new HistoryCallback() {
@@ -1449,6 +1454,11 @@ public void onFxASynSettings(@NonNull View view) {
         public void onHideContextMenu(@NonNull View view) {
             hideContextMenus();
         }
+
+        @Override
+        public void onItemClicked(@NonNull View view, VisitInfo item) {
+            hideHistory();
+        }
     };
 
     private void hideContextMenus() {
@@ -1546,14 +1556,6 @@ public void onVideoAvailabilityChanged(boolean aVideosAvailable) {
     @Override
     public void onPageStart(@NonNull GeckoSession geckoSession, @NonNull String s) {
         mCaptureOnPageStop = true;
-
-        if (isHistoryVisible()) {
-            hideHistory();
-        }
-
-        if (isBookmarksVisible()) {
-            hideBookmarks();
-        }
     }
 
     @Override