Allow moving between images in detail, gallery

Co-authored-by: Morris Richman <mcrich23@icloud.com>

Author: alicerunsonfedora

MCMaps/Red Window/Views/Detail/Cells/RedWindowPinGalleryCell.swift

@@ -27,6 +27,12 @@ struct RedWindowPinGalleryCell: RedWindowDetailCell {
 
     @State private var imageToPreview: URL?
 
+    private var imageURLs: [URL] {
+        pin.images?.compactMap { filename in
+            getUrl(forImageNamed: filename)
+        } ?? []
+    }
+
     var body: some View {
         Group {
             Text("Gallery")
@@ -57,7 +63,7 @@ struct RedWindowPinGalleryCell: RedWindowDetailCell {
                 ContentUnavailableView("No Photos Uploaded", systemImage: "photo.stack")
             }
         }
-        .quickLookPreview($imageToPreview)
+        .quickLookPreview($imageToPreview, in: imageURLs)
     }
 
     private func getImage(named name: String) -> Data? {

MCMaps/Resources/Credits.md

@@ -25,4 +25,4 @@ Alidade was made possible thanks to the following open-source projects:
 - femialiu
 - Jon Reid
 - Joe Graf (joeisanerd)
-
+- Morris Richman

MCMaps/Resources/Settings.bundle/en.lproj/Credits.strings

@@ -1,2 +1,2 @@
 "Credits" = "Credits";
-"credit_text"="Alidade is free and open-source software licensed under the Mozilla Public License, v2.0. For more information on your rights, you can visit https://www.mozilla.org/en-US/MPL/2.0/.\n\nOPEN SOURCE LIBRARIES\nAlidade was made possible thanks to the following open-source projects:\n\n- Adaptable Sidebar Sheet: Mozilla Public License, v2 (https://github.com/AlidadeMC/adaptablesidebarsheetview)\n- Caching MapKit Tile Overlay: BSD 3-Clause License (https://github.com/stadiamaps/mapkit-caching-tile-overlay)\n- Cubiomes: MIT License (https://github.com/Cubitect/cubiomes)\n- CubiomesKit: Mozilla Public License, v2 (https://github.com/AlidadeMC/cubiomeskit)\n- VersionedCodable: MIT License (https://github.com/jrothwell/VersionedCodable)\n\n\nSPECIAL THANKS\n- Christine Kearney-Kurt\n- Michael Kurt\n- Jo Kurt\n- Em Belkowitz\n- Paul Straw\n- Zack Snyder (The3DPrintist)\n- rae\n- Zel\n- Kiwi\n- 2DArray\n- Grant Neufeld\n- femialiu\n- Jon Reid\n- Joe Graf (joeisanerd)\n";
+"credit_text"="Alidade is free and open-source software licensed under the Mozilla Public License, v2.0. For more information on your rights, you can visit https://www.mozilla.org/en-US/MPL/2.0/.\n\nOPEN SOURCE LIBRARIES\nAlidade was made possible thanks to the following open-source projects:\n\n- Adaptable Sidebar Sheet: Mozilla Public License, v2 (https://github.com/AlidadeMC/adaptablesidebarsheetview)\n- Caching MapKit Tile Overlay: BSD 3-Clause License (https://github.com/stadiamaps/mapkit-caching-tile-overlay)\n- Cubiomes: MIT License (https://github.com/Cubitect/cubiomes)\n- CubiomesKit: Mozilla Public License, v2 (https://github.com/AlidadeMC/cubiomeskit)\n- VersionedCodable: MIT License (https://github.com/jrothwell/VersionedCodable)\n\n\nSPECIAL THANKS\n- Christine Kearney-Kurt\n- Michael Kurt\n- Jo Kurt\n- Em Belkowitz\n- Paul Straw\n- Zack Snyder (The3DPrintist)\n- rae\n- Zel\n- Kiwi\n- 2DArray\n- Grant Neufeld\n- femialiu\n- Jon Reid\n- Joe Graf (joeisanerd)\n- Morris Richman";

MCMaps/Shared/Views/Gallery/CartographyGalleryView.swift

@@ -29,6 +29,12 @@ struct CartographyGalleryView: View {
     @State private var scaledToFill = true
     @State private var currentPhotoURL: URL?
 
+    private var imageURLs: [URL] {
+        context.imageCollection.compactMap { (key, _) in
+            getURL(forImageNamed: key)
+        }
+    }
+
     var body: some View {
         Group {
             if context.imageCollection.isEmpty {
@@ -40,15 +46,15 @@ struct CartographyGalleryView: View {
                     LazyVGrid(columns: columns, spacing: 2) {
                         ForEach(RandomAccessDictionary(context.imageCollection)) { element in
                             Button {
-                                prepareQuickLook(forImageNamed: element.key)
+                                currentPhotoURL = getURL(forImageNamed: element.key)
                             } label: {
                                 cell(for: element.value)
                                     .frame(maxWidth: .infinity, maxHeight: .infinity)
                             }
                             .buttonStyle(.plain)
                             .contextMenu {
                                 Button("Preview Image") {
-                                    prepareQuickLook(forImageNamed: element.key)
+                                    currentPhotoURL = getURL(forImageNamed: element.key)
                                 }
                                 ShareLink(
                                     item: element.value,
@@ -66,7 +72,7 @@ struct CartographyGalleryView: View {
                 }
             }
         }
-        .quickLookPreview($currentPhotoURL)
+        .quickLookPreview($currentPhotoURL, in: imageURLs)
         .navigationTitle("Gallery")
         #if os(macOS)
         .navigationSubtitle(context.documentBaseURL?.lastPathComponent ?? "Untitled Map")
@@ -96,8 +102,7 @@ struct CartographyGalleryView: View {
             .aspectRatio(1, contentMode: .fit)
     }
 
-    private func prepareQuickLook(forImageNamed imageName: String) {
-        guard let baseURL = context.documentBaseURL else { return }
-        currentPhotoURL = baseURL.appending(components: CartographyMapFile.Keys.images, imageName)
+    private func getURL(forImageNamed name: String) -> URL? {
+        context.documentBaseURL?.appending(components: CartographyMapFile.Keys.images, name)
     }
 }