From f04c64a60df3d0038f2acb13c8a8f83308057242 Mon Sep 17 00:00:00 2001
From: dhk2 <donkimberlin@hotmail.com>
Date: Fri, 3 Jul 2020 14:41:09 -0700
Subject: [PATCH] adding controls to exit pip or switch to background audio

---
 .../net/schueller/peertube/activity/VideoPlayActivity.java | 7 +++++--
 .../schueller/peertube/fragment/VideoPlayerFragment.java   | 2 +-
 app/src/main/res/layout/row_video.xml                      | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index ba64f12..ba8c71e 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -70,6 +70,8 @@ import static net.schueller.peertube.helper.Constants.THEME_PREF_KEY;
 public class VideoPlayActivity extends AppCompatActivity {
 
     private static final String TAG = "VideoPlayActivity";
+
+
     private static boolean floatMode = false;
     private static final int REQUEST_CODE = 101;
     private BroadcastReceiver receiver;
@@ -171,7 +173,7 @@ public class VideoPlayActivity extends AppCompatActivity {
 
         if (isLandscape) {
             assert videoPlayerFragment != null;
-            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) videoPlayerFragment.requireView().getLayoutParams();
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) Objects.requireNonNull(videoPlayerFragment.getView()).getLayoutParams();
             params.width = FrameLayout.LayoutParams.MATCH_PARENT;
             params.height = FrameLayout.LayoutParams.MATCH_PARENT;
             videoPlayerFragment.getView().setLayoutParams(params);
@@ -186,7 +188,7 @@ public class VideoPlayActivity extends AppCompatActivity {
 
         } else {
             assert videoPlayerFragment != null;
-            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) videoPlayerFragment.requireView().getLayoutParams();
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) Objects.requireNonNull(videoPlayerFragment.getView()).getLayoutParams();
             params.width = FrameLayout.LayoutParams.MATCH_PARENT;
             params.height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 250, getResources().getDisplayMetrics());
             videoPlayerFragment.getView().setLayoutParams(params);
@@ -388,6 +390,7 @@ public class VideoPlayActivity extends AppCompatActivity {
                     if (action.equals(ACTION_PLAY)){
                         videoPlayerFragment.pauseToggle();
                     }
+                    */
                     if (action.equals(BACKGROUND_AUDIO)) {
                         unregisterReceiver(receiver);
                         finish();
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
index ab0e4d1..2c4140f 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
@@ -270,7 +270,7 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
     public void stopVideo() {
 
         if (mBound) {
-            requireContext().unbindService(mConnection);
+            Objects.requireNonNull(getContext()).unbindService(mConnection);
             mBound = false;
         }
     }
diff --git a/app/src/main/res/layout/row_video.xml b/app/src/main/res/layout/row_video.xml
index afc2c1e..170c104 100644
--- a/app/src/main/res/layout/row_video.xml
+++ b/app/src/main/res/layout/row_video.xml
@@ -3,6 +3,7 @@
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:focusable="true"
     card_view:cardCornerRadius="0dp"
     card_view:cardElevation="0dp"
     card_view:contentPadding="0dp"