Merge branch 'fluttercommunity:master' into master

floodoo · web-flow · commit afa4171b5195 · 2025-01-13T10:36:55.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [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).
diff --git a/README.md b/README.md
@@ -33,6 +33,8 @@ dependencies:
 
 ```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'));
 
diff --git a/devtools_options.yaml b/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:
diff --git a/example/devtools_options.yaml b/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:
diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Flutter
 import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
diff --git a/lib/src/cupertino/cupertino_controls.dart b/lib/src/cupertino/cupertino_controls.dart
@@ -460,7 +460,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),
diff --git a/lib/src/helpers/adaptive_controls.dart b/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();
     }
   }
 }
diff --git a/lib/src/material/material_controls.dart b/lib/src/material/material_controls.dart
@@ -260,6 +260,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 +292,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(),
@@ -469,7 +470,7 @@ class _MaterialControlsState extends State<MaterialControls>
             text: '/ ${formatDuration(duration)}',
             style: TextStyle(
               fontSize: 14.0,
-              color: Colors.white.withOpacity(.75),
+              color: Colors.white.withValues(alpha: .75),
               fontWeight: FontWeight.normal,
             ),
           )
@@ -682,8 +683,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.withValues(alpha: 0.5),
+              backgroundColor:
+                  Theme.of(context).disabledColor.withValues(alpha: .5),
             ),
         draggableProgressBar: chewieController.draggableProgressBar,
       ),
diff --git a/lib/src/material/material_desktop_controls.dart b/lib/src/material/material_desktop_controls.dart
@@ -12,6 +12,7 @@ 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 +50,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 +96,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 +143,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
   @override
   void dispose() {
     _dispose();
+    _focusNode.dispose();
     super.dispose();
   }
 
@@ -566,6 +593,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(
@@ -592,8 +649,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.withValues(alpha: 0.5),
+              backgroundColor:
+                  Theme.of(context).disabledColor.withValues(alpha: 0.5),
             ),
         draggableProgressBar: chewieController.draggableProgressBar,
       ),
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: chewie
 description: A video player for Flutter with Cupertino and Material play controls
-version: 1.8.5
+version: 1.9.0
 homepage: https://github.com/fluttercommunity/chewie
 
 environment:
   sdk: '>=3.3.0 <4.0.0'
-  flutter: ">=3.19.0"
+  flutter: ">=3.27.0"
 
 dependencies:
   cupertino_icons: ^1.0.5

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+description: This file stores settings for Dart & Flutter DevTools.`
	`2`	`+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states`
	`3`	`+extensions:`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ class AdaptiveControls extends StatelessWidget {`
`23`	`23`	`backgroundColor: Color.fromRGBO(41, 41, 41, 0.7),`
`24`	`24`	`iconColor: Color.fromARGB(255, 200, 200, 200),`
`25`	`25`	`);`
`26`		`- default:`
`27`		`- return const MaterialControls();`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`	`}`