Split views into files

alin23 · Sep 17, 2023 · 503c38a · 503c38a
1 parent e11e2bd
commit 503c38a
Show file tree

Hide file tree

Showing 52 changed files with 2,781 additions and 2,898 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,5 @@ Lunar/DDC/DDC2.h
 Lunar/DDC/DDC2.c
 old_updates
 .ruby-lsp
+Retired.swift
+Lunar/required.swift
diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
@@ -1,9 +1,10 @@
 Lunar/Resources/dsa_priv.pem:4724e8ee0055cf3ddc55ca528691955d68879ec8abaafd3200cdfa20298ea1d9
 Lunar/Resources/eddsa_priv:d079018c2b1c003c9e239ea8f8cc999b7d98adfd0616911ba0263dd20629e646
-Lunar/Modes/SensorMode.swift:9f798c2648117de29c66ed008ff85f699bccec3e018118f3a0473501585e2afe
-Lunar/Modes/SyncMode.swift:923d6e3fda70191799b9247db94e96a7f407fcd74d7c57e7a2e39198caebd62e
+Lunar/Modes/SensorMode.swift:5463b100b6cea38f5f9475e30832286a7c502e279182f3cc9530c4730ae7843a
+Lunar/Modes/SyncMode.swift:8bfee97d9fc77e674ce4adff7aecb7c70d5c7734d8453db403c80f43af453fe7
 Lunar/Modes/LocationMode.swift:b76654d4be9bcad914ef5cb5d91cf5dcb6b6fa3e152da84f17402b9ac7accb61
-Lunar/Data/Pro.swift:961e08602ceb9971b7038700db4501381cceb40dcd5dc37800835fba49b5dd90
+Lunar/Data/Pro.swift:5af963cd110177933651cee5e7fcf975c8b4156729b3c229f651183c39346794
 Lunar/Modes/ClockMode.swift:94e469f2e134069f3a1a57743299c4ed1119d241e42d4fb49b92e62197061557
 Lunar/DDC/DDC2.h:f1472daaae41855fa32901fedc441fd14e958fefe938f7829e9679d3ca7684c6
-Lunar/DDC/DDC2.c:e55a1aa8c81ab991b46a88d1564911d1d3fa2486b928b784d285d208522f89ce
+Lunar/DDC/DDC2.c:d396061e84fe2cdc7679d6936656824d1e2e89f5412cee7af2965916447fdd18
+Lunar/required.swift:9e2efda4a18426d4605992625334a4d6eece11c8aa632c39123fc12bb14475ba
diff --git a/Lunar.xcodeproj/project.pbxproj b/Lunar.xcodeproj/project.pbxproj
diff --git a/Lunar.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Lunar.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -18,15 +18,6 @@
         "revision" : "055c6abb49bb86c8d700da74d834523b03b4d702"
       }
     },
-    {
-      "identity" : "blueecc",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Kitura/BlueECC.git",
-      "state" : {
-        "branch" : "master",
-        "revision" : "1485268a54f8135435a825a855e733f026fa6cc8"
-      }
-    },
     {
       "identity" : "bluesocket",
       "kind" : "remoteSourceControl",
@@ -36,15 +27,6 @@
         "revision" : "4e334a848f89c44b2348332f0996f312dc6ed0d2"
       }
     },
-    {
-      "identity" : "burritos",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/alin23/Burritos",
-      "state" : {
-        "branch" : "master",
-        "revision" : "3dd5867dc5b321fbd5a28d2d8b283e4252b2e4d7"
-      }
-    },
     {
       "identity" : "charts",
       "kind" : "remoteSourceControl",
@@ -230,8 +212,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/siteline/SwiftUI-Introspect",
       "state" : {
-        "revision" : "adb9e7a69fd75322dcdee0c20f2fb6640d6f0087",
-        "version" : "0.9.0"
+        "revision" : "3ba734dd20faada0e3234b68e78db97005315f0e",
+        "version" : "1.0.0"
       }
     },
     {

diff --git a/...roj/xcshareddata/xcschemes/Debug.xcscheme → ...roj/xcshareddata/xcschemes/Lunar.xcscheme b/...roj/xcshareddata/xcschemes/Debug.xcscheme → ...roj/xcshareddata/xcschemes/Lunar.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Lunar.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/Lunar.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
diff --git a/Lunar.xcodeproj/xcuserdata/alin.xcuserdatad/xcschemes/xcschememanagement.plist b/Lunar.xcodeproj/xcuserdata/alin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -25,8 +25,10 @@
 			<key>orderHint</key>
 			<integer>7</integer>
 		</dict>
-		<key>Debug.xcscheme_^#shared#^_</key>
+		<key>Lunar.xcscheme_^#shared#^_</key>
 		<dict>
+			<key>isShown</key>
+			<true/>
 			<key>orderHint</key>
 			<integer>2</integer>
 		</dict>
@@ -124,11 +126,6 @@
 			<key>orderHint</key>
 			<integer>19</integer>
 		</dict>
-		<key>Release.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
 		<key>Surge (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>

diff --git a/Lunar.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Lunar.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -18,15 +18,6 @@
         "revision" : "055c6abb49bb86c8d700da74d834523b03b4d702"
       }
     },
-    {
-      "identity" : "blueecc",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Kitura/BlueECC.git",
-      "state" : {
-        "branch" : "master",
-        "revision" : "1485268a54f8135435a825a855e733f026fa6cc8"
-      }
-    },
     {
       "identity" : "bluesocket",
       "kind" : "remoteSourceControl",
@@ -36,15 +27,6 @@
         "revision" : "4e334a848f89c44b2348332f0996f312dc6ed0d2"
       }
     },
-    {
-      "identity" : "burritos",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/alin23/Burritos",
-      "state" : {
-        "branch" : "master",
-        "revision" : "3dd5867dc5b321fbd5a28d2d8b283e4252b2e4d7"
-      }
-    },
     {
       "identity" : "charts",
       "kind" : "remoteSourceControl",
@@ -150,7 +132,7 @@
       "location" : "https://github.com/alin23/sentry-cocoa.git",
       "state" : {
         "branch" : "master",
-        "revision" : "a890c38828010ebcdbe6b0edad84a97d06e54e0b"
+        "revision" : "04bee4ad86d74d4cb4d7101ff826d6e355301ba9"
       }
     },
     {
@@ -159,7 +141,7 @@
       "location" : "https://github.com/rnine/SimplyCoreAudio",
       "state" : {
         "branch" : "develop",
-        "revision" : "35cc0e6eac5c2ee5049431f4238b0e333cf79869"
+        "revision" : "99caee2ca2bcd33f49e4e2c0d8ba898c33421508"
       }
     },
     {
@@ -185,8 +167,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a",
-        "version" : "1.2.2"
+        "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
+        "version" : "1.2.3"
       }
     },
     {
@@ -230,8 +212,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/siteline/SwiftUI-Introspect",
       "state" : {
-        "revision" : "adb9e7a69fd75322dcdee0c20f2fb6640d6f0087",
-        "version" : "0.9.0"
+        "revision" : "3ba734dd20faada0e3234b68e78db97005315f0e",
+        "version" : "1.0.0"
       }
     },
     {

diff --git a/Lunar/AppDelegate.swift b/Lunar/AppDelegate.swift
@@ -1800,7 +1800,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDeleg
     }
 
     func applicationWillFinishLaunching(_: Notification) {
-        #if !DEBUG
+        #if !DEBUG && arch(arm64)
             PFMoveToApplicationsFolderIfNecessary()
         #endif
     }
@@ -2080,11 +2080,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDeleg
             scope.setTag(value: DC.adaptiveModeString(), key: "adaptiveMode")
             scope.setTag(value: DC.adaptiveModeString(last: true), key: "lastAdaptiveMode")
             scope.setTag(value: CachedDefaults[.overrideAdaptiveMode] ? "false" : "true", key: "autoMode")
-            if let secondPhase = Defaults[.secondPhase] {
-                scope.setTag(value: secondPhase ? "true" : "false", key: "secondPhase")
-            } else {
-                scope.setTag(value: "null", key: "secondPhase")
-            }
         }
     }
 
@@ -2188,7 +2183,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDeleg
 
         startTime = Date()
         lastBlackOutToggleDate = Date()
-        Defaults[.secondPhase] = initFirstPhase()
+        Defaults[.secondPhase] = initSecondPhase()
         #if arch(arm64)
             if #available(macOS 13, *) {
                 if restarted {
@@ -2277,11 +2272,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDeleg
                     scope.setTag(value: DC.adaptiveModeString(), key: "adaptiveMode")
                     scope.setTag(value: DC.adaptiveModeString(last: true), key: "lastAdaptiveMode")
                     scope.setTag(value: CachedDefaults[.overrideAdaptiveMode] ? "false" : "true", key: "autoMode")
-                    if let secondPhase = Defaults[.secondPhase] {
-                        scope.setTag(value: secondPhase ? "false" : "true", key: "secondPhase")
-                    } else {
-                        scope.setTag(value: "null", key: "secondPhase")
-                    }
                 }
                 DC.addSentryData()
                 SentrySDK.capture(message: "Launch New")