From 4d043bb9b2a907c09e683465d6cd2a4d367cfabd Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Sep 2025 23:22:36 +0100 Subject: [PATCH 1/3] WIP --- .swiftformat | 1 + Package.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.swiftformat b/.swiftformat index 9be9a13f..b65b3819 100644 --- a/.swiftformat +++ b/.swiftformat @@ -5,3 +5,4 @@ --ifdef no-indent --extensionacl on-declarations --patternlet inline +--ranges no-space diff --git a/Package.swift b/Package.swift index 6421a6c9..cdbf8057 100644 --- a/Package.swift +++ b/Package.swift @@ -65,7 +65,7 @@ package.dependencies = [ .package(url: "https://github.com/davdroman/swift-once-macro", from: "1.0.0"), .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"), // dev .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"), - .package(url: "https://github.com/siteline/swiftui-introspect", "1.3.0" ..< "27.0.0"), + .package(url: "https://github.com/siteline/swiftui-introspect", "1.3.0"..<"27.0.0"), ] for target in package.targets { From fd7960b7b4006c1aba407dfee4d2f2f3ca36cd91 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Sep 2025 23:32:39 +0100 Subject: [PATCH 2/3] WIP --- .swiftformat | 5 ++--- Examples/Demo/Demo/Pages.swift | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.swiftformat b/.swiftformat index b65b3819..778604cc 100644 --- a/.swiftformat +++ b/.swiftformat @@ -1,8 +1,7 @@ ---disable redundantNilInit,redundantSelf,redundantType,unusedArguments +--disable redundantNilInit,redundantSelf,redundantType,unusedArguments,indent --header strip ---indent tab ---ifdef no-indent --extensionacl on-declarations --patternlet inline --ranges no-space +--trailing-commas always diff --git a/Examples/Demo/Demo/Pages.swift b/Examples/Demo/Demo/Pages.swift index 43931b93..3d3cf695 100644 --- a/Examples/Demo/Demo/Pages.swift +++ b/Examples/Demo/Demo/Pages.swift @@ -126,15 +126,15 @@ struct PageLink: View { var body: some View { ZStack { RoundedRectangle(cornerRadius: 6, style: .continuous) - #if !os(tvOS) && !os(visionOS) + #if !os(tvOS) && !os(visionOS) .fill(Color.blue.opacity(0.8)) - #else + #else .fill(Color.clear) - #endif + #endif Text(title) - #if !os(tvOS) + #if !os(tvOS) .foregroundColor(.white) - #endif + #endif .font(.system(size: 18, weight: .medium, design: .rounded)) } .frame(maxHeight: 50) @@ -163,9 +163,9 @@ struct Code: View { .minimumScaleFactor(0.5) .font(.system(size: 14, design: .monospaced)) .background(shape.stroke(Color(white: 0.1).opacity(0.35), lineWidth: 1)) - .background(Color(white: 0.94).opacity(0.6).clipShape(shape)) - #if !os(tvOS) + #if !os(tvOS) .textSelection(.enabled) - #endif + #endif + .background(Color(white: 0.94).opacity(0.6).clipShape(shape)) } } From fd670b00e9b42e7c963f755a0365d4cab64f97cd Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Sep 2025 23:35:47 +0100 Subject: [PATCH 3/3] Trigger