refactor: remove null check enforcements (#11)

Author: BBarisKilic

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.1
+
+* refactor: remove null check enforcements (#10)
+* docs: update `README.md`
+
 ## 1.2.0
 
 * feat: add volume set feature (#8)

README.md

@@ -23,7 +23,7 @@ dependencies:
   video_player_service:
     git:
       url: https://github.com/BBKDevelopment/Video-Player-Service.git
-      ref: v1.2.0
+      ref: v1.2.1
 ```
 
 Install it:

lib/src/video_player_service.dart

@@ -57,7 +57,7 @@ class VideoPlayerService {
   /// Returns `false` if the video has not been initialized.
   bool get isPlaying {
     try {
-      return _controller!.value.isPlaying;
+      return _controller?.value.isPlaying ?? false;
     } catch (error, stackTrace) {
       log(
         'Could not get playing status!',
@@ -74,7 +74,7 @@ class VideoPlayerService {
   /// Returns [Duration.zero] if the video has not been initialized.
   Duration get position {
     try {
-      return _controller!.value.position;
+      return _controller?.value.position ?? Duration.zero;
     } catch (error, stackTrace) {
       log(
         'Could not get position!',
@@ -91,7 +91,7 @@ class VideoPlayerService {
   /// Returns [Duration.zero] if the video has not been initialized.
   Duration get duration {
     try {
-      return _controller!.value.duration;
+      return _controller?.value.duration ?? Duration.zero;
     } catch (error, stackTrace) {
       log(
         'Could not get duration!',
@@ -108,7 +108,7 @@ class VideoPlayerService {
   /// Returns `1` if the video has not been initialized.
   double get playbackSpeed {
     try {
-      return _controller!.value.playbackSpeed;
+      return _controller?.value.playbackSpeed ?? 1;
     } catch (error, stackTrace) {
       log(
         'Could not get playback speed!',
@@ -125,7 +125,7 @@ class VideoPlayerService {
   /// Returns `0` if the video has not been initialized.
   double get height {
     try {
-      return _controller!.value.size.height;
+      return _controller?.value.size.height ?? 0;
     } catch (error, stackTrace) {
       log(
         'Could not get height!',
@@ -142,7 +142,7 @@ class VideoPlayerService {
   /// Returns `0` if the video has not been initialized.
   double get width {
     try {
-      return _controller!.value.size.width;
+      return _controller?.value.size.width ?? 0;
     } catch (error, stackTrace) {
       log(
         'Could not get width!',
@@ -166,8 +166,8 @@ class VideoPlayerService {
         );
       }
 
-      await _controller!.initialize();
-      await _controller!.setVolume(volume);
+      await _controller?.initialize();
+      await _controller?.setVolume(volume);
     } catch (error, stackTrace) {
       log(
         'Could not load file!',
@@ -198,7 +198,7 @@ class VideoPlayerService {
   /// Throws a [PlayVideoException] if the video fails to play.
   Future<void> play() async {
     try {
-      await _controller!.play();
+      await _controller?.play();
     } catch (error, stackTrace) {
       log(
         'Could not play the video!',
@@ -215,7 +215,7 @@ class VideoPlayerService {
   /// Throws a [PauseVideoException] if the video fails to pause.
   Future<void> pause() async {
     try {
-      await _controller!.pause();
+      await _controller?.pause();
     } catch (error, stackTrace) {
       log(
         'Could not pause the video!',
@@ -232,7 +232,7 @@ class VideoPlayerService {
   /// Throws a [SetVideoPlaybackSpeedException] if could not set playback speed.
   Future<void> setPlaybackSpeed(double speed) async {
     try {
-      await _controller!.setPlaybackSpeed(speed);
+      await _controller?.setPlaybackSpeed(speed);
     } catch (error, stackTrace) {
       log(
         'Could not set playback speed!',
@@ -249,7 +249,7 @@ class VideoPlayerService {
   /// Throws a [SetVolumeException] if the video fails to set the volume.
   Future<void> setVolume(double volume) async {
     try {
-      await _controller!.setVolume(volume);
+      await _controller?.setVolume(volume);
     } catch (error, stackTrace) {
       log(
         'Could not set volume!',
@@ -266,7 +266,7 @@ class VideoPlayerService {
   /// Throws a [SeekVideoPositionException] if the video fails to seek.
   Future<void> seekTo(Duration position) async {
     try {
-      await _controller!.seekTo(position);
+      await _controller?.seekTo(position);
     } catch (error, stackTrace) {
       log(
         'Could not seek to the position!',
@@ -281,7 +281,7 @@ class VideoPlayerService {
   /// Adds a listener to the video player.
   void addListener(VoidCallback listener) {
     try {
-      _controller!.addListener(listener);
+      _controller?.addListener(listener);
     } catch (error, stackTrace) {
       log(
         'Could not add listener!',

pubspec.yaml

@@ -1,6 +1,6 @@
 name: video_player_service
 description: Video Player Service
-version: 1.2.0
+version: 1.2.1
 publish_to: none
 
 environment:

test/src/video_player_service_test.dart

@@ -17,9 +17,15 @@ class _MockVideoPlayerController extends Mock
 
 void main() {
   late VideoPlayerService sut;
+  late VideoPlayerController controller;
 
   setUp(() {
-    sut = VideoPlayerService(options: VideoPlayerOptions());
+    controller = _MockVideoPlayerController();
+    sut = VideoPlayerService.test(controller: controller);
+  });
+
+  tearDown(() {
+    sut.dispose();
   });
 
   group('VideoPlayerService', () {
@@ -28,22 +34,25 @@ void main() {
     });
 
     test('can provide a controller', () {
-      expect(sut.controller, isNull);
+      expect(sut.controller, isNotNull);
     });
 
     test('can provide status of the video player', () {
-      expect(sut.isReady, false);
+      expect(sut.isReady, true);
     });
 
     test('can provide current status of the video player', () {
+      when(() => controller.value.isPlaying).thenThrow(Exception());
       expect(sut.isPlaying, false);
     });
 
     test('can provide current position of the video', () {
+      when(() => controller.value.position).thenThrow(Exception());
       expect(sut.position, Duration.zero);
     });
 
     test('can provide duration of the video', () {
+      when(() => controller.value.duration).thenThrow(Exception());
       expect(sut.duration, Duration.zero);
     });
 
@@ -60,23 +69,20 @@ void main() {
     });
 
     test('can load a video from file', () async {
-      final controller = _MockVideoPlayerController();
-      final videoPlayerService = VideoPlayerService.test(
-        controller: controller,
-      );
-
-      when(controller.initialize).thenAnswer((_) => Future.value());
-      when(() => controller.setVolume(any())).thenAnswer((_) => Future.value());
-
-      await videoPlayerService.loadFile(File(''));
-
+      when(() => controller.initialize()).thenAnswer(Future.value);
+      when(() => controller.setVolume(any())).thenAnswer(Future.value);
+      await sut.loadFile(File(''));
       verify(controller.initialize).called(1);
       verify(() => controller.setVolume(any())).called(1);
     });
 
     test('can throw LoadVideoException while loading a video from file', () {
+      final videoPlayerService = VideoPlayerService(
+        options: VideoPlayerOptions(),
+      );
+
       expect(
-        sut.loadFile(File('')),
+        videoPlayerService.loadFile(File('')),
         throwsA(isA<LoadVideoException>()),
       );
     });
@@ -87,13 +93,8 @@ void main() {
 
     test('can log the issue when could not dispose the video player controller',
         () {
-      final controller = _MockVideoPlayerController();
-      final videoPlayerService = VideoPlayerService.test(
-        controller: controller,
-      );
-
       when(controller.dispose).thenThrow(Exception());
-      expect(videoPlayerService.dispose(), isA<Future<void>>());
+      expect(sut.dispose(), isA<Future<void>>());
     });
 
     test('can throw PlayVideoException while trying to play a video', () {