Added Patch created apollos as a permanent fix

ApollosProject · Dec 29, 2023 · 139d695 · 139d695
1 parent eef48e4
commit 139d695
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -256,6 +256,17 @@ public void onHostResume() {
         isInBackground = false;
     }
 
+    public void setShowControlsModifier(final boolean showControls) {
+        if(player == null) return;
+        reLayout(playerControlView);
+        if (showControls) {
+            playerControlView.show();
+        }
+        else {
+            playerControlView.hide();
+        }
+    }
+
     @Override
     public void onHostPause() {
         isInBackground = true;

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
@@ -71,6 +71,8 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi
     private static final String PROP_HIDE_SHUTTER_VIEW = "hideShutterView";
     private static final String PROP_CONTROLS = "controls";
 
+    public static final String PROP_SHOW_CONTROLS = "showControls";
+
     private ReactExoplayerConfig config;
 
     public ReactExoplayerViewManager(ReactExoplayerConfig config) {
@@ -314,6 +316,11 @@ public void setControls(final ReactExoplayerView videoView, final boolean contro
         videoView.setControls(controls);
     }
 
+    @ReactProp(name = PROP_SHOW_CONTROLS, defaultBoolean = false)
+    public void setShowControls(final ReactExoplayerView videoView, final boolean control) {
+              videoView.setShowControlsModifier(control);
+            }
+
     @ReactProp(name = PROP_BUFFER_CONFIG)
     public void setBufferConfig(final ReactExoplayerView videoView, @Nullable ReadableMap bufferConfig) {
         int minBufferMs = DefaultLoadControl.DEFAULT_MIN_BUFFER_MS;

diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoView.java b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
@@ -413,6 +413,14 @@ public void setPausedModifier(final boolean paused) {
         setKeepScreenOn(!mPaused && mPreventsDisplaySleepDuringVideoPlayback);
     }
 
+
+  public void setShowControlsModifier(final boolean paused) {
+    if (mUseNativeControls) {
+      initializeMediaControllerIfNeeded();
+      mediaController.show();
+    }
+  }
+
     // reduces the volume based on stereoPan
     private float calulateRelativeVolume() {
         float relativeVolume = (mVolume * (1 - Math.abs(mStereoPan)));

diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoViewManager.java b/android/src/main/java/com/brentvatne/react/ReactVideoViewManager.java
@@ -29,6 +29,7 @@ public class ReactVideoViewManager extends SimpleViewManager<ReactVideoView> {
     public static final String PROP_RESIZE_MODE = "resizeMode";
     public static final String PROP_REPEAT = "repeat";
     public static final String PROP_PAUSED = "paused";
+    public static final String PROP_SHOW_CONTROLS = "showControls";
     public static final String PROP_MUTED = "muted";
     public static final String PROP_PREVENTS_DISPLAY_SLEEP_DURING_VIDEO_PLAYBACK = "preventsDisplaySleepDuringVideoPlayback";
     public static final String PROP_VOLUME = "volume";
@@ -125,6 +126,11 @@ public void setPaused(final ReactVideoView videoView, final boolean paused) {
         videoView.setPausedModifier(paused);
     }
 
+    @ReactProp(name = PROP_SHOW_CONTROLS, defaultBoolean = false)
+    public void setShowControls(final ReactVideoView videoView, final boolean control) {
+      videoView.setShowControlsModifier(control);
+    }
+
     @ReactProp(name = PROP_MUTED, defaultBoolean = false)
     public void setMuted(final ReactVideoView videoView, final boolean muted) {
         videoView.setMutedModifier(muted);