Remove channel card background on tvOS and fix grid focus clipping

This commit is contained in:
Arkadiusz Fal
2026-04-17 03:48:18 +02:00
parent 7a55f8ac3a
commit 5ef40e24bf
5 changed files with 20 additions and 2 deletions

View File

@@ -72,8 +72,10 @@ struct ChannelCardGridView: View {
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
} }
.padding() .padding()
.background(.quaternary.opacity(0.3)) #if !os(tvOS)
.clipShape(RoundedRectangle(cornerRadius: 12)) .background(.quaternary.opacity(0.3))
.clipShape(RoundedRectangle(cornerRadius: 12))
#endif
.contentShape(Rectangle()) .contentShape(Rectangle())
} }

View File

@@ -82,6 +82,9 @@ struct ViewOptionsSheet: View {
} }
} }
} }
.scrollClipDisabled()
.padding(.horizontal, 40)
.padding(.vertical, 24)
} }
#endif #endif

View File

@@ -43,10 +43,16 @@ struct MediaBrowserViewOptionsSheet: View {
.listRowInsets(EdgeInsets(top: 8, leading: 0, bottom: 8, trailing: 0)) .listRowInsets(EdgeInsets(top: 8, leading: 0, bottom: 8, trailing: 0))
} }
} }
#if os(tvOS)
.scrollClipDisabled()
.padding(.horizontal, 40)
.padding(.vertical, 24)
#else
.navigationTitle("mediaBrowser.viewOptions.title") .navigationTitle("mediaBrowser.viewOptions.title")
#if os(iOS) #if os(iOS)
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
#endif #endif
#endif
.toolbar { .toolbar {
ToolbarItem(placement: .confirmationAction) { ToolbarItem(placement: .confirmationAction) {
Button(role: .cancel) { Button(role: .cancel) {

View File

@@ -386,6 +386,7 @@ struct ManageChannelsView: View {
} }
} }
} }
.scrollClipDisabled()
} }
// MARK: - Helpers // MARK: - Helpers

View File

@@ -323,10 +323,16 @@ struct SubscriptionsView: View {
} }
#endif #endif
} }
#if os(tvOS)
.scrollClipDisabled()
.padding(.horizontal, 40)
.padding(.vertical, 24)
#else
.navigationTitle(String(localized: "subscriptions.viewOptions.title")) .navigationTitle(String(localized: "subscriptions.viewOptions.title"))
#if os(iOS) #if os(iOS)
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
#endif #endif
#endif
} }
.presentationDetents([.height(420), .large]) .presentationDetents([.height(420), .large])
.presentationDragIndicator(.visible) .presentationDragIndicator(.visible)