Fix play button bad behavior (#1512)

mlemgroup · Dec 17, 2024 · 4cd9eb3 · 4cd9eb3
1 parent f8f06b5
commit 4cd9eb3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Mlem/App/Views/Pages/ImageViewer.swift b/Mlem/App/Views/Pages/ImageViewer.swift
@@ -52,7 +52,7 @@ struct ImageViewer: View {
                 .padding(Constants.main.standardSpacing)
             }
         }
-        .simultaneousGesture(DragGesture(minimumDistance: 0.0)
+        .simultaneousGesture(DragGesture(minimumDistance: 1.0)
             .updating($dragState) { value, state, _ in
                 state = true
                 if !isZoomed, !isDismissing {

diff --git a/Mlem/App/Views/Shared/Images/Core/FixedImageView.swift b/Mlem/App/Views/Shared/Images/Core/FixedImageView.swift
@@ -22,6 +22,7 @@ struct FixedImageView: View {
     let fallback: Fallback
     let showProgress: Bool
     let blurred: Bool
+    let showPlayButton: Bool
 
     /// Enumeration of placeholder images to use if image loading fails
     enum Fallback {
@@ -44,12 +45,14 @@ struct FixedImageView: View {
         size: CGSize,
         fallback: Fallback,
         showProgress: Bool,
-        blurred: Bool = false
+        blurred: Bool = false,
+        showPlayButton: Bool = true
     ) {
         self.fallback = fallback
         self.showProgress = showProgress
         self._loader = .init(wrappedValue: .init(url: url, size: size))
         self.blurred = blurred
+        self.showPlayButton = showPlayButton
     }
 
     var isMovie: Bool { loader.url?.proxyAwarePathExtension?.isMovieExtension ?? false }
@@ -79,7 +82,7 @@ struct FixedImageView: View {
             || (loader.loading == .loading && !showProgress) {
             fallbackImage
                 .overlay {
-                    if loader.isAnimated {
+                    if loader.isAnimated, showPlayButton {
                         PlayButton(postSize: postSize)
                     }
                 }
@@ -92,7 +95,7 @@ struct FixedImageView: View {
                     .scaledToFill()
                     .dynamicBlur(blurred: blurred)
                     .overlay {
-                        if loader.isAnimated {
+                        if loader.isAnimated, showPlayButton {
                             PlayButton(postSize: postSize)
                         }
                     }

diff --git a/Mlem/App/Views/Shared/Images/Wrappers/CircleCroppedImageView.swift b/Mlem/App/Views/Shared/Images/Wrappers/CircleCroppedImageView.swift
@@ -37,7 +37,8 @@ struct CircleCroppedImageView: View {
             size: .init(width: frame, height: frame),
             fallback: fallback,
             showProgress: showProgress,
-            blurred: blurred
+            blurred: blurred,
+            showPlayButton: false
         )
         .clipShape(Circle())
         .geometryGroup()

diff --git a/Mlem/App/Views/Shared/Images/Wrappers/ThumbnailImageView.swift b/Mlem/App/Views/Shared/Images/Wrappers/ThumbnailImageView.swift
@@ -101,9 +101,9 @@ struct ThumbnailImageView: View {
                 url: url,
                 size: frame,
                 fallback: url.proxyAwarePathExtension?.isMovieExtension ?? false ? .movie : .image,
-                showProgress: true
+                showProgress: true,
+                blurred: blurred && loading == .done
             )
-            .dynamicBlur(blurred: blurred && loading == .done)
             .clipShape(RoundedRectangle(cornerRadius: Constants.main.smallItemCornerRadius))
             .onPreferenceChange(MediaLoadingPreferenceKey.self, perform: { loading = $0 })
         } else {
@@ -125,9 +125,9 @@ struct ThumbnailImageView: View {
                 url: url,
                 size: frame,
                 fallback: .image,
-                showProgress: true
+                showProgress: true,
+                blurred: blurred && loading == .done
             )
-            .dynamicBlur(blurred: blurred)
             .onPreferenceChange(MediaLoadingPreferenceKey.self, perform: { loading = $0 })
         } else {
             Image(systemName: post.placeholderImageName)