Merge pull request #3 from Piwigo/master

updating master

Author: abrenoch

README.md

@@ -10,7 +10,7 @@ If you face trouble please [create tickets](https://github.com/Piwigo/piwigo-flu
 
 # Installation
 
-For now, this application is in Beta. You can download the latest version either from Github or from Google Play Store:
+You can download the latest version either from Github or from Google Play Store:
 
 ## Download from Play Store
 
@@ -87,7 +87,7 @@ With Piwigo NG, you can upload images from the phone.
 
 # Flutter
 
-This application is made with [Google's Flutter](https://flutter.dev/?gclid=Cj0KCQjwvYSEBhDjARIsAJMn0lj-G1Ly0oznQeMGvyTYBY2TZfxFpkb9WYp4dsyMSwKIUsmTwE-SltIaAsjFEALw_wcB&gclsrc=aw.ds)
+This application is made with [Flutter](https://flutter.dev/?gclid=Cj0KCQjwvYSEBhDjARIsAJMn0lj-G1Ly0oznQeMGvyTYBY2TZfxFpkb9WYp4dsyMSwKIUsmTwE-SltIaAsjFEALw_wcB&gclsrc=aw.ds)
 
 A UI toolkit for building beautiful, natively compiled applications for [mobile](https://flutter.dev/docs), [web](https://flutter.dev/web), and [desktop](https://flutter.dev/desktop) from a single codebase.
 
@@ -105,4 +105,4 @@ For the upload, we are using the **uploadAsync** method of the API. This method
 # Licence
 
 Piwigo is a free software, it can be redistributed it and / or modified under the terms of the GNU General Public License
-[see more here](./LICENCE.txt)
+[see more here](./LICENCE.txt)

lib/views/UploadGalleryViewPage.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:video_player/video_player.dart';
+import 'package:better_player/better_player.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:piwigo_ng/constants/SettingsConstants.dart';
@@ -593,15 +593,24 @@ class VideoItem extends StatefulWidget {
   _VideoItemState createState() => _VideoItemState();
 }
 class _VideoItemState extends State<VideoItem> {
-  VideoPlayerController _controller;
+  BetterPlayerController _controller;
 
   @override
   void initState() {
     super.initState();
-    _controller = VideoPlayerController.file(File(widget.path))
-      ..initialize().then((_) {
-        setState(() {});
-      });
+    BetterPlayerDataSource betterPlayerDataSource = BetterPlayerDataSource.file(widget.path);
+    _controller = BetterPlayerController(
+        BetterPlayerConfiguration(
+          aspectRatio: 1,
+          autoPlay: true,
+          looping: true,
+          fit: BoxFit.cover,
+          controlsConfiguration: BetterPlayerControlsConfiguration(
+            showControls: false
+          ),
+        ),
+        betterPlayerDataSource: betterPlayerDataSource);
+    setState(() {});
   }
 
   @override
@@ -612,25 +621,18 @@ class _VideoItemState extends State<VideoItem> {
 
   @override
   Widget build(BuildContext context) {
-    if(_controller.value.isInitialized) {
-      return FittedBox(
-        fit: BoxFit.cover,
-        child: GestureDetector(
-          onTap: () {
-            setState(() {
-              _controller.value.isPlaying
-                  ? _controller.pause()
-                  : _controller.play();
-            });
-          },
-          child: SizedBox(
-            width: _controller.value.size?.width ?? 0,
-            height: _controller.value.size?.height ?? 0,
-            child: VideoPlayer(_controller),
-          ),
-        ),
+      return GestureDetector(
+        onTap: () {
+          setState(() {
+            _controller.isPlaying()
+                ? _controller.pause()
+                : _controller.play();
+          });
+        },
+        child: AspectRatio(
+          aspectRatio: 1,
+          child: BetterPlayer(controller: _controller),
+        )
       );
-    }
-    return CircularProgressIndicator();
   }
-}
+}

pubspec.yaml

@@ -56,7 +56,6 @@ dependencies:
   photo_view: ^0.9.0
   cached_network_image: ^3.0.0
   better_player: ^0.0.79
-  video_player: ^2.2.10
   wakelock: ^0.5.6
 
 dev_dependencies: