✨ Fix more stuff

MrKai77 · Jul 3, 2024 · 6b164dc · 6b164dc
1 parent 7e05b3a
commit 6b164dc
Show file tree

Hide file tree

Showing 13 changed files with 533 additions and 508 deletions.
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop (GH ACTIONS).xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop (GH ACTIONS).xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+               BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
                BuildableName = "Loop.app"
                BlueprintName = "Loop"
                ReferencedContainer = "container:Loop.xcodeproj">
@@ -44,7 +44,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+            BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
             BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop.xcodeproj">
@@ -61,7 +61,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+            BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
             BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop.xcodeproj">

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
@@ -9,30 +9,13 @@
          <ExecutionAction
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
-               title = "Set Build Number"
-               scriptText = "$SRCROOT/assets/set_build_number.sh&#10;"
+               title = "Run Script"
+               scriptText = "$SRCROOT/assets/set_build_number.sh&#10;/usr/bin/xattr -cr ~/Library/Developer/Xcode/DerivedData&#10;"
                shellToInvoke = "/bin/bash">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "A8849FE72C34C54600C233C2"
-                     BuildableName = "Loop.app"
-                     BlueprintName = "Loop"
-                     ReferencedContainer = "container:Loop.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Remove Attributes"
-               scriptText = "/usr/bin/xattr -cr $SRCROOT/DerivedData/&#10;"
-               shellToInvoke = "/bin/bash">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+                     BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
                      BuildableName = "Loop.app"
                      BlueprintName = "Loop"
                      ReferencedContainer = "container:Loop.xcodeproj">
@@ -45,13 +28,13 @@
          <ExecutionAction
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
-               title = "Reset Build Number"
+               title = "Run Script"
                scriptText = "$SRCROOT/assets/reset_build_number.sh&#10;"
                shellToInvoke = "/bin/bash">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+                     BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
                      BuildableName = "Loop.app"
                      BlueprintName = "Loop"
                      ReferencedContainer = "container:Loop.xcodeproj">
@@ -69,7 +52,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+               BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
                BuildableName = "Loop.app"
                BlueprintName = "Loop"
                ReferencedContainer = "container:Loop.xcodeproj">
@@ -99,7 +82,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+            BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
             BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop.xcodeproj">
@@ -116,7 +99,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A8849FE72C34C54600C233C2"
+            BlueprintIdentifier = "A8E59C34297F5E9A0064D4BA"
             BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop.xcodeproj">

diff --git a/Loop/Assets.xcassets/Window Actions/Contents.json b/Loop/Assets.xcassets/Window Actions/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...e.exclamationmark.symbolset/Contents.json → ...e.exclamationmark.symbolset/Contents.json b/...e.exclamationmark.symbolset/Contents.json → ...e.exclamationmark.symbolset/Contents.json
diff --git a/...cwindow.trianglebadge.exclamationmark.svg → ...cwindow.trianglebadge.exclamationmark.svg b/...cwindow.trianglebadge.exclamationmark.svg → ...cwindow.trianglebadge.exclamationmark.svg
diff --git a/...m.rectangle.slash.symbolset/Contents.json → ...m.rectangle.slash.symbolset/Contents.json b/...m.rectangle.slash.symbolset/Contents.json → ...m.rectangle.slash.symbolset/Contents.json
diff --git a/...lash.symbolset/custom.rectangle.slash.svg → ...lash.symbolset/custom.rectangle.slash.svg b/...lash.symbolset/custom.rectangle.slash.svg → ...lash.symbolset/custom.rectangle.slash.svg
diff --git a/Loop/Assets.xcassets/empty.imageset/Contents.json b/Loop/Assets.xcassets/empty.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "empty.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Loop/Assets.xcassets/empty.imageset/empty.png b/Loop/Assets.xcassets/empty.imageset/empty.png
diff --git a/Loop/Assets.xcassets/menubarIcon.imageset/Contents.json b/Loop/Assets.xcassets/menubarIcon.imageset/Contents.json
@@ -22,4 +22,4 @@
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}
diff --git a/Loop/LoopApp.swift b/Loop/LoopApp.swift
@@ -17,7 +17,9 @@ struct LoopApp: App {
     var body: some Scene {
         MenuBarExtra(Bundle.main.appName, image: "menubarIcon", isInserted: Binding.constant(!hideMenuBarIcon)) {
             #if DEBUG
-                MenuBarHeaderText("DEV BUILD: \(Bundle.main.appVersion ?? "Unknown") (\(Bundle.main.appBuild ?? 0))")
+                let text = "DEV BUILD: \(Bundle.main.appVersion ?? "Unknown") (\(Bundle.main.appBuild ?? 0))"
+                Text(text)
+                    .font(.system(size: 11, weight: .semibold))
             #endif
 
             Button {
@@ -31,15 +33,11 @@ struct LoopApp: App {
                 }
             }
 
-            Divider()
-
             Button("Settings…") {
                 LuminareManager.open()
             }
             .keyboardShortcut(",", modifiers: .command)
 
-            Divider()
-
             Button("Quit") {
                 NSApp.terminate(nil)
             }

diff --git a/Loop/MenuBar/MenuBarHeaderText.swift b/Loop/MenuBar/MenuBarHeaderText.swift
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ @@
       "properties" : {
         "template-rendering-intent" : "template"
       }
-    }
+    }