Merge branch 'main' into deployment-target-macOS-12

F1248 · Sep 19, 2024 · df8c7c4 · df8c7c4
2 parents f666c84 + db665f2
commit df8c7c4
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 32 deletions.
diff --git a/Genius/Localization/Localizable.xcstrings b/Genius/Localization/Localizable.xcstrings
@@ -39,6 +39,7 @@
       }
     },
     "Home" : {
+      "extractionState" : "manual",
       "localizations" : {
         "de" : {
           "stringUnit" : {

diff --git a/Genius/Types/AppDelegate.swift b/Genius/Types/AppDelegate.swift
@@ -11,4 +11,19 @@ import ObjectiveC
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationShouldTerminateAfterLastWindowClosed(_: NSApplication) -> Bool { true }
+
+    func applicationDockMenu(_: NSApplication) -> NSMenu? {
+        let dockMenu = NSMenu()
+        for tab in ContentViewTab.allCases {
+            let menuItem = NSMenuItem(title: tab.localizedString, action: #selector(changeTab(_:)), keyEquivalent: "")
+            menuItem.tag = tab.tag
+            dockMenu.addItem(menuItem)
+        }
+        return dockMenu
+    }
+
+    @objc
+    func changeTab(_ sender: NSMenuItem) {
+        sharedData.selectedTabIndex = sender.tag
+    }
 }
diff --git a/Genius/Types/SharedData.swift b/Genius/Types/SharedData.swift
@@ -0,0 +1,15 @@
+//
+//  SharedData.swift
+//  Genius
+//
+//  Created by F1248.
+//
+
+import Foundation
+
+class SharedData: ObservableObject {
+
+    @Published var selectedTabIndex = 0 // swiftlint:disable:this explicit_type_interface
+}
+
+nonisolated(unsafe) let sharedData = SharedData()
diff --git a/Genius/Views/Common/TabContentBuilder.swift b/Genius/Views/Common/TabContentBuilder.swift
@@ -8,6 +8,10 @@
 @resultBuilder
 enum TabContentBuilder {
 
+    static func buildBlock(_ tabs: [TabLegacy]) -> [TabLegacy] {
+        tabs
+    }
+
     static func buildBlock(_ tabs: TabLegacy...) -> [TabLegacy] {
         tabs
     }

diff --git a/Genius/Views/Common/TabViewLegacy.swift b/Genius/Views/Common/TabViewLegacy.swift
@@ -12,22 +12,24 @@ struct TabViewLegacy: View {
 
     let entireWindow: Bool
     let tabs: [TabLegacy]
+    var selectedTabIndexParameter: Binding<Int>?
 
-    @State private var selectedTab: TabLegacy
+    @State private var selectedTabIndexPrivate = 0 // swiftlint:disable:this explicit_type_interface
+
+    var selectedTab: TabLegacy { tabs[selectedTabIndexParameter?.wrappedValue ?? selectedTabIndexPrivate] }
 
     // swiftlint:disable:next type_contents_order
-    init?(entireWindow: Bool = false, @TabContentBuilder content: () -> [TabLegacy]) {
+    init?(selection: Binding<Int>? = nil, entireWindow: Bool = false, @TabContentBuilder content: () -> [TabLegacy]) {
+        self.selectedTabIndexParameter = selection
         self.entireWindow = entireWindow
         self.tabs = content()
-        guard let firstTab = tabs.first else { return nil }
-        self.selectedTab = firstTab
     }
 
     var picker: some View {
-        Picker(selection: $selectedTab) {
+        Picker(selection: selectedTabIndexParameter ?? $selectedTabIndexPrivate) {
             ForEach(tabs) { tab in
                 tab.title
-                    .tag(tab)
+                    .tag(tabs.firstIndex(of: tab)!) // swiftlint:disable:this force_unwrapping
             }
         }
         .pickerStyle(.segmented)

diff --git a/Genius/Views/ContentView.swift b/Genius/Views/ContentView.swift
@@ -10,39 +10,31 @@ import SwiftUICore
 
 struct ContentView: View {
 
+    @ObservedObject var observedSharedData: SharedData = sharedData
     @AppStorage("interfaceMode")
     var interfaceMode = Settings.InterfaceMode()
 
     var body: some View {
         if #available(macOS 15, *) {
-            TabView {
-                Tab("Home") {
-                    HomeView()
-                }
-                Tab("System Information", variesByInterfaceMode: true, viewInvalidator: interfaceMode) {
-                    SystemInformationView()
-                }
-                Tab("Maintenance") {
-                    MaintenanceView()
-                }
-                Tab("Settings") {
-                    SettingsView()
+            TabView(selection: $observedSharedData.selectedTabIndex) {
+                ForEach(ContentViewTab.allCases) { tab in
+                    Tab(
+                        tab.localizedStringKey,
+                        value: tab.tag,
+                        variesByInterfaceMode: tab.variesByInterfaceMode,
+                        viewInvalidator: tab.variesByInterfaceMode ? interfaceMode : nil
+                    ) { tab.content }
                 }
             }
             .frame(minWidth: 686, minHeight: 256)
         } else {
-            TabViewLegacy(entireWindow: true) {
-                TabLegacy("Home") {
-                    HomeView()
-                }
-                TabLegacy("System Information", variesByInterfaceMode: true, viewInvalidator: interfaceMode) {
-                    SystemInformationView()
-                }
-                TabLegacy("Maintenance") {
-                    MaintenanceView()
-                }
-                TabLegacy("Settings") {
-                    SettingsView()
+            TabViewLegacy(selection: $observedSharedData.selectedTabIndex, entireWindow: true) {
+                ContentViewTab.allCases.map { tab in
+                    TabLegacy(
+                        tab.localizedStringKey,
+                        variesByInterfaceMode: tab.variesByInterfaceMode,
+                        viewInvalidator: tab.variesByInterfaceMode ? interfaceMode : nil
+                    ) { tab.content }
                 }
             }
             .frame(minWidth: 686, minHeight: 256)

diff --git a/Genius/Views/Extensions/Tab.swift b/Genius/Views/Extensions/Tab.swift
@@ -9,15 +9,16 @@ import SwiftUI
 import SwiftUICore
 
 @available(macOS 15, *)
-extension Tab where Value == Never, Content: View, Label == SwiftUI.Label<Text, EmptyView> {
+extension Tab where Value: Hashable, Content: View, Label == SwiftUI.Label<Text, EmptyView> {
 
     init(
         _ titleKey: LocalizedStringKey,
+        value: Value,
         variesByInterfaceMode: Bool = false,
         viewInvalidator _: Any? = nil,
         content: () -> Content
     ) {
-        self.init(content: content) {
+        self.init(value: value, content: content) {
             Label {
                 Text(titleKey, variesByInterfaceMode: variesByInterfaceMode)
             } icon: {

diff --git a/Genius/Views/Types/ContentViewTab.swift b/Genius/Views/Types/ContentViewTab.swift
@@ -0,0 +1,37 @@
+//
+//  ContentViewTab.swift
+//  Genius
+//
+//  Created by F1248.
+//
+
+import SwiftUICore
+
+enum ContentViewTab: String, CaseIterable, Identifiable {
+
+    case home = "Home"
+    case systemInformation = "System Information"
+    case maintenance = "Maintenance"
+    case settings = "Settings"
+
+    var id: Self { self }
+    var tag: Int { Self.allCases.firstIndex(of: self)! } // swiftlint:disable:this force_unwrapping
+    var localizedString: String { rawValue.localized }
+    var localizedStringKey: LocalizedStringKey { LocalizedStringKey(rawValue) }
+
+    var content: AnyView {
+        switch self {
+        case .home: AnyView(HomeView())
+        case .systemInformation: AnyView(SystemInformationView())
+        case .maintenance: AnyView(MaintenanceView())
+        case .settings: AnyView(SettingsView())
+        }
+    }
+
+    var variesByInterfaceMode: Bool {
+        switch self {
+        case .systemInformation: true
+        default: false
+        }
+    }
+}