Skip to content

Commit e08fde2

Browse files
FastestMolassesFastestMolasses
committed
Merge branch 'main' into itembox
2 parents 48a7fd6 + 050c3e3 commit e08fde2

File tree

193 files changed

+3853
-5859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+3853
-5859
lines changed

‎.github/scripts/test_app.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ elif [ $1 = "arm" ]; then
88
ARCH="arm64"
99
fi
1010

11+
echo "Building with Xcode: $(xcodebuild -version)"
1112
echo "Building with arch: ${ARCH}"
1213
echo "SwiftLint Version: $(swiftlint --version)"
1314

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 157 additions & 4208 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "bb72acfad31b288599b6721256b508d8209ba1bc1d7ab0fff6a358d49a1deae0",
2+
"originHash" : "3d134b350244fc51aaff618575f0cb6d754dbbef6fb05b12964d922d42ce960e",
33
"pins" : [
44
{
55
"identity" : "anycodable",
@@ -28,6 +28,15 @@
2828
"version" : "0.1.20"
2929
}
3030
},
31+
{
32+
"identity" : "codeeditsourceeditor",
33+
"kind" : "remoteSourceControl",
34+
"location" : "https://github.com/CodeEditApp/CodeEditSourceEditor",
35+
"state" : {
36+
"revision" : "6b2c945501f0a5c15d8aa6d159fb2550c391bdd0",
37+
"version" : "0.10.0"
38+
}
39+
},
3140
{
3241
"identity" : "codeeditsymbols",
3342
"kind" : "remoteSourceControl",
@@ -42,8 +51,8 @@
4251
"kind" : "remoteSourceControl",
4352
"location" : "https://github.com/CodeEditApp/CodeEditTextView.git",
4453
"state" : {
45-
"revision" : "509d7b2e86460e8ec15b0dd5410cbc8e8c05940f",
46-
"version" : "0.7.7"
54+
"revision" : "1792167c751b6668b4743600d2cf73d2829dd18a",
55+
"version" : "0.7.9"
4756
}
4857
},
4958
{
@@ -213,8 +222,8 @@
213222
"kind" : "remoteSourceControl",
214223
"location" : "https://github.com/lukepistrol/SwiftLintPlugin",
215224
"state" : {
216-
"revision" : "87454f5c9ff4d644086aec2a0df1ffba678e7f3c",
217-
"version" : "0.57.1"
225+
"revision" : "3825ebf8d55bb877c91bc897e8e3d0c001f16fba",
226+
"version" : "0.58.2"
218227
}
219228
},
220229
{

‎CodeEdit.xcodeproj/xcshareddata/xcschemes/CodeEdit.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1540"
3+
LastUpgradeVersion = "1620"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CodeEdit.xcodeproj/xcshareddata/xcschemes/OpenWithCodeEdit.xcscheme

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1620"
4+
wasCreatedForAppExtension = "YES"
5+
version = "2.0">
6+
<BuildAction
7+
parallelizeBuildables = "YES"
8+
buildImplicitDependencies = "YES"
9+
buildArchitectures = "Automatic">
10+
<BuildActionEntries>
11+
<BuildActionEntry
12+
buildForTesting = "YES"
13+
buildForRunning = "YES"
14+
buildForProfiling = "YES"
15+
buildForArchiving = "YES"
16+
buildForAnalyzing = "YES">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "2BE487EB28245162003F3F64"
20+
BuildableName = "OpenWithCodeEdit.appex"
21+
BlueprintName = "OpenWithCodeEdit"
22+
ReferencedContainer = "container:CodeEdit.xcodeproj">
23+
</BuildableReference>
24+
</BuildActionEntry>
25+
<BuildActionEntry
26+
buildForTesting = "YES"
27+
buildForRunning = "YES"
28+
buildForProfiling = "YES"
29+
buildForArchiving = "YES"
30+
buildForAnalyzing = "YES">
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "B658FB2B27DA9E0F00EA4DBD"
34+
BuildableName = "CodeEdit.app"
35+
BlueprintName = "CodeEdit"
36+
ReferencedContainer = "container:CodeEdit.xcodeproj">
37+
</BuildableReference>
38+
</BuildActionEntry>
39+
</BuildActionEntries>
40+
</BuildAction>
41+
<TestAction
42+
buildConfiguration = "Debug"
43+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
44+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
45+
shouldUseLaunchSchemeArgsEnv = "YES"
46+
shouldAutocreateTestPlan = "YES">
47+
</TestAction>
48+
<LaunchAction
49+
buildConfiguration = "Debug"
50+
selectedDebuggerIdentifier = ""
51+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
52+
launchStyle = "0"
53+
askForAppToLaunch = "Yes"
54+
useCustomWorkingDirectory = "NO"
55+
ignoresPersistentStateOnLaunch = "NO"
56+
debugDocumentVersioning = "YES"
57+
debugServiceExtension = "internal"
58+
allowLocationSimulation = "YES"
59+
launchAutomaticallySubstyle = "2">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "B658FB2B27DA9E0F00EA4DBD"
65+
BuildableName = "CodeEdit.app"
66+
BlueprintName = "CodeEdit"
67+
ReferencedContainer = "container:CodeEdit.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</LaunchAction>
71+
<ProfileAction
72+
buildConfiguration = "Release"
73+
shouldUseLaunchSchemeArgsEnv = "YES"
74+
savedToolIdentifier = ""
75+
useCustomWorkingDirectory = "NO"
76+
debugDocumentVersioning = "YES"
77+
askForAppToLaunch = "Yes"
78+
launchAutomaticallySubstyle = "2">
79+
<BuildableProductRunnable
80+
runnableDebuggingMode = "0">
81+
<BuildableReference
82+
BuildableIdentifier = "primary"
83+
BlueprintIdentifier = "B658FB2B27DA9E0F00EA4DBD"
84+
BuildableName = "CodeEdit.app"
85+
BlueprintName = "CodeEdit"
86+
ReferencedContainer = "container:CodeEdit.xcodeproj">
87+
</BuildableReference>
88+
</BuildableProductRunnable>
89+
</ProfileAction>
90+
<AnalyzeAction
91+
buildConfiguration = "Debug">
92+
</AnalyzeAction>
93+
<ArchiveAction
94+
buildConfiguration = "Release"
95+
revealArchiveInOrganizer = "YES">
96+
</ArchiveAction>
97+
</Scheme>

‎CodeEdit/Features/About/Views/BlurButtonStyle.swift

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ import SwiftUI
99

1010
extension ButtonStyle where Self == BlurButtonStyle {
1111
static var blur: BlurButtonStyle { BlurButtonStyle() }
12+
static var secondaryBlur: BlurButtonStyle { BlurButtonStyle(isSecondary: true) }
1213
}
1314

1415
struct BlurButtonStyle: ButtonStyle {
16+
var isSecondary: Bool = false
17+
1518
@Environment(\.controlSize)
1619
var controlSize
1720

21+
@Environment(\.colorScheme)
22+
var colorScheme
23+
1824
var height: CGFloat {
1925
switch controlSize {
2026
case .large:
@@ -24,32 +30,40 @@ struct BlurButtonStyle: ButtonStyle {
2430
}
2531
}
2632

27-
@Environment(\.colorScheme)
28-
var colorScheme
29-
3033
func makeBody(configuration: Configuration) -> some View {
3134
configuration.label
35+
.padding(.horizontal, 8)
3236
.frame(height: height)
33-
.buttonStyle(.bordered)
3437
.background {
3538
switch colorScheme {
3639
case .dark:
37-
Color
38-
.gray
39-
.opacity(0.001)
40-
.overlay(.regularMaterial.blendMode(.plusLighter))
41-
.overlay(Color.gray.opacity(0.30))
42-
.overlay(Color.white.opacity(configuration.isPressed ? 0.20 : 0.00))
40+
ZStack {
41+
Color.gray.opacity(0.001)
42+
if isSecondary {
43+
Rectangle()
44+
.fill(.regularMaterial)
45+
} else {
46+
Rectangle()
47+
.fill(.regularMaterial)
48+
.blendMode(.plusLighter)
49+
}
50+
Color.gray.opacity(isSecondary ? 0.10 : 0.30)
51+
Color.white.opacity(configuration.isPressed ? 0.10 : 0.00)
52+
}
4353
case .light:
44-
Color
45-
.gray
46-
.opacity(0.001)
47-
.overlay(.regularMaterial.blendMode(.darken))
48-
.overlay(Color.gray.opacity(0.15).blendMode(.plusDarker))
54+
ZStack {
55+
Color.gray.opacity(0.001)
56+
Rectangle()
57+
.fill(.regularMaterial)
58+
.blendMode(.darken)
59+
Color.gray.opacity(isSecondary ? 0.05 : 0.15)
60+
.blendMode(.plusDarker)
61+
Color.gray.opacity(configuration.isPressed ? 0.10 : 0.00)
62+
}
4963
@unknown default:
5064
Color.black
5165
}
5266
}
53-
.clipShape(RoundedRectangle(cornerRadius: 6))
67+
.clipShape(RoundedRectangle(cornerRadius: controlSize == .large ? 6 : 5))
5468
}
5569
}

‎CodeEdit/Features/ActivityViewer/ActivityViewer.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,7 @@ struct ActivityViewer: View {
5959
.opacity(0.1)
6060
}
6161
}
62+
.accessibilityElement(children: .contain)
63+
.accessibilityLabel("Activity Viewer")
6264
}
6365
}

‎CodeEdit/Features/ActivityViewer/Notifications/CECircularProgressView.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ struct CECircularProgressView: View {
5050
.font(.caption)
5151
}
5252
}
53+
.accessibilityElement()
54+
.accessibilityAddTraits(.updatesFrequently)
55+
.accessibilityValue(
56+
progress != nil ? Text(progress!, format: .percent) : Text("working")
57+
)
5358
}
5459
}
5560

‎CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ import Combine
7676
/// "id": "uniqueTaskID",
7777
/// "action": "update",
7878
/// "title": "Updated Task Title",
79-
/// "message": "Updated Task Message"
79+
/// "message": "Updated Task Message",
8080
/// "percentage": 0.5,
8181
/// "isLoading": true
8282
/// ]

‎CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import SwiftUI
99

1010
struct TaskNotificationView: View {
11+
@Environment(\.controlActiveState)
12+
private var activeState
13+
1114
@ObservedObject var taskNotificationHandler: TaskNotificationHandler
1215
@State private var isPresented: Bool = false
1316
@State var notification: TaskNotificationModel?
@@ -46,12 +49,14 @@ struct TaskNotificationView: View {
4649
}
4750
}
4851
.transition(.opacity.combined(with: .move(edge: .trailing)))
52+
.opacity(activeState == .inactive ? 0.4 : 1.0)
4953
.padding(3)
5054
.padding(-3)
5155
.padding(.trailing, 3)
5256
.popover(isPresented: $isPresented, arrowEdge: .bottom) {
5357
TaskNotificationsDetailView(taskNotificationHandler: taskNotificationHandler)
54-
}.onTapGesture {
58+
}
59+
.onTapGesture {
5560
self.isPresented.toggle()
5661
}
5762
}

‎CodeEdit/Features/ActivityViewer/Tasks/OptionMenuItemView.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import SwiftUI
1010
struct OptionMenuItemView: View {
1111
var label: String
1212
var action: () -> Void
13+
1314
var body: some View {
1415
HStack {
1516
Text(label)
@@ -22,6 +23,11 @@ struct OptionMenuItemView: View {
2223
.onTapGesture {
2324
action()
2425
}
26+
.accessibilityElement()
27+
.accessibilityAction {
28+
action()
29+
}
30+
.accessibilityLabel(label)
2531
}
2632
}
2733

0 commit comments

Comments
 (0)