yorickr/plezy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(back): adopt host-owned sheet back in watch-together + player

Browse Source 
watch_together, video_player, mobile_remote and live_tv_show_schedule now
pass canPop/onSystemBack to OverlaySheetHost instead of hand-rolling a
PopScope. Restores the iOS swipe-back on watch_together and centralizes
the sheet-close-on-back logic.
This commit is contained in:
edde746
2026-06-07 09:13:49 +02:00
parent bbf7b1f9da
commit 248b5fd91a
5 changed files with 194 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/watch_together/screens/watch_together_screen.dart
+11 -35
View File
@@ -12,7 +12,6 @@ import '../../mixins/mounted_set_state_mixin.dart';
import '../../focus/focusable_button.dart';
import '../../focus/focusable_text_field.dart';
import '../../focus/focusable_wrapper.dart';
import '../../focus/key_event_utils.dart';
import '../../profiles/active_profile_provider.dart';
import '../../services/settings_service.dart';
import '../../utils/app_logger.dart';
@@ -38,41 +37,18 @@ class WatchTogetherScreen extends StatelessWidget {
return Consumer<WatchTogetherProvider>(
builder: (context, watchTogether, child) {
final canGoBack = watchTogether.isHost || !watchTogether.isInSession;
// Host the actions sheet so it uses the overlay system (focus + back
// handling) instead of the showModalBottomSheet fallback, which on
// TV/dpad leaks the select-key suppressor. The PopScope sits *below* the
// host (via Builder) so that on a system/gesture back it can see the open
// sheet and close it instead of popping the screen — mirrors the
// video_player_screen pattern and the OverlaySheetHost contract.
// The host owns sheet + system back: a back with the actions sheet open
// closes it; otherwise the route pops only when [canGoBack] (a guest in
// an active session can't leave). canGoBack==true also preserves the iOS
// interactive swipe-back.
return OverlaySheetHost(
child: Builder(
builder: (context) => PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, result) {
if (didPop) return;
final sheet = OverlaySheetController.maybeOf(context);
if (sheet != null && sheet.isOpen) {
sheet.pop();
return;
}
if (BackKeyCoordinator.consumeIfHandled()) return;
if (!canGoBack) return;
BackKeyCoordinator.markHandled();
Navigator.pop(context);
},
child: FocusedScrollScaffold(
title: Text(t.watchTogether.title),
automaticallyImplyLeading: canGoBack,
slivers: watchTogether.isInSession
? _buildActiveSessionSlivers(watchTogether)
: [
SliverFillRemaining(
hasScrollBody: false,
child: _NotInSessionView(watchTogether: watchTogether),
),
],
),
),
canPop: canGoBack,
child: FocusedScrollScaffold(
title: Text(t.watchTogether.title),
automaticallyImplyLeading: canGoBack,
slivers: watchTogether.isInSession
? _buildActiveSessionSlivers(watchTogether)
: [SliverFillRemaining(hasScrollBody: false, child: _NotInSessionView(watchTogether: watchTogether))],
),
);
},