diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java index cf38bfe1..1cef05bb 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java @@ -178,7 +178,10 @@ public class PlayerBottomSheetFragment extends Fragment { public void goBackToFirstPage() { bind.playerBodyLayout.playerBodyBottomSheetViewPager.setCurrentItem(0, false); + goToControllerPage(); + } + public void goToControllerPage() { PlayerControllerVerticalPager playerControllerVerticalPager = (PlayerControllerVerticalPager) bind.playerBodyLayout.playerBodyBottomSheetViewPager.getAdapter(); if (playerControllerVerticalPager != null) { PlayerControllerFragment playerControllerFragment = (PlayerControllerFragment) playerControllerVerticalPager.getRegisteredFragment(0); @@ -187,4 +190,14 @@ public class PlayerBottomSheetFragment extends Fragment { } } } + + public void goToLyricsPage() { + PlayerControllerVerticalPager playerControllerVerticalPager = (PlayerControllerVerticalPager) bind.playerBodyLayout.playerBodyBottomSheetViewPager.getAdapter(); + if (playerControllerVerticalPager != null) { + PlayerControllerFragment playerControllerFragment = (PlayerControllerFragment) playerControllerVerticalPager.getRegisteredFragment(0); + if (playerControllerFragment != null) { + playerControllerFragment.goToLyricsPage(); + } + } + } } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java index af254068..415ecbcc 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java @@ -29,6 +29,7 @@ import com.cappielloantonio.play.repository.SongRepository; import com.cappielloantonio.play.service.MediaManager; import com.cappielloantonio.play.service.MediaService; import com.cappielloantonio.play.ui.dialog.PlaylistChooserDialog; +import com.cappielloantonio.play.ui.fragment.pager.PlayerControllerVerticalPager; import com.cappielloantonio.play.util.DownloadUtil; import com.cappielloantonio.play.util.MappingUtil; import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel; @@ -129,7 +130,10 @@ public class PlayerCoverFragment extends Fragment { }); bind.innerButtonBottomRight.setOnClickListener(view -> { - + PlayerBottomSheetFragment playerBottomSheetFragment = (PlayerBottomSheetFragment) getActivity().getSupportFragmentManager().findFragmentByTag("PlayerBottomSheet"); + if (playerBottomSheetFragment != null) { + playerBottomSheetFragment.goToLyricsPage(); + } }); } });