Use "PlatformView" instead of "NativeView" everywhere

flutter · auto-submit · Mar 4, 2025 · Jan 21, 2025 · Jan 21, 2025 · Jan 21, 2025
commit 22c9241246bafc5ebac98a2fefdb4b52944bb769
@@ -15,16 +15,17 @@
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.PlaybackParameters;
 import androidx.media3.exoplayer.ExoPlayer;
+import io.flutter.plugins.videoplayer.platformview.PlatformVideoViewFactory;
 import io.flutter.plugins.videoplayer.platformview.PlatformViewExoPlayerEventListener;
 
 /**
  * A class responsible for managing video playback using {@link ExoPlayer}. It provides methods to
  * control playback, adjust volume, and handle seeking. This class contains all functionalities
  * needed to manage video playback in platform views and is typically used alongside {@link
- * NativeVideoViewFactory}. If you need to display a video using a texture, use {@link
+ * PlatformVideoViewFactory}. If you need to display a video using a texture, use {@link
  * TextureBasedVideoPlayer} instead.
  */
-class VideoPlayer {
+public class VideoPlayer {
   @NonNull private final ExoPlayerProvider exoPlayerProvider;
   @NonNull private final MediaItem mediaItem;
   @NonNull private final VideoPlayerOptions options;
@@ -150,7 +151,7 @@ long getPosition() {
   }
 
   @NonNull
-  ExoPlayer getExoPlayer() {
+  public ExoPlayer getExoPlayer() {
     return exoPlayer;
   }
 

@@ -14,6 +14,7 @@
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugins.videoplayer.Messages.AndroidVideoPlayerApi;
 import io.flutter.plugins.videoplayer.Messages.CreateMessage;
+import io.flutter.plugins.videoplayer.platformview.PlatformVideoViewFactory;
 import io.flutter.view.TextureRegistry;
 
 /** Android platform implementation of the VideoPlayerPlugin. */
@@ -48,7 +49,7 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
         .getPlatformViewRegistry()
         .registerViewFactory(
             "plugins.flutter.dev/video_player_android",
-            new NativeVideoViewFactory(videoPlayers::get));
+            new PlatformVideoViewFactory(videoPlayers::get));
   }
 
   @Override

diff --git a/...yer_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerProvider.java b/...yer_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerProvider.java
@@ -6,9 +6,10 @@
 
 import androidx.annotation.NonNull;
 
+// FIXME Public temporarily (?)
 /** Functional interface for providing a VideoPlayer instance based on the player ID. */
 @FunctionalInterface
-interface VideoPlayerProvider {
+public interface VideoPlayerProvider {
   /**
    * Retrieves a VideoPlayer instance based on the provided player ID.
    *

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.videoplayer;
+package io.flutter.plugins.videoplayer.platformview;
 
 import android.content.Context;
 import android.view.SurfaceView;
@@ -15,16 +15,16 @@
  * A class used to create a native video view that can be embedded in a Flutter app. It wraps an
  * {@link ExoPlayer} instance and displays its video content.
  */
-final class NativeVideoView implements PlatformView {
+public final class PlatformVideoView implements PlatformView {
   @NonNull private final SurfaceView surfaceView;
 
   /**
-   * Constructs a new NativeVideoView.
+   * Constructs a new PlatformVideoView.
    *
    * @param context The context in which the view is running.
    * @param exoPlayer The ExoPlayer instance used to play the video.
    */
-  NativeVideoView(@NonNull Context context, @NonNull ExoPlayer exoPlayer) {
+  public PlatformVideoView(@NonNull Context context, @NonNull ExoPlayer exoPlayer) {
     surfaceView = new SurfaceView(context);
     // The line below is needed to display the video correctly on older Android versions (blank
     // space instead of a video).

@@ -2,30 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.videoplayer;
+package io.flutter.plugins.videoplayer.platformview;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.media3.exoplayer.ExoPlayer;
 import io.flutter.plugin.platform.PlatformView;
 import io.flutter.plugin.platform.PlatformViewFactory;
+import io.flutter.plugins.videoplayer.Messages;
+import io.flutter.plugins.videoplayer.VideoPlayer;
+import io.flutter.plugins.videoplayer.VideoPlayerProvider;
+
 import java.util.Objects;
 
 /**
  * A factory class responsible for creating native video views that can be embedded in a Flutter
  * app.
  */
-class NativeVideoViewFactory extends PlatformViewFactory {
+public class PlatformVideoViewFactory extends PlatformViewFactory {
   private final VideoPlayerProvider videoPlayerProvider;
 
   /**
-   * Constructs a new NativeVideoViewFactory.
+   * Constructs a new PlatformVideoViewFactory.
    *
    * @param videoPlayerProvider The provider used to retrieve the video player associated with the
    *     view.
    */
-  public NativeVideoViewFactory(@NonNull VideoPlayerProvider videoPlayerProvider) {
+  public PlatformVideoViewFactory(@NonNull VideoPlayerProvider videoPlayerProvider) {
     super(Messages.AndroidVideoPlayerApi.getCodec());
     this.videoPlayerProvider = videoPlayerProvider;
   }
@@ -36,7 +40,7 @@ public NativeVideoViewFactory(@NonNull VideoPlayerProvider videoPlayerProvider)
    * @param context The context in which the view is running.
    * @param id The unique identifier for the view.
    * @param args The arguments for creating the view.
-   * @return A new instance of NativeVideoView.
+   * @return A new instance of PlatformVideoView.
    */
   @NonNull
   @Override
@@ -48,6 +52,6 @@ public PlatformView create(@NonNull Context context, int id, @Nullable Object ar
     final VideoPlayer player = videoPlayerProvider.getVideoPlayer(playerId);
     final ExoPlayer exoPlayer = player.getExoPlayer();
 
-    return new NativeVideoView(context, exoPlayer);
+    return new PlatformVideoView(context, exoPlayer);
   }
 }
@@ -10,11 +10,13 @@
 import android.content.Context;
 import androidx.media3.exoplayer.ExoPlayer;
 import io.flutter.plugin.platform.PlatformView;
+import io.flutter.plugins.videoplayer.platformview.PlatformVideoView;
+import io.flutter.plugins.videoplayer.platformview.PlatformVideoViewFactory;
 import org.junit.Test;
 
-public class NativeVideoViewFactoryTest {
+public class PlatformVideoViewFactoryTest {
   @Test
-  public void createsNativeVideoViewBasedOnSuppliedArguments() throws Exception {
+  public void createsPlatformVideoViewBasedOnSuppliedArguments() throws Exception {
     final VideoPlayerProvider videoPlayerProvider = mock(VideoPlayerProvider.class);
     final VideoPlayer videoPlayer = mock(VideoPlayer.class);
     final ExoPlayer exoPlayer = mock(ExoPlayer.class);
@@ -24,13 +26,13 @@ public void createsNativeVideoViewBasedOnSuppliedArguments() throws Exception {
     when(videoPlayerProvider.getVideoPlayer(playerId)).thenReturn(videoPlayer);
     when(videoPlayer.getExoPlayer()).thenReturn(exoPlayer);
 
-    final NativeVideoViewFactory factory = new NativeVideoViewFactory(videoPlayerProvider);
+    final PlatformVideoViewFactory factory = new PlatformVideoViewFactory(videoPlayerProvider);
     final Messages.PlatformVideoViewCreationParams args =
         new Messages.PlatformVideoViewCreationParams.Builder().setPlayerId(playerId).build();
 
     final PlatformView view = factory.create(context, 0, args);
 
-    assertTrue(view instanceof NativeVideoView);
+    assertTrue(view instanceof PlatformVideoView);
     verify(videoPlayerProvider).getVideoPlayer(playerId);
     verify(videoPlayer).getExoPlayer();
   }

@@ -13,15 +13,17 @@
 import java.lang.reflect.Field;
 import org.junit.Test;
 
-public class NativeVideoViewTest {
+import io.flutter.plugins.videoplayer.platformview.PlatformVideoView;
+
+public class PlatformVideoViewTest {
   @Test
   public void createsSurfaceViewAndSetsItForExoPlayer() throws Exception {
     final Context mockContext = mock(Context.class);
     final ExoPlayer mockExoPlayer = mock(ExoPlayer.class);
 
-    final NativeVideoView view = new NativeVideoView(mockContext, mockExoPlayer);
+    final PlatformVideoView view = new PlatformVideoView(mockContext, mockExoPlayer);
 
-    final Field field = NativeVideoView.class.getDeclaredField("surfaceView");
+    final Field field = PlatformVideoView.class.getDeclaredField("surfaceView");
     field.setAccessible(true);
     final SurfaceView surfaceView = (SurfaceView) field.get(view);
 

@@ -13,6 +13,7 @@
 import io.flutter.plugin.platform.PlatformViewRegistry;
 import io.flutter.plugins.videoplayer.Messages.CreateMessage;
 import io.flutter.plugins.videoplayer.Messages.PlatformVideoViewType;
+import io.flutter.plugins.videoplayer.platformview.PlatformVideoViewFactory;
 import io.flutter.view.TextureRegistry;
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -61,10 +62,10 @@ public void initPluginDoesNotThrow() {
   }
 
   @Test
-  public void registersNativeVideoViewFactory() throws Exception {
+  public void registersPlatformVideoViewFactory() throws Exception {
     verify(mockPlatformViewRegistry)
         .registerViewFactory(
-            eq("plugins.flutter.dev/video_player_android"), any(NativeVideoViewFactory.class));
+            eq("plugins.flutter.dev/video_player_android"), any(PlatformVideoViewFactory.class));
   }
 
   @Test