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

F1248 · Aug 25, 2024 · e38735d · e38735d
2 parents 1e93400 + 79adb27
commit e38735d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 55 deletions.
diff --git a/Genius/GeniusApp.swift b/Genius/GeniusApp.swift
@@ -14,11 +14,7 @@ struct GeniusApp: App {
 
     var body: some Scene {
         WindowGroup {
-            if #available(macOS 15, *) {
-                ContentView()
-            } else {
-                ContentViewLegacy()
-            }
+            ContentView()
         }
         .windowToolbarStyle(.unified(showsTitle: false))
         .commands {

diff --git a/Genius/Views/ContentView.swift b/Genius/Views/ContentView.swift
@@ -7,32 +7,48 @@
 
 import SwiftUI
 
-@available(macOS 15, *)
 struct ContentView: View {
 
     @AppStorage("interfaceMode")
     var interfaceMode = Settings.InterfaceMode()
 
     var body: some View {
-        TabView {
-            Tab("Home") {
-                HomeView()
+        if #available(macOS 15, *) {
+            TabView {
+                Tab("Home") {
+                    HomeView()
+                }
+                Tab(interfaceMode >= .simple ? "System Information" : "Information") {
+                    SystemInformationView()
+                }
+                Tab("Maintenance") {
+                    MaintenanceView()
+                }
+                Tab("Settings") {
+                    SettingsView()
+                }
             }
-            Tab(interfaceMode >= .simple ? "System Information" : "Information") {
-                SystemInformationView()
-            }
-            Tab("Maintenance") {
-                MaintenanceView()
-            }
-            Tab("Settings") {
-                SettingsView()
+            .frame(minWidth: 686, minHeight: 256)
+        } else {
+            TabViewLegacy(entireWindow: true) {
+                TabLegacy("Home") {
+                    HomeView()
+                }
+                TabLegacy(interfaceMode >= .simple ? "System Information" : "Information") {
+                    SystemInformationView()
+                }
+                TabLegacy("Maintenance") {
+                    MaintenanceView()
+                }
+                TabLegacy("Settings") {
+                    SettingsView()
+                }
             }
+            .frame(minWidth: 686, minHeight: 256)
         }
-        .frame(minWidth: 686, minHeight: 256)
     }
 }
 
-@available(macOS 15, *)
 #Preview {
     ContentView()
 }
diff --git a/Genius/Views/ContentViewLegacy.swift b/Genius/Views/ContentViewLegacy.swift