Use SwiftUI App entrypoint

josh · Feb 15, 2024 · 0e30cfa · 0e30cfa
1 parent d00b5ee
commit 0e30cfa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 35 deletions.
diff --git a/Aware.xcodeproj/project.pbxproj b/Aware.xcodeproj/project.pbxproj
@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		036DA9B52B7AF52E0066B4B2 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 036DA9B42B7AF52E0066B4B2 /* App.swift */; };
 		036EBD191C1408C200121D0B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 036EBD181C1408C200121D0B /* AppDelegate.swift */; };
 		036EBD1B1C1408C200121D0B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 036EBD1A1C1408C200121D0B /* Assets.xcassets */; };
-		036EBD1E1C1408C200121D0B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 036EBD1C1C1408C200121D0B /* MainMenu.xib */; };
 		03F9E2311C24CCA8001DBE86 /* CustomTimeIntervalFormatStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F9E2301C24CCA8001DBE86 /* CustomTimeIntervalFormatStyle.swift */; };
 		03F9E2331C24CD2E001DBE86 /* CustomTimeIntervalFormatStyleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F9E2321C24CD2E001DBE86 /* CustomTimeIntervalFormatStyleTests.swift */; };
 /* End PBXBuildFile section */
@@ -25,10 +25,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		036DA9B42B7AF52E0066B4B2 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
 		036EBD151C1408C200121D0B /* Aware.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Aware.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		036EBD181C1408C200121D0B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		036EBD1A1C1408C200121D0B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		036EBD1D1C1408C200121D0B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		038D0B381C4DDD5600040C44 /* Aware.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Aware.entitlements; sourceTree = "<group>"; };
 		03F9E2261C24CAD3001DBE86 /* AwareTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AwareTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		03F9E2301C24CCA8001DBE86 /* CustomTimeIntervalFormatStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTimeIntervalFormatStyle.swift; sourceTree = "<group>"; };
@@ -74,10 +74,10 @@
 		036EBD171C1408C200121D0B /* Aware */ = {
 			isa = PBXGroup;
 			children = (
+				036DA9B42B7AF52E0066B4B2 /* App.swift */,
 				036EBD181C1408C200121D0B /* AppDelegate.swift */,
 				03F9E2301C24CCA8001DBE86 /* CustomTimeIntervalFormatStyle.swift */,
 				036EBD1A1C1408C200121D0B /* Assets.xcassets */,
-				036EBD1C1C1408C200121D0B /* MainMenu.xib */,
 				038D0B381C4DDD5600040C44 /* Aware.entitlements */,
 			);
 			path = Aware;
@@ -184,7 +184,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				036EBD1B1C1408C200121D0B /* Assets.xcassets in Resources */,
-				036EBD1E1C1408C200121D0B /* MainMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -202,6 +201,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				036DA9B52B7AF52E0066B4B2 /* App.swift in Sources */,
 				03F9E2311C24CCA8001DBE86 /* CustomTimeIntervalFormatStyle.swift in Sources */,
 				036EBD191C1408C200121D0B /* AppDelegate.swift in Sources */,
 			);
@@ -225,17 +225,6 @@
 		};
 /* End PBXTargetDependency section */
 
-/* Begin PBXVariantGroup section */
-		036EBD1C1C1408C200121D0B /* MainMenu.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				036EBD1D1C1408C200121D0B /* Base */,
-			);
-			name = MainMenu.xib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
 		036EBD201C1408C200121D0B /* Debug */ = {
 			isa = XCBuildConfiguration;

diff --git a/Aware/App.swift b/Aware/App.swift
@@ -0,0 +1,17 @@
+//
+//  App.swift
+//  Aware
+//
+//  Created by Joshua Peek on 2/12/24.
+//
+
+import SwiftUI
+
+@main
+struct AwareApp: App {
+    @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+
+    var body: some Scene {
+        _EmptyScene()
+    }
+}
diff --git a/Aware/AppDelegate.swift b/Aware/AppDelegate.swift
@@ -6,9 +6,8 @@
 //  Copyright © 2015 Joshua Peek. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
-@NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
     var timerStart: Date = .init()
 
@@ -29,7 +28,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         return defaultsValue ?? type(of: self).defaultUserIdleSeconds
     }
 
-    let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+    lazy var statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
 
     func applicationDidFinishLaunching(_: Notification) {
         userIdleSeconds = readUserIdleSeconds()

diff --git a/Aware/Base.lproj/MainMenu.xib b/Aware/Base.lproj/MainMenu.xib