Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
15a0d09
Add platform interface changes
FirentisTFW Jan 21, 2025
25520fc
Add platform view support for Android
FirentisTFW Jan 21, 2025
28d38c5
Rearrange native unit tests after merge
FirentisTFW Jan 21, 2025
0d3a753
Remove a todo in web implementation
FirentisTFW Jan 21, 2025
ea16d63
Set initial value of nextNonTexturePlayerId to Long.MAX_VALUE
FirentisTFW Jan 21, 2025
25425ca
Use player provider instead of modifiable list
FirentisTFW Jan 21, 2025
ce2aa51
Remove empty line
FirentisTFW Jan 21, 2025
8aeca10
Check player view states in Dart unit tests
FirentisTFW Jan 21, 2025
209f34f
Restore previous formatting for comments
FirentisTFW Jan 21, 2025
42cb659
Add missing licenses
FirentisTFW Jan 21, 2025
690ec54
Format files
FirentisTFW Jan 21, 2025
6db9e6d
Fix linting issues
FirentisTFW Jan 21, 2025
277bff7
Rename textureId to playerId in platform interace methods
FirentisTFW Jan 21, 2025
5aca5db
Rename textureId to playerId in Android Dart files
FirentisTFW Jan 21, 2025
751d529
Rename textureId to playerId in Android native code
FirentisTFW Jan 21, 2025
e6f856b
Add an ignore to UI test (it times out on Firebase Test Lab)
FirentisTFW Jan 21, 2025
b752b4c
Merge branch 'main' into feature/video-player-android-platform-view-s…
FirentisTFW Jan 28, 2025
8fc1fa0
Bump platform interface dependency to 6.3.0
FirentisTFW Jan 28, 2025
b745dcc
Remove resolved todo and fix dartdocs
FirentisTFW Jan 28, 2025
773cfc1
Add missing import
FirentisTFW Jan 28, 2025
89dfcea
Format test file
FirentisTFW Jan 28, 2025
f59463a
Add more context to class names for native views
FirentisTFW Jan 28, 2025
650cc21
Add missing docs for Android
FirentisTFW Jan 28, 2025
18463e7
Format file
FirentisTFW Jan 28, 2025
11647d0
Remove redundant async keyword
FirentisTFW Jan 29, 2025
8f9ccd8
Depend on platform interface 6.3.0
FirentisTFW Feb 10, 2025
0c2e19b
Add more details to javadocs for players
FirentisTFW Feb 10, 2025
17d5c6c
Rename method for clarity
FirentisTFW Feb 10, 2025
10640da
Remove "///" from a javadoc
FirentisTFW Feb 11, 2025
7917c0c
Add unit tests for NativeVideoView and NativeVideoViewFactory
FirentisTFW Feb 19, 2025
06b20a1
Add unit tests for VideoPlayerPlugin.create method
FirentisTFW Feb 19, 2025
1e51f8c
Add empty line to separate concepts
FirentisTFW Feb 19, 2025
e2a5afa
Clean up newly added tests
FirentisTFW Feb 19, 2025
2692564
Sort imports
FirentisTFW Feb 19, 2025
f5258df
Add missing licenses
FirentisTFW Feb 19, 2025
1bbe2c2
Split ExoPlayerEventListener into two classes, for platform view and …
FirentisTFW Feb 24, 2025
f43e9ba
Make class final
FirentisTFW Feb 24, 2025
22c9241
Use "PlatformView" instead of "NativeView" everywhere
FirentisTFW Feb 24, 2025
df3959d
Rename TextureBased to Texture, move texture player to a separate pac…
FirentisTFW Feb 24, 2025
4575c4c
Make VideoPlayer abstract
FirentisTFW Feb 24, 2025
eae1eb5
Clean up analysis
FirentisTFW Feb 24, 2025
c39b14c
Rename nextNonTexturePlayerId to nextPlatformViewPlayerId
FirentisTFW Feb 24, 2025
8d3279d
Split tests for exo player event listeners
FirentisTFW Feb 24, 2025
2862323
Update implementation comment
FirentisTFW Feb 24, 2025
314bf82
Use widget instead of a method
FirentisTFW Feb 24, 2025
feca35d
Move VideoPlayerProvider to PlatformVideoViewFactory
FirentisTFW Feb 24, 2025
7956b19
Comment on swapping width and height
FirentisTFW Feb 25, 2025
70ed428
Remove redundant abstract class method
FirentisTFW Feb 25, 2025
ce63f14
Handle SurfaceView on Android 9 correctly, document workarounds
FirentisTFW Feb 25, 2025
81a71a3
Test output, not internal state
FirentisTFW Feb 25, 2025
41891d2
Remove overriden == operator as it's not needed anymore
FirentisTFW Feb 25, 2025
6bf34e7
Clean up code
FirentisTFW Feb 25, 2025
dc08e2d
Format code
FirentisTFW Feb 25, 2025
0681400
Use custom test class in VideoPlayerTest
FirentisTFW Feb 25, 2025
b0f282d
Add missing licenses
FirentisTFW Feb 25, 2025
6c17ebc
Add a todo to decouple identifiers in the future
FirentisTFW Feb 26, 2025
9895676
Format file
FirentisTFW Feb 26, 2025
da1b78d
Resolve lint issues
FirentisTFW Feb 26, 2025
ae4bfae
Inline method
FirentisTFW Feb 26, 2025
371c462
Format file
FirentisTFW Feb 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use widget instead of a method
  • Loading branch information
FirentisTFW committed Feb 24, 2025
commit 314bf827d4eaa0ef7db3a4d271d1c1a3370c3e96
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@

import 'dart:async';

import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:video_player_platform_interface/video_player_platform_interface.dart';

import 'messages.g.dart';
import 'platform_view_player.dart';

/// An Android implementation of [VideoPlayerPlatform] that uses the
/// Pigeon-generated [VideoPlayerApi].
Expand Down Expand Up @@ -189,52 +187,13 @@ class AndroidVideoPlayer extends VideoPlayerPlatform {
return switch (viewState) {
VideoPlayerTextureViewState(:final int textureId) =>
Texture(textureId: textureId),
VideoPlayerPlatformViewState() => _buildPlatformView(playerId),
VideoPlayerPlatformViewState() => PlatformViewPlayer(playerId: playerId),
null => throw Exception(
'Could not find corresponding view type for playerId: $playerId',
),
};
}

Widget _buildPlatformView(int playerId) {
const String viewType = 'plugins.flutter.dev/video_player_android';
final PlatformVideoViewCreationParams creationParams =
PlatformVideoViewCreationParams(playerId: playerId);

return Builder(
// IgnorePointer so that GestureDetector can be used above the platform view.
builder: (BuildContext context) => IgnorePointer(
child: PlatformViewLink(
viewType: viewType,
surfaceFactory: (
BuildContext context,
PlatformViewController controller,
) {
return AndroidViewSurface(
controller: controller as AndroidViewController,
gestureRecognizers: const <Factory<
OneSequenceGestureRecognizer>>{},
hitTestBehavior: PlatformViewHitTestBehavior.opaque,
);
},
onCreatePlatformView: (PlatformViewCreationParams params) {
return PlatformViewsService.initSurfaceAndroidView(
id: params.id,
viewType: viewType,
layoutDirection:
Directionality.maybeOf(context) ?? TextDirection.ltr,
creationParams: creationParams,
creationParamsCodec: AndroidVideoPlayerApi.pigeonChannelCodec,
onFocus: () => params.onFocusChanged(true),
)
..addOnPlatformViewCreatedListener(params.onPlatformViewCreated)
..create();
},
),
),
);
}

@override
Future<void> setMixWithOthers(bool mixWithOthers) {
return _api.setMixWithOthers(mixWithOthers);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';

import 'messages.g.dart';

/// A widget that displays a video player using a platform view.
class PlatformViewPlayer extends StatelessWidget {
/// Creates a new instance of [PlatformViewPlayer].
const PlatformViewPlayer({
super.key,
required this.playerId,
});

/// The ID of the player.
final int playerId;

@override
Widget build(BuildContext context) {
const String viewType = 'plugins.flutter.dev/video_player_android';
final PlatformVideoViewCreationParams creationParams =
PlatformVideoViewCreationParams(playerId: playerId);

return Builder(
// IgnorePointer so that GestureDetector can be used above the platform view.
builder: (BuildContext context) => IgnorePointer(
child: PlatformViewLink(
viewType: viewType,
surfaceFactory: (
BuildContext context,
PlatformViewController controller,
) {
return AndroidViewSurface(
controller: controller as AndroidViewController,
gestureRecognizers: const <Factory<
OneSequenceGestureRecognizer>>{},
hitTestBehavior: PlatformViewHitTestBehavior.opaque,
);
},
onCreatePlatformView: (PlatformViewCreationParams params) {
return PlatformViewsService.initSurfaceAndroidView(
id: params.id,
viewType: viewType,
layoutDirection:
Directionality.maybeOf(context) ?? TextDirection.ltr,
creationParams: creationParams,
creationParamsCodec: AndroidVideoPlayerApi.pigeonChannelCodec,
onFocus: () => params.onFocusChanged(true),
)
..addOnPlatformViewCreatedListener(params.onPlatformViewCreated)
..create();
},
),
),
);
}
}