From d8490322d9ff314210569cd76db53ed4e1e9688a Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Thu, 28 Nov 2024 22:22:33 +0530 Subject: [PATCH] fix: update for iOS --- mobile/lib/main.dart | 6 ++++++ mobile/pubspec.lock | 23 +++++++++++++++-------- mobile/pubspec.yaml | 11 +++-------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart index f44a3d799f..33dd4cc4ea 100644 --- a/mobile/lib/main.dart +++ b/mobile/lib/main.dart @@ -51,6 +51,7 @@ import "package:photos/utils/email_util.dart"; import 'package:photos/utils/file_uploader.dart'; import "package:photos/utils/lock_screen_settings.dart"; import 'package:shared_preferences/shared_preferences.dart'; +import "package:video_player_media_kit/video_player_media_kit.dart"; final _logger = Logger("main"); @@ -65,6 +66,11 @@ const kBGPushTimeout = Duration(seconds: 28); const kFGTaskDeathTimeoutInMicroseconds = 5000000; void main() async { + VideoPlayerMediaKit.ensureInitialized( + android: + true, // default: false - dependency: media_kit_libs_android_video + iOS: true, // default: false - dependency: media_kit_libs_ios_video + ); debugRepaintRainbowEnabled = false; WidgetsFlutterBinding.ensureInitialized(); //For audio to work on vidoes in iOS when in silent mode. diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 3de20725fb..c104e49bac 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -250,12 +250,11 @@ packages: chewie: dependency: "direct main" description: - path: "." - ref: forked_video_player_plus - resolved-ref: "2d8908efe9d7533ec76abe2e59444547c4031f28" - url: "https://github.com/ente-io/chewie.git" - source: git - version: "1.7.1" + name: chewie + sha256: "8bc4ac4cf3f316e50a25958c0f5eb9bb12cf7e8308bb1d74a43b230da2cfc144" + url: "https://pub.dev" + source: hosted + version: "1.7.5" cli_util: dependency: transitive description: @@ -1531,7 +1530,7 @@ packages: source: hosted version: "1.1.11" media_kit_libs_android_video: - dependency: transitive + dependency: "direct main" description: name: media_kit_libs_android_video sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c" @@ -1539,7 +1538,7 @@ packages: source: hosted version: "1.3.6" media_kit_libs_ios_video: - dependency: transitive + dependency: "direct main" description: name: media_kit_libs_ios_video sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991 @@ -2790,6 +2789,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.6.2" + video_player_media_kit: + dependency: "direct main" + description: + name: video_player_media_kit + sha256: eadf78b85d0ecc6f65bb5ca84c5ad9546a8609c6c0ee207e81673f7969461f3b + url: "https://pub.dev" + source: hosted + version: "1.0.5" video_player_platform_interface: dependency: transitive description: diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 3c0fb72fef..6c8216591a 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -28,9 +28,6 @@ dependencies: bip39: ^1.0.6 cached_network_image: ^3.0.0 chewie: - git: - url: https://github.com/ente-io/chewie.git - ref: forked_video_player_plus collection: # dart computer: git: "https://github.com/ente-io/computer.git" @@ -114,6 +111,8 @@ dependencies: maps_launcher: ^2.2.1 media_extension: ^1.0.1 media_kit: ^1.1.10+1 + media_kit_libs_android_video: ^1.3.6 + media_kit_libs_ios_video: ^1.1.4 media_kit_libs_video: ^1.0.4 media_kit_video: ^1.2.4 ml_linalg: ^13.11.31 @@ -178,15 +177,11 @@ dependencies: video_compress: git: url: https://github.com/RmanAkbarzadeh/VideoCompress.git - video_editor: git: url: https://github.com/prateekmedia/video_editor.git video_player: - git: - url: https://github.com/ente-io/packages.git - ref: android_video_roation_fix - path: packages/video_player/video_player/ + video_player_media_kit: ^1.0.5 video_thumbnail: ^0.5.3 visibility_detector: ^0.3.3 wakelock_plus: ^1.1.1