Moved buffer detection logic for andorid into shared function

Author: timoxd7

lib/src/cupertino/cupertino_controls.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'dart:math' as math;
 import 'dart:ui' as ui;
 
@@ -811,33 +810,7 @@ class _CupertinoControlsState extends State<CupertinoControls>
   void _updateState() {
     if (!mounted) return;
 
-    late final bool buffering;
-
-    if (Platform.isAndroid) {
-      if (controller.value.isBuffering) {
-        // -> Check if we actually buffer, as android has a bug preventing to
-        //    get the correct buffering state from this single bool.
-        final VideoPlayerValue value = controller.value;
-
-        final int position = value.position.inMilliseconds;
-
-        // Special case, if the video is finished, we don't want to show the
-        // buffering indicator anymore
-        if (position >= value.duration.inMilliseconds) {
-          buffering = false;
-        } else {
-          final int buffer =
-              value.buffered.lastOrNull?.end.inMilliseconds ?? -1;
-
-          buffering = position >= buffer;
-        }
-      } else {
-        // -> No buffering
-        buffering = false;
-      }
-    } else {
-      buffering = controller.value.isBuffering;
-    }
+    final bool buffering = getIsBuffering(controller);
 
     // display the progress bar indicator only after the buffering delay if it has been set
     if (chewieController.progressIndicatorDelay != null) {

lib/src/helpers/utils.dart

@@ -1,3 +1,7 @@
+import 'dart:io';
+
+import 'package:video_player/video_player.dart';
+
 String formatDuration(Duration position) {
   final ms = position.inMilliseconds;
 
@@ -30,3 +34,30 @@ String formatDuration(Duration position) {
 
   return formattedTime;
 }
+
+bool getIsBuffering(VideoPlayerController controller) {
+  final VideoPlayerValue value = controller.value;
+
+  if (Platform.isAndroid) {
+    if (value.isBuffering) {
+      // -> Check if we actually buffer, as android has a bug preventing to
+      //    get the correct buffering state from this single bool.
+      final int position = value.position.inMilliseconds;
+
+      // Special case, if the video is finished, we don't want to show the
+      // buffering indicator anymore
+      if (position >= value.duration.inMilliseconds) {
+        return false;
+      } else {
+        final int buffer = value.buffered.lastOrNull?.end.inMilliseconds ?? -1;
+
+        return position >= buffer;
+      }
+    } else {
+      // -> No buffering
+      return false;
+    }
+  }
+
+  return value.isBuffering;
+}

lib/src/material/material_controls.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:chewie/src/center_play_button.dart';
 import 'package:chewie/src/center_seek_button.dart';
@@ -646,33 +645,7 @@ class _MaterialControlsState extends State<MaterialControls>
   void _updateState() {
     if (!mounted) return;
 
-    late final bool buffering;
-
-    if (Platform.isAndroid) {
-      if (controller.value.isBuffering) {
-        // -> Check if we actually buffer, as android has a bug preventing to
-        //    get the correct buffering state from this single bool.
-        final VideoPlayerValue value = controller.value;
-
-        final int position = value.position.inMilliseconds;
-
-        // Special case, if the video is finished, we don't want to show the
-        // buffering indicator anymore
-        if (position >= value.duration.inMilliseconds) {
-          buffering = false;
-        } else {
-          final int buffer =
-              value.buffered.lastOrNull?.end.inMilliseconds ?? -1;
-
-          buffering = position >= buffer;
-        }
-      } else {
-        // -> No buffering
-        buffering = false;
-      }
-    } else {
-      buffering = controller.value.isBuffering;
-    }
+    final bool buffering = getIsBuffering(controller);
 
     // display the progress bar indicator only after the buffering delay if it has been set
     if (chewieController.progressIndicatorDelay != null) {

lib/src/material/material_desktop_controls.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:chewie/src/animated_play_pause.dart';
 import 'package:chewie/src/center_play_button.dart';
@@ -582,33 +581,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
   void _updateState() {
     if (!mounted) return;
 
-    late final bool buffering;
-
-    if (Platform.isAndroid) {
-      if (controller.value.isBuffering) {
-        // -> Check if we actually buffer, as android has a bug preventing to
-        //    get the correct buffering state from this single bool.
-        final VideoPlayerValue value = controller.value;
-
-        final int position = value.position.inMilliseconds;
-
-        // Special case, if the video is finished, we don't want to show the
-        // buffering indicator anymore
-        if (position >= value.duration.inMilliseconds) {
-          buffering = false;
-        } else {
-          final int buffer =
-              value.buffered.lastOrNull?.end.inMilliseconds ?? -1;
-
-          buffering = position >= buffer;
-        }
-      } else {
-        // -> No buffering
-        buffering = false;
-      }
-    } else {
-      buffering = controller.value.isBuffering;
-    }
+    final bool buffering = getIsBuffering(controller);
 
     // display the progress bar indicator only after the buffering delay if it has been set
     if (chewieController.progressIndicatorDelay != null) {