From 27845b46464dfa879460cb118cae6b744f4ac8ce Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Thu, 13 Jan 2022 17:44:32 +0100 Subject: [PATCH] Changed downloadedPlaylistItem layout --- .../play/ui/fragment/DownloadFragment.java | 31 +++++-------------- app/src/main/res/layout/fragment_download.xml | 11 ++++--- 2 files changed, 14 insertions(+), 28 deletions(-) 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 028120a6..5425ff03 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 @@ -18,6 +18,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.media3.session.MediaBrowser; import androidx.media3.session.SessionToken; import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.SnapHelper; import androidx.viewpager2.widget.ViewPager2; @@ -26,6 +27,7 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.AlbumHorizontalAdapter; import com.cappielloantonio.play.adapter.ArtistHorizontalAdapter; import com.cappielloantonio.play.adapter.PlaylistAdapter; +import com.cappielloantonio.play.adapter.PlaylistHorizontalAdapter; import com.cappielloantonio.play.adapter.SongHorizontalAdapter; import com.cappielloantonio.play.databinding.FragmentDownloadBinding; import com.cappielloantonio.play.helper.recyclerview.DotsIndicatorDecoration; @@ -52,7 +54,7 @@ public class DownloadFragment extends Fragment { private ArtistHorizontalAdapter downloadedArtistAdapter; private AlbumHorizontalAdapter downloadedAlbumAdapter; private SongHorizontalAdapter downloadedTrackAdapter; - private PlaylistAdapter playlistAdapter; + private PlaylistHorizontalAdapter playlistHorizontalAdapter; private ListenableFuture mediaBrowserListenableFuture; @@ -264,11 +266,11 @@ public class DownloadFragment extends Fragment { } private void initDownloadedPlaylistSlideView() { - bind.downloadedPlaylistViewPager.setOrientation(ViewPager2.ORIENTATION_HORIZONTAL); + bind.downloadedPlaylistRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); + bind.downloadedPlaylistRecyclerView.setHasFixedSize(true); - playlistAdapter = new PlaylistAdapter(activity, requireContext(), true); - bind.downloadedPlaylistViewPager.setAdapter(playlistAdapter); - bind.downloadedPlaylistViewPager.setOffscreenPageLimit(3); + playlistHorizontalAdapter = new PlaylistHorizontalAdapter(activity, requireContext()); + bind.downloadedPlaylistRecyclerView.setAdapter(playlistHorizontalAdapter); downloadViewModel.getDownloadedPlaylists(requireActivity(), 5).observe(requireActivity(), playlists -> { if (playlists == null) { if (bind != null) bind.downloadDownloadedPlaylistPlaceholder.placeholder.setVisibility(View.VISIBLE); @@ -277,24 +279,7 @@ public class DownloadFragment extends Fragment { if (bind != null) bind.downloadDownloadedPlaylistPlaceholder.placeholder.setVisibility(View.GONE); if (bind != null) bind.downloadDownloadedPlaylistSector.setVisibility(!playlists.isEmpty() ? View.VISIBLE : View.GONE); - playlistAdapter.setItems(playlists); - } - }); - - setSlideViewOffset(20, 16); - } - - private void setSlideViewOffset(float pageOffset, float pageMargin) { - bind.downloadedPlaylistViewPager.setPageTransformer((page, position) -> { - float myOffset = position * -(2 * pageOffset + pageMargin); - if (bind.downloadedPlaylistViewPager.getOrientation() == ViewPager2.ORIENTATION_HORIZONTAL) { - if (ViewCompat.getLayoutDirection(bind.downloadedPlaylistViewPager) == ViewCompat.LAYOUT_DIRECTION_RTL) { - page.setTranslationX(-myOffset); - } else { - page.setTranslationX(myOffset); - } - } else { - page.setTranslationY(myOffset); + playlistHorizontalAdapter.setItems(playlists); } }); } diff --git a/app/src/main/res/layout/fragment_download.xml b/app/src/main/res/layout/fragment_download.xml index 8c00e7ac..887414c0 100644 --- a/app/src/main/res/layout/fragment_download.xml +++ b/app/src/main/res/layout/fragment_download.xml @@ -297,11 +297,12 @@ - - @@ -309,7 +310,7 @@