Skip to content

Support trait changes (color schemes) in ShapeDrawingNode #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnEstropia merged 2 commits into from
Feb 14, 2025
Merged

Support trait changes (color schemes) in ShapeDrawingNode #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fadf28
support trait changes in ShapeDrawingNode
JohnEstropia Feb 12, 2025
1cba5e3
make default unspecified
JohnEstropia Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions Sources/Components/Compositions/ShapeDrawingNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public final class ShapeDrawingNode: ASDisplayNode, ShapeDisplaying {
var shapePath: UIBezierPath?
var shapeLineWidth: CGFloat = 0
var shapeStrokeColor: UIColor?
var userInterfaceStyle: UIUserInterfaceStyle = .unspecified
}

private final class ParameterBox: NSObject {
Expand Down Expand Up @@ -104,17 +105,38 @@ public final class ShapeDrawingNode: ASDisplayNode, ShapeDisplaying {
let backing = parameter.backing

guard let path = backing.shapePath else { return }


let userInterfaceStyle = backing.userInterfaceStyle

path.lineWidth = backing.shapeLineWidth

backing.shapeFillColor?.setFill()
backing.shapeFillColor?
.resolvedColor(with: .init(userInterfaceStyle: userInterfaceStyle))
.setFill()

path.fill()

backing.shapeStrokeColor?.setStroke()
backing.shapeStrokeColor?
.resolvedColor(with: .init(userInterfaceStyle: userInterfaceStyle))
.setStroke()

path.stroke()

}


public override func asyncTraitCollectionDidChange(
withPreviousTraitCollection previousTraitCollection: ASPrimitiveTraitCollection
) {
super.asyncTraitCollectionDidChange(withPreviousTraitCollection: previousTraitCollection)
let userInterfaceStyle = asyncTraitCollection().userInterfaceStyle
guard
self.backing.userInterfaceStyle != userInterfaceStyle
else {
return
}
self.backing.userInterfaceStyle = userInterfaceStyle
}


}