From 81fb44c45c8acf6d235e8afff31f348bccf8e2b7 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Thu, 21 Jul 2022 06:56:51 +0530
Subject: [PATCH] Remove uses of setBottomSheetCallback().

---
 .../fragments/detail/VideoDetailFragment.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index f4838482b97..4ad270c501c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -208,6 +208,8 @@ public final class VideoDetailFragment
     private Player player;
     private final PlayerHolder playerHolder = PlayerHolder.getInstance();
 
+    private BottomSheetBehavior.BottomSheetCallback bottomSheetCallback;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Service management
     //////////////////////////////////////////////////////////////////////////*/
@@ -386,7 +388,7 @@ public void onDestroy() {
         disposables.clear();
         positionSubscriber = null;
         currentWorker = null;
-        bottomSheetBehavior.setBottomSheetCallback(null);
+        bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallback);
 
         if (activity.isFinishing()) {
             playQueue = null;
@@ -2289,7 +2291,7 @@ private void setupBottomPlayer() {
             }
         }
 
-        bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+        bottomSheetCallback = new BottomSheetBehavior.BottomSheetCallback() {
             @Override
             public void onStateChanged(@NonNull final View bottomSheet, final int newState) {
                 bottomSheetState = newState;
@@ -2343,12 +2345,14 @@ && isPlayerAvailable()
                         }
                         if (isPlayerAvailable()) {
                             player.UIs().get(MainPlayerUi.class).ifPresent(ui -> {
-                                    if (ui.isControlsVisible()) {
-                                        ui.hideControls(0, 0);
-                                    }
+                                if (ui.isControlsVisible()) {
+                                    ui.hideControls(0, 0);
+                                }
                             });
                         }
                         break;
+                    case BottomSheetBehavior.STATE_HALF_EXPANDED:
+                        break;
                 }
             }
 
@@ -2356,7 +2360,9 @@ && isPlayerAvailable()
             public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
                 setOverlayLook(binding.appBarLayout, behavior, slideOffset);
             }
-        });
+        };
+
+        bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback);
 
         // User opened a new page and the player will hide itself
         activity.getSupportFragmentManager().addOnBackStackChangedListener(() -> {