fix(player): start the TV player with its chrome down
A television raised the whole OSD and timebar on every playback start. The chrome controller is born visible, and its auto-hide clock cannot arm until the first frame lands, so the controls did not merely appear early: they appeared exactly when the picture did, and then sat over the opening five seconds of every movie and episode. The timeline is gated behind the first frame, so the bar materialised on top of the video rather than over the loading spinner, which is what makes it read as a pop-up rather than as chrome that was already there. The route now opens with no chrome on TV. Nothing is lost: the loading spinner and buffering overlay are their own overlays, the screen focus node owns back, and the first D-pad press raises the controls the way it already does after every auto-hide. Pointer and touch platforms keep the chrome, where the viewer's hand is on the surface and the title and back affordance belong over the spinner. Initial presentation now follows initial visibility. They were separate: seeding only visibility would leave the route claiming its chrome was still presented, so PlayerNavigationCoordinator would read back as "hide the chrome", hide() would no-op against chrome that was never up, and the press would be swallowed instead of leaving the player. Controls that mount with the chrome already down now claim focus themselves. Focus normally reaches them through the hide transition, and their own autofocus cannot win it back because the screen node took it during the loading phase. Left alone, the screen node kept primary focus and its self-heal raised the entire OSD on the first D-pad press, which put the chrome straight back over the picture and bypassed the transient seek and transport indicators. Both player spinners now carry a label. They were bare progress indicators, so a screen reader announced nothing at all while the picture was coming up, and the TV Maestro flows had no way left to tell a loading player from a playing one once the Pause button stopped appearing on its own. The two TV flows are repaired to match. They waited on that button, and now wait for the labelled spinner to clear, which cannot happen before the media is opened. 05 additionally reaches Search by D-pad rather than a percentage coordinate, because a tap flips InputModeTracker to pointer mode and collapses the rail it is aiming at, and it gates on the play-next prompt's own Cancel action: "Next Episode" is also the credits skip button, so the old assertion could pass without the prompt ever opening. close #1765
This commit is contained in:
edde746
@@ -148,6 +148,39 @@ void main() {
|
||||
expect(chromeController.isHeld(PlayerChromeHold.promptInteraction), isFalse);
|
||||
expect(notifications, 0);
|
||||
});
|
||||
|
||||
testWidgets('the buffering spinner announces loading until the first frame renders', (tester) async {
|
||||
PipService().isPipActive.value = false;
|
||||
final isBuffering = ValueNotifier<bool>(false);
|
||||
final hasFirstFrame = ValueNotifier<bool>(false);
|
||||
final isExiting = ValueNotifier<bool>(false);
|
||||
addTearDown(isBuffering.dispose);
|
||||
addTearDown(hasFirstFrame.dispose);
|
||||
addTearDown(isExiting.dispose);
|
||||
final semantics = tester.ensureSemantics();
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrapPrompt(
|
||||
VideoPlayerBufferingOverlay(isBuffering: isBuffering, hasFirstFrame: hasFirstFrame, isExiting: isExiting),
|
||||
),
|
||||
);
|
||||
|
||||
// The TV player no longer raises its chrome on startup (#1765), so this
|
||||
// label is what tells "the player is still waiting for its first frame"
|
||||
// apart from "it has stopped waiting" — the readiness gate the Maestro TV
|
||||
// flows use in place of the Pause button.
|
||||
expect(find.bySemanticsLabel('Loading video'), findsOneWidget);
|
||||
|
||||
hasFirstFrame.value = true;
|
||||
await tester.pump();
|
||||
expect(find.bySemanticsLabel('Loading video'), findsNothing);
|
||||
|
||||
isBuffering.value = true;
|
||||
await tester.pump();
|
||||
expect(find.bySemanticsLabel('Loading video'), findsOneWidget, reason: 'a mid-playback stall loads again');
|
||||
|
||||
semantics.dispose();
|
||||
});
|
||||
}
|
||||
|
||||
Widget _wrapPrompt(Widget child) {
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:plezy/providers/playback_state_provider.dart';
|
||||
import 'package:plezy/screens/video_player_screen.dart';
|
||||
import 'package:plezy/services/settings_service.dart';
|
||||
import 'package:plezy/utils/platform_detector.dart';
|
||||
import 'package:plezy/widgets/video_controls/player_chrome_controller.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import '../../test_helpers/media_items.dart';
|
||||
import '../../test_helpers/mock_player_channels.dart';
|
||||
import '../../test_helpers/prefs.dart';
|
||||
|
||||
/// Regression coverage for #1765: a television opened the player with the whole
|
||||
/// OSD and timebar up, and auto-hide cannot arm before the first frame, so the
|
||||
/// chrome sat over the opening seconds of every video.
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
setUp(() async {
|
||||
resetSharedPreferencesForTest();
|
||||
SettingsService.resetForTesting();
|
||||
await SettingsService.getInstance();
|
||||
});
|
||||
|
||||
tearDown(() {
|
||||
TvDetectionService.debugSetAppleTVOverride(null);
|
||||
});
|
||||
|
||||
test('a television opens the player with its chrome down', () {
|
||||
expect(playerChromeStartsVisible(isTv: true), isFalse);
|
||||
expect(playerChromeStartsVisible(isTv: false), isTrue);
|
||||
});
|
||||
|
||||
testWidgets('the TV player route opens with the chrome down and unpresented', (tester) async {
|
||||
TvDetectionService.debugSetAppleTVOverride(true);
|
||||
|
||||
final chrome = await _openPlayerChrome(tester);
|
||||
|
||||
expect(chrome.controlsVisible, isFalse);
|
||||
// Presented must fall with visible, or PlayerNavigationCoordinator reads
|
||||
// back as "hide the chrome", hide() no-ops, and back is swallowed.
|
||||
expect(chrome.controlsPresented, isFalse);
|
||||
});
|
||||
|
||||
testWidgets('pointer and touch routes keep the chrome over the loading surface', (tester) async {
|
||||
TvDetectionService.debugSetAppleTVOverride(false);
|
||||
|
||||
final chrome = await _openPlayerChrome(tester);
|
||||
|
||||
expect(chrome.controlsVisible, isTrue);
|
||||
expect(chrome.controlsPresented, isTrue);
|
||||
});
|
||||
|
||||
testWidgets('the route announces loading from its first frame, with or without chrome', (tester) async {
|
||||
TvDetectionService.debugSetAppleTVOverride(true);
|
||||
final semantics = tester.ensureSemantics();
|
||||
|
||||
// The Maestro TV flows replaced the Pause button with this label as their
|
||||
// readiness gate, which only holds if it is on screen from the moment the
|
||||
// player route owns the frame — long before any media opens.
|
||||
await _openPlayerChrome(
|
||||
tester,
|
||||
whileMounted: () {
|
||||
expect(find.bySemanticsLabel('Loading video'), findsOneWidget);
|
||||
},
|
||||
);
|
||||
|
||||
semantics.dispose();
|
||||
});
|
||||
}
|
||||
|
||||
Future<PlayerChromeController> _openPlayerChrome(WidgetTester tester, {VoidCallback? whileMounted}) async {
|
||||
final key = GlobalKey<VideoPlayerScreenState>();
|
||||
late PlayerChromeController chrome;
|
||||
|
||||
await withMockPlayerChannels(
|
||||
methodChannelName: 'com.plezy/mpv_player',
|
||||
eventChannelName: 'com.plezy/mpv_player/events',
|
||||
testBody: () async {
|
||||
await tester.pumpWidget(
|
||||
ChangeNotifierProvider(
|
||||
create: (_) => PlaybackStateProvider(),
|
||||
child: MaterialApp(
|
||||
home: VideoPlayerScreen(
|
||||
key: key,
|
||||
metadata: testMediaItem(title: 'Startup chrome video'),
|
||||
isOffline: true,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
chrome = key.currentState!.chromeController;
|
||||
whileMounted?.call();
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
},
|
||||
);
|
||||
|
||||
return chrome;
|
||||
}
|
||||
@@ -133,6 +133,25 @@ void main() {
|
||||
expect(controller.controlsPresented, isFalse);
|
||||
});
|
||||
|
||||
test('a hidden start is also unpresented, so back is not classified as hide-the-chrome', () {
|
||||
final controller = PlayerChromeController(initiallyVisible: false);
|
||||
addTearDown(controller.dispose);
|
||||
|
||||
expect(controller.controlsVisible, isFalse);
|
||||
expect(controller.controlsPresented, isFalse);
|
||||
expect(controller.hide(), isFalse, reason: 'there is nothing to hide, so back must fall through to the route');
|
||||
});
|
||||
|
||||
test('showing after a hidden start restores both visibility and presentation', () {
|
||||
final controller = PlayerChromeController(initiallyVisible: false);
|
||||
addTearDown(controller.dispose);
|
||||
|
||||
controller.show();
|
||||
|
||||
expect(controller.controlsVisible, isTrue);
|
||||
expect(controller.controlsPresented, isTrue);
|
||||
});
|
||||
|
||||
test('a stale fade-out completion cannot hide controls that were shown again', () {
|
||||
final controller = PlayerChromeController();
|
||||
addTearDown(controller.dispose);
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
import 'package:drift/native.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:intl/date_symbol_data_local.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:plezy/database/app_database.dart';
|
||||
import 'package:plezy/i18n/strings.g.dart';
|
||||
import 'package:plezy/mpv/mpv.dart';
|
||||
import 'package:plezy/providers/playback_state_provider.dart';
|
||||
import 'package:plezy/services/settings_service.dart';
|
||||
import 'package:plezy/services/video_volume_controller.dart';
|
||||
import 'package:plezy/utils/platform_detector.dart';
|
||||
import 'package:plezy/watch_together/providers/watch_together_provider.dart';
|
||||
import 'package:plezy/widgets/video_controls/desktop_video_controls.dart';
|
||||
import 'package:plezy/widgets/video_controls/mobile_video_controls.dart';
|
||||
import 'package:plezy/widgets/video_controls/player_chrome_controller.dart';
|
||||
import 'package:plezy/widgets/video_controls/video_controls.dart';
|
||||
import 'package:plezy/widgets/video_controls/widgets/player_toast_indicator.dart';
|
||||
|
||||
import '../test_helpers/media_items.dart';
|
||||
import '../test_helpers/prefs.dart';
|
||||
import '../test_helpers/theme.dart';
|
||||
|
||||
/// Regression coverage for #1765: a player route that opens with its chrome
|
||||
/// down must stay down across the whole startup sequence. Auto-hide cannot arm
|
||||
/// before the first frame, so chrome that survives into the picture parks the
|
||||
/// OSD and timebar over the opening seconds of the video.
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
group('startup chrome', () {
|
||||
late _PlayingPlayer player;
|
||||
late PlayerChromeController chrome;
|
||||
late PlayerToastController toast;
|
||||
late VideoVolumeController volume;
|
||||
late PlaybackStateProvider playbackState;
|
||||
late WatchTogetherProvider watchTogether;
|
||||
late AppDatabase database;
|
||||
late ValueNotifier<bool> hasFirstFrame;
|
||||
late FocusNode screenFocusNode;
|
||||
late List<LogicalKeyboardKey> keysReachingScreen;
|
||||
|
||||
setUp(() async {
|
||||
LocaleSettings.setLocaleSync(AppLocale.en);
|
||||
await initializeDateFormatting('en');
|
||||
resetSharedPreferencesForTest();
|
||||
SettingsService.resetForTesting();
|
||||
final settings = await SettingsService.getInstance();
|
||||
|
||||
TvDetectionService.debugSetAppleTVOverride(true);
|
||||
PlatformDetector.debugSetIsDesktopOSOverride(false);
|
||||
|
||||
database = AppDatabase.forTesting(NativeDatabase.memory());
|
||||
player = _PlayingPlayer();
|
||||
chrome = PlayerChromeController(initiallyVisible: false);
|
||||
toast = PlayerToastController();
|
||||
volume = VideoVolumeController(player: player, settings: settings, initialVolume: 100);
|
||||
playbackState = PlaybackStateProvider();
|
||||
watchTogether = WatchTogetherProvider();
|
||||
hasFirstFrame = ValueNotifier<bool>(false);
|
||||
screenFocusNode = FocusNode(debugLabel: 'VideoPlayerScreen');
|
||||
keysReachingScreen = <LogicalKeyboardKey>[];
|
||||
});
|
||||
|
||||
tearDown(() async {
|
||||
TvDetectionService.debugSetAppleTVOverride(null);
|
||||
PlatformDetector.debugSetIsDesktopOSOverride(null);
|
||||
hasFirstFrame.dispose();
|
||||
screenFocusNode.dispose();
|
||||
volume.dispose();
|
||||
playbackState.dispose();
|
||||
watchTogether.dispose();
|
||||
chrome.dispose();
|
||||
toast.dispose();
|
||||
await database.close();
|
||||
});
|
||||
|
||||
Widget shell(Widget child) {
|
||||
return MultiProvider(
|
||||
providers: [
|
||||
Provider<AppDatabase>.value(value: database),
|
||||
ChangeNotifierProvider<PlaybackStateProvider>.value(value: playbackState),
|
||||
ChangeNotifierProvider<WatchTogetherProvider>.value(value: watchTogether),
|
||||
],
|
||||
child: MaterialApp(
|
||||
theme: ThemeData(platform: TargetPlatform.android, extensions: const [testMonoTokens]),
|
||||
home: Scaffold(
|
||||
body: SizedBox(
|
||||
width: 1280,
|
||||
height: 720,
|
||||
child: Focus(
|
||||
focusNode: screenFocusNode,
|
||||
autofocus: true,
|
||||
onKeyEvent: (node, event) {
|
||||
if (event is KeyDownEvent) keysReachingScreen.add(event.logicalKey);
|
||||
return KeyEventResult.ignored;
|
||||
},
|
||||
child: child,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> pumpControls(WidgetTester tester) async {
|
||||
// Two phases, like the route itself: the loading surface first, so the
|
||||
// screen node owns primary focus before the controls exist. The controls'
|
||||
// own `autofocus` cannot win it back afterwards — an explicit claim must.
|
||||
await tester.pumpWidget(shell(const SizedBox.expand()));
|
||||
await tester.pump();
|
||||
expect(screenFocusNode.hasPrimaryFocus, isTrue, reason: 'the loading phase owns focus, as on the real route');
|
||||
|
||||
await tester.pumpWidget(
|
||||
shell(
|
||||
PlexVideoControls(
|
||||
player: player,
|
||||
volumeController: volume,
|
||||
metadata: testMediaItem(id: 'startup-chrome'),
|
||||
toastController: toast,
|
||||
chromeController: chrome,
|
||||
hasFirstFrame: hasFirstFrame,
|
||||
canNavigateMediaItems: false,
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
}
|
||||
|
||||
void expectNoChrome(String reason) {
|
||||
expect(chrome.controlsVisible, isFalse, reason: reason);
|
||||
// Presented must fall with visible, or Back is classified as "hide the
|
||||
// chrome", no-ops against already-hidden chrome, and never exits.
|
||||
expect(chrome.controlsPresented, isFalse, reason: reason);
|
||||
expect(find.byType(DesktopVideoControls), findsNothing, reason: reason);
|
||||
expect(find.byType(MobileVideoControls), findsNothing, reason: reason);
|
||||
}
|
||||
|
||||
testWidgets('a hidden start never mounts the OSD while loading or once the picture arrives', (tester) async {
|
||||
await pumpControls(tester);
|
||||
|
||||
expectNoChrome('the route opened with the chrome down');
|
||||
|
||||
hasFirstFrame.value = true;
|
||||
await tester.pump();
|
||||
expectNoChrome('the first frame must not raise the OSD over the picture');
|
||||
|
||||
// Well past the TV auto-hide delay: nothing may surface late either.
|
||||
await tester.pump(const Duration(seconds: 10));
|
||||
expectNoChrome('no deferred timer may raise the OSD after startup');
|
||||
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
});
|
||||
|
||||
testWidgets('the viewer can still raise the OSD after a hidden start', (tester) async {
|
||||
await pumpControls(tester);
|
||||
hasFirstFrame.value = true;
|
||||
await tester.pump();
|
||||
|
||||
chrome.show();
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(chrome.controlsVisible, isTrue);
|
||||
expect(chrome.controlsPresented, isTrue);
|
||||
expect(find.byType(DesktopVideoControls), findsOneWidget);
|
||||
|
||||
chrome.cancelAutoHide();
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
});
|
||||
|
||||
testWidgets('a hidden start hands the remote to the hidden-chrome key layer', (tester) async {
|
||||
await pumpControls(tester);
|
||||
hasFirstFrame.value = true;
|
||||
await tester.pump();
|
||||
|
||||
await tester.sendKeyDownEvent(LogicalKeyboardKey.arrowRight);
|
||||
await tester.pump();
|
||||
|
||||
// The controls' own Focus autofocuses too late to win the scope: without
|
||||
// an explicit claim the screen node keeps primary focus, the arrow
|
||||
// reaches it first, and its self-heal raises the whole OSD on this very
|
||||
// first press (#1765).
|
||||
expect(
|
||||
keysReachingScreen,
|
||||
isEmpty,
|
||||
reason: 'the hidden-chrome layer must own the remote, not the screen self-heal',
|
||||
);
|
||||
expect(find.text('10s'), findsOneWidget, reason: 'the seek badge answers, not the chrome');
|
||||
expectNoChrome('a directional seek must leave the picture alone');
|
||||
|
||||
await tester.sendKeyUpEvent(LogicalKeyboardKey.arrowRight);
|
||||
await tester.pump();
|
||||
expect(player.seeks, [const Duration(seconds: 10)]);
|
||||
|
||||
chrome.cancelAutoHide();
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/// Minimal [Player] that reports steady playback, the state a startup sequence
|
||||
/// settles into once the media opens.
|
||||
class _PlayingPlayer implements Player {
|
||||
final List<Duration> seeks = [];
|
||||
Duration _position = Duration.zero;
|
||||
|
||||
@override
|
||||
String get playerType => 'mpv';
|
||||
|
||||
@override
|
||||
PlayerState get state =>
|
||||
PlayerState(playing: true, position: _position, duration: const Duration(minutes: 45), seekable: true);
|
||||
|
||||
@override
|
||||
Future<void> seek(Duration position) async {
|
||||
seeks.add(position);
|
||||
_position = position;
|
||||
}
|
||||
|
||||
@override
|
||||
PlayerStreams get streams => PlayerStreams(
|
||||
playing: const Stream<bool>.empty(),
|
||||
completed: const Stream<bool>.empty(),
|
||||
buffering: const Stream<bool>.empty(),
|
||||
position: const Stream<Duration>.empty(),
|
||||
duration: const Stream<Duration>.empty(),
|
||||
seekable: const Stream<bool>.empty(),
|
||||
buffer: const Stream<Duration>.empty(),
|
||||
volume: const Stream<double>.empty(),
|
||||
rate: const Stream<double>.empty(),
|
||||
tracks: const Stream<Tracks>.empty(),
|
||||
track: const Stream<TrackSelection>.empty(),
|
||||
log: const Stream<PlayerLog>.empty(),
|
||||
error: const Stream<PlayerError>.empty(),
|
||||
audioDevice: const Stream<AudioDevice>.empty(),
|
||||
audioDevices: const Stream<List<AudioDevice>>.empty(),
|
||||
bufferRanges: const Stream<List<BufferRange>>.empty(),
|
||||
playbackRestart: const Stream<void>.empty(),
|
||||
backendSwitched: const Stream<void>.empty(),
|
||||
);
|
||||
|
||||
@override
|
||||
dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
|
||||
}
|
||||
@@ -623,6 +623,18 @@ void main() {
|
||||
expect(exits, 1);
|
||||
});
|
||||
|
||||
testWidgets('Back exits on the first press when the route opened with no chrome', (tester) async {
|
||||
final chromeController = PlayerChromeController(initiallyVisible: false);
|
||||
addTearDown(chromeController.dispose);
|
||||
var exits = 0;
|
||||
final coordinator = coordinatorFor(chromeController, exitPlayer: () => exits++);
|
||||
await pumpNavigationFocus(tester, coordinator);
|
||||
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.gameButtonB);
|
||||
|
||||
expect(exits, 1, reason: 'a TV start has no chrome to hide, so back belongs to the route (#1765)');
|
||||
});
|
||||
|
||||
testWidgets('physical Escape outside fullscreen hides presented chrome without exiting', (tester) async {
|
||||
final chromeController = PlayerChromeController();
|
||||
addTearDown(chromeController.dispose);
|
||||
|
||||
Reference in New Issue
Block a user