Move UI to AppBundle/ui folder. Rename TrayItemType. ExperimentalUISettings preview and name in 1 line

Author: mobile-ar

…s/AppBundle/ExperimentalUISettings.swift …ppBundle/ui/ExperimentalUISettings.swiftSources/AppBundle/ExperimentalUISettings.swift renamed to Sources/AppBundle/ui/ExperimentalUISettings.swift Sources/AppBundle/ExperimentalUISettings.swift renamed to Sources/AppBundle/ui/ExperimentalUISettings.swift

@@ -26,43 +26,40 @@ func getExperimentalUISettingsMenu(viewModel: TrayMenuModel) -> some View {
     let appearence = NSApplication.shared.effectiveAppearance.name
     let color = (appearence == .vibrantDark || appearence == .darkAqua) ? Color.white : Color.black
     return Menu {
-        Text("These settings are EXPERIMENTAL.")
-        Text("No stability guarantees are provided.")
-        Divider()
         Text("Menu bar style (macOS 14 or later):")
-        Text(MenuBarStyle.systemText.title)
         Button {
-            viewModel.experimentalUISettings.displayStyle = .systemText
+            viewModel.experimentalUISettings.displayStyle = .monospacedText
         } label: {
-            Toggle(isOn: .constant(viewModel.experimentalUISettings.displayStyle == .systemText)) {
-                MenuBarLabel(viewModel.trayText, textStyle: .system, color: color)
+            Toggle(isOn: .constant(viewModel.experimentalUISettings.displayStyle == .monospacedText)) {
+                MenuBarLabel(viewModel.trayText, color: color)
+                Text(" -  " + MenuBarStyle.monospacedText.title)
             }
         }
-        Text(MenuBarStyle.monospacedText.title)
         Button {
-            viewModel.experimentalUISettings.displayStyle = .monospacedText
+            viewModel.experimentalUISettings.displayStyle = .systemText
         } label: {
-            Toggle(isOn: .constant(viewModel.experimentalUISettings.displayStyle == .monospacedText)) {
-                MenuBarLabel(viewModel.trayText, color: color)
+            Toggle(isOn: .constant(viewModel.experimentalUISettings.displayStyle == .systemText)) {
+                MenuBarLabel(viewModel.trayText, textStyle: .system, color: color)
+                Text(" -  " + MenuBarStyle.systemText.title)
             }
         }
-        Text(MenuBarStyle.squares.title)
         Button {
             viewModel.experimentalUISettings.displayStyle = .squares
         } label: {
             Toggle(isOn: .constant(viewModel.experimentalUISettings.displayStyle == .squares)) {
                 MenuBarLabel(viewModel.trayText, color: color, trayItems: viewModel.trayItems)
+                Text(" -  " + MenuBarStyle.squares.title)
             }
         }
-        Text(MenuBarStyle.i3.title)
         Button {
             viewModel.experimentalUISettings.displayStyle = .i3
         } label: {
             Toggle(isOn: .constant(viewModel.experimentalUISettings.displayStyle == .i3)) {
                 MenuBarLabel(viewModel.trayText, color: color, trayItems: viewModel.trayItems, workspaces: viewModel.workspaces)
+                Text(" -  " + MenuBarStyle.i3.title)
             }
         }
     } label: {
-        Text("Experimental UI Settings")
+        Text("Experimental UI Settings (No stability guarantees)")
     }
 }

Sources/AppBundle/MenuBar.swift Sources/AppBundle/ui/MenuBar.swiftSources/AppBundle/MenuBar.swift renamed to Sources/AppBundle/ui/MenuBar.swift

@@ -65,10 +65,10 @@ public func menuBar(viewModel: TrayMenuModel) -> some Scene { // todo should it
     } label: {
         if viewModel.isEnabled {
             switch viewModel.experimentalUISettings.displayStyle {
-                case .systemText:
-                    MenuBarLabel(viewModel.trayText, textStyle: .system)
                 case .monospacedText:
                     MenuBarLabel(viewModel.trayText)
+                case .systemText:
+                    MenuBarLabel(viewModel.trayText, textStyle: .system)
                 case .squares:
                     MenuBarLabel(viewModel.trayText, trayItems: viewModel.trayItems)
                 case .i3:
@@ -134,9 +134,9 @@ struct MenuBarLabel: View {
                                 .bold()
                         }
                     }
-                    if workspaces != nil {
-                        let otherWorkspaces = Workspace.all.filter { workspace in
-                            !workspace.isEffectivelyEmpty && !trayItems.contains(where: { item in item.type == .monitor && item.name == workspace.name })
+                    if let workspaces {
+                        let otherWorkspaces = workspaces.filter { workspace in
+                            !workspace.isEffectivelyEmpty && !trayItems.contains(where: { item in item.type == .workspace && item.name == workspace.name })
                         }
                         if !otherWorkspaces.isEmpty {
                             Group {
@@ -146,7 +146,7 @@ struct MenuBarLabel: View {
                                     .bold()
                                     .padding(.bottom, 2)
                                 ForEach(otherWorkspaces, id: \.name) { item in
-                                    itemView(for: TrayItem(type: .monitor, name: item.name, isActive: false))
+                                    itemView(for: TrayItem(type: .workspace, name: item.name, isActive: false))
                                 }
                             }
                             .opacity(0.6)

Sources/AppBundle/TrayMenuModel.swift Sources/AppBundle/ui/TrayMenuModel.swiftSources/AppBundle/TrayMenuModel.swift renamed to Sources/AppBundle/ui/TrayMenuModel.swift

@@ -25,10 +25,10 @@ public class TrayMenuModel: ObservableObject {
         .joined(separator: " │ ")
     TrayMenuModel.shared.workspaces = Workspace.all.map {
         let monitor = $0.isVisible || !$0.isEffectivelyEmpty ? " - \($0.workspaceMonitor.name)" : ""
-        return WorkspaceViewModel(name: $0.name, suffix: monitor, isFocused: focus.workspace == $0)
+        return WorkspaceViewModel(name: $0.name, suffix: monitor, isFocused: focus.workspace == $0, isEffectivelyEmpty: $0.isEffectivelyEmpty)
     }
     var items = sortedMonitors.map {
-        TrayItem(type: .monitor, name: $0.activeWorkspace.name, isActive: $0.activeWorkspace == focus.workspace && sortedMonitors.count > 1)
+        TrayItem(type: .workspace, name: $0.activeWorkspace.name, isActive: $0.activeWorkspace == focus.workspace && sortedMonitors.count > 1)
     }
     let mode = activeMode?.takeIf { $0 != mainModeId }?.first?.lets { TrayItem(type: .mode, name: $0.uppercased(), isActive: true) }
     if let mode {
@@ -41,29 +41,30 @@ struct WorkspaceViewModel: Hashable {
     let name: String
     let suffix: String
     let isFocused: Bool
+    let isEffectivelyEmpty: Bool
 }
 
 enum TrayItemType: String, Hashable {
     case mode
-    case monitor
+    case workspace
 }
 
-private let validNumbers = "0" ... "9"
+private let validNumbers = (0 ... 50).map { String($0) }
 private let validLetters = "A" ... "Z"
 
 struct TrayItem: Hashable, Identifiable {
     let type: TrayItemType
     let name: String
     let isActive: Bool
     var systemImageName: String? {
-        // System image type is only valid for single number and single capital char workspace name
-        guard name.count == 1 else { return nil }
+        // System image type is only valid for numbers 0 to 50 and single capital char workspace name
+        guard name.count <= 2 else { return nil }
         guard validNumbers.contains(name) || validLetters.contains(name) else { return nil }
         let lowercasedName = name.lowercased()
         switch type {
             case .mode:
                 return "\(lowercasedName).circle"
-            case .monitor:
+            case .workspace:
                 if isActive {
                     return "\(lowercasedName).square.fill"
                 } else {