Skip to content

feat(css-bkg-pos): Added possibility to declare background pos by single numeric value #7958

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
vmutafov merged 8 commits into from
Mar 24, 2020
Merged

feat(css-bkg-pos): Added possibility to declare background pos by single numeric value #7958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34407f8
feat(css-bkg-pos): Added possibility to declare background pos by sin…
Oct 14, 2019
d3bb4e6
feat(css-bkg-pos): Implemented numeric bkg pos for iOS
Oct 22, 2019
b757cfb
Merge branch 'master' into bkg-pos
vtrifonov Jan 21, 2020
dcecf27
feat(css-bkg-pos): removed unnecessary code
Jan 21, 2020
2f929f6
Merge branch 'master' into bkg-pos
vtrifonov Jan 22, 2020
f246f8f
Merge branch 'master' into bkg-pos
vtrifonov Mar 20, 2020
5834f92
Merge branch 'master' into bkg-pos
vtrifonov Mar 20, 2020
ae4a5be
Merge branch 'master' into bkg-pos
vtrifonov Mar 23, 2020
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
41 changes: 29 additions & 12 deletions nativescript-core/ui/styling/background.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,23 @@ function parsePosition(pos: string): { x: CSSValue, y: CSSValue } {
return { x: values[0], y: values[1] };
}

if (values.length === 1 && values[0].type === "ident") {
const val = values[0].string.toLocaleLowerCase();
const center = { type: "ident", string: "center" };

// If you only one keyword is specified, the other value is "center"
if (val === "left" || val === "right") {
return { x: values[0], y: center };
} else if (val === "top" || val === "bottom") {
return { x: center, y: values[0] };
} else if (val === "center") {
return { x: center, y: center };
}
if (values.length === 1) {
const center = { type: "ident", string: "center" };

if (values[0].type === "ident") {
const val = values[0].string.toLocaleLowerCase();

// If you only one keyword is specified, the other value is "center"
if (val === "left" || val === "right") {
return { x: values[0], y: center };
} else if (val === "top" || val === "bottom") {
return { x: center, y: values[0] };
} else if (val === "center") {
return { x: center, y: center };
}
} else if (values[0].type === "number") {
return {x: values[0], y: center};
}
}

return null;
Expand Down Expand Up @@ -322,6 +327,18 @@ function getDrawParams(this: void, image: UIImage, background: BackgroundDefinit
} else if (v.y.string.toLowerCase() === "bottom") {
res.posY = spaceY;
}
} else if (v.x.type === "number" && v.y.type === "ident") {
if (v.x.unit === "%") {
res.posX = spaceX * v.x.value / 100;
} else if (v.x.unit === "px" || v.x.unit === "") {
res.posX = v.x.value;
}

if (v.y.string.toLowerCase() === "center") {
Comment thread
surdu marked this conversation as resolved.
res.posY = spaceY / 2;
} else if (v.y.string.toLowerCase() === "bottom") {
res.posY = spaceY;
}
}
}
}
Expand Down
33 changes: 25 additions & 8 deletions ...odules-widgets/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,18 @@ private BackgroundDrawParams getDrawParams(float width, float height) {
res.posX = spaceX;
}

if ("center".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {

@vmutafov vmutafov Dec 16, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Couldn't this logic be reused with the one below? This if introduces code duplication. Also, perhaps it's a good idea to extract pieces like vy.getString().toLowerCase(Locale.ENGLISH) into separate variables. This would increase readability, easier debugging and would not perform multiple method calls.

@surdu surdu Jan 21, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm afraid that without strong unit tests around this area, an important part of the parser could brake. I could write those unit tests, but as stated above, I would need some help with that 😞

res.posY = spaceY / 2;
} else if ("bottom".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {
res.posY = spaceY;
}
} else if ("number".equals(vx.getType()) && "ident".equals(vy.getType())) {
if ("%".equals(vx.getUnit())) {
res.posX = spaceX * vx.getValue() / 100;
} else if ("px".equals(vx.getUnit()) || vx.getUnit() == null || vx.getUnit().isEmpty()) {
res.posX = vx.getValue();
}

if ("center".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {
res.posY = spaceY / 2;
} else if ("bottom".equals(vy.getString().toLowerCase(Locale.ENGLISH))) {
Expand All @@ -731,17 +743,22 @@ private static CSSValue[] parsePosition(CSSValue[] values) {
}

CSSValue[] result = null;
if (values.length == 1 && "ident".equals(values[0].getType())) {
String val = values[0].getString().toLowerCase(Locale.ENGLISH);
if (values.length == 1) {
// If you only one keyword is specified, the other value is "center"
CSSValue center = new CSSValue("ident", "center", null, 0);

// If you only one keyword is specified, the other value is "center"
if ("left".equals(val) || "right".equals(val)) {
if ("ident".equals(values[0].getType())) {
String val = values[0].getString().toLowerCase(Locale.ENGLISH);

if ("left".equals(val) || "right".equals(val)) {
result = new CSSValue[]{values[0], center};
} else if ("top".equals(val) || "bottom".equals(val)) {
result = new CSSValue[]{center, values[0]};
} else if ("center".equals(val)) {
result = new CSSValue[]{center, center};
}
} else if ("number".equals(values[0].getType())) {
result = new CSSValue[]{values[0], center};
} else if ("top".equals(val) || "bottom".equals(val)) {
result = new CSSValue[]{center, values[0]};
} else if ("center".equals(val)) {
result = new CSSValue[]{center, center};
}
}

Expand Down