Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
Add open in tab menu item (#2106)
Browse files Browse the repository at this point in the history 
Fixes issues with the library context menus
  • Loading branch information
@keianhzo @MortimerGoro
keianhzo authored and MortimerGoro committed Oct 31, 2019
1 parent 7875e70 commit b84dffb
Show file tree
Hide file tree
Showing 19 changed files with 328 additions and 402 deletions.
9 changes: 5 additions & 4 deletions ...common/shared/org/mozilla/vrbrowser/ui/callbacks/LibraryItemContextMenuClickCallback.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package org.mozilla.vrbrowser.ui.callbacks;

import org.mozilla.vrbrowser.ui.views.LibraryItemContextMenu;
import org.mozilla.vrbrowser.ui.widgets.menus.LibraryMenuWidget;

public interface LibraryItemContextMenuClickCallback {
void onOpenInNewWindowClick(LibraryItemContextMenu.LibraryContextMenuItem item);
void onAddToBookmarks(LibraryItemContextMenu.LibraryContextMenuItem item);
void onRemoveFromBookmarks(LibraryItemContextMenu.LibraryContextMenuItem item);
void onOpenInNewWindowClick(LibraryMenuWidget.LibraryContextMenuItem item);
void onOpenInNewTabClick(LibraryMenuWidget.LibraryContextMenuItem item);
void onAddToBookmarks(LibraryMenuWidget.LibraryContextMenuItem item);
void onRemoveFromBookmarks(LibraryMenuWidget.LibraryContextMenuItem item);
}
117 changes: 0 additions & 117 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/views/LibraryItemContextMenu.java
View file

This file was deleted.

96 changes: 54 additions & 42 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@
import org.mozilla.vrbrowser.ui.callbacks.LibraryItemContextMenuClickCallback;
import org.mozilla.vrbrowser.ui.views.BookmarksView;
import org.mozilla.vrbrowser.ui.views.HistoryView;
import org.mozilla.vrbrowser.ui.views.LibraryItemContextMenu;
import org.mozilla.vrbrowser.ui.widgets.dialogs.BaseAppDialogWidget;
import org.mozilla.vrbrowser.ui.widgets.dialogs.ClearCacheDialogWidget;
import org.mozilla.vrbrowser.ui.widgets.dialogs.LibraryItemContextMenuWidget;
import org.mozilla.vrbrowser.ui.widgets.dialogs.MessageDialogWidget;
import org.mozilla.vrbrowser.ui.widgets.dialogs.SelectionActionWidget;
import org.mozilla.vrbrowser.ui.widgets.menus.ContextMenuWidget;
import org.mozilla.vrbrowser.ui.widgets.menus.LibraryMenuWidget;
import org.mozilla.vrbrowser.ui.widgets.prompts.AlertPromptWidget;
import org.mozilla.vrbrowser.ui.widgets.prompts.ConfirmPromptWidget;
import org.mozilla.vrbrowser.ui.widgets.prompts.PromptWidget;
import org.mozilla.vrbrowser.ui.widgets.settings.SettingsWidget;
import org.mozilla.vrbrowser.utils.SystemUtils;
import org.mozilla.vrbrowser.utils.UIThreadExecutor;
import org.mozilla.vrbrowser.utils.ViewUtils;

import java.util.ArrayList;
Expand Down Expand Up @@ -105,7 +105,7 @@ default void onBookmarksHidden(WindowWidget aWindow) {}
private ClearCacheDialogWidget mClearCacheDialog;
private ContextMenuWidget mContextMenu;
private SelectionActionWidget mSelectionMenu;
private LibraryItemContextMenuWidget mLibraryItemContextMenu;
private LibraryMenuWidget mLibraryItemContextMenu;
private int mWidthBackup;
private int mHeightBackup;
private int mBorderWidth;
Expand Down Expand Up @@ -1310,7 +1310,7 @@ private int getWindowWidth(float aWorldWidth) {
return (int) Math.floor(SettingsStore.WINDOW_WIDTH_DEFAULT * aWorldWidth / WidgetPlacement.floatDimension(getContext(), R.dimen.window_world_width));
}

private void showLibraryItemContextMenu(@NotNull View view, LibraryItemContextMenu.LibraryContextMenuItem item, boolean isLastVisibleItem) {
private void showLibraryItemContextMenu(@NotNull View view, LibraryMenuWidget.LibraryContextMenuItem item, boolean isLastVisibleItem) {
view.requestFocusFromTouch();

hideContextMenus();
Expand All @@ -1321,56 +1321,68 @@ private void showLibraryItemContextMenu(@NotNull View view, LibraryItemContextMe
getDrawingRect(offsetViewBounds);
offsetDescendantRectToMyCoords(view, offsetViewBounds);

mLibraryItemContextMenu = new LibraryItemContextMenuWidget(getContext());
mLibraryItemContextMenu.setItem(item);
mLibraryItemContextMenu.mWidgetPlacement.parentHandle = getHandle();
SessionStore.get().getBookmarkStore().isBookmarked(item.getUrl()).thenAcceptAsync((isBookmarked -> {
mLibraryItemContextMenu = new LibraryMenuWidget(getContext(), item, mWidgetManager.canOpenNewWindow(), isBookmarked);
mLibraryItemContextMenu.getPlacement().parentHandle = getHandle();

PointF position;
if (isLastVisibleItem) {
mLibraryItemContextMenu.mWidgetPlacement.anchorY = 0.0f;
position = new PointF(
(offsetViewBounds.left + view.getWidth()) * ratio,
-(offsetViewBounds.top) * ratio);
PointF position;
if (isLastVisibleItem) {
mLibraryItemContextMenu.mWidgetPlacement.anchorY = 0.0f;
position = new PointF(
(offsetViewBounds.left + view.getWidth()) * ratio,
-(offsetViewBounds.top) * ratio);

} else {
mLibraryItemContextMenu.mWidgetPlacement.anchorY = 1.0f;
position = new PointF(
(offsetViewBounds.left + view.getWidth()) * ratio,
-(offsetViewBounds.top + view.getHeight()) * ratio);
}

mLibraryItemContextMenu.setPosition(position);
mLibraryItemContextMenu.setHistoryContextMenuItemCallback((new LibraryItemContextMenuClickCallback() {
@Override
public void onOpenInNewWindowClick(LibraryItemContextMenu.LibraryContextMenuItem item) {
mWidgetManager.openNewWindow(item.getUrl());
hideContextMenus();
} else {
mLibraryItemContextMenu.mWidgetPlacement.anchorY = 1.0f;
position = new PointF(
(offsetViewBounds.left + view.getWidth()) * ratio,
-(offsetViewBounds.top + view.getHeight()) * ratio);
}
mLibraryItemContextMenu.mWidgetPlacement.translationX = position.x - (mLibraryItemContextMenu.getWidth()/mLibraryItemContextMenu.mWidgetPlacement.density);
mLibraryItemContextMenu.mWidgetPlacement.translationY = position.y + getResources().getDimension(R.dimen.library_menu_top_margin)/mLibraryItemContextMenu.mWidgetPlacement.density;

mLibraryItemContextMenu.setItemDelegate((new LibraryItemContextMenuClickCallback() {
@Override
public void onOpenInNewWindowClick(LibraryMenuWidget.LibraryContextMenuItem item) {
mWidgetManager.openNewWindow(item.getUrl());
hideContextMenus();
}

@Override
public void onAddToBookmarks(LibraryItemContextMenu.LibraryContextMenuItem item) {
SessionStore.get().getBookmarkStore().addBookmark(item.getUrl(), item.getTitle());
hideContextMenus();
}
@Override
public void onOpenInNewTabClick(LibraryMenuWidget.LibraryContextMenuItem item) {
mWidgetManager.openNewTabForeground(item.getUrl());
hideContextMenus();
}

@Override
public void onRemoveFromBookmarks(LibraryItemContextMenu.LibraryContextMenuItem item) {
SessionStore.get().getBookmarkStore().deleteBookmarkByURL(item.getUrl());
hideContextMenus();
}
}));
mLibraryItemContextMenu.show(REQUEST_FOCUS);
@Override
public void onAddToBookmarks(LibraryMenuWidget.LibraryContextMenuItem item) {
SessionStore.get().getBookmarkStore().addBookmark(item.getUrl(), item.getTitle());
hideContextMenus();
}

@Override
public void onRemoveFromBookmarks(LibraryMenuWidget.LibraryContextMenuItem item) {
SessionStore.get().getBookmarkStore().deleteBookmarkByURL(item.getUrl());
hideContextMenus();
}
}));
mLibraryItemContextMenu.show(REQUEST_FOCUS);

}), new UIThreadExecutor()).exceptionally(throwable -> {
Log.d(LOGTAG, "Couldn't get the bookmarked status of the history item");
return null;
});
}

private BookmarksCallback mBookmarksListener = new BookmarksCallback() {
@Override
public void onShowContextMenu(@NonNull View view, @NotNull Bookmark item, boolean isLastVisibleItem) {
showLibraryItemContextMenu(
view,
new LibraryItemContextMenu.LibraryContextMenuItem(
new LibraryMenuWidget.LibraryContextMenuItem(
item.getUrl(),
item.getTitle(),
LibraryItemContextMenu.LibraryItemType.BOOKMARKS),
LibraryMenuWidget.LibraryItemType.BOOKMARKS),
isLastVisibleItem);
}

Expand All @@ -1391,10 +1403,10 @@ public void onClearHistory(@NonNull View view) {
public void onShowContextMenu(@NonNull View view, @NonNull VisitInfo item, boolean isLastVisibleItem) {
showLibraryItemContextMenu(
view,
new LibraryItemContextMenu.LibraryContextMenuItem(
new LibraryMenuWidget.LibraryContextMenuItem(
item.getUrl(),
item.getTitle(),
LibraryItemContextMenu.LibraryItemType.HISTORY),
LibraryMenuWidget.LibraryItemType.HISTORY),
isLastVisibleItem);
}

Expand Down
Loading

0 comments on commit b84dffb

Please sign in to comment.