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

fix: dpad nav skipping episodes on single-season shows

Browse Source 
close #691
This commit is contained in:
edde746
2026-03-14 11:09:01 +01:00
parent 045e68ca10
commit cde6e99a17
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/screens/media_detail_screen.dart
+24 -2
View File
@@ -1205,7 +1205,7 @@ class _MediaDetailScreenState extends State<MediaDetailScreen>
final isAlways = flattenSeasons == flattenSeasonsAlways; final isAlways = flattenSeasons == flattenSeasonsAlways;
final isSingleSeason = flattenSeasons == flattenSeasonsSingleSeason; final isSingleSeason = flattenSeasons == flattenSeasonsSingleSeason;
final shouldShowEpisodesDirectly = final shouldShowEpisodesDirectly =
isAlways || (isSingleSeason && seasonsWithServerId.length == 1); isAlways || seasonsWithServerId.length <= 1 || (isSingleSeason && seasonsWithServerId.length == 1);
// Create focus nodes for season tabs // Create focus nodes for season tabs
_updateSeasonTabFocusNodes(seasonsWithServerId.length); _updateSeasonTabFocusNodes(seasonsWithServerId.length);
@@ -1460,6 +1460,12 @@ class _MediaDetailScreenState extends State<MediaDetailScreen>
return KeyEventResult.handled; return KeyEventResult.handled;
} }
if (_episodes.isNotEmpty) {
_firstEpisodeFocusNode.requestFocus();
_scrollSectionIntoView(_seasonsSectionKey);
return KeyEventResult.handled;
}
if (metadata.role != null && metadata.role!.isNotEmpty) { if (metadata.role != null && metadata.role!.isNotEmpty) {
_castFocusNode.requestFocus(); _castFocusNode.requestFocus();
_scrollSectionIntoView(_castSectionKey); _scrollSectionIntoView(_castSectionKey);
@@ -1504,6 +1510,9 @@ class _MediaDetailScreenState extends State<MediaDetailScreen>
if (metadata.isShow && !_showEpisodesDirectly && _seasons.isNotEmpty && _seasonTabFocusNodes.isNotEmpty) { if (metadata.isShow && !_showEpisodesDirectly && _seasons.isNotEmpty && _seasonTabFocusNodes.isNotEmpty) {
_seasonTabFocusNodes[_selectedSeasonIndex].requestFocus(); _seasonTabFocusNodes[_selectedSeasonIndex].requestFocus();
_scrollSectionIntoView(_seasonsSectionKey); _scrollSectionIntoView(_seasonsSectionKey);
} else if (_episodes.isNotEmpty) {
_firstEpisodeFocusNode.requestFocus();
_scrollSectionIntoView(_seasonsSectionKey);
} else if (metadata.role != null && metadata.role!.isNotEmpty) { } else if (metadata.role != null && metadata.role!.isNotEmpty) {
_castFocusNode.requestFocus(); _castFocusNode.requestFocus();
_scrollSectionIntoView(_castSectionKey); _scrollSectionIntoView(_castSectionKey);
@@ -1798,7 +1807,20 @@ class _MediaDetailScreenState extends State<MediaDetailScreen>
: index == _episodes.length - 1 && _episodes.length > 1 : index == _episodes.length - 1 && _episodes.length > 1
? _lastEpisodeFocusNode ? _lastEpisodeFocusNode
: null, : null,
onNavigateUp: index == 0 ? _focusSelectedSeasonTab : null, onNavigateUp: index == 0
? () {
if (!_showEpisodesDirectly) {
_focusSelectedSeasonTab();
} else if ((_fullMetadata ?? widget.metadata).summary?.isNotEmpty == true) {
_overviewFocusNode.requestFocus();
_scrollSectionIntoView(_overviewSectionKey);
} else {
_scrollController.animateTo(0,
duration: const Duration(milliseconds: 200), curve: Curves.easeOut);
_playButtonFocusNode.requestFocus();
}
}
: null,
localPosterPath: localPosterPath, localPosterPath: localPosterPath,
onTap: () async { onTap: () async {
await navigateToVideoPlayerWithRefresh( await navigateToVideoPlayerWithRefresh(