🚚 Move files around

PHP Monitor.xcodeproj/project.pbxproj

@@ -27,8 +27,9 @@
 		C4811D2A22D70F9A00B5F6B3 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */; };
 		C48D0C9025CC7FD000CC7490 /* StatsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C48D0C8F25CC7FD000CC7490 /* StatsView.xib */; };
 		C48D0C9325CC804200CC7490 /* XibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0C9225CC804200CC7490 /* XibLoadable.swift */; };
-		C48D0C9625CC80B100CC7490 /* XibViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0C9525CC80B100CC7490 /* XibViews.swift */; };
+		C48D0C9625CC80B100CC7490 /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0C9525CC80B100CC7490 /* HeaderView.swift */; };
 		C48D0C9A25CC888B00CC7490 /* HeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C48D0C9925CC888B00CC7490 /* HeaderView.xib */; };
+		C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0CA225CC992000CC7490 /* StatsView.swift */; };
 		C49EAB46259FC305007F6C3B /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EAB45259FC305007F6C3B /* Paths.swift */; };
 		C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; };
 		C4D8016622B1584700C6DA1B /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; };
@@ -60,8 +61,9 @@
 		C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = "<group>"; };
 		C48D0C8F25CC7FD000CC7490 /* StatsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StatsView.xib; sourceTree = "<group>"; };
 		C48D0C9225CC804200CC7490 /* XibLoadable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XibLoadable.swift; sourceTree = "<group>"; };
-		C48D0C9525CC80B100CC7490 /* XibViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XibViews.swift; sourceTree = "<group>"; };
+		C48D0C9525CC80B100CC7490 /* HeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = "<group>"; };
 		C48D0C9925CC888B00CC7490 /* HeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HeaderView.xib; sourceTree = "<group>"; };
+		C48D0CA225CC992000CC7490 /* StatsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsView.swift; sourceTree = "<group>"; };
 		C49EAB45259FC305007F6C3B /* Paths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Paths.swift; sourceTree = "<group>"; };
 		C4ACA38E25C754C100060C66 /* PhpExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtension.swift; sourceTree = "<group>"; };
 		C4D8016522B1584700C6DA1B /* Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Startup.swift; sourceTree = "<group>"; };
@@ -116,10 +118,7 @@
 			children = (
 				C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */,
 				C4EE188322D3386B00E126E5 /* Constants.swift */,
-				C4811D2622D70CEF00B5F6B3 /* Singletons */,
+				C41E181722CB61EB0072CF09 /* Domain */,
-				C41E181722CB61EB0072CF09 /* Classes */,
-				C41E181822CB62200072CF09 /* View Controllers */,
-				C4F8C0A222D4F100002EFE61 /* Extensions */,
 				C41C1B3F22B0098000E7CF16 /* Info.plist */,
 				C41C1B4022B0098000E7CF16 /* phpmon.entitlements */,
 				C41C1B3A22B0098000E7CF16 /* Assets.xcassets */,
@@ -129,32 +128,27 @@
 			path = phpmon;
 			sourceTree = "<group>";
 		};
-		C41E181722CB61EB0072CF09 /* Classes */ = {
+		C41E181722CB61EB0072CF09 /* Domain */ = {
 			isa = PBXGroup;
 			children = (
+				C4811D2622D70CEF00B5F6B3 /* Singletons */,
 				C4B13B1D25C4915000548C3A /* Core */,
 				C47331A0247093AC009A0597 /* Menu */,
 				C4811D2722D70D8E00B5F6B3 /* Commands */,
 				C4811D2822D70D9C00B5F6B3 /* Helpers */,
+				C4F8C0A222D4F100002EFE61 /* Extensions */,
 			);
-			path = Classes;
+			path = Domain;
-			sourceTree = "<group>";
-		};
-		C41E181822CB62200072CF09 /* View Controllers */ = {
-			isa = PBXGroup;
-			children = (
-				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
-			);
-			path = "View Controllers";
 			sourceTree = "<group>";
 		};
 		C47331A0247093AC009A0597 /* Menu */ = {
 			isa = PBXGroup;
 			children = (
 				C47331A1247093B7009A0597 /* StatusMenu.swift */,
+				C48D0C9525CC80B100CC7490 /* HeaderView.swift */,
 				C48D0C9925CC888B00CC7490 /* HeaderView.xib */,
+				C48D0CA225CC992000CC7490 /* StatsView.swift */,
 				C48D0C8F25CC7FD000CC7490 /* StatsView.xib */,
-				C48D0C9525CC80B100CC7490 /* XibViews.swift */,
 			);
 			path = Menu;
 			sourceTree = "<group>";
@@ -193,6 +187,7 @@
 		C4B13B1D25C4915000548C3A /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
 				C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */,
 				C41C1B4A22B019FF00E7CF16 /* PhpInstall.swift */,
 				C4ACA38E25C754C100060C66 /* PhpExtension.swift */,
@@ -290,6 +285,7 @@
 				C4F8C0A422D4F12C002EFE61 /* DateExtension.swift in Sources */,
 				C41C1B4722B009A400E7CF16 /* Shell.swift in Sources */,
 				C41C1B4D22B0215A00E7CF16 /* Actions.swift in Sources */,
+				C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */,
 				C42295DD2358D02000E263B2 /* Command.swift in Sources */,
 				C4811D2422D70A4700B5F6B3 /* App.swift in Sources */,
 				C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */,
@@ -301,7 +297,7 @@
 				C49EAB46259FC305007F6C3B /* Paths.swift in Sources */,
 				C476FF9822B0DD830098105B /* Alert.swift in Sources */,
 				C474B00624C0E98C00066A22 /* LocalNotification.swift in Sources */,
-				C48D0C9625CC80B100CC7490 /* XibViews.swift in Sources */,
+				C48D0C9625CC80B100CC7490 /* HeaderView.swift in Sources */,
 				C47331A2247093B7009A0597 /* StatusMenu.swift in Sources */,
 				C46FA23F246C358E00944F05 /* StringExtension.swift in Sources */,
 				C4EE188422D3386B00E126E5 /* Constants.swift in Sources */,

phpmon/Domain/Menu/HeaderView.swift

@@ -0,0 +1,23 @@
+//
+//  HeaderView.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 04/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class HeaderView: NSView, XibLoadable {
+    @IBOutlet weak var textField: NSTextField!
+    
+    static func asMenuItem(text: String) -> NSMenuItem {
+        let view = Self.createFromXib()
+        view!.textField.stringValue = text.uppercased()
+        let item = NSMenuItem()
+        item.view = view
+        item.target = self
+        return item
+    }
+}

phpmon/Domain/Menu/StatsView.swift

@@ -32,15 +32,3 @@ class StatsView: NSView, XibLoadable {
         return item
     }
 }
-class HeaderView: NSView, XibLoadable {
-    @IBOutlet weak var textField: NSTextField!
-    
-    static func asMenuItem(text: String) -> NSMenuItem {
-        let view = Self.createFromXib()
-        view!.textField.stringValue = text.uppercased()
-        let item = NSMenuItem()
-        item.view = view
-        item.target = self
-        return item
-    }
-}