From a0b4cf767ac5f7862ceedbb6fe8a5e418551de55 Mon Sep 17 00:00:00 2001
From: Serhiy Mytrovtsiy <mitrovtsiy@ukr.net>
Date: Sat, 21 Jan 2023 14:21:50 +0100
Subject: [PATCH] feat: enabled symbols instead of images for the menu

---
 Kit/helpers.swift          |  9 +++++++++
 Stats/Views/Settings.swift | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/Kit/helpers.swift b/Kit/helpers.swift
index b8b0de8c..a6e888f0 100644
--- a/Kit/helpers.swift
+++ b/Kit/helpers.swift
@@ -1368,3 +1368,12 @@ public func controlState(_ sender: NSControl) -> Bool {
     
     return state == .on
 }
+
+@available(macOS 11.0, *)
+public func iconFromSymbol(name: String, scale: NSImage.SymbolScale) -> NSImage? {
+    let config = NSImage.SymbolConfiguration(textStyle: .body, scale: scale)
+    if let symbol = NSImage(systemSymbolName: name, accessibilityDescription: nil) {
+        return symbol.withSymbolConfiguration(config)
+    }
+    return nil
+}
diff --git a/Stats/Views/Settings.swift b/Stats/Views/Settings.swift
index c0cb099c..8b42d5aa 100644
--- a/Stats/Views/Settings.swift
+++ b/Stats/Views/Settings.swift
@@ -293,19 +293,34 @@ private class SidebarView: NSStackView {
     }
     
     private var bugIcon: NSImage {
-        NSImage(named: NSImage.Name("bug"))!
+        if #available(macOS 12.0, *), let icon = iconFromSymbol(name: "ladybug", scale: .large) {
+            return icon
+        }
+        return NSImage(named: NSImage.Name("bug"))!
     }
     private var supportIcon: NSImage {
-        NSImage(named: NSImage.Name("donate"))!
+        if #available(macOS 12.0, *), let icon = iconFromSymbol(name: "heart.fill", scale: .large) {
+            return icon
+        }
+        return NSImage(named: NSImage.Name("donate"))!
     }
     private var pauseIcon: NSImage {
-        NSImage(named: NSImage.Name("pause"))!
+        if #available(macOS 11.0, *), let icon = iconFromSymbol(name: "pause.fill", scale: .large) {
+            return icon
+        }
+        return NSImage(named: NSImage.Name("pause"))!
     }
     private var resumeIcon: NSImage {
-        NSImage(named: NSImage.Name("resume"))!
+        if #available(macOS 11.0, *), let icon = iconFromSymbol(name: "play.fill", scale: .large) {
+            return icon
+        }
+        return NSImage(named: NSImage.Name("resume"))!
     }
     private var closeIcon: NSImage {
-        NSImage(named: NSImage.Name("power"))!
+        if #available(macOS 12.0, *), let icon = iconFromSymbol(name: "power", scale: .large) {
+            return icon
+        }
+        return NSImage(named: NSImage.Name("power"))!
     }
     
     override init(frame: NSRect) {
@@ -328,9 +343,11 @@ private class SidebarView: NSStackView {
         self.supportPopover.behavior = .transient
         self.supportPopover.contentViewController = self.supportView()
         
-        let additionalButtons: NSStackView = NSStackView(frame: NSRect(x: 0, y: 0, width: frame.width, height: 40))
+        let additionalButtons: NSStackView = NSStackView(frame: NSRect(x: 0, y: 0, width: frame.width, height: 45))
+        additionalButtons.heightAnchor.constraint(equalToConstant: 45).isActive = true
         additionalButtons.orientation = .horizontal
         additionalButtons.distribution = .fillEqually
+        additionalButtons.alignment = .centerY
         additionalButtons.spacing = 0
         
         let pauseButton = self.makeButton(title: localizedString("Pause the Stats"), image: self.pauseState ? self.resumeIcon : self.pauseIcon, action: #selector(togglePause))
@@ -386,10 +403,7 @@ private class SidebarView: NSStackView {
     }
     
     private func makeButton(title: String, image: NSImage, action: Selector) -> NSButton {
-        let button = NSButtonWithPadding()
-        button.frame = CGRect(x: 0, y: 0, width: 44, height: 44)
-        button.verticalPadding = 20
-        button.horizontalPadding = 20
+        let button = NSButton()
         button.title = title
         button.toolTip = title
         button.bezelStyle = .regularSquare
@@ -403,8 +417,9 @@ private class SidebarView: NSStackView {
         button.action = action
         button.target = self
         button.focusRingType = .none
+        button.widthAnchor.constraint(equalToConstant: 45).isActive = true
         
-        let rect = NSRect(x: 0, y: 0, width: 44, height: 44)
+        let rect = NSRect(x: 0, y: 0, width: 45, height: 45)
         let trackingArea = NSTrackingArea(
             rect: rect,
             options: [NSTrackingArea.Options.activeAlways, NSTrackingArea.Options.mouseEnteredAndExited, NSTrackingArea.Options.activeInActiveApp],