From 83a1037ad861fc2e9088dd6ca21174da79a2d3dd Mon Sep 17 00:00:00 2001 From: James Leahy Date: Wed, 22 Feb 2023 17:26:18 +0100 Subject: [PATCH] ci: use paths --- .../video_player/example/lib/main.dart | 37 ++++++++++--------- .../video_player/example/pubspec.yaml | 2 + .../video_player/video_player/pubspec.yaml | 13 +++++-- .../video_player_android/example/pubspec.yaml | 3 +- .../video_player_android/pubspec.yaml | 4 +- .../example/pubspec.yaml | 3 +- .../video_player_avfoundation/pubspec.yaml | 4 +- .../video_player_web/example/pubspec.yaml | 3 +- .../video_player_web/pubspec.yaml | 4 +- 9 files changed, 46 insertions(+), 27 deletions(-) diff --git a/packages/video_player/video_player/example/lib/main.dart b/packages/video_player/video_player/example/lib/main.dart index 208cd2fc6c39..758741ca435b 100644 --- a/packages/video_player/video_player/example/lib/main.dart +++ b/packages/video_player/video_player/example/lib/main.dart @@ -6,7 +6,6 @@ /// An example of using the plugin, controlling lifecycle and playback of the /// video. - import 'package:flutter/material.dart'; import 'package:video_player/video_player.dart'; @@ -85,13 +84,10 @@ class _ButterFlyAssetVideoInList extends StatelessWidget { leading: Icon(Icons.cake), title: Text('Video video'), ), - Stack( - alignment: FractionalOffset.bottomRight + - const FractionalOffset(-0.1, -0.1), - children: [ - _ButterFlyAssetVideo(), - Image.asset('assets/flutter-mark-square-64.png'), - ]), + Stack(alignment: FractionalOffset.bottomRight + const FractionalOffset(-0.1, -0.1), children: [ + _ButterFlyAssetVideo(), + Image.asset('assets/flutter-mark-square-64.png'), + ]), ], ), ])), @@ -154,7 +150,18 @@ class _ButterFlyAssetVideoState extends State<_ButterFlyAssetVideo> { @override void initState() { super.initState(); - _controller = VideoPlayerController.asset('assets/Butterfly-209.mp4'); + _controller = VideoPlayerController.asset( + 'assets/Butterfly-209.mp4', + videoPlayerOptions: VideoPlayerOptions( + webOptions: const VideoPlayerWebOptions( + allowContextMenu: false, + controlsEnabled: true, + allowDownload: false, + allowFullscreen: false, + allowPlaybackRate: false, + ), + ), + ); _controller.addListener(() { setState(() {}); @@ -208,10 +215,8 @@ class _BumbleBeeRemoteVideoState extends State<_BumbleBeeRemoteVideo> { late VideoPlayerController _controller; Future _loadCaptions() async { - final String fileContents = await DefaultAssetBundle.of(context) - .loadString('assets/bumble_bee_captions.vtt'); - return WebVTTCaptionFile( - fileContents); // For vtt files, use WebVTTCaptionFile + final String fileContents = await DefaultAssetBundle.of(context).loadString('assets/bumble_bee_captions.vtt'); + return WebVTTCaptionFile(fileContents); // For vtt files, use WebVTTCaptionFile } @override @@ -265,8 +270,7 @@ class _BumbleBeeRemoteVideoState extends State<_BumbleBeeRemoteVideo> { } class _ControlsOverlay extends StatelessWidget { - const _ControlsOverlay({Key? key, required this.controller}) - : super(key: key); + const _ControlsOverlay({Key? key, required this.controller}) : super(key: key); static const List _exampleCaptionOffsets = [ Duration(seconds: -10), @@ -394,8 +398,7 @@ class _PlayerVideoAndPopPageState extends State<_PlayerVideoAndPopPage> { void initState() { super.initState(); - _videoPlayerController = - VideoPlayerController.asset('assets/Butterfly-209.mp4'); + _videoPlayerController = VideoPlayerController.asset('assets/Butterfly-209.mp4'); _videoPlayerController.addListener(() { if (startedPlaying && !_videoPlayerController.value.isPlaying) { Navigator.pop(context); diff --git a/packages/video_player/video_player/example/pubspec.yaml b/packages/video_player/video_player/example/pubspec.yaml index 0b30e9fb01e7..2bee204eddee 100644 --- a/packages/video_player/video_player/example/pubspec.yaml +++ b/packages/video_player/video_player/example/pubspec.yaml @@ -16,6 +16,8 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ + video_player_platform_interface: + path: ../../video_player_platform_interface dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml index 6519b109e272..48658e655ea3 100644 --- a/packages/video_player/video_player/pubspec.yaml +++ b/packages/video_player/video_player/pubspec.yaml @@ -4,6 +4,7 @@ description: Flutter plugin for displaying inline video with other Flutter repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 version: 2.5.3 +publish_to: 'none' environment: sdk: ">=2.14.0 <3.0.0" @@ -23,10 +24,14 @@ dependencies: flutter: sdk: flutter html: ^0.15.0 - video_player_android: ^2.3.5 - video_player_avfoundation: ^2.2.17 - video_player_platform_interface: ">=5.1.1 <7.0.0" - video_player_web: ^2.0.0 + video_player_android: + path: ../video_player_android + video_player_avfoundation: + path: ../video_player_avfoundation + video_player_platform_interface: + path: ../video_player_platform_interface + video_player_web: + path: ../video_player_web dev_dependencies: flutter_test: diff --git a/packages/video_player/video_player_android/example/pubspec.yaml b/packages/video_player/video_player_android/example/pubspec.yaml index 16ffe17e7ba3..3eff590e163c 100644 --- a/packages/video_player/video_player_android/example/pubspec.yaml +++ b/packages/video_player/video_player_android/example/pubspec.yaml @@ -16,7 +16,8 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ - video_player_platform_interface: ">=5.1.1 <7.0.0" + video_player_platform_interface: + path: ../../video_player_platform_interface dev_dependencies: flutter_driver: diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml index 9d9fc02e2e92..09980768a62d 100644 --- a/packages/video_player/video_player_android/pubspec.yaml +++ b/packages/video_player/video_player_android/pubspec.yaml @@ -3,6 +3,7 @@ description: Android implementation of the video_player plugin. repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 version: 2.3.11 +publish_to: 'none' environment: sdk: ">=2.14.0 <3.0.0" @@ -20,7 +21,8 @@ flutter: dependencies: flutter: sdk: flutter - video_player_platform_interface: ">=5.1.1 <7.0.0" + video_player_platform_interface: + path: ../video_player_platform_interface dev_dependencies: flutter_test: diff --git a/packages/video_player/video_player_avfoundation/example/pubspec.yaml b/packages/video_player/video_player_avfoundation/example/pubspec.yaml index 422fb91e35e5..19650a5ac44b 100644 --- a/packages/video_player/video_player_avfoundation/example/pubspec.yaml +++ b/packages/video_player/video_player_avfoundation/example/pubspec.yaml @@ -16,7 +16,8 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ - video_player_platform_interface: ">=4.2.0 <7.0.0" + video_player_platform_interface: + path: ../../video_player_platform_interface dev_dependencies: flutter_driver: diff --git a/packages/video_player/video_player_avfoundation/pubspec.yaml b/packages/video_player/video_player_avfoundation/pubspec.yaml index 52f3d67095f4..f5223627ef97 100644 --- a/packages/video_player/video_player_avfoundation/pubspec.yaml +++ b/packages/video_player/video_player_avfoundation/pubspec.yaml @@ -3,6 +3,7 @@ description: iOS implementation of the video_player plugin. repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_avfoundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 version: 2.4.0 +publish_to: 'none' environment: sdk: ">=2.18.0 <3.0.0" @@ -19,7 +20,8 @@ flutter: dependencies: flutter: sdk: flutter - video_player_platform_interface: ">=4.2.0 <7.0.0" + video_player_platform_interface: + path: ../video_player_platform_interface dev_dependencies: flutter_test: diff --git a/packages/video_player/video_player_web/example/pubspec.yaml b/packages/video_player/video_player_web/example/pubspec.yaml index c4de1ce54c1a..bbc319705eb3 100644 --- a/packages/video_player/video_player_web/example/pubspec.yaml +++ b/packages/video_player/video_player_web/example/pubspec.yaml @@ -9,7 +9,8 @@ dependencies: flutter: sdk: flutter js: ^0.6.0 - video_player_platform_interface: ">=4.2.0 <7.0.0" + video_player_platform_interface: + path: ../../video_player_platform_interface video_player_web: path: ../ diff --git a/packages/video_player/video_player_web/pubspec.yaml b/packages/video_player/video_player_web/pubspec.yaml index 9e2c9e66d5ef..70aa6146d3af 100644 --- a/packages/video_player/video_player_web/pubspec.yaml +++ b/packages/video_player/video_player_web/pubspec.yaml @@ -3,6 +3,7 @@ description: Web platform implementation of video_player. repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 version: 2.0.14 +publish_to: 'none' environment: sdk: ">=2.12.0 <3.0.0" @@ -21,7 +22,8 @@ dependencies: sdk: flutter flutter_web_plugins: sdk: flutter - video_player_platform_interface: ">=4.2.0 <7.0.0" + video_player_platform_interface: + path: ../video_player_platform_interface dev_dependencies: flutter_test: