fix: use enum and it's accomodations for menu icons

Author: schrobingus

MiniSim.xcodeproj/project.pbxproj

@@ -76,6 +76,7 @@
 		76F2A9172991B7B6002D4EF6 /* ViewModifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76F2A9162991B7B6002D4EF6 /* ViewModifiers.swift */; };
 		76F2A91929924242002D4EF6 /* AndroidSubMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76F2A91829924242002D4EF6 /* AndroidSubMenuItem.swift */; };
 		76FCABAB29B390D5003BBF9A /* Collection+get.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76FCABAA29B390D5003BBF9A /* Collection+get.swift */; };
+		84B1A6B42AE4532B00803FA7 /* MenuIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B1A6B32AE4532B00803FA7 /* MenuIcons.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -144,6 +145,7 @@
 		76F2A9162991B7B6002D4EF6 /* ViewModifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModifiers.swift; sourceTree = "<group>"; };
 		76F2A91829924242002D4EF6 /* AndroidSubMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AndroidSubMenuItem.swift; sourceTree = "<group>"; };
 		76FCABAA29B390D5003BBF9A /* Collection+get.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+get.swift"; sourceTree = "<group>"; };
+		84B1A6B32AE4532B00803FA7 /* MenuIcons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuIcons.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -178,6 +180,7 @@
 				76FCABAA29B390D5003BBF9A /* Collection+get.swift */,
 				76E4451329D4403F00039025 /* NSNotificationName.swift */,
 				767F713129D574EF004159A6 /* UNUserNotificationCenter+showNotification.swift */,
+				84B1A6B32AE4532B00803FA7 /* MenuIcons.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -493,6 +496,7 @@
 				763121902A12B45000EE7F48 /* CustomCommandFormViewModel.swift in Sources */,
 				7630B2772986D65800D8B57D /* Bundle+appName.swift in Sources */,
 				763121892A12AF9C00EE7F48 /* Command.swift in Sources */,
+				84B1A6B42AE4532B00803FA7 /* MenuIcons.swift in Sources */,
 				767DDF6829D32ABC005E6F32 /* ReadyPopOver.swift in Sources */,
 				764BA3E92A5AD418003A78AF /* GetDevicesCommand.swift in Sources */,
 				76059BF92AD558C30008D38B /* SetupItemView.swift in Sources */,
@@ -646,7 +650,7 @@
 				CURRENT_PROJECT_VERSION = 12;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"MiniSim/Preview Content\"";
-				DEVELOPMENT_TEAM = Z3M9P6G4WY;
+				DEVELOPMENT_TEAM = S5FW7JRR79;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -682,7 +686,7 @@
 				CURRENT_PROJECT_VERSION = 12;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"MiniSim/Preview Content\"";
-				DEVELOPMENT_TEAM = Z3M9P6G4WY;
+				DEVELOPMENT_TEAM = S5FW7JRR79;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;

MiniSim/.DS_Store

@@ -0,0 +1,7 @@
+import Foundation
+
+enum MenuImage: String, CaseIterable {
+    case iphone = "iphone"
+    case ipad = "ipad"
+    case box = "box"
+}

MiniSim/Assets.xcassets/.DS_Store

@@ -15,7 +15,7 @@ extension UserDefaults {
         static let isOnboardingFinished = "isOnboardingFinished"
         static let enableiOSSimulators = "enableiOSSimulators"
         static let enableAndroidEmulators = "enableAndroidEmulators"
-        static let menuImage = "menu_icon_1"
+        static let menuImage = "menuImage"
     }
 
     @objc dynamic public var androidHome: String? {
@@ -29,7 +29,7 @@ extension UserDefaults {
     }
 
     @objc dynamic public var menuImage: String {
-        get { string(forKey: Keys.menuImage) ?? "menu_icon_1" }
+        get { string(forKey: Keys.menuImage) ?? "iphone" }
         set { set(newValue, forKey: Keys.menuImage) }
     }
 

MiniSim/Assets.xcassets/menu_icon_3.imageset/Contents.json MiniSim/Assets.xcassets/box.imageset/Contents.json

@@ -19,8 +19,6 @@ class MiniSim: NSObject {
     private var isOnboardingFinishedObserver: NSKeyValueObservation?
     private var menuImageObserver: NSKeyValueObservation?
 
-    private var menuImagesObserved: [String] = []
-    
     private lazy var onboarding = Onboarding()
 
     override init() {
@@ -87,6 +85,7 @@ class MiniSim: NSObject {
         }
         menu = Menu()
         statusItem.menu = menu
+        configureMenuImages()
         setMenuImage()
         populateSections()
 
@@ -113,18 +112,21 @@ class MiniSim: NSObject {
             UserDefaults.Keys.enableiOSSimulators: true
         ])
     }
+   
+    private func configureMenuImages() {
+        MenuImage.allCases.forEach { image in
+            let itemImage = NSImage(imageLiteralResourceName: image.rawValue)
+            itemImage.size = NSSize(
+                width:  (itemImage.size.width)  * 0.78,
+                height: (itemImage.size.height) * 0.78)
+            itemImage.isTemplate = true
+        }
+    }
 
     private func setMenuImage() {
         if let button = statusItem.button {
             button.toolTip = "MiniSim"
             let itemImage = NSImage(named: UserDefaults.standard.menuImage)
-            if (!menuImagesObserved.contains(UserDefaults.standard.menuImage)) {
-                itemImage?.size = NSSize(
-                    width:  (itemImage?.size.width  ?? 16) * 0.78,
-                    height: (itemImage?.size.height ?? 16) * 0.78)
-                menuImagesObserved.append(UserDefaults.standard.menuImage)
-            }
-            itemImage?.isTemplate = true
             button.image = itemImage
         }
     }

MiniSim/Assets.xcassets/menu_icon_3.imageset/[email protected] MiniSim/Assets.xcassets/box.imageset/[email protected]

@@ -11,22 +11,20 @@ import KeyboardShortcuts
 import LaunchAtLogin
 
 struct Preferences: View {
-    var menuImages = [ "menu_icon_1", "menu_icon_2", "menu_icon_3" ]
-    @State var menuImageSelected = 0
+    @State var menuImageSelected: String = "iphone"
 
     var body: some View {
         Settings.Container(contentWidth: 400) {
             Settings.Section(title: "Icon:") {
                 Picker("", selection: $menuImageSelected) {
-                    ForEach(0 ..< menuImages.count, id: \.self) { image in
-                        Image(menuImages[image])
-                            .renderingMode(.template)
-                            .tag(image)
+                    ForEach(MenuImage.allCases, id: \.self) { image in
+                        Image(nsImage: NSImage(imageLiteralResourceName: image.rawValue))
+                            .tag(image.rawValue)
                     }
                 }
-                .pickerStyle(.radioGroup)
+                .fixedSize(horizontal: true, vertical: false)
                 .onChange(of: menuImageSelected) { _ in
-                    UserDefaults.standard.menuImage = menuImages[menuImageSelected]
+                    UserDefaults.standard.menuImage = menuImageSelected
                 }
                 Text("The icon displayed in the Menu Bar.")
                     .descriptionText()
@@ -50,9 +48,9 @@ struct Preferences: View {
         }
         .frame(minWidth: 650, minHeight: 450)
         .onAppear {
-            for image in 0 ..< menuImages.count {
-                if (UserDefaults.standard.menuImage == menuImages[image]) {
-                    menuImageSelected = image
+            MenuImage.allCases.forEach { image in
+                if (UserDefaults.standard.menuImage == image.rawValue) {
+                    menuImageSelected = image.rawValue
                 }
             }
         }