Merge branch 'deployment-target-macOS-13' into deployment-target-macO…

…S-14
F1248 · Sep 19, 2024 · a1588c1 · a1588c1
2 parents f12bde3 + 96a3172
commit a1588c1
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 10 deletions.
diff --git a/Genius/Views/Common/TabLegacy.swift b/Genius/Views/Common/TabLegacy.swift
@@ -14,8 +14,13 @@ struct TabLegacy: Hashable, Identifiable {
     let title: Text
     let content: AnyView
 
-    init(_ titleKey: LocalizedStringKey, tableName: String? = nil, content: () -> any View) {
-        self.title = Text(titleKey, tableName: tableName)
+    init(
+        _ titleKey: LocalizedStringKey,
+        variesByInterfaceMode: Bool = false,
+        viewInvalidator _: Any? = nil,
+        content: () -> any View
+    ) {
+        self.title = Text(titleKey, variesByInterfaceMode: variesByInterfaceMode)
         self.content = AnyView(content())
     }
 

diff --git a/Genius/Views/ContentView.swift b/Genius/Views/ContentView.swift
@@ -19,7 +19,7 @@ struct ContentView: View {
                 Tab("Home") {
                     HomeView()
                 }
-                Tab("System Information", tableName: interfaceMode.localizationTable) {
+                Tab("System Information", variesByInterfaceMode: true, viewInvalidator: interfaceMode) {
                     SystemInformationView()
                 }
                 Tab("Maintenance") {
@@ -35,7 +35,7 @@ struct ContentView: View {
                 TabLegacy("Home") {
                     HomeView()
                 }
-                TabLegacy("System Information", tableName: interfaceMode.localizationTable) {
+                TabLegacy("System Information", variesByInterfaceMode: true, viewInvalidator: interfaceMode) {
                     SystemInformationView()
                 }
                 TabLegacy("Maintenance") {

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

diff --git a/Genius/Views/Extensions/Text.swift b/Genius/Views/Extensions/Text.swift
@@ -0,0 +1,18 @@
+//
+//  Text.swift
+//  Genius
+//
+//  Created by F1248.
+//
+
+import SwiftUI
+import SwiftUICore
+
+extension Text {
+
+    init(_ key: LocalizedStringKey, variesByInterfaceMode: Bool) {
+        @AppStorage("interfaceMode")
+        var interfaceMode = Settings.InterfaceMode()
+        self.init(key, tableName: variesByInterfaceMode ? interfaceMode.localizationTable : nil)
+    }
+}
diff --git a/Genius/Views/SystemInformation/SystemInformationView.swift b/Genius/Views/SystemInformation/SystemInformationView.swift
@@ -10,12 +10,9 @@ import SwiftUICore
 
 struct SystemInformationView: View {
 
-    @AppStorage("interfaceMode")
-    var interfaceMode = Settings.InterfaceMode()
-
     var body: some View {
         VStack {
-            Text("System Information", tableName: interfaceMode.localizationTable)
+            Text("System Information", variesByInterfaceMode: true)
                 .font(.largeTitle)
                 .padding()
         }