From bbcd1ff7b062a26102bbb223450a25a5f5416a9c Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Mon, 27 Dec 2021 12:37:16 +0100
Subject: [PATCH] chore: Go back to chewie

---
 lib/pages/chat/events/video_player.dart      | 20 ++++++++++----------
 pubspec.lock                                 | 14 +++++++-------
 pubspec.yaml                                 |  2 +-
 scripts/enable-android-google-services.patch |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/pages/chat/events/video_player.dart b/lib/pages/chat/events/video_player.dart
index 828c76db..c887ae4e 100644
--- a/lib/pages/chat/events/video_player.dart
+++ b/lib/pages/chat/events/video_player.dart
@@ -5,7 +5,7 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-import 'package:flick_video_player/flick_video_player.dart';
+import 'package:chewie/chewie.dart';
 import 'package:flutter_blurhash/flutter_blurhash.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
@@ -27,7 +27,7 @@ class EventVideoPlayer extends StatefulWidget {
 }
 
 class _EventVideoPlayerState extends State<EventVideoPlayer> {
-  FlickManager? _flickManager;
+  ChewieController? _chewieManager;
   bool _isDownloading = false;
   String? _networkUri;
   File? _tmpFile;
@@ -63,7 +63,7 @@ class _EventVideoPlayerState extends State<EventVideoPlayer> {
 
   @override
   void dispose() {
-    _flickManager?.dispose();
+    _chewieManager?.dispose();
     super.dispose();
   }
 
@@ -77,24 +77,24 @@ class _EventVideoPlayerState extends State<EventVideoPlayer> {
         fallbackBlurHash;
     final videoFile = _tmpFile;
     final networkUri = _networkUri;
-    if (kIsWeb && networkUri != null && _flickManager == null) {
-      _flickManager = FlickManager(
+    if (kIsWeb && networkUri != null && _chewieManager == null) {
+      _chewieManager = ChewieController(
         videoPlayerController: VideoPlayerController.network(networkUri),
       );
-    } else if (!kIsWeb && videoFile != null && _flickManager == null) {
-      _flickManager = FlickManager(
+    } else if (!kIsWeb && videoFile != null && _chewieManager == null) {
+      _chewieManager = ChewieController(
         videoPlayerController: VideoPlayerController.file(videoFile),
         autoPlay: true,
       );
     }
 
-    final flickManager = _flickManager;
+    final chewieManager = _chewieManager;
     return SizedBox(
       width: 400,
       height: 300,
       child: Stack(
         children: [
-          if (flickManager == null) ...[
+          if (chewieManager == null) ...[
             if (hasThumbnail)
               ImageBubble(widget.event)
             else
@@ -115,7 +115,7 @@ class _EventVideoPlayerState extends State<EventVideoPlayer> {
               ),
             ),
           ] else
-            FlickVideoPlayer(flickManager: flickManager),
+            Center(child: Chewie(controller: chewieManager)),
         ],
       ),
     );
diff --git a/pubspec.lock b/pubspec.lock
index fd217790..120cdc9a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -148,6 +148,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
+  chewie:
+    dependency: "direct main"
+    description:
+      name: chewie
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.2"
   cli_util:
     dependency: transitive
     description:
@@ -351,13 +358,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.2+1"
-  flick_video_player:
-    dependency: "direct main"
-    description:
-      name: flick_video_player
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.1"
   fluffybox:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3954e781..94cf3de8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,6 +13,7 @@ dependencies:
   audioplayers: ^0.20.1
   blurhash_dart: ^1.1.0
   cached_network_image: ^3.1.0
+  chewie: ^1.2.2
   cupertino_icons: any
   desktop_drop: ^0.3.0
   desktop_notifications: ^0.6.1
@@ -22,7 +23,6 @@ dependencies:
   #fcm_shared_isolate:
   #  git: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git
   file_picker_cross: ^4.5.0
-  flick_video_player: ^0.3.1
   flutter:
     sdk: flutter
   flutter_app_badger: ^1.3.0
diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch
index aefa2ecb..c5680877 100644
--- a/scripts/enable-android-google-services.patch
+++ b/scripts/enable-android-google-services.patch
@@ -99,5 +99,5 @@ index e1670a32..7e3238b0 100644
 +  fcm_shared_isolate:
 +    git: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git
    file_picker_cross: ^4.5.0
-   flick_video_player: ^0.3.1
    flutter:
+     sdk: flutter