Feature/february changes 3 (#274)

* Fixed lint issues

* Fixed subtitles setup issue

Co-authored-by: jhomlala <j.homlala@gmail.com>

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.51
+* Fixed lint issues.
+* Fixed subtitles setup issue.
+
 ## 0.0.50
 * Fixed deprecated resizeToAvoidBottomPadding
 * Fixed playing large videos in iOS.

README.md

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

lib/src/core/better_player_controller.dart

@@ -232,20 +232,20 @@ class BetterPlayerController extends ChangeNotifier {
 
     if (_isDataSourceHls(betterPlayerDataSource)) {
       _setupHlsDataSource().then((dynamic value) {
-        _betterPlayerSubtitlesSourceList.add(
-          BetterPlayerSubtitlesSource(
-              type: BetterPlayerSubtitlesSourceType.none),
-        );
+        _setupSubtitles();
       });
     } else {
-      _betterPlayerSubtitlesSourceList.add(
-        BetterPlayerSubtitlesSource(type: BetterPlayerSubtitlesSourceType.none),
-      );
+      _setupSubtitles();
     }
 
     ///Process data source
     await _setupDataSource(betterPlayerDataSource);
+  }
 
+  void _setupSubtitles() {
+    _betterPlayerSubtitlesSourceList.add(
+      BetterPlayerSubtitlesSource(type: BetterPlayerSubtitlesSourceType.none),
+    );
     final defaultSubtitle = _betterPlayerSubtitlesSourceList.firstWhere(
         (element) => element.selectedByDefault == true,
         orElse: () => null);
@@ -257,10 +257,10 @@ class BetterPlayerController extends ChangeNotifier {
 
   bool _isDataSourceHls(BetterPlayerDataSource betterPlayerDataSource) =>
       betterPlayerDataSource.url.contains(_hlsExtension) ||
-      betterPlayerDataSource.videoFormat == VideoFormat.hls;
+      betterPlayerDataSource.videoFormat == BetterPlayerVideoFormat.hls;
 
   Future _setupHlsDataSource() async {
-    String hlsData =
+    final String hlsData =
         await BetterPlayerHlsUtils.getDataFromUrl(betterPlayerDataSource.url);
     if (hlsData != null) {
       /// Load hls tracks
@@ -662,9 +662,7 @@ class BetterPlayerController extends ChangeNotifier {
             .playerVisibilityChangedBehavior(visibilityFraction);
       } else {
         if (visibilityFraction == 0) {
-          if (_wasPlayingBeforePause == null) {
-            _wasPlayingBeforePause = isPlaying();
-          }
+          _wasPlayingBeforePause ??= isPlaying();
           pause();
         } else {
           if (_wasPlayingBeforePause == true && !isPlaying()) {
@@ -735,9 +733,7 @@ class BetterPlayerController extends ChangeNotifier {
         }
       }
       if (appLifecycleState == AppLifecycleState.paused) {
-        if (_wasPlayingBeforePause == null) {
-          _wasPlayingBeforePause = isPlaying();
-        }
+        _wasPlayingBeforePause ??= isPlaying();
         pause();
       }
     }
@@ -831,7 +827,7 @@ class BetterPlayerController extends ChangeNotifier {
         _postEvent(BetterPlayerEvent(BetterPlayerEventType.seekTo));
         break;
       case VideoEventType.completed:
-        final videoValue = await videoPlayerController.value;
+        final videoValue = videoPlayerController.value;
         _postEvent(
           BetterPlayerEvent(
             BetterPlayerEventType.finished,

lib/src/hls/better_player_hls_utils.dart

@@ -99,13 +99,13 @@ class BetterPlayerHlsUtils {
       String data, String masterPlaylistUrl) async {
     assert(data != null, "Data can't be null");
     assert(masterPlaylistUrl != null, "MasterPlaylistUrl can't be null");
-    List<BetterPlayerHlsAudioTrack> audios = [];
+    final List<BetterPlayerHlsAudioTrack> audios = [];
     final parsedPlaylist = await HlsPlaylistParser.create()
         .parseString(Uri.parse(masterPlaylistUrl), data);
     final hlsMasterPlaylist = parsedPlaylist as HlsMasterPlaylist;
 
     for (int index = 0; index < hlsMasterPlaylist.audios.length; index++) {
-      Rendition audio = hlsMasterPlaylist.audios[index];
+      final Rendition audio = hlsMasterPlaylist.audios[index];
       audios.add(BetterPlayerHlsAudioTrack(
         id: index,
         label: audio.name,

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.50
+version: 0.0.51
 authors:
   - Jakub Homlala <jhomlala@gmail.com>
 homepage: https://github.com/jhomlala/betterplayer