Merge branch 'fluttercommunity:master' into pause-on-tap

Author: Ortes

.github/workflows/ci.yml

@@ -11,46 +11,51 @@ on:
       - '**.md'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  check-format:
-      name: Check format using dart format.
-      runs-on: ubuntu-latest
-
-      steps:
-        - name: Checkout code
-          uses: actions/checkout@v4
-        - name: Flutter Action
-          uses: subosito/flutter-action@v2
-        - name: Check format
-          run: dart format . --set-exit-if-changed
-
-  lint:
-    name: Lint
+  # Does a sanity check that packages at least pass analysis on the N-1
+  # versions of Flutter stable if the package claims to support that version.
+  # This is to minimize accidentally making changes that break old versions
+  # (which we don't commit to supporting, but don't want to actively break)
+  # without updating the constraints.
+  lint_and_build:
+    name: Flutter Version ${{ matrix.flutter-version }} Lint and Build.
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        flutter-version:
+          # The version of Flutter to use should use the minimum Dart SDK version supported by the package,
+          # refer to https://docs.flutter.dev/development/tools/sdk/releases.
+          # Note: The version below should be manually updated to the latest second most recent version
+          # after a new stable version comes out.
+          - "3.27.4"
+          - "3.x"
     steps:
-      - name: Checkout code
+      - name: 📚 Git Checkout
         uses: actions/checkout@v4
-      - name: Flutter Action
+
+      - name: 🐦 Setup Flutter
         uses: subosito/flutter-action@v2
-      - name: Install Package Dependencies
+        with:
+          flutter-version: ${{ matrix.flutter-version }}
+          channel: stable
+          cache: true
+          cache-key: flutter-:os:-:channel:-:version:-:arch:-:hash:-${{ hashFiles('**/pubspec.lock') }}
+
+      - name: 📦 Install Dependencies
         run: flutter packages get
-      - name: Get dependencies for example
-        run: flutter pub get
-        working-directory: example
-      - name: Lint using flutter analyze
-        run: flutter analyze .
-
-  test:
-    name: Run tests.
-    runs-on: ubuntu-latest
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Flutter Action
-        uses: subosito/flutter-action@v2
-      - name: Run flutter test
-        run: |
-          flutter pub get
-          flutter test
+      - name: ✨ Check Formatting
+        run: dart format --set-exit-if-changed lib
+
+      - name: 🕵️ Analyze
+        run: flutter analyze lib
+
+      - name: 🧪 Run Tests
+        run: flutter test --no-pub --coverage --test-randomize-ordering-seed random
+
+      - name: 📁 Upload coverage to Codecov
+        uses: codecov/codecov-action@v5

CHANGELOG.md

@@ -1,3 +1,35 @@
+## [1.11.0]
+* ⬆️ [#900](https://github.com/fluttercommunity/chewie/pull/900): Flutter `3.29` upgrade. Thanks [diegotori](https://github.com/diegotori).
+* **BREAKING CHANGE**: Library now requires at least Flutter version `3.27.0`, for real this time.
+
+## [1.10.0]
+* 🛠️ [#871](https://github.com/fluttercommunity/chewie/pull/871): Fixed pop the wrong page when changing the speed. Thanks [akmalova](https://github.com/akmalova).
+* **BREAKING CHANGES**: 
+  * `OptionItem.onTap` now takes in a `BuildContext`.
+  * `OptionItem`'s properties are now marked as `final`. Use `copyWith` to mutate its properties into
+    a new instance.
+
+## [1.9.2]
+* Fixed broken Table of Contents links in `README.md`, take two.
+
+## [1.9.1+1]
+* Fixed broken Table of Contents links in `README.md`.
+
+## [1.9.1]
+* [#872](https://github.com/fluttercommunity/chewie/pull/872): feat: Add showSubtitles flag to control subtitles (#648). Thanks [floodoo](https://github.com/floodoo).
+* [#890](https://github.com/fluttercommunity/chewie/pull/890): Fix issue 888. Thanks [diegotori](https://github.com/diegotori).
+* **IMPORTANT**: Relaxed the minimum supported Flutter version to `3.24`. 
+  From now on, this library will make a best effort to support the latest `N-1` Flutter version at the minimum.
+
+## [1.9.0]
+* **BREAKING CHANGE**: Library now requires at least Flutter version `3.27.0`.
+
+## [1.8.7]
+* ⬆️ [#876](https://github.com/fluttercommunity/chewie/pull/876): Add keyboard controls seek forward and backward and fullscreen escape on desktop. Thanks [Ortes](https://github.com/Ortes).
+
+## [1.8.6]
+* ⬆️ [#874](https://github.com/fluttercommunity/chewie/pull/874): Add `devtools_options.yaml` configuration files. Thanks [MoRmdn](https://github.com/MoRmdn).
+
 ## [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).

README.md

@@ -8,18 +8,53 @@
 
 The video player for Flutter with a heart of gold. 
 
-The [`video_player`](https://pub.dartlang.org/packages/video_player) plugin provides low-level access to video playback. Chewie uses the `video_player` under the hood and wraps it in a friendly Material or Cupertino UI!
+The [`video_player`](https://pub.dartlang.org/packages/video_player) plugin provides low-level 
+access to video playback. 
 
-## Preview
+Chewie uses the `video_player` under the hood and wraps it in a friendly Material or Cupertino UI!
 
-| MaterialControls | MaterialDesktopControls |
-| :--------------: | :---------------------: |
-|     ![](https://github.com/brianegan/chewie/raw/master/assets/MaterialControls.png)     |    ![](https://github.com/brianegan/chewie/raw/master/assets/MaterialDesktopControls.png)     |
+## Table of Contents
+1.  🚨 [IMPORTANT!!! (READ THIS FIRST)](#-important-read-this-first)
+2.  🔀 [Flutter Version Compatibility](#-flutter-version-compatibility)
+3.  🖼️ [Preview](#%EF%B8%8F-preview)
+4.  ⬇️ [Installation](#%EF%B8%8F-installation)
+5.  🕹️ [Using it](#%EF%B8%8F-using-it)
+6.  ⚙️ [Options](#%EF%B8%8F-options)
+7.  🔡 [Subtitles](#-subtitles)
+8.  🧪 [Example](#-example)
+9.  ⏪ [Migrating from Chewie < 0.9.0](#-migrating-from-chewie--090)
+10. 🗺️ [Roadmap](#%EF%B8%8F-roadmap)
+11. 📱 [iOS warning](#-ios-warning-)
+
+
+## 🚨 IMPORTANT!!! (READ THIS FIRST)
+This library is __NOT__ responsible for any issues caused by `video_player`, since it's merely a UI 
+layer on top of it. 
+
+In other words, if you see any `PlatformException`s being thrown in your app due to video playback,
+they are exclusive to the `video_player` library. 
+
+Instead, please raise an issue related to it with the [Flutter Team](https://github.com/flutter/flutter/issues/new/choose).
+
+## 🔀 Flutter Version Compatibility
+
+This library will at the very least make a solid effort to support the second most recent version 
+of Flutter released. In other words, it will adopt `N-1` version support at
+the bare minimum.
+
+However, this cannot be guaranteed due to major changes between Flutter versions. Should that occur,
+future updates will be released as major or minor versions as needed.
+
+## 🖼️ Preview
+
+|                                MaterialControls                                 |                                MaterialDesktopControls                                 |
+|:-------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------:|
+| ![](https://github.com/brianegan/chewie/raw/master/assets/MaterialControls.png) | ![](https://github.com/brianegan/chewie/raw/master/assets/MaterialDesktopControls.png) |
 
 ### CupertinoControls
 ![](https://github.com/brianegan/chewie/raw/master/assets/CupertinoControls.png)
 
-## Installation
+## ⬇️ Installation
 
 In your `pubspec.yaml` file within your Flutter Project add `chewie` and `video_player` under dependencies:
 
@@ -29,10 +64,12 @@ dependencies:
   video_player: <latest_version>
 ```
 
-## Using it
+## 🕹️ Using it
 
 ```dart
 import 'package:chewie/chewie.dart';
+import 'package:video_player/video_player.dart';
+
 final videoPlayerController = VideoPlayerController.networkUrl(Uri.parse(
     'https://flutter.github.io/assets-for-api-docs/assets/videos/butterfly.mp4'));
 
@@ -59,7 +96,7 @@ void dispose() {
 }
 ```
 
-## Options
+## ⚙️ Options
 
 ![](https://github.com/brianegan/chewie/raw/master/assets/Options.png)
 
@@ -125,13 +162,19 @@ optionsTranslation: OptionsTranslation(
 ),
 ```
 
-## Subtitles
+## 🔡 Subtitles
+
+> Since version 1.1.0, Chewie supports subtitles.
+
+Chewie allows you to enhance the video playback experience with text overlays. You can add a `List<Subtitle>` to your `ChewieController` and fully customize their appearance using the `subtitleBuilder` function.
+
+### Showing Subtitles by Default
 
-> Since version 1.1.0 chewie supports subtitles. Here you can see how to use them.
+Chewie provides the `showSubtitles` flag, allowing you to control whether subtitles are displayed automatically when the video starts. By default, this flag is set to `false`.
 
-You can provide an `List<Subtitle>` and customize your subtitles with the `subtitleBuilder` function.
+### Adding Subtitles
 
-Add subtitles to your `ChewieController` like the following example:
+Here’s an example of how to add subtitles to your `ChewieController`:
 
 ```dart
 ChewieController(
@@ -149,9 +192,10 @@ ChewieController(
       index: 1,
       start: const Duration(seconds: 10),
       end: const Duration(seconds: 20),
-      text: 'Whats up? :)',
+      text: 'What’s up? :)',
     ),
   ]),
+  showSubtitles: true, // Automatically display subtitles
   subtitleBuilder: (context, subtitle) => Container(
     padding: const EdgeInsets.all(10.0),
     child: Text(
@@ -162,9 +206,16 @@ ChewieController(
 );
 ```
 
-The `index` attribute is for if you want to structure your subtitles in your database and provide your indexes here. `end` and `text` are the key attributes. 
+### Subtitle Structure
 
-The Duration defines which part of your video your subtitles should start and end. For example, if your video is 10 minutes long and you want to add a subtitle between: `00:00` and `00:10`'th of a second:
+The `Subtitle` model contains the following key attributes:
+
+- **`index`**: A unique identifier for the subtitle, useful for database integration.
+- **`start`**: The starting point of the subtitle, defined as a `Duration`.
+- **`end`**: The ending point of the subtitle, defined as a `Duration`.
+- **`text`**: The subtitle text that will be displayed.
+
+For example, if your video is 10 minutes long and you want to add a subtitle that appears between `00:00` and `00:10`, you can define it like this:
 
 ```dart
 Subtitle(
@@ -175,11 +226,15 @@ Subtitle(
 ),
 ```
 
-## Example
+### Customizing Subtitles
+
+Use the `subtitleBuilder` function to customize how subtitles are rendered, allowing you to modify text styles, add padding, or apply other customizations to your subtitles.
+
+## 🧪 Example
 
 Please run the app in the [`example/`](https://github.com/brianegan/chewie/tree/master/example) folder to start playing!
 
-## Migrating from Chewie < 0.9.0
+## ⏪ Migrating from Chewie < 0.9.0
 
 Instead of passing the `VideoPlayerController` and your options to the `Chewie` widget you now pass them to the `ChewieController` and pass that later to the `Chewie` widget.
 
@@ -205,7 +260,7 @@ final playerWidget = Chewie(
 );
 ```
 
-## Roadmap
+## 🗺️ Roadmap
 
 - [x] MaterialUI
 - [x] MaterialDesktopUI
@@ -231,7 +286,7 @@ final playerWidget = Chewie(
 - [ ] Screen-Mirroring / Casting (Google Chromecast)
 
 
-## iOS warning 
+## 📱 iOS warning 
 
 The video_player plugin used by chewie will only work in iOS simulators if you are on flutter 1.26.0 or above. You may need to switch to the beta channel `flutter channel beta`
 Please refer to this [issue](https://github.com/flutter/flutter/issues/14647).

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

example/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

example/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import Flutter
 import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

example/lib/app/app.dart

@@ -6,10 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:video_player/video_player.dart';
 
 class ChewieDemo extends StatefulWidget {
-  const ChewieDemo({
-    super.key,
-    this.title = 'Chewie Demo',
-  });
+  const ChewieDemo({super.key, this.title = 'Chewie Demo'});
 
   final String title;
 
@@ -41,19 +38,21 @@ class _ChewieDemoState extends State<ChewieDemo> {
   }
 
   List<String> srcs = [
-    "https://assets.mixkit.co/videos/preview/mixkit-spinning-around-the-earth-29351-large.mp4",
-    "https://assets.mixkit.co/videos/preview/mixkit-daytime-city-traffic-aerial-view-56-large.mp4",
-    "https://assets.mixkit.co/videos/preview/mixkit-a-girl-blowing-a-bubble-gum-at-an-amusement-park-1226-large.mp4"
+    "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+    "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
+    "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4",
   ];
 
   Future<void> initializePlayer() async {
-    _videoPlayerController1 =
-        VideoPlayerController.networkUrl(Uri.parse(srcs[currPlayIndex]));
-    _videoPlayerController2 =
-        VideoPlayerController.networkUrl(Uri.parse(srcs[currPlayIndex]));
+    _videoPlayerController1 = VideoPlayerController.networkUrl(
+      Uri.parse(srcs[currPlayIndex]),
+    );
+    _videoPlayerController2 = VideoPlayerController.networkUrl(
+      Uri.parse(srcs[currPlayIndex]),
+    );
     await Future.wait([
       _videoPlayerController1.initialize(),
-      _videoPlayerController2.initialize()
+      _videoPlayerController2.initialize(),
     ]);
     _createChewieController();
     setState(() {});
@@ -93,7 +92,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
             TextSpan(
               text: 'subtitles',
               style: TextStyle(color: Colors.blue, fontSize: 18),
-            )
+            ),
           ],
         ),
       ),
@@ -119,19 +118,18 @@ class _ChewieDemoState extends State<ChewieDemo> {
       additionalOptions: (context) {
         return <OptionItem>[
           OptionItem(
-            onTap: toggleVideo,
+            onTap: (context) => toggleVideo(),
             iconData: Icons.live_tv_sharp,
             title: 'Toggle Video Src',
           ),
         ];
       },
       subtitle: Subtitles(subtitles),
+      showSubtitles: true,
       subtitleBuilder: (context, dynamic subtitle) => Container(
         padding: const EdgeInsets.all(10.0),
         child: subtitle is InlineSpan
-            ? RichText(
-                text: subtitle,
-              )
+            ? RichText(text: subtitle)
             : Text(
                 subtitle.toString(),
                 style: const TextStyle(color: Colors.black),
@@ -175,19 +173,15 @@ class _ChewieDemoState extends State<ChewieDemo> {
         platform: _platform ?? Theme.of(context).platform,
       ),
       home: Scaffold(
-        appBar: AppBar(
-          title: Text(widget.title),
-        ),
+        appBar: AppBar(title: Text(widget.title)),
         body: Column(
           children: <Widget>[
             Expanded(
               child: Center(
                 child: _chewieController != null &&
                         _chewieController!
                             .videoPlayerController.value.isInitialized
-                    ? Chewie(
-                        controller: _chewieController!,
-                      )
+                    ? Chewie(controller: _chewieController!)
                     : const Column(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
@@ -260,7 +254,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
                       child: Text("Portrait Video"),
                     ),
                   ),
-                )
+                ),
               ],
             ),
             Row(
@@ -290,7 +284,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
                       child: Text("iOS controls"),
                     ),
                   ),
-                )
+                ),
               ],
             ),
             Row(
@@ -323,7 +317,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
                     }
                   },
                 ),
-              )
+              ),
           ],
         ),
       ),

example/lib/main.dart

@@ -2,7 +2,5 @@ import 'package:chewie_example/app/app.dart';
 import 'package:flutter/material.dart';
 
 void main() {
-  runApp(
-    const ChewieDemo(),
-  );
+  runApp(const ChewieDemo());
 }

example/pubspec.yaml

@@ -4,20 +4,20 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
-  flutter: ">=3.19.0"
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: ">=3.27.0"
 
 dependencies:
   chewie:
     path: ../
   flutter:
     sdk: flutter
+  video_player: ^2.9.3
 
-  video_player: ^2.9.1
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec

lib/chewie.dart

@@ -1,9 +1,9 @@
-library chewie;
+library;
 
 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/material/material_progress_bar.dart';
 export 'src/models/index.dart';

lib/src/chewie_player.dart

@@ -288,6 +288,7 @@ class ChewieController extends ChangeNotifier {
     this.zoomAndPan = false,
     this.maxScale = 2.5,
     this.subtitle,
+    this.showSubtitles = false,
     this.subtitleBuilder,
     this.customControls,
     this.errorBuilder,
@@ -340,6 +341,7 @@ class ChewieController extends ChangeNotifier {
     bool? zoomAndPan,
     double? maxScale,
     Subtitles? subtitle,
+    bool? showSubtitles,
     Widget Function(BuildContext, dynamic)? subtitleBuilder,
     Widget? customControls,
     WidgetBuilder? bufferingBuilder,
@@ -393,6 +395,7 @@ class ChewieController extends ChangeNotifier {
       optionsBuilder: optionsBuilder ?? this.optionsBuilder,
       additionalOptions: additionalOptions ?? this.additionalOptions,
       showControls: showControls ?? this.showControls,
+      showSubtitles: showSubtitles ?? this.showSubtitles,
       subtitle: subtitle ?? this.subtitle,
       subtitleBuilder: subtitleBuilder ?? this.subtitleBuilder,
       customControls: customControls ?? this.customControls,
@@ -457,6 +460,12 @@ class ChewieController extends ChangeNotifier {
   /// Add a List of Subtitles here in `Subtitles.subtitle`
   Subtitles? subtitle;
 
+  /// Determines whether subtitles should be shown by default when the video starts.
+  ///
+  /// If set to `true`, subtitles will be displayed automatically when the video
+  /// begins playing. If set to `false`, subtitles will be hidden by default.
+  bool showSubtitles;
+
   /// The controller for the video you want to play
   final VideoPlayerController videoPlayerController;
 

lib/src/cupertino/cupertino_controls.dart

@@ -468,7 +468,7 @@ class _CupertinoControlsState extends State<CupertinoControls>
     final position = _latestValue.duration - _latestValue.position;
 
     return Padding(
-      padding: const EdgeInsets.only(right: 12.0),
+      padding: const EdgeInsets.symmetric(horizontal: 12.0),
       child: Text(
         '-${formatDuration(position)}',
         style: TextStyle(color: iconColor, fontSize: 12.0),
@@ -649,7 +649,8 @@ class _CupertinoControlsState extends State<CupertinoControls>
   }
 
   Future<void> _initialize() async {
-    _subtitleOn = chewieController.subtitle?.isNotEmpty ?? false;
+    chewieController.showSubtitles &&
+        (chewieController.subtitle?.isNotEmpty ?? false);
     controller.addListener(_updateState);
 
     _updateState();

lib/src/cupertino/widgets/cupertino_options_dialog.dart

@@ -24,7 +24,7 @@ class _CupertinoOptionsDialogState extends State<CupertinoOptionsDialog> {
         actions: widget.options
             .map(
               (option) => CupertinoActionSheetAction(
-                onPressed: () => option.onTap!(),
+                onPressed: () => option.onTap(context),
                 child: Text(option.title),
               ),
             )

lib/src/helpers/adaptive_controls.dart

@@ -23,8 +23,6 @@ class AdaptiveControls extends StatelessWidget {
           backgroundColor: Color.fromRGBO(41, 41, 41, 0.7),
           iconColor: Color.fromARGB(255, 200, 200, 200),
         );
-      default:
-        return const MaterialControls();
     }
   }
 }

lib/src/material/color_compat_extensions.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+//ignore_for_file: deprecated_member_use
+extension ColorCompatExtensions on Color {
+  /// Returns a new color that matches this color with the given opacity.
+  ///
+  /// This is a compatibility layer that ensures compatibility with Flutter
+  /// versions below 3.27. In Flutter 3.27 and later, `Color.withOpacity`
+  /// has been deprecated in favor of `Color.withValues`.
+  ///
+  /// This method bridges the gap by providing a consistent way to adjust
+  /// the opacity of a color across different Flutter versions.
+  ///
+  /// **Important:** Once the minimum supported Flutter version is bumped
+  /// to 3.27 or higher, this method should be removed and replaced with
+  /// `withValues(alpha: opacity)`.
+  ///
+  /// See also:
+  ///  * [Color.withOpacity], which is deprecated in Flutter 3.27 and later.
+  ///  * [Color.withValues], the recommended replacement for `withOpacity`.
+  Color withOpacityCompat(double opacity) {
+    // Compatibility layer that uses the legacy withOpacity method, while
+    // ignoring the deprecation for now (in order to guarantee N-1 minimum
+    // version compatibility).
+    // Once it's removed from a future update, we'll have to replace uses of
+    // this method with withValues(alpha: opacity).
+    // TODO: Replace this bridge method once the above holds true.
+    return withOpacity(opacity);
+  }
+}

lib/src/material/material_controls.dart

@@ -5,6 +5,7 @@ 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';
+import 'package:chewie/src/material/color_compat_extensions.dart';
 import 'package:chewie/src/material/material_progress_bar.dart';
 import 'package:chewie/src/material/widgets/options_dialog.dart';
 import 'package:chewie/src/material/widgets/playback_speed_dialog.dart';
@@ -161,10 +162,10 @@ class _MaterialControlsState extends State<MaterialControls>
     );
   }
 
-  Widget _buildOptionsButton() {
+  List<OptionItem> _buildOptions(BuildContext context) {
     final options = <OptionItem>[
       OptionItem(
-        onTap: () async {
+        onTap: (context) async {
           Navigator.pop(context);
           _onSpeedButtonTap();
         },
@@ -178,7 +179,10 @@ class _MaterialControlsState extends State<MaterialControls>
         chewieController.additionalOptions!(context).isNotEmpty) {
       options.addAll(chewieController.additionalOptions!(context));
     }
+    return options;
+  }
 
+  Widget _buildOptionsButton() {
     return AnimatedOpacity(
       opacity: notifier.hideStuff ? 0.0 : 1.0,
       duration: const Duration(milliseconds: 250),
@@ -187,14 +191,15 @@ class _MaterialControlsState extends State<MaterialControls>
           _hideTimer?.cancel();
 
           if (chewieController.optionsBuilder != null) {
-            await chewieController.optionsBuilder!(context, options);
+            await chewieController.optionsBuilder!(
+                context, _buildOptions(context));
           } else {
             await showModalBottomSheet<OptionItem>(
               context: context,
               isScrollControlled: true,
               useRootNavigator: chewieController.useRootNavigator,
               builder: (context) => OptionsDialog(
-                options: options,
+                options: _buildOptions(context),
                 cancelButtonText:
                     chewieController.optionsTranslation?.cancelButtonText,
               ),
@@ -260,6 +265,7 @@ class _MaterialControlsState extends State<MaterialControls>
         height: barHeight + (chewieController.isFullScreen ? 10.0 : 0),
         padding: EdgeInsets.only(
           left: 20,
+          right: 20,
           bottom: !chewieController.isFullScreen ? 10.0 : 0,
         ),
         child: SafeArea(
@@ -291,7 +297,7 @@ class _MaterialControlsState extends State<MaterialControls>
               if (!chewieController.isLive)
                 Expanded(
                   child: Container(
-                    padding: const EdgeInsets.only(right: 20),
+                    padding: const EdgeInsets.symmetric(horizontal: 20),
                     child: Row(
                       children: [
                         _buildProgressBar(),
@@ -474,7 +480,7 @@ class _MaterialControlsState extends State<MaterialControls>
             text: '/ ${formatDuration(duration)}',
             style: TextStyle(
               fontSize: 14.0,
-              color: Colors.white.withOpacity(.75),
+              color: Colors.white.withOpacityCompat(.75),
               fontWeight: FontWeight.normal,
             ),
           )
@@ -529,7 +535,8 @@ class _MaterialControlsState extends State<MaterialControls>
   }
 
   Future<void> _initialize() async {
-    _subtitleOn = chewieController.subtitle?.isNotEmpty ?? false;
+    _subtitleOn = chewieController.showSubtitles &&
+        (chewieController.subtitle?.isNotEmpty ?? false);
     controller.addListener(_updateState);
 
     _updateState();
@@ -686,8 +693,9 @@ class _MaterialControlsState extends State<MaterialControls>
               playedColor: Theme.of(context).colorScheme.secondary,
               handleColor: Theme.of(context).colorScheme.secondary,
               bufferedColor:
-                  Theme.of(context).colorScheme.surface.withOpacity(0.5),
-              backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
+                  Theme.of(context).colorScheme.surface.withOpacityCompat(0.5),
+              backgroundColor:
+                  Theme.of(context).disabledColor.withOpacityCompat(.5),
             ),
         draggableProgressBar: chewieController.draggableProgressBar,
       ),

lib/src/material/material_desktop_controls.dart

@@ -5,13 +5,15 @@ import 'package:chewie/src/center_play_button.dart';
 import 'package:chewie/src/chewie_player.dart';
 import 'package:chewie/src/chewie_progress_colors.dart';
 import 'package:chewie/src/helpers/utils.dart';
+import 'package:chewie/src/material/color_compat_extensions.dart';
 import 'package:chewie/src/material/material_progress_bar.dart';
 import 'package:chewie/src/material/widgets/options_dialog.dart';
 import 'package:chewie/src/material/widgets/playback_speed_dialog.dart';
 import 'package:chewie/src/models/option_item.dart';
 import 'package:chewie/src/models/subtitle_model.dart';
 import 'package:chewie/src/notifiers/index.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:video_player/video_player.dart';
 
@@ -49,16 +51,36 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
 
   late VideoPlayerController controller;
   ChewieController? _chewieController;
+  late final FocusNode _focusNode;
 
   // We know that _chewieController is set in didChangeDependencies
   ChewieController get chewieController => _chewieController!;
 
   @override
   void initState() {
     super.initState();
+    _focusNode = FocusNode();
+    _focusNode.requestFocus();
     notifier = Provider.of<PlayerNotifier>(context, listen: false);
   }
 
+  void _handleKeyPress(event) {
+    if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.space) {
+      _playPause();
+    } else if (event is KeyDownEvent &&
+        event.logicalKey == LogicalKeyboardKey.arrowRight) {
+      _seekForward();
+    } else if (event is KeyDownEvent &&
+        event.logicalKey == LogicalKeyboardKey.arrowLeft) {
+      _seekBackward();
+    } else if (event is KeyDownEvent &&
+        event.logicalKey == LogicalKeyboardKey.escape) {
+      if (chewieController.isFullScreen) {
+        _onExpandCollapse();
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     if (_latestValue.hasError) {
@@ -75,39 +97,44 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
           );
     }
 
-    return MouseRegion(
-      onHover: (_) {
-        _cancelAndRestartTimer();
-      },
-      child: GestureDetector(
-        onTap: () => _cancelAndRestartTimer(),
-        child: AbsorbPointer(
-          absorbing: notifier.hideStuff,
-          child: Stack(
-            children: [
-              if (_displayBufferingIndicator)
-                _chewieController?.bufferingBuilder?.call(context) ??
-                    const Center(
-                      child: CircularProgressIndicator(),
-                    )
-              else
-                _buildHitArea(),
-              Column(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: <Widget>[
-                  if (_subtitleOn)
-                    Transform.translate(
-                      offset: Offset(
-                        0.0,
-                        notifier.hideStuff ? barHeight * 0.8 : 0.0,
+    return KeyboardListener(
+      focusNode: _focusNode,
+      onKeyEvent: _handleKeyPress,
+      child: MouseRegion(
+        onHover: (_) {
+          _focusNode.requestFocus();
+          _cancelAndRestartTimer();
+        },
+        child: GestureDetector(
+          onTap: () => _cancelAndRestartTimer(),
+          child: AbsorbPointer(
+            absorbing: notifier.hideStuff,
+            child: Stack(
+              children: [
+                if (_displayBufferingIndicator)
+                  _chewieController?.bufferingBuilder?.call(context) ??
+                      const Center(
+                        child: CircularProgressIndicator(),
+                      )
+                else
+                  _buildHitArea(),
+                Column(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: <Widget>[
+                    if (_subtitleOn)
+                      Transform.translate(
+                        offset: Offset(
+                          0.0,
+                          notifier.hideStuff ? barHeight * 0.8 : 0.0,
+                        ),
+                        child: _buildSubtitles(
+                            context, chewieController.subtitle!),
                       ),
-                      child:
-                          _buildSubtitles(context, chewieController.subtitle!),
-                    ),
-                  _buildBottomBar(context),
-                ],
-              ),
-            ],
+                    _buildBottomBar(context),
+                  ],
+                ),
+              ],
+            ),
           ),
         ),
       ),
@@ -117,6 +144,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
   @override
   void dispose() {
     _dispose();
+    _focusNode.dispose();
     super.dispose();
   }
 
@@ -155,7 +183,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
   }) {
     final options = <OptionItem>[
       OptionItem(
-        onTap: () async {
+        onTap: (context) async {
           Navigator.pop(context);
           _onSpeedButtonTap();
         },
@@ -471,7 +499,8 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
   }
 
   Future<void> _initialize() async {
-    _subtitleOn = chewieController.subtitle?.isNotEmpty ?? false;
+    _subtitleOn = chewieController.showSubtitles &&
+        (chewieController.subtitle?.isNotEmpty ?? false);
     controller.addListener(_updateState);
 
     _updateState();
@@ -570,6 +599,36 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
     });
   }
 
+  void _seekBackward() {
+    _seekRelative(
+      const Duration(
+        seconds: -10,
+      ),
+    );
+  }
+
+  void _seekForward() {
+    _seekRelative(
+      const Duration(
+        seconds: 10,
+      ),
+    );
+  }
+
+  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);
+    }
+  }
+
   Widget _buildProgressBar() {
     return Expanded(
       child: MaterialVideoProgressBar(
@@ -596,8 +655,9 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
               playedColor: Theme.of(context).colorScheme.secondary,
               handleColor: Theme.of(context).colorScheme.secondary,
               bufferedColor:
-                  Theme.of(context).colorScheme.surface.withOpacity(0.5),
-              backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
+                  Theme.of(context).colorScheme.surface.withOpacityCompat(0.5),
+              backgroundColor:
+                  Theme.of(context).disabledColor.withOpacityCompat(0.5),
             ),
         draggableProgressBar: chewieController.draggableProgressBar,
       ),

lib/src/material/widgets/options_dialog.dart

@@ -28,7 +28,7 @@ class _OptionsDialogState extends State<OptionsDialog> {
             itemCount: widget.options.length,
             itemBuilder: (context, i) {
               return ListTile(
-                onTap: widget.options[i].onTap,
+                onTap: () => widget.options[i].onTap(context),
                 leading: Icon(widget.options[i].iconData),
                 title: Text(widget.options[i].title),
                 subtitle: widget.options[i].subtitle != null

lib/src/models/option_item.dart

@@ -8,13 +8,13 @@ class OptionItem {
     this.subtitle,
   });
 
-  Function()? onTap;
-  IconData iconData;
-  String title;
-  String? subtitle;
+  final void Function(BuildContext context) onTap;
+  final IconData iconData;
+  final String title;
+  final String? subtitle;
 
   OptionItem copyWith({
-    Function()? onTap,
+    Function(BuildContext context)? onTap,
     IconData? iconData,
     String? title,
     String? subtitle,

pubspec.yaml

@@ -1,24 +1,24 @@
 name: chewie
 description: A video player for Flutter with Cupertino and Material play controls
-version: 1.8.5
+version: 1.11.0
 homepage: https://github.com/fluttercommunity/chewie
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
-  flutter: ">=3.19.0"
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: ">=3.27.0"
 
 dependencies:
-  cupertino_icons: ^1.0.5
+  cupertino_icons: ^1.0.8
   flutter:
     sdk: flutter
   provider: ^6.1.2
-  video_player: ^2.9.1
-  wakelock_plus: ^1.2.8
+  video_player: ^2.9.3
+  wakelock_plus: ^1.2.10
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 flutter:
   uses-material-design: true