diff --git a/Shared/Channels/ChannelVideosView.swift b/Shared/Channels/ChannelVideosView.swift index dc7e581b..50645ca0 100644 --- a/Shared/Channels/ChannelVideosView.swift +++ b/Shared/Channels/ChannelVideosView.swift @@ -380,7 +380,7 @@ struct ChannelVideosView: View { navigation.sidebarSectionChanged.toggle() } } label: { - Label("Subscribe", systemImage: "circle") + Label("Subscribe", systemImage: "star.circle") .help("Subscribe") #if os(iOS) .labelStyle(.automatic) diff --git a/Shared/Player/Video Details/VideoDetails.swift b/Shared/Player/Video Details/VideoDetails.swift index 2656ee2d..b75be316 100644 --- a/Shared/Player/Video Details/VideoDetails.swift +++ b/Shared/Player/Video Details/VideoDetails.swift @@ -47,6 +47,12 @@ struct VideoDetails: View { .frame(width: 40, height: 40) .buttonStyle(.plain) .padding(.trailing, 5) + // TODO: when setting tvOS minimum to 16, the platform modifier can be removed + #if !os(tvOS) + .simultaneousGesture( + TapGesture() // Ensures the button tap is recognized + ) + #endif VStack(alignment: .leading, spacing: 2) { HStack { @@ -55,6 +61,14 @@ struct VideoDetails: View { .font(.subheadline) .fontWeight(.semibold) .lineLimit(1) + // TODO: when setting tvOS minimum to 16, the platform modifier can be removed + #if !os(tvOS) + .onTapGesture { + guard let channel = video?.channel else { return } + NavigationModel.shared.openChannel(channel, navigationStyle: .sidebar) + } + .accessibilityAddTraits(.isButton) + #endif } else if model.videoBeingOpened != nil { Text("Yattee") .font(.subheadline) @@ -208,10 +222,10 @@ struct VideoDetails: View { .frame(maxWidth: .infinity, alignment: .leading) .contentShape(Rectangle()) .padding(.horizontal, 16) + // TODO: when setting tvOS minimum to 16, the platform modifier can be removed #if !os(tvOS) - .tapRecognizer( - tapSensitivity: 0.2, - doubleTapAction: { + .simultaneousGesture( // Simultaneous gesture to prioritize button tap + TapGesture(count: 2).onEnded { withAnimation(.default) { fullScreen.toggle() }