Skip to content

Commit 4961349

Browse files
Kyle-YeKyle-Ye
authored
Add ResolvedPaint (#163)
* Add ResolvedPaint implementation * Add PaintTests
1 parent c7af959 commit 4961349

File tree

11 files changed

+297
-29
lines changed

11 files changed

+297
-29
lines changed

‎Sources/OpenSwiftUICore/Graphic/Color/Color.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public import CoreGraphics
4949
///
5050
/// ![A screenshot of a green leaf.](Color-1)
5151
///
52-
/// Because SwiftUI treats colors as ``View`` instances, you can also
52+
/// Because OpenSwiftUI treats colors as ``View`` instances, you can also
5353
/// directly add them to a view hierarchy. For example, you can layer
5454
/// a rectangle beneath a sun image using colors defined above:
5555
///

‎Sources/OpenSwiftUICore/Graphic/Color/ColorResolved.swift

+8-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Audited for iOS 18.0
66
// Status: WIP
77

8-
import Foundation
8+
package import Foundation
99
import OpenSwiftUI_SPI
1010

1111
// MARK: - Color.Resolved
@@ -51,13 +51,14 @@ extension Color {
5151

5252
// MARK: - Color.Resolved + ResolvedPaint
5353

54-
extension Color.Resolved/*: ResolvedPaint*/ {
55-
// func draw(path: Path, style: paathDrawingStyle, in context: GraphicsContext, bounds: CGRect?)
56-
57-
var isClear: Bool { opacity == 0 }
58-
var isOpaque: Bool { opacity == 1 }
54+
extension Color.Resolved: ResolvedPaint {
55+
package func draw(path: Path, style: PathDrawingStyle, in context: GraphicsContext, bounds: CGRect?) {
56+
// TODO
57+
}
5958

60-
// static leafProtobufTag: CodableResolvedPaint.Tag?
59+
package var isClear: Bool { opacity == 0 }
60+
package var isOpaque: Bool { opacity == 1 }
61+
package static var leafProtobufTag: CodableResolvedPaint.Tag? { .color }
6162
}
6263

6364
// MARK: - Color.Resolved + ShapeStyle

‎Sources/OpenSwiftUICore/Graphic/Color/Paint.swift

+176
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
//
2+
// Paint.swift
3+
// OpenSwiftUICore
4+
//
5+
// Audited for iOS 18.0
6+
// Status: Blocked by Gradient, Image and Shader
7+
8+
package import Foundation
9+
10+
// MARK: - ResolvedPaint
11+
12+
package protocol ResolvedPaint: Equatable, Animatable, ProtobufEncodableMessage {
13+
func draw(path: Path, style: PathDrawingStyle, in context: GraphicsContext, bounds: CGRect?)
14+
var isClear: Bool { get }
15+
var isOpaque: Bool { get }
16+
var resolvedGradient: ResolvedGradient? { get }
17+
var isCALayerCompatible: Bool { get }
18+
static var leafProtobufTag: CodableResolvedPaint.Tag? { get }
19+
func encodePaint(to encoder: inout ProtobufEncoder) throws
20+
}
21+
22+
// MARK: - ResolvedPaint + Default Implementations
23+
24+
extension ResolvedPaint {
25+
package var isClear: Bool { false }
26+
package var isOpaque: Bool { false }
27+
package var resolvedGradient: ResolvedGradient? { nil }
28+
package var isCALayerCompatible: Bool { true }
29+
package func encodePaint(to encoder: inout ProtobufEncoder) throws {
30+
if let tag = Self.leafProtobufTag {
31+
try encoder.messageField(tag.rawValue, self)
32+
} else {
33+
try encode(to: &encoder)
34+
}
35+
}
36+
}
37+
38+
// MARK: - AnyResolvedPaint
39+
40+
package class AnyResolvedPaint: Equatable {
41+
package func draw(path: Path, style: PathDrawingStyle, in ctx: GraphicsContext, bounds: CGRect?) {}
42+
package var protobufPaint: Any? { nil }
43+
package var isClear: Bool { false }
44+
package var isOpaque: Bool { false }
45+
package var resolvedGradient: ResolvedGradient? { nil }
46+
package var isCALayerCompatible: Bool { false }
47+
package func isEqual(to other: AnyResolvedPaint) -> Bool { false }
48+
package func visit<V>(_ visitor: inout V) where V : ResolvedPaintVisitor {}
49+
package func encode(to encoder: any Encoder) throws { preconditionFailure("") }
50+
package func encode(to encoder: inout ProtobufEncoder) throws { preconditionFailure("") }
51+
package static func == (lhs: AnyResolvedPaint, rhs: AnyResolvedPaint) -> Bool { lhs.isEqual(to: rhs) }
52+
}
53+
54+
// MARK: - _AnyResolvedPaint
55+
56+
final package class _AnyResolvedPaint<P>: AnyResolvedPaint where P: ResolvedPaint {
57+
package let paint: P
58+
package init(_ paint: P) {
59+
self.paint = paint
60+
}
61+
62+
override package func draw(path: Path, style: PathDrawingStyle, in ctx: GraphicsContext, bounds: CGRect?) {
63+
paint.draw(path: path, style: style, in: ctx, bounds: bounds)
64+
}
65+
66+
override package var protobufPaint: Any? {
67+
paint
68+
}
69+
70+
override package var isClear: Bool {
71+
paint.isClear
72+
}
73+
74+
override package var isOpaque: Bool {
75+
paint.isOpaque
76+
}
77+
78+
override package var resolvedGradient: ResolvedGradient? {
79+
paint.resolvedGradient
80+
}
81+
82+
override package var isCALayerCompatible: Bool {
83+
paint.isCALayerCompatible
84+
}
85+
86+
override package func isEqual(to other: AnyResolvedPaint) -> Bool {
87+
guard let other = other as? _AnyResolvedPaint<P> else {
88+
return false
89+
}
90+
return paint == other.paint
91+
}
92+
93+
override package func visit<V>(_ visitor: inout V) where V : ResolvedPaintVisitor {
94+
visitor.visitPaint(paint)
95+
}
96+
97+
override package func encode(to encoder: inout ProtobufEncoder) throws {
98+
try paint.encodePaint(to: &encoder)
99+
}
100+
}
101+
102+
// FIXME
103+
extension AnyResolvedPaint: @unchecked Sendable {}
104+
extension _AnyResolvedPaint: @unchecked Sendable {}
105+
106+
// MARK: - ResolvedPaintVisitor
107+
108+
package protocol ResolvedPaintVisitor {
109+
mutating func visitPaint<P>(_ paint: P) where P: ResolvedPaint
110+
}
111+
112+
// MARK: - CodableResolvedPaint [TODO]
113+
114+
package struct CodableResolvedPaint: ProtobufMessage {
115+
package struct Tag: Equatable, ProtobufTag {
116+
package let rawValue: UInt
117+
118+
package init(rawValue: UInt) {
119+
self.rawValue = rawValue
120+
}
121+
122+
package static let color: CodableResolvedPaint.Tag = .init(rawValue: 1)
123+
package static let linearGradient: CodableResolvedPaint.Tag = .init(rawValue: 2)
124+
package static let radialGradient: CodableResolvedPaint.Tag = .init(rawValue: 3)
125+
package static let angularGradient: CodableResolvedPaint.Tag = .init(rawValue: 4)
126+
package static let ellipticalGradient: CodableResolvedPaint.Tag = .init(rawValue: 5)
127+
package static let image: CodableResolvedPaint.Tag = .init(rawValue: 6)
128+
package static let anchorRect: CodableResolvedPaint.Tag = .init(rawValue: 7)
129+
package static let shader: CodableResolvedPaint.Tag = .init(rawValue: 8)
130+
package static let meshGradient: CodableResolvedPaint.Tag = .init(rawValue: 9)
131+
}
132+
133+
package var base: AnyResolvedPaint
134+
135+
package init(_ paint: AnyResolvedPaint) {
136+
base = paint
137+
}
138+
139+
package func encode(to encoder: inout ProtobufEncoder) throws {
140+
try base.encode(to: &encoder)
141+
}
142+
143+
package init(from decoder: inout ProtobufDecoder) throws {
144+
var base: AnyResolvedPaint?
145+
while let field = try decoder.nextField() {
146+
switch field.tag {
147+
case Tag.color.rawValue:
148+
let color: Color.Resolved = try decoder.messageField(field)
149+
base = _AnyResolvedPaint(color)
150+
case Tag.linearGradient.rawValue:
151+
break // TODO
152+
case Tag.radialGradient.rawValue:
153+
break // TODO
154+
case Tag.angularGradient.rawValue:
155+
break // TODO
156+
case Tag.ellipticalGradient.rawValue:
157+
break // TODO
158+
case Tag.image.rawValue:
159+
break // TODO
160+
case Tag.anchorRect.rawValue:
161+
break // TODO
162+
case Tag.shader.rawValue:
163+
break // TODO
164+
case Tag.meshGradient.rawValue:
165+
break // TODO
166+
default:
167+
try decoder.skipField(field)
168+
}
169+
}
170+
if let base {
171+
self.init(base)
172+
} else {
173+
throw ProtobufDecoder.DecodingError.failed
174+
}
175+
}
176+
}

‎Sources/OpenSwiftUICore/Graphic/Gradient/ResolvedGradient.swift

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//
2+
// ResolvedGradient.swift
3+
// OpenSwiftUICore
4+
//
5+
// Audited for iOS 18.0
6+
// Status: Empty
7+
8+
package struct ResolvedGradient: Equatable {
9+
}

‎Sources/OpenSwiftUICore/Graphic/ResolvedPaint.swift

-15
This file was deleted.

‎Sources/OpenSwiftUICore/Shape/FillStyle.swift

-2
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,3 @@ public struct FillStyle: Equatable {
3434
self.isAntialiased = antialiased
3535
}
3636
}
37-
38-
extension FillStyle: Sendable {}

‎Sources/OpenSwiftUICore/Shape/Path/Path.swift

+7
Original file line numberDiff line numberDiff line change
@@ -444,3 +444,10 @@ extension Path: CodableByProxy {
444444

445445
static func unwrap(codingProxy: CodablePath) -> Path { codingProxy.base }
446446
}
447+
448+
// MARK: - PathDrawingStyle
449+
450+
package enum PathDrawingStyle {
451+
case fill(FillStyle)
452+
case stroke(StrokeStyle)
453+
}

‎Sources/OpenSwiftUICore/Shape/StrokeStyle.swift

-2
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,3 @@ extension StrokeStyle: Animatable {
7979
}
8080
}
8181
}
82-
83-
extension StrokeStyle: Sendable {}

‎Tests/OpenSwiftUICoreTests/Graphics/Color/ColorMatrixTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ColorMatrixTests.swift
3-
// OpenSwiftUITests
3+
// OpenSwiftUICoreTests
44

55
@testable import OpenSwiftUICore
66
import Testing

‎Tests/OpenSwiftUICoreTests/Graphics/Color/ColorResolvedTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ColorResolvedTests.swift
3-
// OpenSwiftUITests
3+
// OpenSwiftUICoreTests
44

55
#if canImport(Darwin)
66

‎Tests/OpenSwiftUICoreTests/Graphics/Color/PaintTests.swift

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
//
2+
// PaintTests.swift
3+
// OpenSwiftUICoreTests
4+
5+
@testable import OpenSwiftUICore
6+
import Testing
7+
import Foundation
8+
9+
struct PaintTests {
10+
@Test
11+
func anyResolvedPaintEquality() {
12+
let color1 = Color.Resolved(red: 1, green: 0, blue: 0, opacity: 1)
13+
let color2 = Color.Resolved(red: 1, green: 0, blue: 0, opacity: 1)
14+
let color3 = Color.Resolved(red: 0, green: 1, blue: 0, opacity: 1)
15+
16+
let paint1 = _AnyResolvedPaint(color1)
17+
let paint2 = _AnyResolvedPaint(color2)
18+
let paint3 = _AnyResolvedPaint(color3)
19+
20+
#expect(paint1 == paint2)
21+
#expect(paint1 != paint3)
22+
}
23+
24+
@Test
25+
func resolvedPaintProperties() {
26+
// Test with a clear color
27+
let clearColor = Color.Resolved(red: 0, green: 0, blue: 0, opacity: 0)
28+
let clearPaint = _AnyResolvedPaint(clearColor)
29+
30+
#expect(clearPaint.isClear == true)
31+
#expect(clearPaint.isOpaque == false)
32+
#expect(clearPaint.resolvedGradient == nil)
33+
#expect(clearPaint.isCALayerCompatible == true)
34+
35+
// Test with an opaque color
36+
let opaqueColor = Color.Resolved(red: 1, green: 1, blue: 1, opacity: 1)
37+
let opaquePaint = _AnyResolvedPaint(opaqueColor)
38+
39+
#expect(opaquePaint.isClear == false)
40+
#expect(opaquePaint.isOpaque == true)
41+
#expect(opaquePaint.resolvedGradient == nil)
42+
#expect(opaquePaint.isCALayerCompatible == true)
43+
}
44+
45+
@Test
46+
func codableResolvedPaintEncoding() throws {
47+
let color = Color.Resolved(red: 1, green: 0, blue: 0, opacity: 1)
48+
let paint = _AnyResolvedPaint(color)
49+
let codablePaint = CodableResolvedPaint(paint)
50+
51+
var encoder = ProtobufEncoder()
52+
try codablePaint.encode(to: &encoder)
53+
54+
let data = try ProtobufEncoder.encoding { encoder in
55+
try codablePaint.encode(to: &encoder)
56+
}
57+
#expect(data.hexString == "0a0a0d0000803f250000803f")
58+
}
59+
60+
@Test
61+
func codableResolvedPaintDecoding() throws {
62+
// Create encoded data for a red color
63+
let color = Color.Resolved(red: 1, green: 0, blue: 0, opacity: 1)
64+
let paint = _AnyResolvedPaint(color)
65+
let originalCodablePaint = CodableResolvedPaint(paint)
66+
67+
let data = try #require(Data(hexString: "0a0a0d0000803f250000803f"))
68+
var decoder = ProtobufDecoder(data)
69+
let decodedPaint = try CodableResolvedPaint(from: &decoder)
70+
71+
#expect(originalCodablePaint.base == decodedPaint.base)
72+
}
73+
74+
@Test
75+
func resolvedPaintVisitor() {
76+
struct TestVisitor: ResolvedPaintVisitor {
77+
var visitedColor: Color.Resolved?
78+
79+
mutating func visitPaint<P>(_ paint: P) where P: ResolvedPaint {
80+
if let colorPaint = paint as? Color.Resolved {
81+
visitedColor = colorPaint
82+
}
83+
}
84+
}
85+
86+
let color = Color.Resolved(red: 1, green: 0, blue: 0, opacity: 1)
87+
let paint = _AnyResolvedPaint(color)
88+
89+
var visitor = TestVisitor()
90+
paint.visit(&visitor)
91+
92+
#expect(visitor.visitedColor == color)
93+
}
94+
}

0 commit comments

Comments
 (0)