Merge branch 'main'

Author: Syrux64

.all-contributorsrc

@@ -785,6 +785,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "pro100filipp",
+      "name": "Filipp Kuznetsov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12880697?v=4",
+      "profile": "https://github.com/pro100filipp",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/scripts/test_app.sh

@@ -8,6 +8,7 @@ elif [ $1 = "arm" ]; then
     ARCH="arm64"
 fi
 
+echo "Building with Xcode: $(xcodebuild -version)"
 echo "Building with arch: ${ARCH}"
 echo "SwiftLint Version: $(swiftlint --version)"
 

.github/workflows/CI-release-notes.yml

@@ -1,6 +1,7 @@
 name: Deploy Website on Release Note Changes
 
 on:
+  workflow_dispatch:
   release:
     types: [created, edited, deleted]
 

.github/workflows/pre-release.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Build CodeEdit
         env:
           APPLE_TEAM_ID:  ${{ secrets.APPLE_TEAM_ID }}
-        run: xcodebuild -scheme CodeEdit -configuration Pre -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive
+        run: xcodebuild -scheme CodeEdit -configuration Pre -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive | xcpretty
 
       ############################
       # Sign
@@ -109,6 +109,20 @@ jobs:
           echo "APP_VERSION=$APP_VERSION" >> $GITHUB_ENV
           echo "APP_BUILD=$APP_BUILD" >> $GITHUB_ENV
 
+      ############################
+      # Upload dSYMs Artifact
+      ############################
+      - name: Upload dSYMs Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: "CodeEdit-${{ env.APP_BUILD }}-dSYMs"
+          path: "${{ RUNNER.TEMP }}/CodeEdit.xcarchive/dSYMs"
+          if-no-files-found: error
+          # overwrite files for the same build number
+          overwrite: true
+          # these can be big, use maximum compression
+          compression-level: 9
+
       ############################
       # Sparkle Appcast
       ############################

CodeEdit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -9,12 +9,18 @@ import SwiftUI
 
 extension ButtonStyle where Self == BlurButtonStyle {
     static var blur: BlurButtonStyle { BlurButtonStyle() }
+    static var secondaryBlur: BlurButtonStyle { BlurButtonStyle(isSecondary: true) }
 }
 
 struct BlurButtonStyle: ButtonStyle {
+    var isSecondary: Bool = false
+
     @Environment(\.controlSize)
     var controlSize
 
+    @Environment(\.colorScheme)
+    var colorScheme
+
     var height: CGFloat {
         switch controlSize {
         case .large:
@@ -24,32 +30,40 @@ struct BlurButtonStyle: ButtonStyle {
         }
     }
 
-    @Environment(\.colorScheme)
-    var colorScheme
-
     func makeBody(configuration: Configuration) -> some View {
         configuration.label
+            .padding(.horizontal, 8)
             .frame(height: height)
-            .buttonStyle(.bordered)
             .background {
                 switch colorScheme {
                 case .dark:
-                    Color
-                        .gray
-                        .opacity(0.001)
-                        .overlay(.regularMaterial.blendMode(.plusLighter))
-                        .overlay(Color.gray.opacity(0.30))
-                        .overlay(Color.white.opacity(configuration.isPressed ? 0.20 : 0.00))
+                    ZStack {
+                        Color.gray.opacity(0.001)
+                        if isSecondary {
+                            Rectangle()
+                                .fill(.regularMaterial)
+                        } else {
+                            Rectangle()
+                                .fill(.regularMaterial)
+                                .blendMode(.plusLighter)
+                        }
+                        Color.gray.opacity(isSecondary ? 0.10 : 0.30)
+                        Color.white.opacity(configuration.isPressed ? 0.10 : 0.00)
+                    }
                 case .light:
-                    Color
-                        .gray
-                        .opacity(0.001)
-                        .overlay(.regularMaterial.blendMode(.darken))
-                        .overlay(Color.gray.opacity(0.15).blendMode(.plusDarker))
+                    ZStack {
+                        Color.gray.opacity(0.001)
+                        Rectangle()
+                            .fill(.regularMaterial)
+                            .blendMode(.darken)
+                        Color.gray.opacity(isSecondary ? 0.05 : 0.15)
+                            .blendMode(.plusDarker)
+                        Color.gray.opacity(configuration.isPressed ? 0.10 : 0.00)
+                    }
                 @unknown default:
                     Color.black
                 }
             }
-            .clipShape(RoundedRectangle(cornerRadius: 6))
+            .clipShape(RoundedRectangle(cornerRadius: controlSize == .large ? 6 : 5))
     }
 }