diff --git a/.idea/misc.xml b/.idea/misc.xml index f3b0c257..06f9c561 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -69,7 +69,7 @@ - + diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java index ab9e1fc0..b8b0f6fc 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java @@ -34,14 +34,16 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter songs; - public SongHorizontalAdapter(MainActivity mainActivity, Context context) { + public SongHorizontalAdapter(MainActivity mainActivity, Context context, boolean isCoverVisible) { this.mainActivity = mainActivity; this.context = context; this.mInflater = LayoutInflater.from(context); this.songs = new ArrayList<>(); + this.isCoverVisible = isCoverVisible; } @NonNull @@ -58,6 +60,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java index 57b0e680..90c44676 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java @@ -180,7 +180,7 @@ public class ArtistPageFragment extends Fragment { private void initTopSongsView() { bind.mostStreamedSongRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), true); bind.mostStreamedSongRecyclerView.setAdapter(songHorizontalAdapter); artistPageViewModel.getArtistTopSongList(10).observe(requireActivity(), songs -> { if (bind != null) bind.artistPageTopSongsSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java index fdc49cac..007c2ba9 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java @@ -216,7 +216,7 @@ public class DownloadFragment extends Fragment { private void initDownloadedSongView() { bind.downloadedTracksRecyclerView.setHasFixedSize(true); - downloadedTrackAdapter = new SongHorizontalAdapter(activity, requireContext()); + downloadedTrackAdapter = new SongHorizontalAdapter(activity, requireContext(), true); bind.downloadedTracksRecyclerView.setAdapter(downloadedTrackAdapter); downloadViewModel.getDownloadedTracks(requireActivity(), 20).observe(requireActivity(), songs -> { if (songs == null) { 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 cba73796..bfa2cc0f 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 @@ -336,7 +336,7 @@ public class HomeFragment extends Fragment { private void initStarredTracksView() { bind.starredTracksRecyclerView.setHasFixedSize(true); - starredSongAdapter = new SongHorizontalAdapter(activity, requireContext()); + starredSongAdapter = new SongHorizontalAdapter(activity, requireContext(), true); bind.starredTracksRecyclerView.setAdapter(starredSongAdapter); homeViewModel.getStarredTracks(requireActivity()).observe(requireActivity(), songs -> { if (songs == null) { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java index 431fca5d..3457698d 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java @@ -154,7 +154,7 @@ public class PlaylistPageFragment extends Fragment { bind.songRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.songRecyclerView.setHasFixedSize(true); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), true); bind.songRecyclerView.setAdapter(songHorizontalAdapter); playlistPageViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java index a357a46a..acefe46e 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java @@ -73,7 +73,7 @@ public class SearchFragment extends Fragment { bind.searchResultTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.searchResultTracksRecyclerView.setHasFixedSize(true); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), true); bind.searchResultTracksRecyclerView.setAdapter(songHorizontalAdapter); // Albums diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java index 341a9f5c..8ee7aef7 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java @@ -141,7 +141,7 @@ public class SongListPageFragment extends Fragment { bind.songListRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.songListRecyclerView.setHasFixedSize(true); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), true); bind.songListRecyclerView.setAdapter(songHorizontalAdapter); songListPageViewModel.getSongList(requireActivity()).observe(requireActivity(), songs -> songHorizontalAdapter.setItems(songs)); } diff --git a/app/src/main/res/layout/item_horizontal_track.xml b/app/src/main/res/layout/item_horizontal_track.xml index 3b706619..d318340f 100644 --- a/app/src/main/res/layout/item_horizontal_track.xml +++ b/app/src/main/res/layout/item_horizontal_track.xml @@ -19,6 +19,26 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8c6908c0..a0a07bb5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -136,4 +136,11 @@ 700 @color/darkIconColor + + + \ No newline at end of file