chore(android): update UI controller according to media3

android/src/main/java/com/brentvatne/common/api/ControlsConfig.kt

@@ -7,6 +7,8 @@ class ControlsConfig {
     var hideSeekBar: Boolean = false
     var seekIncrementMS: Int = 10000
     var hideDuration: Boolean = false
+    var showSubtitleButton: Boolean = true
+    var showSettingButton: Boolean = true
     var hideNavigationBarOnFullScreenMode: Boolean = true
     var hideNotificationBarOnFullScreenMode: Boolean = true
 
@@ -19,6 +21,8 @@ class ControlsConfig {
                 config.hideSeekBar = ReactBridgeUtils.safeGetBool(src, "hideSeekBar", false)
                 config.seekIncrementMS = ReactBridgeUtils.safeGetInt(src, "seekIncrementMS", 10000)
                 config.hideDuration = ReactBridgeUtils.safeGetBool(src, "hideDuration", false)
+                config.showSubtitleButton = ReactBridgeUtils.safeGetBool(src, "showSubtitleButton", true)
+                config.showSettingButton = ReactBridgeUtils.safeGetBool(src, "showSettingButton", true)
                 config.hideNavigationBarOnFullScreenMode = ReactBridgeUtils.safeGetBool(src, "hideNavigationBarOnFullScreenMode", true)
                 config.hideNotificationBarOnFullScreenMode = ReactBridgeUtils.safeGetBool(src, "hideNotificationBarOnFullScreenMode", true)
             }

android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java

@@ -1,29 +1,25 @@
 package com.brentvatne.exoplayer;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.SurfaceView;
+import android.view.TextureView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.media3.common.AdViewProvider;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.Player;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.VideoSize;
 import androidx.media3.common.text.Cue;
-import androidx.media3.common.util.Assertions;
 import androidx.media3.exoplayer.ExoPlayer;
+import androidx.media3.ui.PlayerView;
 import androidx.media3.ui.SubtitleView;
 
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.SurfaceView;
-import android.view.TextureView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
 import com.brentvatne.common.api.ResizeMode;
 import com.brentvatne.common.api.SubtitleStyle;
 import com.brentvatne.common.api.ViewType;
@@ -32,89 +28,68 @@
 
 import java.util.List;
 
-@SuppressLint("ViewConstructor")
-public final class ExoPlayerView extends FrameLayout implements AdViewProvider {
+public final class ExoPlayerView extends PlayerView {
     private final static String TAG = "ExoPlayerView";
     private View surfaceView;
     private final View shutterView;
-    private final SubtitleView subtitleLayout;
-    private final AspectRatioFrameLayout layout;
     private final ComponentListener componentListener;
     private ExoPlayer player;
     private final Context context;
     private final ViewGroup.LayoutParams layoutParams;
-    private final FrameLayout adOverlayFrameLayout;
+    private final AspectRatioFrameLayout layout;
 
     private @ViewType.ViewType int viewType = ViewType.VIEW_TYPE_SURFACE;
     private boolean hideShutterView = false;
 
-    private SubtitleStyle localStyle = new SubtitleStyle();
-
     public ExoPlayerView(Context context) {
         super(context, null, 0);
 
         this.context = context;
 
+        shutterView = findViewById(androidx.media3.ui.R.id.exo_shutter);
+
         layoutParams = new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT);
 
         componentListener = new ComponentListener();
-
         FrameLayout.LayoutParams aspectRatioParams = new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT,
                 FrameLayout.LayoutParams.MATCH_PARENT);
         aspectRatioParams.gravity = Gravity.CENTER;
         layout = new AspectRatioFrameLayout(context);
         layout.setLayoutParams(aspectRatioParams);
 
-        shutterView = new View(getContext());
-        shutterView.setLayoutParams(layoutParams);
-        shutterView.setBackgroundColor(ContextCompat.getColor(context, android.R.color.black));
-
-        subtitleLayout = new SubtitleView(context);
-        subtitleLayout.setLayoutParams(layoutParams);
-        subtitleLayout.setUserDefaultStyle();
-        subtitleLayout.setUserDefaultTextSize();
-
         updateSurfaceView(viewType);
-
-        adOverlayFrameLayout = new FrameLayout(context);
-
-        layout.addView(shutterView, 1, layoutParams);
-        if (localStyle.getSubtitlesFollowVideo()) {
-            layout.addView(subtitleLayout, layoutParams);
-            layout.addView(adOverlayFrameLayout, layoutParams);
-        }
-
         addViewInLayout(layout, 0, aspectRatioParams);
-        if (!localStyle.getSubtitlesFollowVideo()) {
-            addViewInLayout(subtitleLayout, 1, layoutParams);
-        }
     }
 
-    private void clearVideoView() {
+    private void setVideoView() {
         if (surfaceView instanceof TextureView) {
-            player.clearVideoTextureView((TextureView) surfaceView);
+            player.setVideoTextureView((TextureView) surfaceView);
         } else if (surfaceView instanceof SurfaceView) {
-            player.clearVideoSurfaceView((SurfaceView) surfaceView);
+            player.setVideoSurfaceView((SurfaceView) surfaceView);
         }
     }
 
-    private void setVideoView() {
+    private void clearVideoView() {
+        View surfaceView = this.getVideoSurfaceView();
         if (surfaceView instanceof TextureView) {
-            player.setVideoTextureView((TextureView) surfaceView);
+            player.clearVideoTextureView((TextureView) surfaceView);
         } else if (surfaceView instanceof SurfaceView) {
-            player.setVideoSurfaceView((SurfaceView) surfaceView);
+            player.clearVideoSurfaceView((SurfaceView) surfaceView);
         }
     }
 
     public boolean isPlaying() {
         return player != null && player.isPlaying();
     }
 
+
+
     public void setSubtitleStyle(SubtitleStyle style) {
         // ensure we reset subtitle style before reapplying it
+        SubtitleView subtitleLayout = getSubtitleView();
         subtitleLayout.setUserDefaultStyle();
         subtitleLayout.setUserDefaultTextSize();
 
@@ -128,22 +103,6 @@ public void setSubtitleStyle(SubtitleStyle style) {
         } else {
             subtitleLayout.setVisibility(View.GONE);
         }
-        if (localStyle.getSubtitlesFollowVideo() != style.getSubtitlesFollowVideo()) {
-            // No need to manipulate layout if value didn't change
-            if (style.getSubtitlesFollowVideo()) {
-                removeViewInLayout(subtitleLayout);
-                layout.addView(subtitleLayout, layoutParams);
-            } else {
-                layout.removeViewInLayout(subtitleLayout);
-                addViewInLayout(subtitleLayout, 1, layoutParams, false);
-            }
-            requestLayout();
-        }
-        localStyle = style;
-    }
-
-    public void setShutterColor(Integer color) {
-        shutterView.setBackgroundColor(color);
     }
 
     public void updateSurfaceView(@ViewType.ViewType int viewType) {
@@ -154,46 +113,56 @@ public void updateSurfaceView(@ViewType.ViewType int viewType) {
                 surfaceView = new SurfaceView(context);
                 viewNeedRefresh = true;
             }
-            ((SurfaceView)surfaceView).setSecure(viewType == ViewType.VIEW_TYPE_SURFACE_SECURE);
+            ((SurfaceView) surfaceView).setSecure(viewType == ViewType.VIEW_TYPE_SURFACE_SECURE);
         } else if (viewType == ViewType.VIEW_TYPE_TEXTURE) {
             if (!(surfaceView instanceof TextureView)) {
                 surfaceView = new TextureView(context);
                 viewNeedRefresh = true;
+                // Support opacity properly:
+                ((TextureView) surfaceView).setOpaque(false);
+            } else {
+                DebugLog.wtf(TAG, "Unexpected texture view type: " + viewType);
             }
-            // Support opacity properly:
-            ((TextureView) surfaceView).setOpaque(false);
-        } else {
-            DebugLog.wtf(TAG, "wtf is this texture " + viewType);
         }
-        if (viewNeedRefresh) {
-            surfaceView.setLayoutParams(layoutParams);
+            if (viewNeedRefresh) {
+                surfaceView.setLayoutParams(layoutParams);
 
-            if (layout.getChildAt(0) != null) {
-                layout.removeViewAt(0);
-            }
-            layout.addView(surfaceView, 0, layoutParams);
+                if (layout.getChildAt(0) != null) {
+                    layout.removeViewAt(0);
+                }
+                layout.addView(surfaceView, 0, layoutParams);
 
-            if (this.player != null) {
-                setVideoView();
+                if (this.player != null) {
+                    setVideoView();
+                }
             }
         }
-    }
 
     private void hideShutterView() {
-        shutterView.setVisibility(INVISIBLE);
-        surfaceView.setAlpha(1);
+        if (shutterView != null) {
+            shutterView.setVisibility(INVISIBLE);
+            if (surfaceView != null) {
+                surfaceView.setAlpha(1);
+            }
+        }
     }
 
     private void showShutterView() {
-        shutterView.setVisibility(VISIBLE);
-        surfaceView.setAlpha(0);
+        if (shutterView != null) {
+            shutterView.setVisibility(VISIBLE);
+            if (surfaceView != null) {
+                surfaceView.setAlpha(0);
+            }
+        }
     }
 
     private void updateShutterViewVisibility() {
-        if (this.hideShutterView) {
-            hideShutterView();
-        } else {
-            showShutterView();
+        if (shutterView != null) {
+            if (this.hideShutterView) {
+                hideShutterView();
+            } else {
+                showShutterView();
+            }
         }
     }
 
@@ -203,13 +172,6 @@ public void requestLayout() {
         post(measureAndLayout);
     }
 
-    // AdsLoader.AdViewProvider implementation.
-
-    @Override
-    public ViewGroup getAdViewGroup() {
-        return Assertions.checkNotNull(adOverlayFrameLayout, "exo_ad_overlay must be present for ad playback");
-    }
-
     /**
      * Set the {@link ExoPlayer} to use. The {@link ExoPlayer#addListener} method of the
      * player will be called and previous
@@ -226,9 +188,8 @@ public void setPlayer(ExoPlayer player) {
             clearVideoView();
         }
         this.player = player;
-
-        updateShutterViewVisibility();
-
+        ((PlayerView)this).setPlayer(player);
+        setHideShutterView(this.hideShutterView);
         if (player != null) {
             setVideoView();
             player.addListener(componentListener);
@@ -282,19 +243,19 @@ private void updateForCurrentTrackSelections(Tracks tracks) {
             }
         }
         // no video tracks, in that case refresh shutterView visibility
-        shutterView.setVisibility(this.hideShutterView ? View.INVISIBLE : View.VISIBLE);
-    }
-
-    public void invalidateAspectRatio() {
-        // Resetting aspect ratio will force layout refresh on next video size changed
-        layout.invalidateAspectRatio();
+        setHideShutterView(hideShutterView);
     }
 
     private final class ComponentListener implements Player.Listener {
 
         @Override
         public void onCues(@NonNull List<Cue> cues) {
-            subtitleLayout.setCues(cues);
+            SubtitleView subtitleView = getSubtitleView();
+            if (subtitleView != null) {
+                subtitleView.setCues(cues);
+            } else {
+                DebugLog.w("SubtitleHandler", "Subtitle view is null, cannot set cues");
+            }
         }
 
         @Override