Skip to content

fix:Keep subtitles visible during Next-up preview #1150

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

Open
Haryk96 wants to merge 2 commits into
base: develop
Choose a base branch
from
+104 −91
Open

fix:Keep subtitles visible during Next-up preview #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60f2491
Keep subtitles visible during Next-up preview
Haryk96 Sep 23, 2026
e934b94
Format video player controls
Haryk96 Sep 23, 2026
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
13 changes: 3 additions & 10 deletions lib/screens/video_player/components/video_player_next_wrapper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import 'package:fladder/widgets/shared/progress_floating_button.dart';

class VideoPlayerNextWrapper extends ConsumerStatefulWidget {
final Widget video;
final Widget controls;
final Widget Function(bool nextUpVisible) controlsBuilder;
final List<Widget> overlays;
const VideoPlayerNextWrapper({
required this.video,
required this.controls,
required this.controlsBuilder,
this.overlays = const [],
super.key,
});
Expand Down Expand Up @@ -296,14 +296,7 @@ class _VideoPlayerNextWrapperState extends ConsumerState<VideoPlayerNextWrapper>
),
child: widget.video,
),
IgnorePointer(
ignoring: show,
child: AnimatedOpacity(
opacity: show ? 0 : 1,
duration: animSpeed,
child: widget.controls,
),
),
widget.controlsBuilder(show),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/video_player/video_player.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class _VideoPlayerState extends ConsumerState<VideoPlayer> with WidgetsBindingOb
),
_ => VideoPlayerNextWrapper(
video: player,
controls: const DesktopControls(),
controlsBuilder: (nextUpVisible) => DesktopControls(nextUpVisible: nextUpVisible),
overlays: [
if (errorPlaying) const _VideoErrorWidget(),
],
Expand Down
180 changes: 100 additions & 80 deletions lib/screens/video_player/video_player_controls.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ import 'package:fladder/widgets/full_screen_helpers/full_screen_wrapper.dart';
import 'package:fladder/wrappers/pip_manager.dart';

class DesktopControls extends ConsumerStatefulWidget {
const DesktopControls({super.key});
final bool nextUpVisible;

const DesktopControls({this.nextUpVisible = false, super.key});

@override
ConsumerState<ConsumerStatefulWidget> createState() => _DesktopControlsState();
Expand Down Expand Up @@ -111,7 +113,7 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
);
}
final mediaSegments = ref.watch(playBackModel.select((value) => value?.mediaSegments));
final subtitleWidget = player.subtitleWidget(showOverlay, controlsKey: _bottomControlsKey);
final subtitleWidget = player.subtitleWidget(showOverlay && !widget.nextUpVisible, controlsKey: _bottomControlsKey);
final isDesktop = AdaptiveLayout.of(context).isDesktop || kIsWeb;
final speedBoostEnabled = ref.watch(videoPlayerSettingsProvider.select((value) => value.enableSpeedBoost));

Expand Down Expand Up @@ -144,87 +146,105 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
child: Stack(
children: [
Positioned.fill(
child: GestureDetector(
onTap: initInputDevice == InputDevice.pointer ? null : () => toggleOverlay(),
onDoubleTapDown: initInputDevice == InputDevice.touch ? _handleDoubleTapDown : null,
onDoubleTap: initInputDevice == InputDevice.pointer
? () => fullScreenHelper.toggleFullScreen(ref)
: _handleDoubleTapSeek,
onLongPressStart: initInputDevice == InputDevice.touch ? _handleLongPressStart : null,
onLongPressEnd: initInputDevice == InputDevice.touch ? _handleLongPressEnd : null,
onVerticalDragStart: initInputDevice == InputDevice.touch ? _handleVerticalDragStart : null,
onVerticalDragUpdate: initInputDevice == InputDevice.touch ? _handleVerticalDragUpdate : null,
onVerticalDragEnd: initInputDevice == InputDevice.touch ? _handleVerticalDragEnd : null,
//better play/pause handling on Desktop (works with dragging on click)
onHorizontalDragDown:
initInputDevice == InputDevice.pointer ? (details) => player.playOrPause() : null,
),
),
if (subtitleWidget != null) subtitleWidget,
if (AdaptiveLayout.of(context).isDesktop)
Consumer(builder: (context, ref, child) {
final playing = ref.watch(mediaPlaybackProvider.select((value) => value.playing));
final buffering = ref.watch(mediaPlaybackProvider.select((value) => value.buffering));
return playButton(playing, buffering);
}),
IgnorePointer(
ignoring: !showOverlay,
child: AnimatedOpacity(
duration: fadeDuration,
opacity: showOverlay ? 1 : 0,
child: Column(
children: [
topButtons(context),
const Spacer(),
bottomButtons(context),
],
),
),
),
VideoPlayerSeekIndicator(controller: _seekController),
const VideoPlayerVolumeIndicator(),
const VideoPlayerBrightnessIndicator(),
const VideoPlayerSpeedIndicator(),
const VideoPlayerScreenshotIndicator(),
Consumer(
builder: (context, ref, child) {
final position = ref.watch(mediaPlaybackProvider.select((value) => value.position));
final skippedSegments = ref.watch(mediaPlaybackProvider.select((value) => value.skippedSegments));
MediaSegment? segment = mediaSegments?.atPosition(position);
SegmentVisibility forceShow =
segment?.visibility(position, force: showOverlay) ?? SegmentVisibility.hidden;
final segmentSkipType = ref
.watch(videoPlayerSettingsProvider.select((value) => value.segmentSkipSettings[segment?.type]));

final segmentId = segment != null ? '${segment.type.name}_${segment.start.inMilliseconds}' : null;
final wasSkipped = segmentId != null && skippedSegments.contains(segmentId);

final autoSkip = forceShow != SegmentVisibility.hidden &&
(segmentSkipType == SegmentSkip.skip ||
(segmentSkipType == SegmentSkip.skipOnce && !wasSkipped)) &&
player.lastState?.buffering == false;

if (autoSkip) {
skipToSegmentEnd(segment, segmentId);
}
return Stack(
children: [
Align(
alignment: Alignment.centerRight,
child: Padding(
padding: const EdgeInsets.all(32),
child: SkipSegmentButton(
segment: segment,
skipType: segmentSkipType,
visibility: forceShow,
pressedSkip: () => skipToSegmentEnd(segment, null),
child: IgnorePointer(
ignoring: widget.nextUpVisible,
child: AnimatedOpacity(
duration: const Duration(milliseconds: 250),
opacity: widget.nextUpVisible ? 0 : 1,
child: Stack(
children: [
Positioned.fill(
child: GestureDetector(
onTap: initInputDevice == InputDevice.pointer ? null : () => toggleOverlay(),
onDoubleTapDown: initInputDevice == InputDevice.touch ? _handleDoubleTapDown : null,
onDoubleTap: initInputDevice == InputDevice.pointer
? () => fullScreenHelper.toggleFullScreen(ref)
: _handleDoubleTapSeek,
onLongPressStart: initInputDevice == InputDevice.touch ? _handleLongPressStart : null,
onLongPressEnd: initInputDevice == InputDevice.touch ? _handleLongPressEnd : null,
onVerticalDragStart:
initInputDevice == InputDevice.touch ? _handleVerticalDragStart : null,
onVerticalDragUpdate:
initInputDevice == InputDevice.touch ? _handleVerticalDragUpdate : null,
onVerticalDragEnd: initInputDevice == InputDevice.touch ? _handleVerticalDragEnd : null,
//better play/pause handling on Desktop (works with dragging on click)
onHorizontalDragDown:
initInputDevice == InputDevice.pointer ? (details) => player.playOrPause() : null,
),
),
),
],
);
},
if (AdaptiveLayout.of(context).isDesktop)
Consumer(builder: (context, ref, child) {
final playing = ref.watch(mediaPlaybackProvider.select((value) => value.playing));
final buffering = ref.watch(mediaPlaybackProvider.select((value) => value.buffering));
return playButton(playing, buffering);
}),
IgnorePointer(
ignoring: !showOverlay,
child: AnimatedOpacity(
duration: fadeDuration,
opacity: showOverlay ? 1 : 0,
child: Column(
children: [
topButtons(context),
const Spacer(),
bottomButtons(context),
],
),
),
),
VideoPlayerSeekIndicator(controller: _seekController),
const VideoPlayerVolumeIndicator(),
const VideoPlayerBrightnessIndicator(),
const VideoPlayerSpeedIndicator(),
const VideoPlayerScreenshotIndicator(),
Consumer(
builder: (context, ref, child) {
final position = ref.watch(mediaPlaybackProvider.select((value) => value.position));
final skippedSegments =
ref.watch(mediaPlaybackProvider.select((value) => value.skippedSegments));
MediaSegment? segment = mediaSegments?.atPosition(position);
SegmentVisibility forceShow =
segment?.visibility(position, force: showOverlay) ?? SegmentVisibility.hidden;
final segmentSkipType = ref.watch(videoPlayerSettingsProvider
.select((value) => value.segmentSkipSettings[segment?.type]));

final segmentId =
segment != null ? '${segment.type.name}_${segment.start.inMilliseconds}' : null;
final wasSkipped = segmentId != null && skippedSegments.contains(segmentId);

final autoSkip = forceShow != SegmentVisibility.hidden &&
(segmentSkipType == SegmentSkip.skip ||
(segmentSkipType == SegmentSkip.skipOnce && !wasSkipped)) &&
player.lastState?.buffering == false;

if (autoSkip) {
skipToSegmentEnd(segment, segmentId);
}
return Stack(
children: [
Align(
alignment: Alignment.centerRight,
child: Padding(
padding: const EdgeInsets.all(32),
child: SkipSegmentButton(
segment: segment,
skipType: segmentSkipType,
visibility: forceShow,
pressedSkip: () => skipToSegmentEnd(segment, null),
),
),
),
],
);
},
),
],
),
),
),
),
// Keep the existing subtitle widget visible while Next-up hides the controls.
if (subtitleWidget != null) Positioned.fill(child: subtitleWidget),
],
),
),
Expand Down
Loading