From a1753b2c24ec0e95b3f350a94b31d22ba8669063 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Tue, 30 May 2023 10:30:48 -0700 Subject: [PATCH] video-player: add tap gesture to prevent nav --- damus/Components/ImageCarousel.swift | 9 ++------- damus/Views/Video/DamusVideoPlayer.swift | 3 --- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/damus/Components/ImageCarousel.swift b/damus/Components/ImageCarousel.swift index afad2665..50b974d8 100644 --- a/damus/Components/ImageCarousel.swift +++ b/damus/Components/ImageCarousel.swift @@ -123,9 +123,6 @@ struct ImageCarousel: View { } case .video(let url): DamusVideoPlayer(url: url, video_size: $video_size) - .onTapGesture { - print("video tap") - } .onChange(of: video_size) { size in guard image_fill == nil, let size else { return @@ -182,7 +179,7 @@ struct ImageCarousel: View { } var Medias: some View { - TabView { + TabView(selection: $selectedIndex) { ForEach(urls.indices, id: \.self) { index in GeometryReader { geo in Media(geo: geo, url: urls[index], index: index) @@ -194,9 +191,6 @@ struct ImageCarousel: View { ImageView(urls: urls, disable_animation: state.settings.disable_animation) } .frame(height: height) - .onTapGesture { - open_sheet = true - } .onChange(of: selectedIndex) { value in selectedIndex = value } @@ -206,6 +200,7 @@ struct ImageCarousel: View { var body: some View { VStack { Medias + .onTapGesture { } // This is our custom carousel image indicator CarouselDotsView(urls: urls, selectedIndex: $selectedIndex) diff --git a/damus/Views/Video/DamusVideoPlayer.swift b/damus/Views/Video/DamusVideoPlayer.swift index 7fab1943..f2f640ba 100644 --- a/damus/Views/Video/DamusVideoPlayer.swift +++ b/damus/Views/Video/DamusVideoPlayer.swift @@ -28,9 +28,6 @@ struct DamusVideoPlayer: View { .foregroundColor(.black) Image(systemName: mute_icon) - .onTapGesture { - model.muted = !model.muted - } .padding() .foregroundColor(.white) }