Skip to content

Fixed allowMute being ignored on Desktop #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegotori merged 3 commits into from
Apr 1, 2025
Merged

Fixed allowMute being ignored on Desktop #896

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ade5079
Fixed allowMute being ignored on Desktop
mpoimer Feb 27, 2025
4da460a
reverted formatting
mpoimer Mar 14, 2025
2aca16e
formatted with dart 3.27
mpoimer Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 22 additions & 46 deletions lib/src/material/material_desktop_controls.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ class MaterialDesktopControls extends StatefulWidget {
}
}

class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
with SingleTickerProviderStateMixin {
class _MaterialDesktopControlsState extends State<MaterialDesktopControls> with SingleTickerProviderStateMixin {
Copy link
Collaborator

@diegotori diegotori Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to revert the formatting changes, so that the CI doesn't complain when it attempts to format it.

That and it'll make it easier to see the actual change made.

Copy link
Contributor Author

@mpoimer mpoimer Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Collaborator

@diegotori diegotori Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there's still some formatting issues that CI is complaining about.

To fix those, downgrade to 3.27, then run dart formal in the codebase. Thanks in advance.

Copy link
Contributor Author

@mpoimer mpoimer Mar 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

late PlayerNotifier notifier;
late VideoPlayerValue _latestValue;
double? _latestVolume;
Expand Down Expand Up @@ -67,14 +66,11 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
void _handleKeyPress(event) {
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.space) {
_playPause();
} else if (event is KeyDownEvent &&
event.logicalKey == LogicalKeyboardKey.arrowRight) {
} else if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.arrowRight) {
_seekForward();
} else if (event is KeyDownEvent &&
event.logicalKey == LogicalKeyboardKey.arrowLeft) {
} else if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.arrowLeft) {
_seekBackward();
} else if (event is KeyDownEvent &&
event.logicalKey == LogicalKeyboardKey.escape) {
} else if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.escape) {
if (chewieController.isFullScreen) {
_onExpandCollapse();
}
Expand Down Expand Up @@ -127,8 +123,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
0.0,
notifier.hideStuff ? barHeight * 0.8 : 0.0,
),
child: _buildSubtitles(
context, chewieController.subtitle!),
child: _buildSubtitles(context, chewieController.subtitle!),
),
_buildBottomBar(context),
],
Expand Down Expand Up @@ -188,13 +183,11 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
_onSpeedButtonTap();
},
iconData: Icons.speed,
title: chewieController.optionsTranslation?.playbackSpeedButtonText ??
'Playback speed',
title: chewieController.optionsTranslation?.playbackSpeedButtonText ?? 'Playback speed',
)
];

if (chewieController.additionalOptions != null &&
chewieController.additionalOptions!(context).isNotEmpty) {
if (chewieController.additionalOptions != null && chewieController.additionalOptions!(context).isNotEmpty) {
options.addAll(chewieController.additionalOptions!(context));
}

Expand All @@ -215,8 +208,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
useRootNavigator: chewieController.useRootNavigator,
builder: (context) => OptionsDialog(
options: options,
cancelButtonText:
chewieController.optionsTranslation?.cancelButtonText,
cancelButtonText: chewieController.optionsTranslation?.cancelButtonText,
),
);
}
Expand Down Expand Up @@ -278,8 +270,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
duration: const Duration(milliseconds: 300),
child: Container(
height: barHeight + (chewieController.isFullScreen ? 20.0 : 0),
padding:
EdgeInsets.only(bottom: chewieController.isFullScreen ? 10.0 : 15),
padding: EdgeInsets.only(bottom: chewieController.isFullScreen ? 10.0 : 15),
child: SafeArea(
bottom: chewieController.isFullScreen,
child: Column(
Expand All @@ -291,18 +282,12 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
child: Row(
children: <Widget>[
_buildPlayPause(controller),
_buildMuteButton(controller),
if (chewieController.isLive)
const Expanded(child: Text('LIVE'))
else
_buildPosition(iconColor),
if (chewieController.allowMuting) _buildMuteButton(controller),
if (chewieController.isLive) const Expanded(child: Text('LIVE')) else _buildPosition(iconColor),
const Spacer(),
if (chewieController.showControls &&
chewieController.subtitle != null &&
chewieController.subtitle!.isNotEmpty)
if (chewieController.showControls && chewieController.subtitle != null && chewieController.subtitle!.isNotEmpty)
_buildSubtitleToggle(icon: Icons.subtitles),
if (chewieController.showOptions)
_buildOptionsButton(icon: Icons.settings),
if (chewieController.showOptions) _buildOptionsButton(icon: Icons.settings),
if (chewieController.allowFullScreen) _buildExpandButton(),
],
),
Expand Down Expand Up @@ -344,9 +329,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
),
child: Center(
child: Icon(
chewieController.isFullScreen
? Icons.fullscreen_exit
: Icons.fullscreen,
chewieController.isFullScreen ? Icons.fullscreen_exit : Icons.fullscreen,
color: Colors.white,
),
),
Expand All @@ -356,10 +339,8 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
}

Widget _buildHitArea() {
final bool isFinished = _latestValue.position >= _latestValue.duration &&
_latestValue.duration.inSeconds > 0;
final bool showPlayButton =
widget.showPlayButton && !_dragging && !notifier.hideStuff;
final bool isFinished = _latestValue.position >= _latestValue.duration && _latestValue.duration.inSeconds > 0;
final bool showPlayButton = widget.showPlayButton && !_dragging && !notifier.hideStuff;

return GestureDetector(
onTap: () {
Expand Down Expand Up @@ -494,8 +475,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
}

Future<void> _initialize() async {
_subtitleOn = chewieController.showSubtitles &&
(chewieController.subtitle?.isNotEmpty ?? false);
_subtitleOn = chewieController.showSubtitles && (chewieController.subtitle?.isNotEmpty ?? false);
controller.addListener(_updateState);

_updateState();
Expand All @@ -520,8 +500,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>

chewieController.toggleFullScreen();

_showAfterExpandCollapseTimer =
Timer(const Duration(milliseconds: 300), () {
_showAfterExpandCollapseTimer = Timer(const Duration(milliseconds: 300), () {
setState(() {
_cancelAndRestartTimer();
});
Expand Down Expand Up @@ -552,9 +531,8 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
}

void _startHideTimer() {
final hideControlsTimer = chewieController.hideControlsTimer.isNegative
? ChewieController.defaultHideControlsTimer
: chewieController.hideControlsTimer;
final hideControlsTimer =
chewieController.hideControlsTimer.isNegative ? ChewieController.defaultHideControlsTimer : chewieController.hideControlsTimer;
_hideTimer = Timer(hideControlsTimer, () {
setState(() {
notifier.hideStuff = true;
Expand Down Expand Up @@ -649,10 +627,8 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
ChewieProgressColors(
playedColor: Theme.of(context).colorScheme.secondary,
handleColor: Theme.of(context).colorScheme.secondary,
bufferedColor:
Theme.of(context).colorScheme.surface.withOpacityCompat(0.5),
backgroundColor:
Theme.of(context).disabledColor.withOpacityCompat(0.5),
bufferedColor: Theme.of(context).colorScheme.surface.withOpacityCompat(0.5),
backgroundColor: Theme.of(context).disabledColor.withOpacityCompat(0.5),
),
draggableProgressBar: chewieController.draggableProgressBar,
),
Expand Down
Loading