Feature/december 2021 changes (#854)

* Updated dependencies * Fix bug where a render error can occur if the width of the player is less than 240 pixels. (#810) * Updated changelog * Switch from jcenter to mavenCentral (#798) * Updated changelog * Fixed badState error (#796) * Add dependencies on GCDWebServer and PINCache (#787) Trying to fix part of #714 * Updated changelog * Lint & format changes * Updated installation documentation page * Updated installation documentation page * Updated installation documentation page Co-authored-by: Alan <adman1108@gmail.com> Co-authored-by: Peter Majchrak <pm@lix.com> Co-authored-by: masoudk2000 <52602761+masoudk2000@users.noreply.github.com> Co-authored-by: David Eriksson <david@activout.se>
jhomlala · Dec 29, 2021 · 78f36d0 · 78f36d0
1 parent fe7e10a
commit 78f36d0
Show file tree

Hide file tree

Showing 24 changed files with 73 additions and 278 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.0.80
+* Removed pedantic dependency.
+* Updated dependencies.
+* Fixed controls render issue for small player (by https://github.com/admarwick)
+* Fixed deprecated jCenter. Replaced jCenter with mavenCentral (by https://github.com/petoknm)
+* Fixed iOS GCDWebServer and PINCache import issue (by https://github.com/twogood)
+* Added is mounted check in player controls (by https://github.com/masoudk2000)
+* Updated installation documentation page.
+
 ## 0.0.79
 * Fixed kotlin version issue.
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -24,7 +24,7 @@ buildscript {
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -69,5 +69,3 @@ dependencies {
 repositories {
     mavenCentral()
 }
-
-
diff --git a/docs/install.md b/docs/install.md
@@ -4,7 +4,7 @@
 
 ```yaml
 dependencies:
-  better_player: ^0.0.79
+  better_player: ^0.0.80
 ```
 
 2. Install it
@@ -19,11 +19,18 @@ $ flutter pub get
 import 'package:better_player/better_player.dart';
 ```
 
-4. (Required) iOS configuration
+4. (Required) iOS configuration 
+   You need to change these settings in order to run Better Player on iOS:
+* Set deployment info of your project to **min. iOS 11.0 version**.
+* Set Swift 5 version.
 
-Set deployment info of your project to **min. iOS 11.0 version**. This can be done in XCode in Runner -> General configuration screen.
+5. (Required) Android configuration. 
+   You need to change these settings in order to run Better Player on Android:
+* Set compileSdkVersion to *31*.
+* Set kotlin version to *1.5.31*.
+* Enable multidex.
 
-5. (Optional) Additional iOS configuration
+6. (Optional) Additional iOS configuration
 
 Add this into your `info.plist` file to support full screen rotation (Better Player will rotate screen to horizontal position when full screen is enabled):
 

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext.multidexVersion = "2.0.1"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/ios/better_player.podspec b/ios/better_player.podspec
@@ -16,7 +16,9 @@ A new flutter plugin project.
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'Cache', '~> 6.0.0'
+  s.dependency 'GCDWebServer'
   s.dependency 'HLSCachingReverseProxyServer'
+  s.dependency 'PINCache'
 
   s.platform = :ios, '11.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }

diff --git a/lib/src/configuration/better_player_configuration.dart b/lib/src/configuration/better_player_configuration.dart
@@ -1,11 +1,7 @@
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/configuration/better_player_translations.dart';
-import 'package:better_player/src/subtitles/better_player_subtitles_configuration.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import 'better_player_event.dart';
-
 ///Configuration of Better Player. Allows to setup general behavior of player.
 ///Master configuration which contains children that configure specific part
 ///of player.

diff --git a/lib/src/configuration/better_player_controls_configuration.dart b/lib/src/configuration/better_player_controls_configuration.dart
@@ -1,6 +1,4 @@
-import 'dart:ui';
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/controls/better_player_overflow_menu_item.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 

diff --git a/lib/src/controls/better_player_controls_state.dart b/lib/src/controls/better_player_controls_state.dart
@@ -1,11 +1,8 @@
 import 'dart:io';
 import 'dart:math';
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/asms/better_player_asms_audio_track.dart';
-import 'package:better_player/src/asms/better_player_asms_track.dart';
 import 'package:better_player/src/controls/better_player_clickable_widget.dart';
 import 'package:better_player/src/core/better_player_utils.dart';
-import 'package:better_player/src/video_player/video_player.dart';
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/src/controls/better_player_cupertino_progress_bar.dart b/lib/src/controls/better_player_cupertino_progress_bar.dart
@@ -4,7 +4,6 @@ import 'package:better_player/src/core/better_player_controller.dart';
 import 'package:better_player/src/video_player/video_player.dart';
 import 'package:better_player/src/video_player/video_player_platform_interface.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 class BetterPlayerCupertinoVideoProgressBar extends StatefulWidget {
   BetterPlayerCupertinoVideoProgressBar(
@@ -37,7 +36,7 @@ class _VideoProgressBarState
     extends State<BetterPlayerCupertinoVideoProgressBar> {
   _VideoProgressBarState() {
     listener = () {
-      setState(() {});
+      if (mounted) setState(() {});
     };
   }
 

diff --git a/lib/src/controls/better_player_material_controls.dart b/lib/src/controls/better_player_material_controls.dart
@@ -382,12 +382,12 @@ class _BetterPlayerMaterialControlsState
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: [
                 if (_controlsConfiguration.enableSkips)
-                  _buildSkipButton()
+                  Expanded(child: _buildSkipButton())
                 else
                   const SizedBox(),
-                _buildReplayButton(_controller!),
+                Expanded(child: _buildReplayButton(_controller!)),
                 if (_controlsConfiguration.enableSkips)
-                  _buildForwardButton()
+                  Expanded(child: _buildForwardButton())
                 else
                   const SizedBox(),
               ],

diff --git a/lib/src/controls/better_player_material_progress_bar.dart b/lib/src/controls/better_player_material_progress_bar.dart
@@ -1,10 +1,8 @@
 import 'dart:async';
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/controls/better_player_progress_colors.dart';
 import 'package:better_player/src/video_player/video_player.dart';
 import 'package:better_player/src/video_player/video_player_platform_interface.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 class BetterPlayerMaterialVideoProgressBar extends StatefulWidget {
   BetterPlayerMaterialVideoProgressBar(
@@ -37,7 +35,7 @@ class _VideoProgressBarState
     extends State<BetterPlayerMaterialVideoProgressBar> {
   _VideoProgressBarState() {
     listener = () {
-      setState(() {});
+      if (mounted) setState(() {});
     };
   }
 

diff --git a/lib/src/core/better_player.dart b/lib/src/core/better_player.dart
@@ -5,12 +5,9 @@ import 'package:better_player/src/core/better_player_utils.dart';
 import 'package:better_player/src/core/better_player_with_controls.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 import 'package:wakelock/wakelock.dart';
 
-import 'better_player_controller_provider.dart';
-
 ///Widget which uses provided controller to render video player.
 class BetterPlayer extends StatefulWidget {
   const BetterPlayer({Key? key, required this.controller}) : super(key: key);

diff --git a/lib/src/core/better_player_controller.dart b/lib/src/core/better_player_controller.dart
@@ -1,19 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/asms/better_player_asms_audio_track.dart';
-import 'package:better_player/src/asms/better_player_asms_data_holder.dart';
-import 'package:better_player/src/asms/better_player_asms_subtitle.dart';
-import 'package:better_player/src/asms/better_player_asms_track.dart';
-import 'package:better_player/src/asms/better_player_asms_utils.dart';
-import 'package:better_player/src/configuration/better_player_configuration.dart';
 import 'package:better_player/src/configuration/better_player_controller_event.dart';
-import 'package:better_player/src/configuration/better_player_drm_type.dart';
-import 'package:better_player/src/configuration/better_player_event.dart';
-import 'package:better_player/src/configuration/better_player_event_type.dart';
-import 'package:better_player/src/configuration/better_player_translations.dart';
-import 'package:better_player/src/configuration/better_player_video_format.dart';
-import 'package:better_player/src/core/better_player_controller_provider.dart';
 import 'package:better_player/src/core/better_player_utils.dart';
 import 'package:better_player/src/subtitles/better_player_subtitle.dart';
 import 'package:better_player/src/subtitles/better_player_subtitles_factory.dart';

diff --git a/lib/src/core/better_player_with_controls.dart b/lib/src/core/better_player_with_controls.dart
@@ -5,9 +5,7 @@ import 'package:better_player/better_player.dart';
 import 'package:better_player/src/configuration/better_player_controller_event.dart';
 import 'package:better_player/src/controls/better_player_cupertino_controls.dart';
 import 'package:better_player/src/controls/better_player_material_controls.dart';
-import 'package:better_player/src/core/better_player_controller.dart';
 import 'package:better_player/src/core/better_player_utils.dart';
-import 'package:better_player/src/subtitles/better_player_subtitles_configuration.dart';
 import 'package:better_player/src/subtitles/better_player_subtitles_drawer.dart';
 import 'package:better_player/src/video_player/video_player.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/src/list/better_player_list_video_player.dart b/lib/src/list/better_player_list_video_player.dart
@@ -1,8 +1,5 @@
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/configuration/better_player_configuration.dart';
-import 'package:better_player/src/configuration/better_player_data_source.dart';
 import 'package:better_player/src/core/better_player_utils.dart';
-import 'package:better_player/src/list/better_player_list_video_player_controller.dart';
 import 'package:flutter/material.dart';
 
 ///Special version of Better Player which is used to play video in list view.

diff --git a/lib/src/playlist/better_player_playlist.dart b/lib/src/playlist/better_player_playlist.dart
@@ -1,9 +1,5 @@
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/configuration/better_player_configuration.dart';
-import 'package:better_player/src/configuration/better_player_data_source.dart';
 import 'package:better_player/src/core/better_player_utils.dart';
-import 'package:better_player/src/playlist/better_player_playlist_configuration.dart';
-import 'package:better_player/src/playlist/better_player_playlist_controller.dart';
 
 // Flutter imports:
 import 'package:flutter/material.dart';

diff --git a/lib/src/playlist/better_player_playlist_controller.dart b/lib/src/playlist/better_player_playlist_controller.dart
@@ -1,8 +1,5 @@
 import 'dart:async';
-
 import 'package:better_player/better_player.dart';
-import 'package:better_player/src/configuration/better_player_data_source.dart';
-import 'package:better_player/src/core/better_player_controller.dart';
 
 ///Controller used to manage playlist player.
 class BetterPlayerPlaylistController {

diff --git a/lib/src/subtitles/better_player_subtitles_drawer.dart b/lib/src/subtitles/better_player_subtitles_drawer.dart
@@ -1,8 +1,6 @@
 import 'dart:async';
 import 'package:better_player/better_player.dart';
 import 'package:better_player/src/subtitles/better_player_subtitle.dart';
-import 'package:better_player/src/subtitles/better_player_subtitles_configuration.dart';
-import 'package:better_player/src/video_player/video_player.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
 

diff --git a/lib/src/subtitles/better_player_subtitles_factory.dart b/lib/src/subtitles/better_player_subtitles_factory.dart
@@ -2,9 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:better_player/better_player.dart';
 import 'package:better_player/src/core/better_player_utils.dart';
-import 'package:better_player/src/subtitles/better_player_subtitles_source.dart';
 import 'better_player_subtitle.dart';
-import 'better_player_subtitles_source_type.dart';
 
 class BetterPlayerSubtitlesFactory {
   static Future<List<BetterPlayerSubtitle>> parseSubtitles(

diff --git a/lib/src/video_player/method_channel_video_player.dart b/lib/src/video_player/method_channel_video_player.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 import 'dart:async';
-import 'dart:ui';
 import 'package:better_player/src/configuration/better_player_buffering_configuration.dart';
 import 'package:better_player/src/core/better_player_utils.dart';
 import 'package:flutter/foundation.dart';

diff --git a/lib/src/video_player/video_player.dart b/lib/src/video_player/video_player.dart
@@ -7,11 +7,8 @@ import 'dart:async';
 import 'dart:io';
 import 'package:better_player/src/configuration/better_player_buffering_configuration.dart';
 import 'package:better_player/src/video_player/video_player_platform_interface.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:meta/meta.dart';
-import 'package:pedantic/pedantic.dart';
 
 final VideoPlayerPlatform _videoPlayerPlatform = VideoPlayerPlatform.instance
 // This will clear all open videos on the platform when a full restart is

diff --git a/lib/src/video_player/video_player_platform_interface.dart b/lib/src/video_player/video_player_platform_interface.dart
@@ -4,16 +4,11 @@
 
 // Dart imports:
 import 'dart:async';
-import 'dart:ui';
 
 // Flutter imports:
 import 'package:better_player/src/configuration/better_player_buffering_configuration.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-
-// Package imports:
-import 'package:meta/meta.dart' show visibleForTesting;
-
 import 'method_channel_video_player.dart';
 
 /// The interface that implementations of video_player must implement.