Skip to content
Merged
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
12 changes: 10 additions & 2 deletions App/Continuity/Views/MainPagerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,25 @@ struct MainPagerView: View {
GeometryReader { proxy in
let insets = proxy.safeAreaInsets
ScrollView(.vertical) {
// Two inset strategies on purpose: the NavigationStack pages need HARD padding —
// their bars position from the real window safe area, which this full-screen
// pager ignores, so additive safeAreaPadding leaves the title/toolbar under the
// status bar. Now Playing keeps safeAreaPadding: its content is pure SwiftUI
// (chevrons/labels respect it) and its backdrop must escape to full bleed via
// ignoresSafeArea, which hard padding would block.
VStack(spacing: 0) {
LibrarySheetView()
.safeAreaPadding(insets)
.padding(.top, insets.top)
.padding(.bottom, insets.bottom)
.containerRelativeFrame(.vertical)
.id(MainPagerState.Page.library)
NowPlayingView(mode: .home)
.safeAreaPadding(insets)
.containerRelativeFrame(.vertical)
.id(MainPagerState.Page.nowPlaying)
UpNextView()
.safeAreaPadding(insets)
.padding(.top, insets.top)
.padding(.bottom, insets.bottom)
.containerRelativeFrame(.vertical)
.id(MainPagerState.Page.upNext)
}
Expand Down
Loading