From 036445a57b149dec82c72e48b98ae4b7b7c6c2b8 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sun, 8 Jan 2023 23:56:30 -0600 Subject: Initial progress of huge refactoring job that I really, really shouldn't be doing --- .../daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java') diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java index 6c1c14da..4914d52d 100644 --- a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java +++ b/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java @@ -20,6 +20,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; + import java.util.List; import github.daneren2005.dsub.R; @@ -47,12 +49,13 @@ public class EntryInfiniteGridAdapter extends EntryGridAdapter { super(context, entries, imageLoader, largeCell); } + @NonNull @Override - public UpdateView.UpdateViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public UpdateView.UpdateViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { if(viewType == VIEW_TYPE_LOADING) { View progress = LayoutInflater.from(context).inflate(R.layout.tab_progress, null); progress.setVisibility(View.VISIBLE); - return new UpdateView.UpdateViewHolder(progress, false); + return new UpdateView.UpdateViewHolder(progress); } return super.onCreateViewHolder(parent, viewType); @@ -131,7 +134,7 @@ public class EntryInfiniteGridAdapter extends EntryGridAdapter { result = service.getAlbumList(type, extra, size, offset, false, context, null); } else if("genres".equals(type) || "genres-songs".equals(type)) { result = service.getSongsByGenre(extra, size, offset, context, null); - }else if(type.indexOf(MainFragment.SONGS_LIST_PREFIX) != -1) { + }else if(type.contains(MainFragment.SONGS_LIST_PREFIX)) { result = service.getSongList(type, size, offset, context, null); } else { result = service.getAlbumList(type, size, offset, false, context, null); -- cgit v1.2.3