-
Notifications
You must be signed in to change notification settings - Fork 313
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.
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
Add LaneView
snapshot tests.
#3976
Draft
MaximAlien
wants to merge
3
commits into
main
Choose a base branch
from
maxim/3972-add-lane-view-snapshot-tests
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -336,24 +336,37 @@ extension ManeuverDirection { | |
|
||
/// :nodoc: | ||
open class LaneView: UIView { | ||
Comment on lines
337
to
338
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks for documenting all the members of this class! Note that they still won’t show up in jazzy because the class itself is undocumented. I think that’s OK but just FYI. |
||
|
||
/** | ||
The direction or directions of travel that the lane is reserved for. | ||
*/ | ||
var indications: LaneIndication { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
/** | ||
Denotes which of the `indications` is applicable to the current route when there is more than one. | ||
*/ | ||
var maneuverDirection: ManeuverDirection? { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
var isValid: Bool = false { | ||
/** | ||
Denotes whether or not the user can use this lane to continue along the current route. | ||
*/ | ||
var isUsable: Bool = false { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
/** | ||
Indicates which side of the road cars and traffic flow. | ||
*/ | ||
var drivingSide: DrivingSide = .right { | ||
didSet { | ||
setNeedsDisplay() | ||
|
@@ -364,38 +377,60 @@ open class LaneView: UIView { | |
return bounds.size | ||
} | ||
|
||
/** | ||
Color of the maneuver direction (applied only when `LaneView.isUsable` is set to `true`). In case if | ||
`LaneView.showHighlightedColors` is set to `true` this value is not used, `LaneView.primaryColorHighlighted` | ||
is used instead. | ||
*/ | ||
@objc public dynamic var primaryColor: UIColor = .defaultLaneArrowPrimary { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
/** | ||
Color of the directions that the lane is reserved for (except the one that is applicable to the | ||
current route). In case if `LaneView.showHighlightedColors` is set to `true` this value is not used, | ||
`LaneView.secondaryColorHighlighted` is used instead. | ||
*/ | ||
@objc public dynamic var secondaryColor: UIColor = .defaultLaneArrowSecondary { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
|
||
/** | ||
Highlighted color of the directions that the lane is reserved for (except the one that is | ||
applicable to the current route). | ||
*/ | ||
@objc public dynamic var primaryColorHighlighted: UIColor = .defaultLaneArrowPrimaryHighlighted { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
|
||
/** | ||
Highlighted color of the directions that the lane is reserved for (except the one that is applicable | ||
to the current route). | ||
*/ | ||
@objc public dynamic var secondaryColorHighlighted: UIColor = .defaultLaneArrowSecondaryHighlighted { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
|
||
/** | ||
Controls whether highighted colors (either `LaneView.primaryColorHighlighted` or | ||
`LaneView.secondaryColorHighlighted`) should be used. | ||
*/ | ||
public var showHighlightedColors: Bool = false { | ||
didSet { | ||
setNeedsDisplay() | ||
} | ||
} | ||
|
||
var appropriatePrimaryColor: UIColor { | ||
if isValid { | ||
if isUsable { | ||
return showHighlightedColors ? primaryColorHighlighted : primaryColor | ||
} else { | ||
return showHighlightedColors ? secondaryColorHighlighted : secondaryColor | ||
|
@@ -408,12 +443,16 @@ open class LaneView: UIView { | |
|
||
static let defaultFrame: CGRect = CGRect(origin: .zero, size: 30.0) | ||
|
||
convenience init(indications: LaneIndication, isUsable: Bool, direction: ManeuverDirection?) { | ||
convenience init(indications: LaneIndication, | ||
isUsable: Bool, | ||
direction: ManeuverDirection?, | ||
showHighlightedColors: Bool = false) { | ||
self.init(frame: LaneView.defaultFrame) | ||
backgroundColor = .clear | ||
self.indications = indications | ||
maneuverDirection = direction ?? ManeuverDirection(rawValue: indications.description) | ||
isValid = isUsable | ||
self.isUsable = isUsable | ||
self.showHighlightedColors = showHighlightedColors | ||
} | ||
|
||
override init(frame: CGRect) { | ||
|
@@ -422,9 +461,9 @@ open class LaneView: UIView { | |
commonInit() | ||
} | ||
|
||
@objc public required init?(coder aDecoder: NSCoder) { | ||
@objc public required init?(coder decoder: NSCoder) { | ||
indications = [] | ||
super.init(coder: aDecoder) | ||
super.init(coder: decoder) | ||
commonInit() | ||
} | ||
|
||
|
@@ -444,7 +483,7 @@ open class LaneView: UIView { | |
#endif | ||
|
||
let resizing = LanesStyleKit.ResizingBehavior.aspectFit | ||
let appropriateColor = isValid ? appropriatePrimaryColor : appropriateSecondaryColor | ||
let appropriateColor = isUsable ? appropriatePrimaryColor : appropriateSecondaryColor | ||
let size = CGSize(width: 32, height: 32) | ||
|
||
let isFlipped = indications.dominantSide(maneuverDirection: maneuverDirection, drivingSide: drivingSide) == .left | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no need to set appearance for cases when
LaneView
is insideLanesView
, because setting appearance forphoneTraitCollection
covers this case.