Merge pull request #1691 from planetary-social/fix-gallery-overflow-l…

…inks

Fix galleries expand past the width of the screen when the links are many

CHANGELOG.md

@@ -11,8 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Release Notes
-- Added support for user setting and displaying pronouns. 
-- Added display of website urls for user profiles. 
+- Fixed galleries expanding past the width of the screen when there are lots of links or images. [#24](https://github.com/verse-pbc/issues/issues/24)
+- Added support for user setting and displaying pronouns.
+- Added display of website urls for user profiles.
 
 ## [1.0.2] - 2024-11-26Z
 

Nos/Views/Components/Media/GalleryView.swift

@@ -130,24 +130,87 @@ fileprivate struct GalleryIndexView: View {
     private let secondaryFill = Color.galleryIndexDotSecondary
 
     /// The scale of the circles representing tabs that aren't selected, relative to `circleSize`.
-    private let smallScale: CGFloat = 0.75
+    private let smallScale: CGFloat = 0.5
+
+    /// The maximum number of circles to display.
+    private let maxNumberOfCircles = 7
+
+    /// The range of indices to display. If there are too many pages, we only show up to `maxNumberOfCircles`.
+    private var displayRange: ClosedRange<Int> {
+        let radius = maxNumberOfCircles / 2
+        let idealStart = currentIndex - radius
+        let idealEnd = currentIndex + radius
+
+        switch (idealStart, idealEnd) {
+        case (...0, _):
+            // If ideal start is negative, pin to start of range
+            return 0...min(maxNumberOfCircles - 1, numberOfPages - 1)
+        case (_, numberOfPages...):
+            // If ideal end is greater than the number of pages, pin to end of range
+            return max(0, numberOfPages - maxNumberOfCircles)...numberOfPages - 1
+        default:
+            // Ideal case - centered around current index
+            return idealStart...idealEnd
+        }
+    }
 
     var body: some View {
         HStack(spacing: circleSpacing) {
             ForEach(0..<numberOfPages, id: \.self) { index in
-                Circle()
-                    .fill(currentIndex == index ? AnyShapeStyle(primaryFill) : AnyShapeStyle(secondaryFill))
-                    .scaleEffect(currentIndex == index ? 1 : smallScale)
-                    .frame(width: circleSize, height: circleSize)
-                    .transition(AnyTransition.opacity.combined(with: .scale))
-                    .id(index)
+                if shouldShowIndex(index) {
+                    Circle()
+                        .fill(currentIndex == index ? AnyShapeStyle(primaryFill) : AnyShapeStyle(secondaryFill))
+                        .animation(nil, value: currentIndex)
+                        .scaleEffect(scaleFor(index))
+                        .frame(width: circleSize, height: circleSize)
+                        .id(index)
+                        .animation(.easeInOut(duration: 0.3), value: currentIndex)
+                }
             }
         }
         .padding(8.0)
         .background(
             Color.galleryIndexViewBackground.cornerRadius(16.0)
         )
     }
+
+    /// Determines whether a given index should be displayed in the view.
+    ///
+    /// - Parameter index: The index of the page to evaluate.
+    /// - Returns: `true` if the index is within `maxDistance` of the `currentIndex`; otherwise, `false`.
+    private func shouldShowIndex(_ index: Int) -> Bool {
+        displayRange.contains(index)
+    }
+
+    /// Calculates the scale factor for a circle at a given index.
+    ///
+    /// - Parameter index: The index of the page to evaluate.
+    /// - Returns: A scale factor based on the distance from `currentIndex`.
+    private func scaleFor(_ index: Int) -> CGFloat {
+        // Show all circles at full size if there are 6 or fewer pages
+        if numberOfPages <= maxNumberOfCircles {
+            return 1.0
+        }
+
+        if index == currentIndex {
+            return 1.0
+        }
+        if displayRange.lowerBound > 0 {
+            if index == displayRange.lowerBound {
+                return 0.5
+            } else if index == displayRange.lowerBound + 1 {
+                return 0.75
+            }
+        }
+        if displayRange.upperBound < numberOfPages - 1 {
+            if index == displayRange.upperBound {
+                return 0.5
+            } else if index == displayRange.upperBound - 1 {
+                return 0.75
+            }
+        }
+        return 1.0
+    }
 }
 
 #Preview("Multiple URLs, landscape image first") {