Merge pull request #5 from Shakshi3104/develop

Support M2 and improved features

Author: Shakshi3104

Gaufre.xcodeproj/project.pbxproj

@@ -316,7 +316,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 3.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.shakshi.macos.Gaufre;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -345,7 +345,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 3.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.shakshi.macos.Gaufre;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

Gaufre/AppDelegate.swift

@@ -35,8 +35,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     // MARK: - Build status bar
     func buildMenu() {
 
+        // if Intel Mac, status bar icon is fill icon
+        let statusBarSymbolName = MacDeviceHardware.deviceHardware.processorName.contains("Apple") ? "grid.circle" : "grid.circle.fill"
+        
         if let statusBarButton = statusItem.button {
-            statusBarButton.image = NSImage(systemSymbolName: "grid.circle",
+            statusBarButton.image = NSImage(systemSymbolName: statusBarSymbolName,
                                             accessibilityDescription: "app icon")
             statusBarButton.image?.size = NSSize(width: 18.0, height: 18.0)
             statusBarButton.image?.isTemplate = true
@@ -55,8 +58,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         wafersView = NSHostingView(rootView: WafersView(processor: processor) .scaleEffect(0.55))
         #endif
 
-        let width = coreCount < 30 ? 20 * coreCount + 40 : 20 * coreCount / 2 + 40
-        let height = coreCount < 30 ? 100 : 160
+        let width = coreCount < 30 ? 20 * coreCount + 45 : 20 * coreCount / 2 + 45
+        let height = coreCount < 30 ? 90 : 160
 
         wafersView.frame = NSRect(x: 0, y: 0, width: width, height: height)
 
@@ -67,6 +70,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let mainMenu = NSMenu()
         mainMenu.addItem(coreInfoItem)
 
+        // Processor name
+        let processorName: String
+        #if DEBUG
+        processorName = "DEBUG"
+        #else
+        processorName = MacDeviceHardware.deviceHardware.processorName
+        #endif
+        mainMenu.addItem(withTitle: processorName, action: nil, keyEquivalent: "")
+        
         // separater
         mainMenu.addItem(NSMenuItem.separator())