From 99c956c1226c17dbe82b9baf53a4511334694dd4 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Sat, 14 Aug 2021 17:37:23 +0200 Subject: [PATCH] Fix lint warnings in item adapters --- .../play/adapter/AlbumAdapter.java | 9 ++++++--- .../AlbumArtistPageOrSimilarAdapter.java | 9 ++++++--- .../play/adapter/AlbumCatalogueAdapter.java | 17 ++++++++++------- .../play/adapter/AlbumHorizontalAdapter.java | 12 ++++++------ .../play/adapter/ArtistAdapter.java | 9 ++++++--- .../play/adapter/ArtistCatalogueAdapter.java | 17 ++++++++++------- .../play/adapter/ArtistHorizontalAdapter.java | 14 ++++++-------- .../play/adapter/ArtistSimilarAdapter.java | 9 ++++++--- .../play/adapter/DiscoverSongAdapter.java | 11 +++++++---- .../play/adapter/GenreAdapter.java | 9 +++++---- .../play/adapter/GenreCatalogueAdapter.java | 19 ++++++++++--------- .../adapter/PlayerNowPlayingSongAdapter.java | 7 ++++--- .../play/adapter/PlayerSongQueueAdapter.java | 11 +++++++---- .../play/adapter/PlaylistAdapter.java | 11 +++++++---- .../adapter/PlaylistCatalogueAdapter.java | 18 +++++++++++------- .../PlaylistDialogSongHorizontalAdapter.java | 10 ++++------ .../adapter/PlaylistHorizontalAdapter.java | 15 ++++++++------- .../play/adapter/RecentMusicAdapter.java | 17 +++++++++-------- .../play/adapter/ServerAdapter.java | 11 +++++++---- .../play/adapter/SongHorizontalAdapter.java | 17 +++++++++-------- .../play/adapter/YearAdapter.java | 10 ++++++---- .../ui/fragment/AlbumListPageFragment.java | 2 +- .../ui/fragment/ArtistListPageFragment.java | 2 +- .../play/ui/fragment/HomeFragment.java | 6 +++--- .../fragment/dialog/PlaylistEditorDialog.java | 2 +- 25 files changed, 156 insertions(+), 118 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java index 893bd10e..9ec3f6a8 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java @@ -10,6 +10,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -26,9 +27,10 @@ import java.util.Objects; public class AlbumAdapter extends RecyclerView.Adapter { private static final String TAG = "AlbumAdapter"; + private final LayoutInflater inflater; + private final Context context; + private List albums; - private LayoutInflater inflater; - private Context context; public AlbumAdapter(Context context) { this.context = context; @@ -36,8 +38,9 @@ public class AlbumAdapter extends RecyclerView.Adapter this.albums = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = inflater.inflate(R.layout.item_library_album, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java index 0eaeccda..cbf94893 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -24,9 +25,10 @@ import java.util.List; public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter { private static final String TAG = "AlbumArtistPageAdapter"; + private final LayoutInflater inflater; + private final Context context; + private List albums; - private LayoutInflater inflater; - private Context context; public AlbumArtistPageOrSimilarAdapter(Context context) { this.context = context; @@ -34,8 +36,9 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = inflater.inflate(R.layout.item_library_artist_page_or_similar_album, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java index 25a0fc31..624ef080 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java @@ -12,6 +12,7 @@ import android.widget.Filterable; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -29,12 +30,10 @@ import java.util.Objects; public class AlbumCatalogueAdapter extends RecyclerView.Adapter implements Filterable { private static final String TAG = "AlbumCatalogueAdapter"; - private List albums; - private List albumsFull; - private LayoutInflater inflater; - private MainActivity activity; - private Context context; - private Filter filtering = new Filter() { + private final LayoutInflater inflater; + private final MainActivity activity; + private final Context context; + private final Filter filtering = new Filter() { @Override protected FilterResults performFiltering(CharSequence constraint) { List filteredList = new ArrayList<>(); @@ -65,6 +64,9 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter albums; + private List albumsFull; + public AlbumCatalogueAdapter(MainActivity activity, Context context) { this.activity = activity; this.context = context; @@ -72,8 +74,9 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = inflater.inflate(R.layout.item_library_catalogue_album, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java index a7421020..39d77d70 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.fragment.app.FragmentManager; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -28,19 +29,18 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter albums; - private LayoutInflater mInflater; - private MainActivity mainActivity; - private Context context; + private final LayoutInflater mInflater; + private final Context context; - public AlbumHorizontalAdapter(MainActivity mainActivity, Context context, FragmentManager fragmentManager) { - this.mainActivity = mainActivity; + public AlbumHorizontalAdapter(Context context) { this.context = context; this.mInflater = LayoutInflater.from(context); this.albums = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_horizontal_album, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java index 30386b66..3e2a2ef0 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -25,9 +26,10 @@ import java.util.Objects; public class ArtistAdapter extends RecyclerView.Adapter { private static final String TAG = "ArtistAdapter"; + private final LayoutInflater inflater; + private final Context context; + private List artists; - private LayoutInflater inflater; - private Context context; public ArtistAdapter(Context context) { this.context = context; @@ -35,8 +37,9 @@ public class ArtistAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = inflater.inflate(R.layout.item_library_artist, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java index 9aac0f10..1026cbd0 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java @@ -12,6 +12,7 @@ import android.widget.Filterable; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -29,12 +30,10 @@ import java.util.Objects; public class ArtistCatalogueAdapter extends RecyclerView.Adapter implements Filterable { private static final String TAG = "ArtistCatalogueAdapter"; - private List artists; - private List artistFull; - private LayoutInflater inflater; - private MainActivity activity; - private Context context; - private Filter filtering = new Filter() { + private final LayoutInflater inflater; + private final MainActivity activity; + private final Context context; + private final Filter filtering = new Filter() { @Override protected FilterResults performFiltering(CharSequence constraint) { List filteredList = new ArrayList<>(); @@ -65,6 +64,9 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter artists; + private List artistFull; + public ArtistCatalogueAdapter(MainActivity activity, Context context) { this.activity = activity; this.context = context; @@ -72,8 +74,9 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = inflater.inflate(R.layout.item_library_catalogue_artist, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java index e5fb8db7..e9dd9906 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.fragment.app.FragmentManager; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -28,21 +29,18 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter artists; - private LayoutInflater mInflater; - private MainActivity mainActivity; - private Context context; - private FragmentManager fragmentManager; + private final LayoutInflater mInflater; + private final Context context; - public ArtistHorizontalAdapter(MainActivity mainActivity, Context context, FragmentManager fragmentManager) { - this.mainActivity = mainActivity; + public ArtistHorizontalAdapter(Context context) { this.context = context; - this.fragmentManager = fragmentManager; this.mInflater = LayoutInflater.from(context); this.artists = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_horizontal_artist, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java index 7f52bdf8..e1b02588 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -24,9 +25,10 @@ import java.util.List; public class ArtistSimilarAdapter extends RecyclerView.Adapter { private static final String TAG = "AlbumArtistPageAdapter"; + private final LayoutInflater inflater; + private final Context context; + private List artists; - private LayoutInflater inflater; - private Context context; public ArtistSimilarAdapter(Context context) { this.context = context; @@ -34,8 +36,9 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = inflater.inflate(R.layout.item_library_similar_artist, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java index f574faab..e6edab66 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; @@ -29,10 +30,11 @@ import java.util.List; public class DiscoverSongAdapter extends RecyclerView.Adapter { private static final String TAG = "DiscoverSongAdapter"; + private final LayoutInflater inflater; + private final Context context; + private final MainActivity activity; + private List songs; - private LayoutInflater inflater; - private Context context; - private MainActivity activity; public DiscoverSongAdapter(MainActivity activity, Context context) { this.activity = activity; @@ -41,8 +43,9 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = inflater.inflate(R.layout.item_home_discover_song, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java index f386c197..912c2c54 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java @@ -7,6 +7,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; @@ -19,19 +20,19 @@ import java.util.List; public class GenreAdapter extends RecyclerView.Adapter { private static final String TAG = "GenreAdapter"; + private final LayoutInflater mInflater; + private List genres; - private LayoutInflater mInflater; - private Context context; private ItemClickListener itemClickListener; public GenreAdapter(Context context) { - this.context = context; this.mInflater = LayoutInflater.from(context); this.genres = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_library_genre, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java index 553f130f..a6500c5a 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java @@ -10,6 +10,7 @@ import android.widget.Filter; import android.widget.Filterable; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; @@ -23,13 +24,9 @@ import java.util.List; public class GenreCatalogueAdapter extends RecyclerView.Adapter implements Filterable { private static final String TAG = "GenreCatalogueAdapter"; - private List genres; - private List genresFull; - private LayoutInflater mInflater; - private MainActivity activity; - private Context context; - private ItemClickListener itemClickListener; - private Filter filtering = new Filter() { + private final LayoutInflater mInflater; + private final MainActivity activity; + private final Filter filtering = new Filter() { @Override protected FilterResults performFiltering(CharSequence constraint) { List filteredList = new ArrayList<>(); @@ -60,15 +57,19 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter genres; + private List genresFull; + private ItemClickListener itemClickListener; + public GenreCatalogueAdapter(MainActivity activity, Context context) { this.activity = activity; - this.context = context; this.mInflater = LayoutInflater.from(context); this.genres = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_library_catalogue_genre, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java index b605cdd5..e6dee7c2 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java @@ -21,9 +21,10 @@ import java.util.List; public class PlayerNowPlayingSongAdapter extends RecyclerView.Adapter { private static final String TAG = "DiscoverSongAdapter"; + private final LayoutInflater inflater; + private final Context context; + private List songs; - private LayoutInflater inflater; - private Context context; public PlayerNowPlayingSongAdapter(Context context) { this.context = context; @@ -33,7 +34,7 @@ public class PlayerNowPlayingSongAdapter extends RecyclerView.Adapter { private static final String TAG = "SongResultSearchAdapter"; + private final LayoutInflater mInflater; + private final PlayerBottomSheetFragment playerBottomSheetFragment; + private final Context context; + private List songs; - private LayoutInflater mInflater; - private PlayerBottomSheetFragment playerBottomSheetFragment; - private Context context; public PlayerSongQueueAdapter(Context context, PlayerBottomSheetFragment playerBottomSheetFragment) { this.context = context; @@ -39,8 +41,9 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_player_queue_song, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java index 40b8ef1f..29c5283f 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -26,10 +27,11 @@ import java.util.List; public class PlaylistAdapter extends RecyclerView.Adapter { private static final String TAG = "PlaylistAdapter"; + private final MainActivity activity; + private final Context context; + private final LayoutInflater mInflater; + private List playlists; - private LayoutInflater mInflater; - private Context context; - private MainActivity activity; public PlaylistAdapter(MainActivity activity, Context context) { this.activity = activity; @@ -38,8 +40,9 @@ public class PlaylistAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_library_playlist, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java index ba91ca55..083f7226 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java @@ -12,6 +12,7 @@ import android.widget.Filterable; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -29,13 +30,12 @@ import java.util.ArrayList; import java.util.List; public class PlaylistCatalogueAdapter extends RecyclerView.Adapter implements Filterable { + private static final String TAG = "PlaylistCatalogueAdapter"; - private List playlists; - private List playlistsFull; - private LayoutInflater mInflater; - private MainActivity activity; - private Context context; - private Filter filtering = new Filter() { + private final LayoutInflater mInflater; + private final MainActivity activity; + private final Context context; + private final Filter filtering = new Filter() { @Override protected FilterResults performFiltering(CharSequence constraint) { List filteredList = new ArrayList<>(); @@ -66,6 +66,9 @@ public class PlaylistCatalogueAdapter extends RecyclerView.Adapter playlists; + private List playlistsFull; + public PlaylistCatalogueAdapter(MainActivity activity, Context context) { this.activity = activity; this.context = context; @@ -73,8 +76,9 @@ public class PlaylistCatalogueAdapter extends RecyclerView.Adapter(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_library_catalogue_playlist, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java index 7fb517ec..7d367a43 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java @@ -8,6 +8,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.fragment.app.FragmentManager; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -32,20 +33,17 @@ public class PlaylistDialogSongHorizontalAdapter extends RecyclerView.Adapter songs; private LayoutInflater mInflater; - private MainActivity mainActivity; private Context context; - private FragmentManager fragmentManager; - public PlaylistDialogSongHorizontalAdapter(MainActivity mainActivity, Context context, FragmentManager fragmentManager) { - this.mainActivity = mainActivity; + public PlaylistDialogSongHorizontalAdapter(Context context) { this.context = context; - this.fragmentManager = fragmentManager; this.mInflater = LayoutInflater.from(context); this.songs = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_horizontal_playlist_dialog_track, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java index 6cf033ce..e373af27 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; @@ -20,15 +21,14 @@ import java.util.List; public class PlaylistHorizontalAdapter extends RecyclerView.Adapter { private static final String TAG = "PlaylistHorizontalAdapter"; - private List playlists; - private LayoutInflater mInflater; - private Context context; + private final LayoutInflater mInflater; - private PlaylistChooserViewModel playlistChooserViewModel; - private PlaylistChooserDialog playlistChooserDialog; + private final PlaylistChooserViewModel playlistChooserViewModel; + private final PlaylistChooserDialog playlistChooserDialog; + + private List playlists; public PlaylistHorizontalAdapter(Context context, PlaylistChooserViewModel playlistChooserViewModel, PlaylistChooserDialog playlistChooserDialog) { - this.context = context; this.mInflater = LayoutInflater.from(context); this.playlists = new ArrayList<>(); @@ -36,8 +36,9 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter { private static final String TAG = "RecentMusicAdapter"; - private List songs; - private LayoutInflater mInflater; - private MainActivity mainActivity; - private Context context; - private FragmentManager fragmentManager; + private final MainActivity mainActivity; + private final Context context; + private final LayoutInflater mInflater; - public RecentMusicAdapter(MainActivity mainActivity, Context context, FragmentManager fragmentManager) { + private List songs; + + public RecentMusicAdapter(MainActivity mainActivity, Context context) { this.mainActivity = mainActivity; this.context = context; - this.fragmentManager = fragmentManager; this.mInflater = LayoutInflater.from(context); this.songs = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_home_track, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java index 50d876a7..ddb66e4e 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java @@ -8,6 +8,7 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; import androidx.fragment.app.FragmentManager; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; @@ -29,10 +30,11 @@ import java.util.UUID; public class ServerAdapter extends RecyclerView.Adapter { private static final String TAG = "ServerAdapter"; - private List servers; private final LayoutInflater mInflater; - private MainActivity mainActivity; - private Context context; + private final MainActivity mainActivity; + private final Context context; + + private List servers; public ServerAdapter(MainActivity mainActivity, Context context) { this.mInflater = LayoutInflater.from(context); @@ -41,8 +43,9 @@ public class ServerAdapter extends RecyclerView.Adapter { private static final String TAG = "SongHorizontalAdapter"; - private List songs; - private LayoutInflater mInflater; - private MainActivity mainActivity; - private Context context; - private FragmentManager fragmentManager; + private final MainActivity mainActivity; + private final Context context; + private final LayoutInflater mInflater; - public SongHorizontalAdapter(MainActivity mainActivity, Context context, FragmentManager fragmentManager) { + private List songs; + + public SongHorizontalAdapter(MainActivity mainActivity, Context context) { this.mainActivity = mainActivity; this.context = context; - this.fragmentManager = fragmentManager; this.mInflater = LayoutInflater.from(context); this.songs = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_horizontal_track, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java index 100695a4..5d0b5aea 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/YearAdapter.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; @@ -15,19 +16,20 @@ import java.util.List; public class YearAdapter extends RecyclerView.Adapter { private static final String TAG = "YearAdapter"; + + private final LayoutInflater mInflater; + private List years; - private LayoutInflater mInflater; - private Context context; private ItemClickListener itemClickListener; public YearAdapter(Context context) { - this.context = context; this.mInflater = LayoutInflater.from(context); this.years = new ArrayList<>(); } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_home_year, parent, false); return new ViewHolder(view); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java index 9b3656ff..08b2be66 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java @@ -92,7 +92,7 @@ public class AlbumListPageFragment extends Fragment { bind.albumListRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.albumListRecyclerView.setHasFixedSize(true); - albumHorizontalAdapter = new AlbumHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + albumHorizontalAdapter = new AlbumHorizontalAdapter(requireContext()); bind.albumListRecyclerView.setAdapter(albumHorizontalAdapter); albumListPageViewModel.getAlbumList(requireActivity()).observe(requireActivity(), albums -> albumHorizontalAdapter.setItems(albums)); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java index ca6d7271..4fe0128e 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java @@ -83,7 +83,7 @@ public class ArtistListPageFragment extends Fragment { bind.artistListRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.artistListRecyclerView.setHasFixedSize(true); - artistHorizontalAdapter = new ArtistHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + artistHorizontalAdapter = new ArtistHorizontalAdapter(requireContext()); bind.artistListRecyclerView.setAdapter(artistHorizontalAdapter); artistListPageViewModel.getArtistList().observe(requireActivity(), artists -> artistHorizontalAdapter.setItems(artists)); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java index 30b24498..1961bc0e 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java @@ -265,7 +265,7 @@ public class HomeFragment extends Fragment { private void initStarredAlbumsView() { bind.starredAlbumsRecyclerView.setHasFixedSize(true); - starredAlbumAdapter = new AlbumHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + starredAlbumAdapter = new AlbumHorizontalAdapter(requireContext()); bind.starredAlbumsRecyclerView.setAdapter(starredAlbumAdapter); homeViewModel.getStarredAlbums().observe(requireActivity(), albums -> { if (bind != null) { @@ -282,7 +282,7 @@ public class HomeFragment extends Fragment { private void initStarredArtistsView() { bind.starredArtistsRecyclerView.setHasFixedSize(true); - starredArtistAdapter = new ArtistHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + starredArtistAdapter = new ArtistHorizontalAdapter(requireContext()); bind.starredArtistsRecyclerView.setAdapter(starredArtistAdapter); homeViewModel.getStarredArtists().observe(requireActivity(), artists -> { if (bind != null) { @@ -314,7 +314,7 @@ public class HomeFragment extends Fragment { bind.downloadedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)); bind.downloadedTracksRecyclerView.setHasFixedSize(true); - dowanloadedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager()); + dowanloadedMusicAdapter = new RecentMusicAdapter(activity, requireContext()); bind.downloadedTracksRecyclerView.setAdapter(dowanloadedMusicAdapter); homeViewModel.getDownloaded().observe(requireActivity(), downloads -> { if (bind != null) diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java index 9ebece34..a38390f7 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java @@ -115,7 +115,7 @@ public class PlaylistEditorDialog extends DialogFragment { bind.playlistSongRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.playlistSongRecyclerView.setHasFixedSize(true); - playlistDialogSongHorizontalAdapter = new PlaylistDialogSongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + playlistDialogSongHorizontalAdapter = new PlaylistDialogSongHorizontalAdapter(requireContext()); bind.playlistSongRecyclerView.setAdapter(playlistDialogSongHorizontalAdapter); playlistEditorViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> {