Skip to content

Commit 78f36d0

Browse files
jhomlalaadmarwickPeter Majchrakmasoudk2000twogood
authored
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>
1 parent fe7e10a commit 78f36d0

24 files changed

+73
-278
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 0.0.80
2+
* Removed pedantic dependency.
3+
* Updated dependencies.
4+
* Fixed controls render issue for small player (by https://github.com/admarwick)
5+
* Fixed deprecated jCenter. Replaced jCenter with mavenCentral (by https://github.com/petoknm)
6+
* Fixed iOS GCDWebServer and PINCache import issue (by https://github.com/twogood)
7+
* Added is mounted check in player controls (by https://github.com/masoudk2000)
8+
* Updated installation documentation page.
9+
110
## 0.0.79
211
* Fixed kotlin version issue.
312

‎android/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313

1414
repositories {
1515
google()
16-
jcenter()
16+
mavenCentral()
1717
}
1818

1919
dependencies {
@@ -24,7 +24,7 @@ buildscript {
2424
rootProject.allprojects {
2525
repositories {
2626
google()
27-
jcenter()
27+
mavenCentral()
2828
}
2929
}
3030

@@ -69,5 +69,3 @@ dependencies {
6969
repositories {
7070
mavenCentral()
7171
}
72-
73-

‎docs/install.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
```yaml
66
dependencies:
7-
better_player: ^0.0.79
7+
better_player: ^0.0.80
88
```
99
1010
2. Install it
@@ -19,11 +19,18 @@ $ flutter pub get
1919
import 'package:better_player/better_player.dart';
2020
```
2121

22-
4. (Required) iOS configuration
22+
4. (Required) iOS configuration
23+
You need to change these settings in order to run Better Player on iOS:
24+
* Set deployment info of your project to **min. iOS 11.0 version**.
25+
* Set Swift 5 version.
2326

24-
Set deployment info of your project to **min. iOS 11.0 version**. This can be done in XCode in Runner -> General configuration screen.
27+
5. (Required) Android configuration.
28+
You need to change these settings in order to run Better Player on Android:
29+
* Set compileSdkVersion to *31*.
30+
* Set kotlin version to *1.5.31*.
31+
* Enable multidex.
2532

26-
5. (Optional) Additional iOS configuration
33+
6. (Optional) Additional iOS configuration
2734

2835
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):
2936

‎example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
ext.multidexVersion = "2.0.1"
55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88
}
99

1010
dependencies {
@@ -16,7 +16,7 @@ buildscript {
1616
allprojects {
1717
repositories {
1818
google()
19-
jcenter()
19+
mavenCentral()
2020
}
2121
}
2222

‎ios/better_player.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ A new flutter plugin project.
1616
s.public_header_files = 'Classes/**/*.h'
1717
s.dependency 'Flutter'
1818
s.dependency 'Cache', '~> 6.0.0'
19+
s.dependency 'GCDWebServer'
1920
s.dependency 'HLSCachingReverseProxyServer'
21+
s.dependency 'PINCache'
2022

2123
s.platform = :ios, '11.0'
2224
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }

‎lib/src/configuration/better_player_configuration.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import 'package:better_player/better_player.dart';
2-
import 'package:better_player/src/configuration/better_player_translations.dart';
3-
import 'package:better_player/src/subtitles/better_player_subtitles_configuration.dart';
42
import 'package:flutter/material.dart';
53
import 'package:flutter/services.dart';
64

7-
import 'better_player_event.dart';
8-
95
///Configuration of Better Player. Allows to setup general behavior of player.
106
///Master configuration which contains children that configure specific part
117
///of player.

‎lib/src/configuration/better_player_controls_configuration.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import 'dart:ui';
21
import 'package:better_player/better_player.dart';
3-
import 'package:better_player/src/controls/better_player_overflow_menu_item.dart';
42
import 'package:flutter/cupertino.dart';
53
import 'package:flutter/material.dart';
64

‎lib/src/controls/better_player_controls_state.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import 'dart:io';
22
import 'dart:math';
33
import 'package:better_player/better_player.dart';
4-
import 'package:better_player/src/asms/better_player_asms_audio_track.dart';
5-
import 'package:better_player/src/asms/better_player_asms_track.dart';
64
import 'package:better_player/src/controls/better_player_clickable_widget.dart';
75
import 'package:better_player/src/core/better_player_utils.dart';
8-
import 'package:better_player/src/video_player/video_player.dart';
96
import 'package:collection/collection.dart' show IterableExtension;
107
import 'package:flutter/cupertino.dart';
118
import 'package:flutter/material.dart';

‎lib/src/controls/better_player_cupertino_progress_bar.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:better_player/src/core/better_player_controller.dart';
44
import 'package:better_player/src/video_player/video_player.dart';
55
import 'package:better_player/src/video_player/video_player_platform_interface.dart';
66
import 'package:flutter/material.dart';
7-
import 'package:flutter/widgets.dart';
87

98
class BetterPlayerCupertinoVideoProgressBar extends StatefulWidget {
109
BetterPlayerCupertinoVideoProgressBar(
@@ -37,7 +36,7 @@ class _VideoProgressBarState
3736
extends State<BetterPlayerCupertinoVideoProgressBar> {
3837
_VideoProgressBarState() {
3938
listener = () {
40-
setState(() {});
39+
if (mounted) setState(() {});
4140
};
4241
}
4342

‎lib/src/controls/better_player_material_controls.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,12 @@ class _BetterPlayerMaterialControlsState
382382
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
383383
children: [
384384
if (_controlsConfiguration.enableSkips)
385-
_buildSkipButton()
385+
Expanded(child: _buildSkipButton())
386386
else
387387
const SizedBox(),
388-
_buildReplayButton(_controller!),
388+
Expanded(child: _buildReplayButton(_controller!)),
389389
if (_controlsConfiguration.enableSkips)
390-
_buildForwardButton()
390+
Expanded(child: _buildForwardButton())
391391
else
392392
const SizedBox(),
393393
],

‎lib/src/controls/better_player_material_progress_bar.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import 'dart:async';
22
import 'package:better_player/better_player.dart';
3-
import 'package:better_player/src/controls/better_player_progress_colors.dart';
43
import 'package:better_player/src/video_player/video_player.dart';
54
import 'package:better_player/src/video_player/video_player_platform_interface.dart';
65
import 'package:flutter/material.dart';
7-
import 'package:flutter/widgets.dart';
86

97
class BetterPlayerMaterialVideoProgressBar extends StatefulWidget {
108
BetterPlayerMaterialVideoProgressBar(
@@ -37,7 +35,7 @@ class _VideoProgressBarState
3735
extends State<BetterPlayerMaterialVideoProgressBar> {
3836
_VideoProgressBarState() {
3937
listener = () {
40-
setState(() {});
38+
if (mounted) setState(() {});
4139
};
4240
}
4341

‎lib/src/core/better_player.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@ import 'package:better_player/src/core/better_player_utils.dart';
55
import 'package:better_player/src/core/better_player_with_controls.dart';
66
import 'package:flutter/material.dart';
77
import 'package:flutter/services.dart';
8-
import 'package:flutter/widgets.dart';
98
import 'package:visibility_detector/visibility_detector.dart';
109
import 'package:wakelock/wakelock.dart';
1110

12-
import 'better_player_controller_provider.dart';
13-
1411
///Widget which uses provided controller to render video player.
1512
class BetterPlayer extends StatefulWidget {
1613
const BetterPlayer({Key? key, required this.controller}) : super(key: key);

‎lib/src/core/better_player_controller.dart

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
import 'dart:async';
22
import 'dart:io';
33
import 'package:better_player/better_player.dart';
4-
import 'package:better_player/src/asms/better_player_asms_audio_track.dart';
5-
import 'package:better_player/src/asms/better_player_asms_data_holder.dart';
6-
import 'package:better_player/src/asms/better_player_asms_subtitle.dart';
7-
import 'package:better_player/src/asms/better_player_asms_track.dart';
8-
import 'package:better_player/src/asms/better_player_asms_utils.dart';
9-
import 'package:better_player/src/configuration/better_player_configuration.dart';
104
import 'package:better_player/src/configuration/better_player_controller_event.dart';
11-
import 'package:better_player/src/configuration/better_player_drm_type.dart';
12-
import 'package:better_player/src/configuration/better_player_event.dart';
13-
import 'package:better_player/src/configuration/better_player_event_type.dart';
14-
import 'package:better_player/src/configuration/better_player_translations.dart';
15-
import 'package:better_player/src/configuration/better_player_video_format.dart';
16-
import 'package:better_player/src/core/better_player_controller_provider.dart';
175
import 'package:better_player/src/core/better_player_utils.dart';
186
import 'package:better_player/src/subtitles/better_player_subtitle.dart';
197
import 'package:better_player/src/subtitles/better_player_subtitles_factory.dart';

‎lib/src/core/better_player_with_controls.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import 'package:better_player/better_player.dart';
55
import 'package:better_player/src/configuration/better_player_controller_event.dart';
66
import 'package:better_player/src/controls/better_player_cupertino_controls.dart';
77
import 'package:better_player/src/controls/better_player_material_controls.dart';
8-
import 'package:better_player/src/core/better_player_controller.dart';
98
import 'package:better_player/src/core/better_player_utils.dart';
10-
import 'package:better_player/src/subtitles/better_player_subtitles_configuration.dart';
119
import 'package:better_player/src/subtitles/better_player_subtitles_drawer.dart';
1210
import 'package:better_player/src/video_player/video_player.dart';
1311
import 'package:flutter/material.dart';

‎lib/src/list/better_player_list_video_player.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import 'package:better_player/better_player.dart';
2-
import 'package:better_player/src/configuration/better_player_configuration.dart';
3-
import 'package:better_player/src/configuration/better_player_data_source.dart';
42
import 'package:better_player/src/core/better_player_utils.dart';
5-
import 'package:better_player/src/list/better_player_list_video_player_controller.dart';
63
import 'package:flutter/material.dart';
74

85
///Special version of Better Player which is used to play video in list view.

‎lib/src/playlist/better_player_playlist.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import 'package:better_player/better_player.dart';
2-
import 'package:better_player/src/configuration/better_player_configuration.dart';
3-
import 'package:better_player/src/configuration/better_player_data_source.dart';
42
import 'package:better_player/src/core/better_player_utils.dart';
5-
import 'package:better_player/src/playlist/better_player_playlist_configuration.dart';
6-
import 'package:better_player/src/playlist/better_player_playlist_controller.dart';
73

84
// Flutter imports:
95
import 'package:flutter/material.dart';

‎lib/src/playlist/better_player_playlist_controller.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import 'dart:async';
2-
32
import 'package:better_player/better_player.dart';
4-
import 'package:better_player/src/configuration/better_player_data_source.dart';
5-
import 'package:better_player/src/core/better_player_controller.dart';
63

74
///Controller used to manage playlist player.
85
class BetterPlayerPlaylistController {

‎lib/src/subtitles/better_player_subtitles_drawer.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'dart:async';
22
import 'package:better_player/better_player.dart';
33
import 'package:better_player/src/subtitles/better_player_subtitle.dart';
4-
import 'package:better_player/src/subtitles/better_player_subtitles_configuration.dart';
5-
import 'package:better_player/src/video_player/video_player.dart';
64
import 'package:flutter/material.dart';
75
import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
86

‎lib/src/subtitles/better_player_subtitles_factory.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import 'dart:convert';
22
import 'dart:io';
33
import 'package:better_player/better_player.dart';
44
import 'package:better_player/src/core/better_player_utils.dart';
5-
import 'package:better_player/src/subtitles/better_player_subtitles_source.dart';
65
import 'better_player_subtitle.dart';
7-
import 'better_player_subtitles_source_type.dart';
86

97
class BetterPlayerSubtitlesFactory {
108
static Future<List<BetterPlayerSubtitle>> parseSubtitles(

‎lib/src/video_player/method_channel_video_player.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44
import 'dart:async';
5-
import 'dart:ui';
65
import 'package:better_player/src/configuration/better_player_buffering_configuration.dart';
76
import 'package:better_player/src/core/better_player_utils.dart';
87
import 'package:flutter/foundation.dart';

‎lib/src/video_player/video_player.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ import 'dart:async';
77
import 'dart:io';
88
import 'package:better_player/src/configuration/better_player_buffering_configuration.dart';
99
import 'package:better_player/src/video_player/video_player_platform_interface.dart';
10-
import 'package:flutter/foundation.dart';
1110
import 'package:flutter/material.dart';
1211
import 'package:flutter/services.dart';
13-
import 'package:meta/meta.dart';
14-
import 'package:pedantic/pedantic.dart';
1512

1613
final VideoPlayerPlatform _videoPlayerPlatform = VideoPlayerPlatform.instance
1714
// This will clear all open videos on the platform when a full restart is

‎lib/src/video_player/video_player_platform_interface.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44

55
// Dart imports:
66
import 'dart:async';
7-
import 'dart:ui';
87

98
// Flutter imports:
109
import 'package:better_player/src/configuration/better_player_buffering_configuration.dart';
1110
import 'package:flutter/foundation.dart';
1211
import 'package:flutter/widgets.dart';
13-
14-
// Package imports:
15-
import 'package:meta/meta.dart' show visibleForTesting;
16-
1712
import 'method_channel_video_player.dart';
1813

1914
/// The interface that implementations of video_player must implement.

0 commit comments

Comments
 (0)