Feature/december changes 3 (#186)

* Fixed cupertino loadingColor and loadingWidget issue, fixed cupertino buttons height

* Fixed setControlsEnabled in cupertino player

* General cleanup

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.0.41
+* Fixed loadingColor and loadingWidget for cupertino player
+* Increased size of cupertino buttons
+* Fixed setControlsEnabled in cupertino/material player
+* [BREAKING_CHANGE] Removed startAt, looping, placeholder, overlay, fullScreenByDefault,
+ allowedScreenSleep, systemOverlaysAfterFullScreen, deviceOrientationsAfterFullScreen from BetterPlayerController
+
+
 ## 0.0.40
 * Exposed VideoPlayerValue in export
 * Fixed log issue

README.md

@@ -35,7 +35,7 @@ This plugin is based on [Chewie](https://github.com/brianegan/chewie). Chewie is
 
 ```yaml
 dependencies:
-  better_player: ^0.0.40
+  better_player: ^0.0.41
 ```
 
 2. Install it

example/lib/pages/normal_player_page.dart

@@ -19,11 +19,9 @@ class _NormalPlayerPageState extends State<NormalPlayerPage> {
       fit: BoxFit.contain,
     );
     BetterPlayerDataSource dataSource = BetterPlayerDataSource(
-        BetterPlayerDataSourceType.network,
-        "https://v5.szjal.cn/20200829/qByymCNH/index.m3u8");
+        BetterPlayerDataSourceType.network, Constants.elephantDreamVideoUrl);
     _betterPlayerController = BetterPlayerController(betterPlayerConfiguration);
     _betterPlayerController.setupDataSource(dataSource);
-
     super.initState();
   }
 

lib/src/controls/better_player_cupertino_controls.dart

@@ -144,11 +144,14 @@ class _BetterPlayerCupertinoControlsState
     super.didChangeDependencies();
   }
 
-  AnimatedOpacity _buildBottomBar(
+  Widget _buildBottomBar(
     Color backgroundColor,
     Color iconColor,
     double barHeight,
   ) {
+    if (!betterPlayerController.controlsEnabled) {
+      return const SizedBox();
+    }
     return AnimatedOpacity(
       opacity: _hideStuff ? 0.0 : 1.0,
       duration: _controlsConfiguration.controlsHideTime,
@@ -254,7 +257,6 @@ class _BetterPlayerCupertinoControlsState
                       ? _controlsConfiguration.fullscreenDisableIcon
                       : _controlsConfiguration.fullscreenEnableIcon,
                   color: iconColor,
-                  size: 12.0,
                 ),
               ),
             ),
@@ -321,7 +323,6 @@ class _BetterPlayerCupertinoControlsState
                 child: Icon(
                   _controlsConfiguration.overflowMenuIcon,
                   color: iconColor,
-                  size: 16.0,
                 ),
               ),
             ),
@@ -368,7 +369,6 @@ class _BetterPlayerCupertinoControlsState
                       ? _controlsConfiguration.muteIcon
                       : _controlsConfiguration.unMuteIcon,
                   color: iconColor,
-                  size: 16.0,
                 ),
               ),
             ),
@@ -394,7 +394,6 @@ class _BetterPlayerCupertinoControlsState
               ? _controlsConfiguration.pauseIcon
               : _controlsConfiguration.playIcon,
           color: iconColor,
-          size: 16.0,
         ),
       ),
     );
@@ -442,7 +441,6 @@ class _BetterPlayerCupertinoControlsState
         child: Icon(
           _controlsConfiguration.skipBackIcon,
           color: iconColor,
-          size: 12.0,
         ),
       ),
     );
@@ -459,7 +457,6 @@ class _BetterPlayerCupertinoControlsState
         child: Icon(
           _controlsConfiguration.skipForwardIcon,
           color: iconColor,
-          size: 12.0,
         ),
       ),
     );
@@ -471,6 +468,10 @@ class _BetterPlayerCupertinoControlsState
     double barHeight,
     double buttonPadding,
   ) {
+    if (!betterPlayerController.controlsEnabled) {
+      return const SizedBox();
+    }
+
     return Container(
       height: barHeight,
       margin: EdgeInsets.only(
@@ -700,10 +701,14 @@ class _BetterPlayerCupertinoControlsState
   }
 
   Widget _buildLoadingWidget() {
+    if (_controlsConfiguration.loadingWidget != null) {
+      return _controlsConfiguration.loadingWidget;
+    }
+
     return CircularProgressIndicator(
       valueColor: AlwaysStoppedAnimation<Color>(
-        _controlsConfiguration.controlBarColor,
-      ),
+          _controlsConfiguration.loadingColor ??
+              _controlsConfiguration.controlBarColor),
     );
   }
 }

lib/src/controls/better_player_material_controls.dart

@@ -22,11 +22,11 @@ class BetterPlayerMaterialControls extends StatefulWidget {
   ///Controls config
   final BetterPlayerControlsConfiguration controlsConfiguration;
 
-  const BetterPlayerMaterialControls(
-      {Key key,
-      @required this.onControlsVisibilityChanged,
-      @required this.controlsConfiguration})
-      : assert(onControlsVisibilityChanged != null),
+  const BetterPlayerMaterialControls({
+    Key key,
+    @required this.onControlsVisibilityChanged,
+    @required this.controlsConfiguration,
+  })  : assert(onControlsVisibilityChanged != null),
         assert(controlsConfiguration != null),
         super(key: key);
 
@@ -156,6 +156,10 @@ class _BetterPlayerMaterialControlsState
   }
 
   Widget _buildTopBar() {
+    if (!betterPlayerController.controlsEnabled) {
+      return const SizedBox();
+    }
+
     return _controlsConfiguration.enableOverflowMenu
         ? AnimatedOpacity(
             opacity: _hideStuff ? 0.0 : 1.0,
@@ -189,10 +193,12 @@ class _BetterPlayerMaterialControlsState
     );
   }
 
-  AnimatedOpacity _buildBottomBar() {
+  Widget _buildBottomBar() {
+    if (!betterPlayerController.controlsEnabled) {
+      return const SizedBox();
+    }
     return AnimatedOpacity(
-      opacity:
-          !_betterPlayerController.controlsEnabled || _hideStuff ? 0.0 : 1.0,
+      opacity: _hideStuff ? 0.0 : 1.0,
       duration: _controlsConfiguration.controlsHideTime,
       onEnd: _onPlayerHide,
       child: Container(
@@ -265,6 +271,9 @@ class _BetterPlayerMaterialControlsState
   }
 
   Widget _buildHitArea() {
+    if (!betterPlayerController.controlsEnabled) {
+      return const SizedBox();
+    }
     return Expanded(
       child: Container(
         color: Colors.transparent,

lib/src/core/better_player.dart

@@ -218,7 +218,7 @@ class BetterPlayerState extends State<BetterPlayer>
       );
     }
 
-    if (!widget.controller.allowedScreenSleep) {
+    if (!_betterPlayerConfiguration.allowedScreenSleep) {
       Wakelock.enable();
     }
 
@@ -231,9 +231,9 @@ class BetterPlayerState extends State<BetterPlayer>
     Wakelock.disable();
 
     await SystemChrome.setEnabledSystemUIOverlays(
-        widget.controller.systemOverlaysAfterFullScreen);
+        _betterPlayerConfiguration.systemOverlaysAfterFullScreen);
     await SystemChrome.setPreferredOrientations(
-        widget.controller.deviceOrientationsAfterFullScreen);
+        _betterPlayerConfiguration.deviceOrientationsAfterFullScreen);
   }
 
   Widget _buildPlayer() {

lib/src/core/better_player_controller.dart

@@ -5,7 +5,6 @@ import 'dart:io';
 // Flutter imports:
 import 'package:better_player/src/core/better_player_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
 // Package imports:
 import 'package:path_provider/path_provider.dart';
@@ -32,32 +31,21 @@ class BetterPlayerController extends ChangeNotifier {
 
   final BetterPlayerConfiguration betterPlayerConfiguration;
   final BetterPlayerPlaylistConfiguration betterPlayerPlaylistConfiguration;
+  final List<Function> _eventListeners = [];
+  final List<BetterPlayerSubtitlesSource> _betterPlayerSubtitlesSourceList = [];
+
+  ///List of files to delete once player disposes.
+  final List<File> _tempFiles = [];
+  final StreamController<bool> _controlsVisibilityStreamController =
+      StreamController.broadcast();
 
   VideoPlayerController videoPlayerController;
 
   bool get autoPlay => betterPlayerConfiguration.autoPlay;
 
-  Duration get startAt => betterPlayerConfiguration.startAt;
-
-  bool get looping => betterPlayerConfiguration.looping;
-
   Widget Function(BuildContext context, String errorMessage) get errorBuilder =>
       betterPlayerConfiguration.errorBuilder;
 
-  Widget get placeholder => betterPlayerConfiguration.placeholder;
-
-  Widget get overlay => betterPlayerConfiguration.overlay;
-
-  bool get fullScreenByDefault => betterPlayerConfiguration.fullScreenByDefault;
-
-  bool get allowedScreenSleep => betterPlayerConfiguration.allowedScreenSleep;
-
-  List<SystemUiOverlay> get systemOverlaysAfterFullScreen =>
-      betterPlayerConfiguration.systemOverlaysAfterFullScreen;
-
-  List<DeviceOrientation> get deviceOrientationsAfterFullScreen =>
-      betterPlayerConfiguration.deviceOrientationsAfterFullScreen;
-
   /// Defines a event listener where video player events will be send
   Function(BetterPlayerEvent) get eventListener =>
       betterPlayerConfiguration.eventListener;
@@ -68,14 +56,10 @@ class BetterPlayerController extends ChangeNotifier {
 
   int _lastPositionSelection = 0;
 
-  final List<Function> _eventListeners = [];
-
   BetterPlayerDataSource _betterPlayerDataSource;
 
   BetterPlayerDataSource get betterPlayerDataSource => _betterPlayerDataSource;
 
-  final List<BetterPlayerSubtitlesSource> _betterPlayerSubtitlesSourceList = [];
-
   List<BetterPlayerSubtitlesSource> get betterPlayerSubtitlesSourceList =>
       _betterPlayerSubtitlesSourceList;
   BetterPlayerSubtitlesSource _betterPlayerSubtitlesSource;
@@ -110,18 +94,12 @@ class BetterPlayerController extends ChangeNotifier {
   ///Currently used translations
   BetterPlayerTranslations translations = BetterPlayerTranslations();
 
-  ///List of files to delete once player disposes.
-  final List<File> _tempFiles = [];
-
   ///Has current data source started
   bool _hasCurrentDataSourceStarted = false;
 
   ///Has current data source initialized
   bool _hasCurrentDataSourceInitialized = false;
 
-  final StreamController<bool> _controlsVisibilityStreamController =
-      StreamController.broadcast();
-
   ///Stream which sends flag whenever visibility of controls changes
   Stream<bool> get controlsVisibilityStream =>
       _controlsVisibilityStreamController.stream;
@@ -307,8 +285,9 @@ class BetterPlayerController extends ChangeNotifier {
   }
 
   Future _initialize() async {
-    await videoPlayerController.setLooping(looping);
+    await videoPlayerController.setLooping(betterPlayerConfiguration.looping);
 
+    final fullScreenByDefault = betterPlayerConfiguration.fullScreenByDefault;
     if (autoPlay) {
       if (fullScreenByDefault) {
         enterFullScreen();
@@ -321,6 +300,7 @@ class BetterPlayerController extends ChangeNotifier {
       }
     }
 
+    final startAt = betterPlayerConfiguration.startAt;
     if (startAt != null) {
       await videoPlayerController.seekTo(startAt);
     }

lib/src/core/better_player_with_controls.dart

@@ -123,15 +123,17 @@ class _BetterPlayerWithControlsState extends State<BetterPlayerWithControls> {
       child: Stack(
         fit: StackFit.passthrough,
         children: <Widget>[
-          betterPlayerController.placeholder ?? Container(),
+          betterPlayerController.betterPlayerConfiguration.placeholder ??
+              Container(),
           Transform.rotate(
             angle: rotation * pi / 180,
             child: _BetterPlayerVideoFitWidget(
               betterPlayerController,
               betterPlayerController.betterPlayerConfiguration.fit,
             ),
           ),
-          betterPlayerController.overlay ?? Container(),
+          betterPlayerController.betterPlayerConfiguration.overlay ??
+              Container(),
           BetterPlayerSubtitlesDrawer(
             betterPlayerController: betterPlayerController,
             betterPlayerSubtitlesConfiguration: subtitlesConfiguration,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: better_player
 description: Advanced video player based on video_player and Chewie. It's solves many typical use cases and it's easy to run.
-version: 0.0.40
+version: 0.0.41
 authors:
   - Jakub Homlala <[email protected]>
 homepage: https://github.com/jhomlala/betterplayer