From bf6c32c9cc51516740be03286950c37dc9428dc1 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Tue, 12 Dec 2023 09:43:43 -0800 Subject: [PATCH] [various] Update examples using video_player (#5653) Updates examples in other packages (image_picker, camera) that use the deprecated `VideoPlayerController.network` to use the newer `VideoPlayerController.networkUrl` instead. Fixes https://github.com/flutter/flutter/issues/127754 --- packages/camera/camera/CHANGELOG.md | 4 ++++ packages/camera/camera/example/lib/main.dart | 6 +----- packages/camera/camera/example/pubspec.yaml | 2 +- packages/camera/camera/pubspec.yaml | 3 +-- packages/camera/camera_android/CHANGELOG.md | 4 ++++ packages/camera/camera_android/example/lib/main.dart | 6 +----- packages/camera/camera_android/example/pubspec.yaml | 2 +- packages/camera/camera_android/pubspec.yaml | 2 +- packages/camera/camera_android_camerax/CHANGELOG.md | 4 ++++ .../camera/camera_android_camerax/example/lib/main.dart | 6 +----- packages/camera/camera_android_camerax/example/pubspec.yaml | 2 +- packages/camera/camera_android_camerax/pubspec.yaml | 2 +- packages/camera/camera_avfoundation/CHANGELOG.md | 3 ++- packages/camera/camera_avfoundation/example/lib/main.dart | 6 +----- packages/camera/camera_avfoundation/example/pubspec.yaml | 2 +- packages/camera/camera_avfoundation/pubspec.yaml | 2 +- packages/image_picker/image_picker/CHANGELOG.md | 3 ++- packages/image_picker/image_picker/example/lib/main.dart | 6 +----- packages/image_picker/image_picker/example/pubspec.yaml | 2 +- packages/image_picker/image_picker/pubspec.yaml | 2 +- 20 files changed, 31 insertions(+), 38 deletions(-) diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md index 5de9781549..4c53fe61f0 100644 --- a/packages/camera/camera/CHANGELOG.md +++ b/packages/camera/camera/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.5+7 + +* Updates example app to use non-deprecated video_player method. + ## 0.10.5+6 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/camera/camera/example/lib/main.dart b/packages/camera/camera/example/lib/main.dart index c187e72aad..481774cae2 100644 --- a/packages/camera/camera/example/lib/main.dart +++ b/packages/camera/camera/example/lib/main.dart @@ -986,11 +986,7 @@ class _CameraExampleHomeState extends State } final VideoPlayerController vController = kIsWeb - // TODO(gabrielokura): remove the ignore once the following line can migrate to - // use VideoPlayerController.networkUrl after the issue is resolved. - // https://github.com/flutter/flutter/issues/121927 - // ignore: deprecated_member_use - ? VideoPlayerController.network(videoFile!.path) + ? VideoPlayerController.networkUrl(Uri.parse(videoFile!.path)) : VideoPlayerController.file(File(videoFile!.path)); videoPlayerListener = () { diff --git a/packages/camera/camera/example/pubspec.yaml b/packages/camera/camera/example/pubspec.yaml index cf3560f240..fbfc6949e9 100644 --- a/packages/camera/camera/example/pubspec.yaml +++ b/packages/camera/camera/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: flutter: sdk: flutter path_provider: ^2.0.0 - video_player: ^2.1.4 + video_player: ^2.7.0 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index a14fb80eb3..14e3aa48a0 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing Dart. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.10.5+6 +version: 0.10.5+7 environment: sdk: ">=3.0.0 <4.0.0" @@ -34,7 +34,6 @@ dev_dependencies: sdk: flutter mockito: 5.4.3 plugin_platform_interface: ^2.0.0 - video_player: ^2.0.0 topics: - camera diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md index ef7c4c4ab4..0bf174e781 100644 --- a/packages/camera/camera_android/CHANGELOG.md +++ b/packages/camera/camera_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.8+15 + +* Updates example app to use non-deprecated video_player method. + ## 0.10.8+14 * Fixes `pausePreview` null pointer error. `pausePreview` should not be called diff --git a/packages/camera/camera_android/example/lib/main.dart b/packages/camera/camera_android/example/lib/main.dart index ed1528b416..be43ba998e 100644 --- a/packages/camera/camera_android/example/lib/main.dart +++ b/packages/camera/camera_android/example/lib/main.dart @@ -994,11 +994,7 @@ class _CameraExampleHomeState extends State } final VideoPlayerController vController = kIsWeb - // TODO(gabrielokura): remove the ignore once the following line can migrate to - // use VideoPlayerController.networkUrl after the issue is resolved. - // https://github.com/flutter/flutter/issues/121927 - // ignore: deprecated_member_use - ? VideoPlayerController.network(videoFile!.path) + ? VideoPlayerController.networkUrl(Uri.parse(videoFile!.path)) : VideoPlayerController.file(File(videoFile!.path)); videoPlayerListener = () { diff --git a/packages/camera/camera_android/example/pubspec.yaml b/packages/camera/camera_android/example/pubspec.yaml index a7f2bede8f..51be729613 100644 --- a/packages/camera/camera_android/example/pubspec.yaml +++ b/packages/camera/camera_android/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: flutter: sdk: flutter path_provider: ^2.0.0 - video_player: ^2.1.4 + video_player: ^2.7.0 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml index 4d7554d617..570d7597fe 100644 --- a/packages/camera/camera_android/pubspec.yaml +++ b/packages/camera/camera_android/pubspec.yaml @@ -3,7 +3,7 @@ description: Android implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.10.8+14 +version: 0.10.8+15 environment: sdk: ">=3.0.0 <4.0.0" diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index 53f295252d..e7d7bfd4ea 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0+24 + +* Updates example app to use non-deprecated video_player method. + ## 0.5.0+23 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/camera/camera_android_camerax/example/lib/main.dart b/packages/camera/camera_android_camerax/example/lib/main.dart index a4434e7d5a..449899aef7 100644 --- a/packages/camera/camera_android_camerax/example/lib/main.dart +++ b/packages/camera/camera_android_camerax/example/lib/main.dart @@ -971,11 +971,7 @@ class _CameraExampleHomeState extends State } final VideoPlayerController vController = kIsWeb - // TODO(gabrielokura): remove the ignore once the following line can migrate to - // use VideoPlayerController.networkUrl after the issue is resolved. - // https://github.com/flutter/flutter/issues/121927 - // ignore: deprecated_member_use - ? VideoPlayerController.network(videoFile!.path) + ? VideoPlayerController.networkUrl(Uri.parse(videoFile!.path)) : VideoPlayerController.file(File(videoFile!.path)); videoPlayerListener = () { diff --git a/packages/camera/camera_android_camerax/example/pubspec.yaml b/packages/camera/camera_android_camerax/example/pubspec.yaml index 7b0fadffbe..bdb8f51677 100644 --- a/packages/camera/camera_android_camerax/example/pubspec.yaml +++ b/packages/camera/camera_android_camerax/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: camera_platform_interface: ^2.2.0 flutter: sdk: flutter - video_player: ^2.4.10 + video_player: ^2.7.0 dev_dependencies: espresso: ^0.2.0 diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index 9d25da71bf..2cf3ac3b5d 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/packages/camera/camera_android_camerax/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_android_camerax description: Android implementation of the camera plugin using the CameraX library. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.5.0+23 +version: 0.5.0+24 environment: sdk: ">=3.0.0 <4.0.0" diff --git a/packages/camera/camera_avfoundation/CHANGELOG.md b/packages/camera/camera_avfoundation/CHANGELOG.md index c487812fab..ccc3b46c23 100644 --- a/packages/camera/camera_avfoundation/CHANGELOG.md +++ b/packages/camera/camera_avfoundation/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.9.13+8 +* Updates example app to use non-deprecated video_player method. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 0.9.13+7 diff --git a/packages/camera/camera_avfoundation/example/lib/main.dart b/packages/camera/camera_avfoundation/example/lib/main.dart index dca906cf26..304cd0279e 100644 --- a/packages/camera/camera_avfoundation/example/lib/main.dart +++ b/packages/camera/camera_avfoundation/example/lib/main.dart @@ -994,11 +994,7 @@ class _CameraExampleHomeState extends State } final VideoPlayerController vController = kIsWeb - // TODO(gabrielokura): remove the ignore once the following line can migrate to - // use VideoPlayerController.networkUrl after the issue is resolved. - // https://github.com/flutter/flutter/issues/121927 - // ignore: deprecated_member_use - ? VideoPlayerController.network(videoFile!.path) + ? VideoPlayerController.networkUrl(Uri.parse(videoFile!.path)) : VideoPlayerController.file(File(videoFile!.path)); videoPlayerListener = () { diff --git a/packages/camera/camera_avfoundation/example/pubspec.yaml b/packages/camera/camera_avfoundation/example/pubspec.yaml index 3332e37c0e..dd6b5f13d1 100644 --- a/packages/camera/camera_avfoundation/example/pubspec.yaml +++ b/packages/camera/camera_avfoundation/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: flutter: sdk: flutter path_provider: ^2.0.0 - video_player: ^2.1.4 + video_player: ^2.7.0 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/camera/camera_avfoundation/pubspec.yaml b/packages/camera/camera_avfoundation/pubspec.yaml index 13d4249b84..103859ffb3 100644 --- a/packages/camera/camera_avfoundation/pubspec.yaml +++ b/packages/camera/camera_avfoundation/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_avfoundation description: iOS implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.9.13+7 +version: 0.9.13+8 environment: sdk: ">=3.0.0 <4.0.0" diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index 850bd96394..03b66b572c 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 1.0.5 +* Updates example app to use non-deprecated video_player method. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 1.0.4 diff --git a/packages/image_picker/image_picker/example/lib/main.dart b/packages/image_picker/image_picker/example/lib/main.dart index 74626cfcea..2e1a3d720e 100755 --- a/packages/image_picker/image_picker/example/lib/main.dart +++ b/packages/image_picker/image_picker/example/lib/main.dart @@ -62,11 +62,7 @@ class _MyHomePageState extends State { await _disposeVideoController(); late VideoPlayerController controller; if (kIsWeb) { - // TODO(gabrielokura): remove the ignore once the following line can migrate to - // use VideoPlayerController.networkUrl after the issue is resolved. - // https://github.com/flutter/flutter/issues/121927 - // ignore: deprecated_member_use - controller = VideoPlayerController.network(file.path); + controller = VideoPlayerController.networkUrl(Uri.parse(file.path)); } else { controller = VideoPlayerController.file(File(file.path)); } diff --git a/packages/image_picker/image_picker/example/pubspec.yaml b/packages/image_picker/image_picker/example/pubspec.yaml index 3dd1f8dd8c..f38127fe67 100644 --- a/packages/image_picker/image_picker/example/pubspec.yaml +++ b/packages/image_picker/image_picker/example/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: path: ../ image_picker_platform_interface: ^2.8.0 mime: ^1.0.4 - video_player: ^2.1.4 + video_player: ^2.7.0 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index f43699a43e..7fde8ca7bb 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image library, and taking new pictures with the camera. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 1.0.4 +version: 1.0.5 environment: sdk: ">=3.0.0 <4.0.0"