gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-10 07:50:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature: Improved video player stop controls (#146)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2024-11-16 12:55:12 +01:00 • committed by GitHub
parent 9f141a826b
commit f20aab2118
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 89 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/screens/book_viewer/book_viewer_controls.dart
View file

@ -13,7 +13,7 @@ import 'package:fladder/providers/items/book_details_provider.dart';
import 'package:fladder/providers/settings/book_viewer_settings_provider.dart';
import 'package:fladder/screens/book_viewer/book_viewer_chapters.dart';
import 'package:fladder/screens/book_viewer/book_viewer_settings.dart';
import 'package:fladder/screens/shared/default_titlebar.dart';
import 'package:fladder/screens/shared/default_title_bar.dart';
import 'package:fladder/screens/shared/fladder_snackbar.dart';
import 'package:fladder/util/adaptive_layout.dart';
import 'package:fladder/util/input_handler.dart';

2
lib/screens/photo_viewer/photo_viewer_screen.dart
View file

@ -10,7 +10,7 @@ import 'package:fladder/providers/user_provider.dart';
import 'package:fladder/screens/photo_viewer/photo_viewer_controls.dart';
import 'package:fladder/providers/settings/photo_view_settings_provider.dart';
import 'package:fladder/screens/photo_viewer/simple_video_player.dart';
import 'package:fladder/screens/shared/default_titlebar.dart';
import 'package:fladder/screens/shared/default_title_bar.dart';
import 'package:fladder/util/adaptive_layout.dart';
import 'package:fladder/util/item_base_model/item_base_model_extensions.dart';
import 'package:fladder/util/list_padding.dart';

0
lib/screens/shared/default_titlebar.dart → lib/screens/shared/default_title_bar.dart
View file

35
lib/screens/video_player/components/video_player_next_wrapper.dart
View file

@ -1,23 +1,28 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:ficonsax/ficonsax.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:screen_brightness/screen_brightness.dart';
import 'package:fladder/models/item_base_model.dart';
import 'package:fladder/models/items/movie_model.dart';
import 'package:fladder/models/media_playback_model.dart';
import 'package:fladder/models/playback/playback_model.dart';
import 'package:fladder/models/settings/video_player_settings.dart';
import 'package:fladder/providers/settings/client_settings_provider.dart';
import 'package:fladder/providers/settings/video_player_settings_provider.dart';
import 'package:fladder/providers/user_provider.dart';
import 'package:fladder/providers/video_player_provider.dart';
import 'package:fladder/screens/shared/animated_fade_size.dart';
import 'package:fladder/screens/shared/default_titlebar.dart';
import 'package:fladder/screens/shared/default_title_bar.dart';
import 'package:fladder/util/adaptive_layout.dart';
import 'package:fladder/util/fladder_image.dart';
import 'package:fladder/util/list_padding.dart';
import 'package:fladder/util/localization_helper.dart';
import 'package:fladder/widgets/navigation_scaffold/components/floating_player_bar.dart';
import 'package:fladder/widgets/shared/full_screen_button.dart'
if (dart.library.html) 'package:fladder/widgets/shared/full_screen_button_web.dart';
import 'package:fladder/widgets/shared/progress_floating_button.dart';
class VideoPlayerNextWrapper extends ConsumerStatefulWidget {
@ -117,6 +122,24 @@ class _VideoPlayerNextWrapperState extends ConsumerState<VideoPlayerNextWrapper>
});
}
Future<void> closePlayer() async {
clearOverlaySettings();
ref.read(videoPlayerProvider).stop();
Navigator.of(context).pop();
}
Future<void> clearOverlaySettings() async {
if (AdaptiveLayout.of(context).inputDevice != InputDevice.pointer) {
ScreenBrightness().resetScreenBrightness();
} else {
closeFullScreen();
}
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
statusBarIconBrightness: ref.read(clientSettingsProvider.select((value) => value.statusBarBrightness(context))),
));
}
@override
void dispose() {
timerController.cancel();
@ -252,9 +275,15 @@ class _VideoPlayerNextWrapperState extends ConsumerState<VideoPlayerNextWrapper>
const SizedBox(width: 8),
IconButton.filledTonal(
onPressed: () => hideNextUp(),
tooltip: "Resume video",
tooltip: context.localized.resumeVideo,
icon: const Icon(IconsaxBold.maximize_4),
),
const SizedBox(width: 8),
IconButton.filledTonal(
onPressed: () => closePlayer(),
tooltip: context.localized.closeVideo,
icon: const Icon(IconsaxBold.close_square),
),
],
),
)
@ -430,7 +459,7 @@ class _SimpleControls extends ConsumerWidget {
if (skip != null)
IconButton.filledTonal(
onPressed: skip,
tooltip: "Play next video",
tooltip: context.localized.playNextVideo,
icon: const Icon(IconsaxBold.next),
)
].addInBetween(const SizedBox(width: 4)));

41
lib/screens/video_player/video_player_controls.dart
View file

@ -10,8 +10,6 @@ import 'package:collection/collection.dart';
import 'package:ficonsax/ficonsax.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:screen_brightness/screen_brightness.dart';
import 'package:universal_html/html.dart' as html;
import 'package:window_manager/window_manager.dart';
import 'package:fladder/models/items/media_segments_model.dart';
import 'package:fladder/models/media_playback_model.dart';
@ -19,7 +17,7 @@ import 'package:fladder/models/playback/playback_model.dart';
import 'package:fladder/providers/settings/client_settings_provider.dart';
import 'package:fladder/providers/settings/video_player_settings_provider.dart';
import 'package:fladder/providers/video_player_provider.dart';
import 'package:fladder/screens/shared/default_titlebar.dart';
import 'package:fladder/screens/shared/default_title_bar.dart';
import 'package:fladder/screens/video_player/components/video_playback_information.dart';
import 'package:fladder/screens/video_player/components/video_player_controls_extras.dart';
import 'package:fladder/screens/video_player/components/video_player_options_sheet.dart';
@ -83,7 +81,7 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
return true;
}
if (value.logicalKey == LogicalKeyboardKey.escape) {
disableFullscreen();
disableFullScreen();
return true;
}
if (value.logicalKey == LogicalKeyboardKey.space) {
@ -262,12 +260,17 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
),
),
const SizedBox(width: 16),
Flexible(
Expanded(
child: Text(
currentItem?.title ?? "",
style: Theme.of(context).textTheme.titleLarge,
),
),
if (AdaptiveLayout.of(context).inputDevice == InputDevice.touch)
Tooltip(
message: context.localized.stop,
child: IconButton(
onPressed: () => closePlayer(), icon: const Icon(IconsaxOutline.close_square))),
],
),
),
@ -375,11 +378,13 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Tooltip(
message: "Stop",
child: IconButton(onPressed: () => closePlayer(), icon: const Icon(IconsaxOutline.stop))),
if (AdaptiveLayout.of(context).inputDevice == InputDevice.pointer)
Tooltip(
message: context.localized.stop,
child: IconButton(
onPressed: () => closePlayer(), icon: const Icon(IconsaxOutline.close_square))),
const Spacer(),
if ((AdaptiveLayout.of(context).isDesktop || kIsWeb) &&
if (AdaptiveLayout.of(context).inputDevice == InputDevice.pointer &&
ref.read(videoPlayerProvider).player != null) ...{
// OpenQueueButton(x),
// ChapterButton(
@ -641,10 +646,10 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
Future<void> clearOverlaySettings() async {
toggleOverlay(value: true);
if (!(AdaptiveLayout.of(context).isDesktop || kIsWeb)) {
if (AdaptiveLayout.of(context).inputDevice != InputDevice.pointer) {
ScreenBrightness().resetScreenBrightness();
} else {
disableFullscreen();
disableFullScreen();
}
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
@ -654,18 +659,8 @@ class _DesktopControlsState extends ConsumerState<DesktopControls> {
timer.cancel();
}
Future<void> disableFullscreen() async {
Future<void> disableFullScreen() async {
resetTimer();
if (kIsWeb) {
if (html.document.fullscreenElement != null) {
html.document.exitFullscreen();
await Future.delayed(const Duration(milliseconds: 500));
}
} else {
final isFullScreen = await windowManager.isFullScreen();
if (isFullScreen) {
await windowManager.setFullScreen(false);
}
}
closeFullScreen();
}
}