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

Open the mobile bookmarks folder by default #2164

Merged
merged 1 commit into from
Nov 7, 2019
Merged

Open the mobile bookmarks folder by default #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
import org.mozilla.vrbrowser.utils.AnimationHelper;
import org.mozilla.vrbrowser.utils.SystemUtils;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

import mozilla.appservices.places.BookmarkRoot;
import mozilla.components.concept.storage.BookmarkNode;
import mozilla.components.concept.storage.BookmarkNodeType;

Expand Down Expand Up @@ -74,8 +77,15 @@ public void setBookmarkList(final List<BookmarkNode> bookmarkList) {

List<Bookmark> newDisplayList;
if (mDisplayList == null || mDisplayList.isEmpty()) {
newDisplayList = Bookmark.getRootDisplayListTree(mBookmarksList);
newDisplayList = Bookmark.getDisplayListTree(mBookmarksList, Collections.singletonList(BookmarkRoot.Mobile.getId()));
mDisplayList = newDisplayList;
for (Bookmark node : mDisplayList) {
if (node.isExpanded()) {
if (mBookmarkItemCallback != null) {
mBookmarkItemCallback.onFolderOpened(node);
}
}
}
notifyItemRangeInserted(0, mDisplayList.size());

} else {
Expand Down Expand Up @@ -198,7 +208,9 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
switch (ev) {
case MotionEvent.ACTION_UP:
binding.setIsHovered(true);
mBookmarkItemCallback.onMore(view, binding.getItem());
if (mBookmarkItemCallback != null) {
mBookmarkItemCallback.onMore(view, binding.getItem());
}
return true;

case MotionEvent.ACTION_DOWN:
Expand All @@ -213,7 +225,9 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
switch (ev) {
case MotionEvent.ACTION_UP:
binding.setIsHovered(true);
mBookmarkItemCallback.onDelete(view, binding.getItem());
if (mBookmarkItemCallback != null) {
mBookmarkItemCallback.onDelete(view, binding.getItem());
}
return true;

case MotionEvent.ACTION_DOWN:
Expand Down Expand Up @@ -349,7 +363,9 @@ public void onClick(View view, Bookmark item) {
List<Bookmark> newDisplayList = Bookmark.getDisplayListTree(mBookmarksList, openFoldersGuid);
notifyDiff(newDisplayList);

mBookmarkItemCallback.onFolderOpened(item);
if (mBookmarkItemCallback != null) {
mBookmarkItemCallback.onFolderOpened(item);
}
}
};

Expand Down
8 changes: 6 additions & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
switch (ev) {
case MotionEvent.ACTION_UP:
binding.setIsHovered(true);
mHistoryItemCallback.onMore(view, binding.getItem());
if (mHistoryItemCallback != null) {
mHistoryItemCallback.onMore(view, binding.getItem());
}
return true;

case MotionEvent.ACTION_DOWN:
Expand All @@ -193,7 +195,9 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
switch (ev) {
case MotionEvent.ACTION_UP:
binding.setIsHovered(true);
mHistoryItemCallback.onDelete(view, binding.getItem());
if (mHistoryItemCallback != null) {
mHistoryItemCallback.onDelete(view, binding.getItem());
}
return true;

case MotionEvent.ACTION_DOWN:
Expand Down