Skip to content
Open
Changes from all commits
Commits
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
63 changes: 63 additions & 0 deletions lib/screens/video_player/video_player_controls.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:iconsax_plus/iconsax_plus.dart';
import 'package:screen_brightness/screen_brightness.dart';

import 'package:fladder/models/item_base_model.dart';
import 'package:fladder/models/items/chapters_model.dart';
import 'package:fladder/models/items/media_segments_model.dart';
import 'package:fladder/models/items/media_streams_model.dart';
import 'package:fladder/models/media_playback_model.dart';
Expand Down Expand Up @@ -428,6 +429,7 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
),
),
previousButton,
previousChapterButton(ref),
seekBackwardButton(ref),
IconButton.filledTonal(
iconSize: 38,
Expand All @@ -439,6 +441,7 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
),
),
seekForwardButton(ref),
nextChapterButton(ref),
nextVideoButton,
Flexible(
flex: 2,
Expand Down Expand Up @@ -685,6 +688,66 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
);
}

Widget nextChapterButton(WidgetRef ref) {
return Consumer(builder: (context, ref2, child) {
final chapters = ref.read(playBackModel.select((value) => value?.chapters));
final enabled = chapters?.isNotEmpty == true;
return IconButton(
onPressed: enabled ? () => _nextChapter(ref) : null,
iconSize: 30,
tooltip: context.localized.nextChapter,
icon: const Icon(IconsaxPlusLinear.arrow_right_1),
);
});
}

Widget previousChapterButton(WidgetRef ref) {
return Consumer(builder: (context, ref2, child) {
final chapters = ref.read(playBackModel.select((value) => value?.chapters));
final enabled = chapters?.isNotEmpty == true;
return IconButton(
onPressed: enabled ? () => _previousChapter(ref) : null,
iconSize: 30,
tooltip: context.localized.nextChapter,
icon: const Icon(IconsaxPlusLinear.arrow_left_3),
);
});
}

void _previousChapter(WidgetRef ref) {
final chapters = ref.read(playBackModel.select((value) => value?.chapters)) ?? [];
if (chapters.isEmpty) return;
final position = ref.read(mediaPlaybackProvider).position;
final threshold = const Duration(milliseconds: 3000);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

There is a extension in chapters_model.dart lets move the next/previous lookups in there and only pass the required paramaters to fetch previous/next chapters.

That way we can re-use it when needed.

Chapter? prev;
final earlier = chapters.where((c) => c.startPosition < position - threshold).toList();
if (earlier.isNotEmpty) prev = earlier.last;
final target = prev ?? chapters.first;
ref.read(videoPlayerProvider).seek(target.startPosition);
resetTimer();
}

void _nextChapter(WidgetRef ref) {
final chapters = ref.read(playBackModel.select((value) => value?.chapters)) ?? [];
if (chapters.isEmpty) return;
final position = ref.read(mediaPlaybackProvider).position;
Chapter? next;
for (final c in chapters) {
if (c.startPosition > position) {
next = c;
break;
}
}
if (next != null) {
ref.read(videoPlayerProvider).seek(next.startPosition);
} else {
// fallback: load next video
final nextVideo = ref.read(playBackModel.select((value) => value?.nextVideo));
if (nextVideo != null) ref.read(playbackModelHelper).loadNewVideo(nextVideo);
}
Comment on lines +741 to +747

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I'm not sure about loading the next video. Would it not be better to disable the next chapter button if there is no next chapter?

resetTimer();
}

void skipToSegmentEnd(MediaSegment? mediaSegment, String? segmentId) {
final end = mediaSegment?.end;
if (end != null) {
Expand Down
Loading