Skip to content
Snippets Groups Projects
Commit ef6dbddc authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Show network favorites on top

parent 75c1faab
No related branches found
No related tags found
No related merge requests found
......@@ -64,6 +64,7 @@ public class BaseBrowserAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
LinkedList<String> mMediaDirsLocation;
List<String> mCustomDirsLocation;
String mEmptyDirectoryString;
private int mTop = 0;
public BaseBrowserAdapter(BaseBrowserFragment fragment){
this.fragment = fragment;
......@@ -236,7 +237,7 @@ public class BaseBrowserAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
if (positionTo != -1)
position = positionTo;
else
position = top ? 0 : mMediaList.size();
position = top ? mTop : mMediaList.size();
if (item instanceof Media)
item = new MediaWrapper((Media) item);
......@@ -249,6 +250,10 @@ public class BaseBrowserAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
notifyItemInserted(position);
}
public void setTop (int top) {
mTop = top;
}
public void setDescription(int position, String description){
Object item = getItem(position);
if (item instanceof MediaWrapper)
......
......@@ -112,13 +112,7 @@ public class NetworkBrowserFragment extends BaseBrowserFragment implements View.
@Override
protected void browseRoot() {
ArrayList<MediaWrapper> favs = MediaDatabase.getInstance().getAllNetworkFav();
if (!favs.isEmpty()) {
mFavorites = favs.size();
for (MediaWrapper fav : favs) {
mAdapter.addItem(fav, false, true);
}
mAdapter.addItem("Network favorites", false, true);
}
updateFavorites();
mMediaBrowser.discoverNetworkShares(Util.NETWORK_DISCOVER_LIST);
}
......@@ -133,16 +127,22 @@ public class NetworkBrowserFragment extends BaseBrowserFragment implements View.
if (newSize == 0 && mFavorites == 0)
return;
for (int i = 1 ; i <= mFavorites ; ++i){ //remove former favorites
mAdapter.removeItem(totalSize-i, mReadyToDisplay);
}
if (newSize == 0)
mAdapter.removeItem(totalSize-mFavorites-1, mReadyToDisplay); //also remove separator if no more fav
else {
if (mFavorites != 0)
for (int i = 1 ; i <= mFavorites ; ++i) //remove former favorites
mAdapter.removeItem(i, mReadyToDisplay);
if (newSize == 0) {
mAdapter.removeItem(0, mReadyToDisplay); //also remove separator if no more fav
mAdapter.removeItem(0, mReadyToDisplay); //also remove separator if no more fav
} else {
if (mFavorites == 0)
mAdapter.addItem("Network favorites", false, false,0); //add header if needed
for (int i = 0 ; i < newSize ; ++i)
mAdapter.addItem(favs.get(i), false, false, i+1); //add new favorites
if (mFavorites == 0)
mAdapter.addItem("Network favorites", false, false); //add header if needed
for (MediaWrapper fav : favs)
mAdapter.addItem(fav, false, false); //add new favorites
mAdapter.addItem("Shared folders", false, false, newSize + 1); //add header if needed
mAdapter.setTop(newSize + 2);
mAdapter.notifyItemRangeChanged(0, newSize + 1);
}
mFavorites = newSize; //update count
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment