Skip to content
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

Jump to bottom

Fix field with multiple constraints. #77

Closed
wants to merge 3 commits into from
Closed

Fix field with multiple constraints. #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d0e8a3
Add index to field when multiple constraints.
fortmarek May 9, 2018
4c3905d
Refactor.
fortmarek May 9, 2018
7e28ece
Change constrain naming.
fortmarek May 9, 2018
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
2 changes: 1 addition & 1 deletion Example/Source/Component/Examples/ProgressView/ProgressViewRootView.ui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
progress="0.8"
progressTintColor="red"
trackTintColor="green"
layout:fillHorizontally="super inset(20)"
layout:fillHorizontally="progressFill = super inset(20)"
layout:centerY="super" />

</Component>
13 changes: 12 additions & 1 deletion Sources/Tokenizer/Layout/Constraints/Constraint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,18 @@ public struct Constraint {
public static func constraints(name: String, attribute: XMLAttribute) throws -> [Constraint] {
let layoutAttributes = try LayoutAttribute.deserialize(name)
let tokens = Lexer.tokenize(input: attribute.text)
return try layoutAttributes.flatMap { try ConstraintParser(tokens: tokens, layoutAttribute: $0).parse() }
let constraints = try layoutAttributes.flatMap { try ConstraintParser(tokens: tokens, layoutAttribute: $0).parse() }

guard
constraints.count > 1,
let field = constraints.first?.field
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this a potential problem? You got this field from every individual constraint before.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, here you can get only constraints belonging to the same constraintField, eg fillHorizontally returns two constraints, one leading and one trailing

else { return constraints }

return constraints.map { currentConstraint in
var constraint = currentConstraint
constraint.field = field + "\(currentConstraint.attribute)".capitalizingFirstLetter()
return constraint
}
}

func serialize() -> XMLSerializableAttribute {
Expand Down