Improve icons in PDF song details

Desbeers · Feb 17, 2025 · a43677c · a43677c
1 parent d69ce23
commit a43677c
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 26 deletions.
diff --git a/Chord Provider/PDFBuild/SongElements/PDFBuild+SongDetails.swift b/Chord Provider/PDFBuild/SongElements/PDFBuild+SongDetails.swift
@@ -41,6 +41,9 @@ extension PDFBuild {
             if let time = song.metadata.time {
                 items.append(detailLabel(icon: "time", label: time))
             }
+            if let tempo = song.metadata.tempo {
+                items.append(detailLabel(icon: "tempo", label: "\(tempo) bpm"))
+            }
             /// Draw the details
             let textBounds = items.boundingRect(with: rect.size, options: .usesLineFragmentOrigin)
             if !calculationOnly {
@@ -59,11 +62,16 @@ extension PDFBuild {
         private func detailLabel(icon: String, label: String) -> NSAttributedString {
             let imageAttachment = NSTextAttachment()
             imageAttachment.image = NSImage(named: icon)
+            let imageSize = imageAttachment.image?.size ?? .init()
+            imageAttachment.bounds = CGRect(
+                x: CGFloat(0),
+                y: (NSFont.systemFont(ofSize: 8, weight: .regular).capHeight - imageSize.height) / 2,
+                width: imageSize.width,
+                height: imageSize.height
+            )
             let result = NSMutableAttributedString()
             result.append(NSAttributedString(attachment: imageAttachment, attributes: .alignment(.center)))
-            result.append(NSAttributedString(string: " "))
-            result.append(NSAttributedString(string: label, attributes: .songDetailLabel))
-            result.append(NSAttributedString(string: "  "))
+            result.append(NSAttributedString(string: " \(label)   ", attributes: .songDetailLabel))
             return result
         }
     }

diff --git a/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/capo.imageset/Contents.json b/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/capo.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "paperclip-svgrepo-com.svg",
+      "filename" : "capo.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/...s/capo.imageset/paperclip-svgrepo-com.svg → ...s/SongDetailsIcons/capo.imageset/capo.svg b/...s/capo.imageset/paperclip-svgrepo-com.svg → ...s/SongDetailsIcons/capo.imageset/capo.svg
diff --git a/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/instrument.imageset/Contents.json b/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/instrument.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "acoustic-guitar-illustration-1-svgrepo-com.svg",
+      "filename" : "instrument.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/...tic-guitar-illustration-1-svgrepo-com.svg → ...sIcons/instrument.imageset/instrument.svg b/...tic-guitar-illustration-1-svgrepo-com.svg → ...sIcons/instrument.imageset/instrument.svg
diff --git a/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/key.imageset/Contents.json b/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/key.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "key-svgrepo-com.svg",
+      "filename" : "key.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/...ilsIcons/key.imageset/key-svgrepo-com.svg → ...ets/SongDetailsIcons/key.imageset/key.svg b/...ilsIcons/key.imageset/key-svgrepo-com.svg → ...ets/SongDetailsIcons/key.imageset/key.svg
diff --git a/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/tempo.imageset/Contents.json b/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/tempo.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tempo.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/tempo.imageset/tempo.svg b/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/tempo.imageset/tempo.svg
diff --git a/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/time.imageset/Contents.json b/Chord Provider/Resources/Assets.xcassets/SongDetailsIcons/time.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "time-svgrepo-com.svg",
+      "filename" : "time.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/...sIcons/time.imageset/time-svgrepo-com.svg → ...s/SongDetailsIcons/time.imageset/time.svg b/...sIcons/time.imageset/time-svgrepo-com.svg → ...s/SongDetailsIcons/time.imageset/time.svg