Merge commit 'c7665a379343679beba9d480a8989df6f2e0499c' into github/custom-lg

* commit 'c7665a379343679beba9d480a8989df6f2e0499c':
  chewie, version 1.8.5. Addresses Issue fluttercommunity#615.
  Fixed a stray lint issue due to recent PR.
  chore: pass draggableProgressBar from chewieController.
  chore: make progress bar independent on chewie controller.
  chore: add barHeight and handleHeight properties.
  chore: export MaterialVideoProgressBar widget.
  Adding Material Seek Control button size and fade duration config
  Adding Seek buttons for Android

Author: lg8294

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.8.5]
+* ⬆️ [#703](https://github.com/fluttercommunity/chewie/pull/703): Adding Seek buttons for Android. Thanks [GyanendroKh](https://github.com/GyanendroKh).
+* Upgraded `wakelock_plus` to version `1.2.8`, which uses `web` version `1.0.0`. Thanks [diegotori](https://github.com/diegotori).
+
 ## [1.8.4]
 * 🛠️ [#838](https://github.com/fluttercommunity/chewie/pull/838): Add bufferingBuilder. Thanks [daniellampl](https://github.com/daniellampl).
 

lib/chewie.dart

@@ -4,5 +4,6 @@ export 'src/chewie_player.dart';
 export 'src/chewie_progress_colors.dart';
 export 'src/cupertino/cupertino_controls.dart';
 export 'src/material/material_controls.dart';
+export 'src/material/material_progress_bar.dart';
 export 'src/material/material_desktop_controls.dart';
 export 'src/models/index.dart';

lib/src/center_seek_button.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+
+class CenterSeekButton extends StatelessWidget {
+  const CenterSeekButton({
+    super.key,
+    required this.iconData,
+    required this.backgroundColor,
+    this.iconColor,
+    required this.show,
+    this.fadeDuration = const Duration(milliseconds: 300),
+    this.iconSize = 26,
+    this.onPressed,
+  });
+
+  final IconData iconData;
+  final Color backgroundColor;
+  final Color? iconColor;
+  final bool show;
+  final VoidCallback? onPressed;
+  final Duration fadeDuration;
+  final double iconSize;
+
+  @override
+  Widget build(BuildContext context) {
+    return ColoredBox(
+      color: Colors.transparent,
+      child: Center(
+        child: UnconstrainedBox(
+          child: AnimatedOpacity(
+            opacity: show ? 1.0 : 0.0,
+            duration: fadeDuration,
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: backgroundColor,
+                shape: BoxShape.circle,
+              ),
+              // Always set the iconSize on the IconButton, not on the Icon itself:
+              // https://github.com/flutter/flutter/issues/52980
+              child: IconButton(
+                iconSize: iconSize,
+                padding: const EdgeInsets.all(8.0),
+                icon: Icon(iconData, color: iconColor),
+                onPressed: onPressed,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/src/chewie_player.dart

@@ -289,6 +289,8 @@ class ChewieController extends ChangeNotifier {
     this.fullScreenByDefault = false,
     this.cupertinoProgressColors,
     this.materialProgressColors,
+    this.materialSeekButtonFadeDuration = const Duration(milliseconds: 300),
+    this.materialSeekButtonSize = 26,
     this.placeholder,
     this.overlay,
     this.showControlsOnInitialize = true,
@@ -338,6 +340,8 @@ class ChewieController extends ChangeNotifier {
     bool? fullScreenByDefault,
     ChewieProgressColors? cupertinoProgressColors,
     ChewieProgressColors? materialProgressColors,
+    Duration? materialSeekButtonFadeDuration,
+    double? materialSeekButtonSize,
     Widget? placeholder,
     Widget? overlay,
     bool? showControlsOnInitialize,
@@ -390,6 +394,10 @@ class ChewieController extends ChangeNotifier {
           cupertinoProgressColors ?? this.cupertinoProgressColors,
       materialProgressColors:
           materialProgressColors ?? this.materialProgressColors,
+      materialSeekButtonFadeDuration:
+          materialSeekButtonFadeDuration ?? this.materialSeekButtonFadeDuration,
+      materialSeekButtonSize:
+          materialSeekButtonSize ?? this.materialSeekButtonSize,
       placeholder: placeholder ?? this.placeholder,
       overlay: overlay ?? this.overlay,
       showControlsOnInitialize:
@@ -520,6 +528,12 @@ class ChewieController extends ChangeNotifier {
   /// player uses the colors from your Theme.
   final ChewieProgressColors? materialProgressColors;
 
+  // The duration of the fade animation for the seek button (Material Player only)
+  final Duration materialSeekButtonFadeDuration;
+
+  // The size of the seek button for the Material Player only
+  final double materialSeekButtonSize;
+
   /// The placeholder is displayed underneath the Video before it is initialized
   /// or played.
   final Widget? placeholder;

lib/src/cupertino/cupertino_controls.dart

@@ -722,6 +722,7 @@ class _CupertinoControlsState extends State<CupertinoControls>
                   255,
                 ),
               ),
+          draggableProgressBar: chewieController.draggableProgressBar,
         ),
       ),
     );

lib/src/cupertino/cupertino_progress_bar.dart

@@ -12,13 +12,15 @@ class CupertinoVideoProgressBar extends StatelessWidget {
     this.onDragStart,
     this.onDragUpdate,
     super.key,
+    this.draggableProgressBar = true,
   }) : colors = colors ?? ChewieProgressColors();
 
   final VideoPlayerController controller;
   final ChewieProgressColors colors;
   final Function()? onDragStart;
   final Function()? onDragEnd;
   final Function()? onDragUpdate;
+  final bool draggableProgressBar;
 
   @override
   Widget build(BuildContext context) {
@@ -31,6 +33,7 @@ class CupertinoVideoProgressBar extends StatelessWidget {
       onDragEnd: onDragEnd,
       onDragStart: onDragStart,
       onDragUpdate: onDragUpdate,
+      draggableProgressBar: draggableProgressBar,
     );
   }
 }

lib/src/material/material_controls.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:chewie/src/center_play_button.dart';
+import 'package:chewie/src/center_seek_button.dart';
 import 'package:chewie/src/chewie_player.dart';
 import 'package:chewie/src/chewie_progress_colors.dart';
 import 'package:chewie/src/helpers/utils.dart';
@@ -388,13 +389,48 @@ class _MaterialControlsState extends State<MaterialControls>
           });
         }
       },
-      child: CenterPlayButton(
-        backgroundColor: Colors.black54,
-        iconColor: Colors.white,
-        isFinished: isFinished,
-        isPlaying: controller.value.isPlaying,
-        show: showPlayButton,
-        onPressed: _playPause,
+      child: Container(
+        alignment: Alignment.center,
+        color: Colors
+            .transparent, // The Gesture Detector doesn't expand to the full size of the container without this; Not sure why!
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            if (!isFinished && !chewieController.isLive)
+              CenterSeekButton(
+                iconData: Icons.replay_10,
+                backgroundColor: Colors.black54,
+                iconColor: Colors.white,
+                show: showPlayButton,
+                fadeDuration: chewieController.materialSeekButtonFadeDuration,
+                iconSize: chewieController.materialSeekButtonSize,
+                onPressed: _seekBackward,
+              ),
+            Container(
+              margin: EdgeInsets.symmetric(
+                horizontal: marginSize,
+              ),
+              child: CenterPlayButton(
+                backgroundColor: Colors.black54,
+                iconColor: Colors.white,
+                isFinished: isFinished,
+                isPlaying: controller.value.isPlaying,
+                show: showPlayButton,
+                onPressed: _playPause,
+              ),
+            ),
+            if (!isFinished && !chewieController.isLive)
+              CenterSeekButton(
+                iconData: Icons.forward_10,
+                backgroundColor: Colors.black54,
+                iconColor: Colors.white,
+                show: showPlayButton,
+                fadeDuration: chewieController.materialSeekButtonFadeDuration,
+                iconSize: chewieController.materialSeekButtonSize,
+                onPressed: _seekForward,
+              ),
+          ],
+        ),
       ),
     );
   }
@@ -546,6 +582,36 @@ class _MaterialControlsState extends State<MaterialControls>
     });
   }
 
+  void _seekRelative(Duration relativeSeek) {
+    _cancelAndRestartTimer();
+    final position = _latestValue.position + relativeSeek;
+    final duration = _latestValue.duration;
+
+    if (position < Duration.zero) {
+      controller.seekTo(Duration.zero);
+    } else if (position > duration) {
+      controller.seekTo(duration);
+    } else {
+      controller.seekTo(position);
+    }
+  }
+
+  void _seekBackward() {
+    _seekRelative(
+      const Duration(
+        seconds: -10,
+      ),
+    );
+  }
+
+  void _seekForward() {
+    _seekRelative(
+      const Duration(
+        seconds: 10,
+      ),
+    );
+  }
+
   void _startHideTimer() {
     final hideControlsTimer = chewieController.hideControlsTimer.isNegative
         ? ChewieController.defaultHideControlsTimer
@@ -618,6 +684,7 @@ class _MaterialControlsState extends State<MaterialControls>
                   Theme.of(context).colorScheme.surface.withOpacity(0.5),
               backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
             ),
+        draggableProgressBar: chewieController.draggableProgressBar,
       ),
     );
   }

lib/src/material/material_desktop_controls.dart

@@ -594,6 +594,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
                   Theme.of(context).colorScheme.surface.withOpacity(0.5),
               backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
             ),
+        draggableProgressBar: chewieController.draggableProgressBar,
       ),
     );
   }

lib/src/material/material_progress_bar.dart

@@ -7,31 +7,38 @@ class MaterialVideoProgressBar extends StatelessWidget {
   MaterialVideoProgressBar(
     this.controller, {
     this.height = kToolbarHeight,
+    this.barHeight = 10,
+    this.handleHeight = 6,
     ChewieProgressColors? colors,
     this.onDragEnd,
     this.onDragStart,
     this.onDragUpdate,
     super.key,
+    this.draggableProgressBar = true,
   }) : colors = colors ?? ChewieProgressColors();
 
   final double height;
+  final double barHeight;
+  final double handleHeight;
   final VideoPlayerController controller;
   final ChewieProgressColors colors;
   final Function()? onDragStart;
   final Function()? onDragEnd;
   final Function()? onDragUpdate;
+  final bool draggableProgressBar;
 
   @override
   Widget build(BuildContext context) {
     return VideoProgressBar(
       controller,
-      barHeight: 10,
-      handleHeight: 6,
+      barHeight: barHeight,
+      handleHeight: handleHeight,
       drawShadow: true,
       colors: colors,
       onDragEnd: onDragEnd,
       onDragStart: onDragStart,
       onDragUpdate: onDragUpdate,
+      draggableProgressBar: draggableProgressBar,
     );
   }
 }

lib/src/progress_bar.dart

@@ -9,6 +9,7 @@ class VideoProgressBar extends StatefulWidget {
     this.onDragEnd,
     this.onDragStart,
     this.onDragUpdate,
+    this.draggableProgressBar = true,
     super.key,
     required this.barHeight,
     required this.handleHeight,
@@ -24,6 +25,7 @@ class VideoProgressBar extends StatefulWidget {
   final double barHeight;
   final double handleHeight;
   final bool drawShadow;
+  final bool draggableProgressBar;
 
   @override
   // ignore: library_private_types_in_public_api
@@ -65,7 +67,6 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
 
   @override
   Widget build(BuildContext context) {
-    final ChewieController chewieController = ChewieController.of(context);
     final child = Center(
       child: StaticProgressBar(
         value: controller.value,
@@ -77,7 +78,7 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
       ),
     );
 
-    return chewieController.draggableProgressBar
+    return widget.draggableProgressBar
         ? GestureDetector(
             onHorizontalDragStart: (DragStartDetails details) {
               if (!controller.value.isInitialized) {