Bump version

CHDataManagement.xcodeproj/project.pbxproj

@@ -202,6 +202,8 @@
 		E2EC1FB02DC0D7DA00C41784 /* RouteBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2EC1FAF2DC0D7D600C41784 /* RouteBlock.swift */; };
 		E2EC1FB22DC0D8BD00C41784 /* RouteViewComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2EC1FB12DC0D8BD00C41784 /* RouteViewComponents.swift */; };
 		E2EC1FB42DC0FA8700C41784 /* Insert+Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2EC1FB32DC0FA6D00C41784 /* Insert+Route.swift */; };
+		E2F3B3832DC496CB00CFA712 /* GalleryBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3822DC496C800CFA712 /* GalleryBlock.swift */; };
+		E2F3B3852DC49B7A00CFA712 /* Insert+Gallery.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3842DC49B4400CFA712 /* Insert+Gallery.swift */; };
 		E2FD1D0D2D2DBBA600B48627 /* LinkPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D0C2D2DBBA100B48627 /* LinkPreview.swift */; };
 		E2FD1D192D2DC4F500B48627 /* LoadingContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D182D2DC4F500B48627 /* LoadingContext.swift */; };
 		E2FD1D1B2D2DC63800B48627 /* LinkPreviewDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D1A2D2DC62C00B48627 /* LinkPreviewDetailView.swift */; };
@@ -480,6 +482,8 @@
 		E2EC1FAF2DC0D7D600C41784 /* RouteBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouteBlock.swift; sourceTree = "<group>"; };
 		E2EC1FB12DC0D8BD00C41784 /* RouteViewComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouteViewComponents.swift; sourceTree = "<group>"; };
 		E2EC1FB32DC0FA6D00C41784 /* Insert+Route.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Insert+Route.swift"; sourceTree = "<group>"; };
+		E2F3B3822DC496C800CFA712 /* GalleryBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryBlock.swift; sourceTree = "<group>"; };
+		E2F3B3842DC49B4400CFA712 /* Insert+Gallery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Insert+Gallery.swift"; sourceTree = "<group>"; };
 		E2FD1D0C2D2DBBA100B48627 /* LinkPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreview.swift; sourceTree = "<group>"; };
 		E2FD1D182D2DC4F500B48627 /* LoadingContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingContext.swift; sourceTree = "<group>"; };
 		E2FD1D1A2D2DC62C00B48627 /* LinkPreviewDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreviewDetailView.swift; sourceTree = "<group>"; };
@@ -1106,6 +1110,7 @@
 				E2FD1D362D3BBCB500B48627 /* Insert+Image.swift */,
 				E2EC1FB32DC0FA6D00C41784 /* Insert+Route.swift */,
 				E2FD1D552D46CED500B48627 /* Insert+Labels.swift */,
+				E2F3B3842DC49B4400CFA712 /* Insert+Gallery.swift */,
 			);
 			path = Commands;
 			sourceTree = "<group>";
@@ -1147,6 +1152,7 @@
 		E2FE0F342D2B27E6002963B7 /* Blocks */ = {
 			isa = PBXGroup;
 			children = (
+				E2F3B3822DC496C800CFA712 /* GalleryBlock.swift */,
 				E2EC1FAF2DC0D7D600C41784 /* RouteBlock.swift */,
 				E2B482212D676BEB005C309D /* PhoneScreensBlock.swift */,
 				E2FE0F652D2C3B33002963B7 /* LabelsBlock.swift */,
@@ -1480,6 +1486,7 @@
 				E25DA5732D018AA100AEF16D /* FileContentView.swift in Sources */,
 				E2FD1D3F2D46405000B48627 /* PostLabelsView.swift in Sources */,
 				E25DA5232CFF6C3700AEF16D /* ImageGenerator.swift in Sources */,
+				E2F3B3832DC496CB00CFA712 /* GalleryBlock.swift in Sources */,
 				E2A9CB7E2C7BCF2A005C89CC /* Page.swift in Sources */,
 				E29D31202D0320E70051B7F4 /* ContentLabels.swift in Sources */,
 				E2FE0F572D2BCFD4002963B7 /* BlockLineProcessor.swift in Sources */,
@@ -1520,6 +1527,7 @@
 				E2FE0F112D268E7E002963B7 /* MarkdownCodeProcessor.swift in Sources */,
 				E2B482102D5E9FF9005C309D /* RemotePush.swift in Sources */,
 				E22990202D0ECBE5009F8D77 /* TagOverviewDetailView.swift in Sources */,
+				E2F3B3852DC49B7A00CFA712 /* Insert+Gallery.swift in Sources */,
 				E29D31C02D0DB9F20051B7F4 /* AudioPlayerContent.swift in Sources */,
 				E22990192D0E3546009F8D77 /* ItemReference.swift in Sources */,
 				E2FD1D372D3BBCCA00B48627 /* Insert+Image.swift in Sources */,
@@ -1731,7 +1739,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = de.christophhagen.CHDataManagement;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -1770,7 +1778,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = de.christophhagen.CHDataManagement;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -1866,7 +1874,7 @@
 			repositoryURL = "https://github.com/SFSafeSymbols/SFSafeSymbols";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.3.0;
+				minimumVersion = 6.0.0;
 			};
 		};
 		E2FD1D502D4644B400B48627 /* XCRemoteSwiftPackageReference "SVGView" */ = {

CHDataManagement.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -132,8 +132,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SFSafeSymbols/SFSafeSymbols",
       "state" : {
-        "revision" : "e2e28f4e56e1769c2ec3c61c9355fc64eb7a535a",
+        "revision" : "3dd282d3269b061853a3b3bcd23a509d2aa166ce",
-        "version" : "5.3.0"
+        "version" : "6.2.0"
       }
     },
     {

CHDataManagement/Generator/Blocks/ContentBlock.swift

@@ -17,6 +17,8 @@ enum ContentBlock: String, CaseIterable {
 
     case route
 
+    case gallery
+
     var processor: BlockProcessor.Type {
         switch self {
         case .audio: return AudioBlock.self
@@ -27,6 +29,7 @@ enum ContentBlock: String, CaseIterable {
         case .labels: return LabelsBlock.self
         case .screens: return PhoneScreensBlock.self
         case .route: return RouteBlock.self
+        case .gallery: return GalleryBlock.self
         }
     }
 }

CHDataManagement/Generator/Blocks/GalleryBlock.swift

@@ -0,0 +1,46 @@
+
+struct GalleryBlock: BlockLineProcessor {
+
+    static let blockId: ContentBlock = .gallery
+
+    let content: Content
+
+    let results: PageGenerationResults
+
+    let language: ContentLanguage
+
+    init(content: Content, results: PageGenerationResults, language: ContentLanguage) {
+        self.content = content
+        self.results = results
+        self.language = language
+    }
+
+    private var imageWidth: Int {
+        content.settings.pages.contentWidth
+    }
+
+    func process(_ lines: [String], markdown: Substring) -> String {
+        var images = [FileResource]()
+
+        for line in lines {
+            let imageId = line.trimmed
+            guard !imageId.isEmpty else { continue }
+            guard let image = content.image(imageId) else {
+                results.missing(file: imageId, source: "Route block")
+                continue
+            }
+            images.append(image)
+        }
+        guard let firstImage = images.first else { return "" }
+
+        let imageSets = images.map {
+            $0.imageSet(width: imageWidth, height: imageWidth, language: language)
+        }
+        imageSets.forEach(results.require)
+        let id = firstImage.id.replacingOccurrences(of: ".", with: "-")
+        let gallery = ImageGallery(id: id, images: imageSets, standalone: true)
+        results.require(footer: gallery.standaloneFooter)
+        results.require(headers: .swiperJs, .swiperCss)
+        return gallery.content
+    }
+}

CHDataManagement/Generator/HeaderElement.swift

@@ -95,7 +95,10 @@ extension HeaderElement: Hashable {
 extension HeaderElement: Comparable {
 
     static func < (lhs: HeaderElement, rhs: HeaderElement) -> Bool {
-        lhs.order < rhs.order
+        guard lhs.order == rhs.order else {
+            return lhs.order < rhs.order
+        }
+        return lhs.content < rhs.content
     }
 }
 

CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift

@@ -11,15 +11,16 @@ final class FeedPageGenerator {
         self.results = results
     }
 
-    private func includeSwiper(in headers: inout Set<HeaderElement>) {
+    private func makeHeaders(requiredItems: Set<KnownHeaderElement>, results: PageGenerationResults) -> Set<HeaderElement> {
-        if let swiperCss = content.settings.posts.swiperCssFile {
+        var result = content.postPageHeaders
-            headers.insert(.css(file: swiperCss, order: HeaderElement.swiperCssFileOrder))
+        for item in requiredItems {
-            results.require(file: swiperCss)
+            guard let header = item.header(content: content) else {
-        }
+                results.warning("Header \(item) not configured in settings")
-        if let swiperJs = content.settings.posts.swiperJsFile {
+                continue
-            headers.insert(.js(file: swiperJs, defer: true))
+            }
-            results.require(file: swiperJs)
+            result.insert(header)
         }
+        return result
     }
 
     func generatePage(language: ContentLanguage,
@@ -33,13 +34,16 @@ final class FeedPageGenerator {
                       totalPages: Int,
                       languageButtonUrl: String,
                       linkPrefix: String) -> String {
-        var headers = content.postPageHeaders
         var footer = ""
+        var requiredHeaders = Set<KnownHeaderElement>()
         if posts.contains(where: { $0.requiresSwiper }) {
             // Sort swiper style sheet before default style sheet
-            includeSwiper(in: &headers)
+            requiredHeaders.formUnion([.swiperJs, .swiperCss])
             footer = swiperInitScript(posts: posts)
         }
+        let headers = makeHeaders(requiredItems: requiredHeaders, results: results)
+        results.require(files: headers.compactMap { $0.requiredFile })
+        results.require(headers: requiredHeaders)
 
         let iconUrl = content.settings.navigation.localized(in: language).rootUrl
         let languageButton = NavigationBar.Link(
@@ -84,14 +88,7 @@ final class FeedPageGenerator {
     }
 
     func swiperInitScript(posts: [FeedEntryData]) -> String {
-        var result = "<script> window.onload = () => { "
+        let ids = posts.filter { $0.requiresSwiper }.map { $0.entryId }
-        for post in posts {
+        return ImageGallery.combinedFootor(ids: ids)
-            guard post.requiresSwiper else {
-                continue
-            }
-            result += ImageGallery.swiperInit(id: post.entryId)
-        }
-        result += "}; </script>"
-        return result
     }
 }

CHDataManagement/Generator/Post Lists/PostListPageGenerator.swift

@@ -116,6 +116,8 @@ final class PostListPageGenerator {
         // Includes leading slash
         let pageUrl = pageUrl(in: language, pageNumber: pageIndex)
 
+        #warning("Use results for each individual posts page")
+
         let fileContent = feedPageGenerator.generatePage(
             language: language,
             posts: posts,

CHDataManagement/Generator/Results/PageGenerationResults.swift

@@ -242,6 +242,10 @@ final class PageGenerationResults: ObservableObject {
         onMain { self.requiredHeaders.formUnion(headers) }
     }
 
+    func require<S>(headers: S) where S: Sequence, S.Element == KnownHeaderElement {
+        onMain { self.requiredHeaders.formUnion(headers) }
+    }
+
     func require(icon: PageIcon) {
         onMain { self.requiredIcons.insert(icon) }
     }

CHDataManagement/Model/FileType.swift

@@ -27,9 +27,9 @@ enum FileTypeCategory: String, CaseIterable {
         case .image: .photo
         case .code: .keyboard
         case .model: .cubeTransparent
-        case .text: .docText
+        case .text: .textDocument
         case .video: .video
-        case .resource: .docZipper
+        case .resource: .zipperPage
         case .audio: .speakerWave2CircleFill
         }
     }

CHDataManagement/Page Elements/ContentElements/Images/ImageGallery.swift

@@ -11,14 +11,17 @@ struct ImageGallery: HtmlProducer {
     /// The images to display
     let images: [ImageSet]
 
+    let standalone: Bool
+
     /// A version of the id that is safe to use in HTML and JavaScript
     private var htmlSafeId: String {
         ImageGallery.htmlSafe(id)
     }
 
-    init(id: String, images: [ImageSet]) {
+    init(id: String, images: [ImageSet], standalone: Bool = false) {
         self.id = id
         self.images = images
+        self.standalone = standalone
     }
 
     func populate(_ result: inout String) {
@@ -26,7 +29,7 @@ struct ImageGallery: HtmlProducer {
             return
         }
 
-        result += "<div id='\(htmlSafeId)' class='swiper'><div class='swiper-wrapper'>"
+        result += "<div id='\(htmlSafeId)' class='swiper\(standalone ? " swiper-standalone" : "")'><div class='swiper-wrapper'>"
 
         let needsPagination = images.count > 1
 
@@ -53,10 +56,27 @@ struct ImageGallery: HtmlProducer {
         id.replacingOccurrences(of: "-", with: "_")
     }
 
-    static func swiperInit(id: String) -> String {
+    var javascriptInit: String {
+        ImageGallery.swiperInit(id: id)
+    }
+
+    var standaloneFooter: String {
+        "<script> window.onload = () => {\n\(javascriptInit)\n}; </script>"
+    }
+
+    static func combinedFootor(ids: [String]) -> String {
+        var result = ["<script> window.onload = () => { "]
+        for id in ids {
+            result.append(swiperInit(id: id))
+        }
+        result.append("}; </script>")
+        return result.joined(separator: "\n")
+    }
+
+    private static func swiperInit(id: String) -> String {
         let id = htmlSafe(id)
         return """
-        var swiper_\(id) = new Swiper("#\(id)", {
+            var swiper_\(id) = new Swiper("#\(id)", {
               loop: true,
               lazy: {
                   loadPrevNext: false,
@@ -77,25 +97,3 @@ struct ImageGallery: HtmlProducer {
         """
     }
 }
-
-/*
-extension ImageGallery: HTML {
-
-    var content: some HTML {
-        div(.id(id), .class("swiper")) {
-            div(.class("swiper-wrapper")) {
-                for image in images {
-                    div(.class("swiper-slide")) {
-                        // TODO: Use different images based on device
-                        img(.src(image.mainImageUrl), .lazyLoad)
-                        div(.class("swiper-lazy-preloader"), .class("swiper-lazy-preloader-white")) { }
-                    }
-                }
-            }
-            div(.class("swiper-button-next")) { }
-            div(.class("swiper-button-prev")) { }
-            div(.class("swiper-pagination")) { }
-        }
-    }
-}
-*/

CHDataManagement/Views/Files/FileContentView.swift

@@ -59,7 +59,7 @@ struct FileContentView: View {
                     }.foregroundStyle(.secondary)
                 case .resource:
                     VStack {
-                        Image(systemSymbol: .docQuestionmark)
+                        Image(systemSymbol: .questionmarkTextPage)
                             .resizable()
                             .aspectRatio(contentMode: .fit)
                             .frame(width: iconSize)

CHDataManagement/Views/Files/FileToAddView.swift

@@ -10,7 +10,7 @@ struct FileToAddView: View {
 
     var symbol: SFSymbol {
         if file.idAlreadyExists {
-            return .docOnDoc
+            return .documentOnDocument
         }
         if file.isSelected {
             return .checkmarkCircleFill

CHDataManagement/Views/Files/TextFileContentView.swift

@@ -27,7 +27,7 @@ struct TextFileContentView: View {
                     .textEditorStyle(.plain)
                     .foregroundStyle(.primary)
             } else {
-                Image(systemSymbol: .docText)
+                Image(systemSymbol: .textDocument)
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(width: 150)

CHDataManagement/Views/Pages/Commands/Insert+Gallery.swift

@@ -0,0 +1,68 @@
+import SwiftUI
+import SFSafeSymbols
+
+struct InsertableGallery: View, InsertableCommandView {
+
+    static let title = "Gallery"
+
+    static let sheetTitle = "Insert an image gallery"
+
+    static let icon: SFSymbol = .photoStack
+
+    final class Model: InsertableCommandModel {
+
+        @Published
+        var images: [FileResource] = []
+
+        var isReady: Bool {
+            !images.isEmpty
+        }
+
+        init() {
+
+        }
+
+        var command: String? {
+            guard !images.isEmpty else {
+                return nil
+            }
+            return (
+                ["```\(GalleryBlock.blockId)"] +
+                images.map { $0.id } +
+                ["```"]
+            ).joined(separator: "\n")
+        }
+    }
+
+    @Environment(\.colorScheme)
+    private var colorScheme
+
+    @ObservedObject
+    private var model: Model
+
+    @State
+    private var showImagePicker = false
+
+    init(model: Model) {
+        self.model = model
+    }
+
+    var body: some View {
+        VStack(spacing: 2) {
+            ScrollView(.horizontal) {
+                HStack(alignment: .center, spacing: 8) {
+                    ForEach(model.images) { image in
+                        PostImageView(image: image)
+                    }
+                }
+            }
+            Button("Select images", action: { showImagePicker = true })
+            .padding(.vertical, 2)
+        }
+        .sheet(isPresented: $showImagePicker) {
+            MultiFileSelectionView(
+                selectedFiles: $model.images,
+                allowedType: .image)
+        }
+    }
+}

CHDataManagement/Views/Pages/Commands/InsertableItemsView.swift

@@ -7,6 +7,7 @@ struct InsertableItemsView: View {
             Text("Commands")
                 .font(.headline)
             InsertableView<InsertableImage>()
+            InsertableView<InsertableGallery>()
             InsertableView<InsertableLabels>()
             InsertableView<InsertableButtons>()
             InsertableView<InsertableLink>()

CHDataManagement/Views/Pages/PageContentResultsView.swift

@@ -68,13 +68,13 @@ struct PageContentResultsView: View {
         }
         + results.missingLinkedPages.keys.map {
             TextWithSymbol(
-                symbol: .doc,
+                symbol: .document,
                 color: .red,
                 text: $0)
         }
         + results.linkedPages.map {
             TextWithSymbol(
-                symbol: .docBadgePlus,
+                symbol: .documentBadgePlus,
                 color: .blue,
                 text: $0.title(in: language))
         }

CHDataManagement/Views/Settings/SettingsSection.swift

@@ -26,7 +26,7 @@ extension SettingsSection {
         case .paths: return .folder
         case .navigationBar: return .menubarArrowUpRectangle
         case .postFeed: return .rectangleGrid1x2
-        case .pages: return .docRichtext
+        case .pages: return .richtextPage
         case .tagOverview: return .tag
         case .audioPlayer: return .waveform
         }