Skip to content

Ensure adapter is created along with recyclerView #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vrih wants to merge 1 commit into
base: edge
Choose a base branch
from
Open

Ensure adapter is created along with recyclerView #901

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
133 changes: 104 additions & 29 deletions app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package github.daneren2005.dsub.fragments;

import android.annotation.TargetApi;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
Expand Down Expand Up @@ -139,7 +140,7 @@ public void onSaveInstanceState(Bundle outState) {
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle bundle) {
Bundle args = getArguments();
if(args != null) {
id = args.getString(Constants.INTENT_EXTRA_NAME_ID);
Expand Down Expand Up @@ -172,35 +173,87 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bu
albums = (List<Entry>) args.getSerializable(Constants.FRAGMENT_LIST2);

if(albums == null) {
albums = new ArrayList<Entry>();
albums = new ArrayList<>();
}
}
}

rootView = inflater.inflate(R.layout.abstract_recycler_fragment, container, false);

refreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.refresh_layout);
refreshLayout = rootView.findViewById(R.id.refresh_layout);
refreshLayout.setOnRefreshListener(this);

if(Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_LARGE_ALBUM_ART, true)) {
largeAlbums = true;
}

recyclerView = (RecyclerView) rootView.findViewById(R.id.fragment_recycler);
recyclerView = rootView.findViewById(R.id.fragment_recycler);
recyclerView.setHasFixedSize(true);
fastScroller = (FastScroller) rootView.findViewById(R.id.fragment_fast_scroller);
fastScroller = rootView.findViewById(R.id.fragment_fast_scroller);
setupScrollList(recyclerView);
setupLayoutManager(recyclerView, largeAlbums);

if(entries == null) {
entries = new ArrayList<>();
}

if(albumListType == null || "starred".equals(albumListType)) {
entryGridAdapter = new EntryGridAdapter(context, entries, getImageLoader(), largeAlbums);
recyclerView.setAdapter(entryGridAdapter);
entryGridAdapter.setRemoveFromPlaylist(playlistId != null);
} else {
setupAlbumGridAdapter();
recyclerView.setAdapter(entryGridAdapter);

// Setup infinite loading based on scrolling
final EntryInfiniteGridAdapter infiniteGridAdapter = (EntryInfiniteGridAdapter) entryGridAdapter;
infiniteGridAdapter.setData(albumListType, albumListExtra, albumListSize);

recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
super.onScrollStateChanged(recyclerView, newState);
}

@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
super.onScrolled(recyclerView, dx, dy);

RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
int totalItemCount = layoutManager.getItemCount();
int lastVisibleItem;
if(layoutManager instanceof GridLayoutManager) {
lastVisibleItem = ((GridLayoutManager) layoutManager).findLastVisibleItemPosition();
} else if(layoutManager instanceof LinearLayoutManager) {
lastVisibleItem = ((LinearLayoutManager) layoutManager).findLastVisibleItemPosition();
} else {
return;
}

if(totalItemCount > 0 && lastVisibleItem >= totalItemCount - 2) {
infiniteGridAdapter.loadMore();
}
}
});
}

boolean addedHeader = setupEntryGridAdapter();

fastScroller.attachRecyclerView(recyclerView);
context.supportInvalidateOptionsMenu();

scrollToPosition(addedHeader);
playAll(args);

if(entries.size() == 0) {
if(primaryFragment || secondaryFragment) {
load(false);
} else {
invalidated = true;
}
} else {
licenseValid = true;
finishLoading();
licenseValid = true;
finishLoading();
}

if(name != null) {
Expand Down Expand Up @@ -693,13 +746,7 @@ private void finishLoading() {
entryGridAdapter = new EntryGridAdapter(context, entries, getImageLoader(), largeAlbums);
entryGridAdapter.setRemoveFromPlaylist(playlistId != null);
} else {
if("alphabeticalByName".equals(albumListType)) {
entryGridAdapter = new AlphabeticalAlbumAdapter(context, entries, getImageLoader(), largeAlbums);
} else if("highest".equals(albumListType)) {
entryGridAdapter = new TopRatedAlbumAdapter(context, entries, getImageLoader(), largeAlbums);
} else {
entryGridAdapter = new EntryInfiniteGridAdapter(context, entries, getImageLoader(), largeAlbums);
}
setupAlbumGridAdapter();

// Setup infinite loading based on scrolling
final EntryInfiniteGridAdapter infiniteGridAdapter = (EntryInfiniteGridAdapter) entryGridAdapter;
Expand Down Expand Up @@ -732,6 +779,31 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
}
});
}

boolean addedHeader = setupEntryGridAdapter();

recyclerView.setAdapter(entryGridAdapter);
fastScroller.attachRecyclerView(recyclerView);
context.supportInvalidateOptionsMenu();

scrollToPosition(addedHeader);
playAll(getArguments());
}

private void setupAlbumGridAdapter(){
switch(albumListType){
case "alphabeticalByName":
entryGridAdapter = new AlphabeticalAlbumAdapter(context, entries, getImageLoader(), largeAlbums);
break;
case "highest":
entryGridAdapter = new TopRatedAlbumAdapter(context, entries, getImageLoader(), largeAlbums);
break;
default:
entryGridAdapter = new EntryInfiniteGridAdapter(context, entries, getImageLoader(), largeAlbums);
}
}

private boolean setupEntryGridAdapter(){
entryGridAdapter.setOnItemClickedListener(this);
// Always show artist if this is not a artist we are viewing
if(!artist) {
Expand All @@ -747,7 +819,7 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
if(albumListType == null && (!artist || artistInfo != null || artistInfoDelayed != null) && (share == null || entries.size() != albums.size())) {
View header = createHeader();

if(header != null) {
if (header != null) {
if (artistInfoDelayed != null) {
final View finalHeader = header.findViewById(R.id.select_album_header);
final View headerProgress = header.findViewById(R.id.header_progress);
Expand Down Expand Up @@ -780,31 +852,24 @@ protected void done(Void result) {
addedHeader = true;
}
}
return addedHeader;
}

int scrollToPosition = -1;
private void scrollToPosition(boolean addedHeader){
int scrollPosition = -1;
if(lookupEntry != null) {
for(int i = 0; i < entries.size(); i++) {
if(lookupEntry.equals(entries.get(i).getTitle())) {
scrollToPosition = i;
scrollPosition = i;
entryGridAdapter.addSelected(entries.get(i));
lookupEntry = null;
break;
}
}
}

recyclerView.setAdapter(entryGridAdapter);
fastScroller.attachRecyclerView(recyclerView);
context.supportInvalidateOptionsMenu();

if(scrollToPosition != -1) {
recyclerView.scrollToPosition(scrollToPosition + (addedHeader ? 1 : 0));
}

Bundle args = getArguments();
boolean playAll = args.getBoolean(Constants.INTENT_EXTRA_NAME_AUTOPLAY, false);
if (playAll && !restoredInstance) {
playAll(args.getBoolean(Constants.INTENT_EXTRA_NAME_SHUFFLE, false), false, false);
if(scrollPosition != -1) {
recyclerView.scrollToPosition(scrollPosition + (addedHeader ? 1 : 0));
}
}

Expand All @@ -830,6 +895,16 @@ private void playAll(final boolean shuffle, final boolean append, final boolean
}
}

private void playAll(Bundle args){
boolean playAll = false;
if (args != null) {
playAll = args.getBoolean(Constants.INTENT_EXTRA_NAME_AUTOPLAY, false);
}
if (playAll && !restoredInstance) {
playAll(args.getBoolean(Constants.INTENT_EXTRA_NAME_SHUFFLE, false), false, false);
}
}

private List<Integer> getSelectedIndexes() {
List<Entry> selected = entryGridAdapter.getSelected();
List<Integer> indexes = new ArrayList<Integer>();
Expand Down