Sharper chord diagrams on export

Desbeers · Sep 7, 2023 · bf69726 · bf69726
1 parent f349c8a
commit bf69726
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Chord Provider/Export/ExportSong+render.swift b/Chord Provider/Export/ExportSong+render.swift
@@ -38,19 +38,22 @@ extension ExportSong {
     /// - Returns: The header as CGImage
     @MainActor
     static func renderChords(song: Song) -> CGImage? {
-        /// Size of the chord diagram
-        let frame = CGRect(x: 0, y: 0, width: 60, height: 80)
+        /// Size of the chord diagrams
+        let frame = CGRect(x: 0, y: 0, width: 180, height: 240)
+        /// The grid items
+        let gridItems = Array(repeating: GridItem(.fixed(60), spacing: 0), count: 10)
         /// Render the chords
         let renderer = ImageRenderer(
             content:
                 LazyVGrid(
-                    columns: [GridItem(.adaptive(minimum: frame.width ))],
+                    columns: gridItems,
                     alignment: .center,
-                    spacing: 4,
-                    pinnedViews: [.sectionHeaders, .sectionFooters]
+                    spacing: 4
                 ) {
                     ForEach(song.chords.sorted(using: KeyPathComparator(\.name))) { chord in
                         ChordDiagramView(chord: chord, frame: frame)
+                            .scaledToFit()
+                            .frame(width: 60)
                     }
                 }
                 .padding()

diff --git a/Chord Provider/Export/ExportSong.swift b/Chord Provider/Export/ExportSong.swift
@@ -107,7 +107,8 @@ enum ExportSong {
             pages.append(finalA4)
 #else
             let finalA4: SWIFTImage = UIGraphicsImageRenderer(size: pageSize).image { _ in
-                SWIFTImage(ciImage: page).draw(in: .init(origin: .zero, size: .init(width: rectToDrawIn.width, height: rectToDrawIn.height)))
+                SWIFTImage(ciImage: page)
+                    .draw(in: .init(origin: .zero, size: .init(width: rectToDrawIn.width, height: rectToDrawIn.height)))
             }
             pages.append(finalA4)
 #endif

diff --git a/Chord Provider/Views/ChordDiagramView.swift b/Chord Provider/Views/ChordDiagramView.swift
@@ -50,6 +50,8 @@ struct ChordDiagramView: View {
         )
         if let image = layer.image() {
             Image(swiftImage: image)
+                .resizable()
+                .aspectRatio(contentMode: .fit)
         }
     }
     /// The warning if we can't show a diagram