From c1c1c3acfae93afbd7907989056adf8425438f63 Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Wed, 22 Dec 2021 16:47:50 +0100
Subject: [PATCH] Check the presence of the context

---
 .../play/ui/activity/MainActivity.java                 |  2 ++
 .../play/ui/fragment/PlayerCoverFragment.java          | 10 ++++++++--
 .../play/ui/fragment/PlayerLyricsFragment.java         |  9 +++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
index e4451d43..c22c6315 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
@@ -163,6 +163,7 @@ public class MainActivity extends BaseActivity {
                             break;
                         case BottomSheetBehavior.STATE_COLLAPSED:
                             if (playerBottomSheetFragment != null) {
+                                playerBottomSheetFragment.scrollOnTop();
                                 playerBottomSheetFragment.goBackToFirstPage();
                             }
                         case BottomSheetBehavior.STATE_SETTLING:
@@ -172,6 +173,7 @@ public class MainActivity extends BaseActivity {
                             break;
                         case BottomSheetBehavior.STATE_EXPANDED:
                             if (playerBottomSheetFragment != null) {
+                                playerBottomSheetFragment.scrollOnTop();
                                 setBottomSheetDraggableState(playerBottomSheetFragment.isViewPagerInFirstPage());
                             }
                         case BottomSheetBehavior.STATE_DRAGGING:
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 743ed579..56b12d07 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
@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -26,11 +27,16 @@ public class PlayerCoverFragment extends Fragment {
         View view = bind.getRoot();
         playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
 
-        init();
-
         return view;
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        init();
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerLyricsFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerLyricsFragment.java
index 819a4170..aa1db51e 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerLyricsFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerLyricsFragment.java
@@ -29,11 +29,16 @@ public class PlayerLyricsFragment extends Fragment {
         View view = bind.getRoot();
         playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
 
-        initLyrics();
-
         return view;
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        initLyrics();
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();