javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from NativeScript/optimization

Browse Source 
Small optimisation.
This commit is contained in:
Rossen Hristov
2016-06-21 16:23:21 +03:00
committed by GitHub
parent 0b91c361ef 505f4cbfa1
commit abf4cc585b
1 changed files with 27 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
View File

@@ -21,6 +21,17 @@ public class BorderDrawable extends ColorDrawable {
private float density; private float density;
private float borderWidth; private float borderWidth;
private int borderColor; private int borderColor;
private float borderRadius;
private String clipPath;
private int backgroundColor;
private Bitmap backgroundImage;
private float backgroundImageWidth;
private float backgroundImageHeight;
private String backgroundRepeat;
private String backgroundPosition;
private CSSValue[] backgroundPositionParsedCSSValues;
private String backgroundSize;
private CSSValue[] backgroundSizeParsedCSSValues;
public float getBorderWidth() { public float getBorderWidth() {
return borderWidth; return borderWidth;
@@ -66,18 +77,6 @@ public class BorderDrawable extends ColorDrawable {
return backgroundSize; return backgroundSize;
} }
private float borderRadius;
private String clipPath;
private int backgroundColor;
private Bitmap backgroundImage;
private float backgroundImageWidth;
private float backgroundImageHeight;
private String backgroundRepeat;
private String backgroundPosition;
private CSSValue[] backgroundPositionParsedCSSValues;
private String backgroundSize;
private CSSValue[] backgroundSizeParsedCSSValues;
public BorderDrawable(float density){ public BorderDrawable(float density){
super(); super();
this.density = density; this.density = density;
@@ -96,73 +95,20 @@ public class BorderDrawable extends ColorDrawable {
CSSValue[] backgroundPositionParsedCSSValues, CSSValue[] backgroundPositionParsedCSSValues,
String backgroundSize, String backgroundSize,
CSSValue[] backgroundSizeParsedCSSValues){ CSSValue[] backgroundSizeParsedCSSValues){
boolean dirty = false; this.borderWidth = borderWidth;
this.borderColor = borderColor;
if (this.borderWidth != borderWidth){ this.borderRadius = borderRadius;
this.borderWidth = borderWidth; this.clipPath = clipPath;
dirty = true; this.backgroundColor = backgroundColor;
} this.backgroundImage = backgroundImage;
this.backgroundImageWidth = backgroundImageWidth;
if (this.borderColor != borderColor){ this.backgroundImageHeight = backgroundImageHeight;
this.borderColor = borderColor; this.backgroundRepeat = backgroundRepeat;
dirty = true; this.backgroundPosition = backgroundPosition;
} this.backgroundPositionParsedCSSValues = backgroundPositionParsedCSSValues;
this.backgroundSize = backgroundSize;
if (this.borderRadius != borderRadius){ this.backgroundSizeParsedCSSValues = backgroundSizeParsedCSSValues;
this.borderRadius = borderRadius; this.invalidateSelf();
dirty = true;
}
if (!compare(this.clipPath, clipPath)){
this.clipPath = clipPath;
dirty = true;
}
if (this.backgroundColor != backgroundColor){
this.backgroundColor = backgroundColor;
dirty = true;
}
if (this.backgroundImage != backgroundImage){
this.backgroundImage = backgroundImage;
dirty = true;
}
if (this.backgroundImageWidth != backgroundImageWidth){
this.backgroundImageWidth = backgroundImageWidth;
dirty = true;
}
if (this.backgroundImageHeight != backgroundImageHeight){
this.backgroundImageHeight = backgroundImageHeight;
dirty = true;
}
if (!compare(this.backgroundRepeat, backgroundRepeat)){
this.backgroundRepeat = backgroundRepeat;
dirty = true;
}
if (!compare(this.backgroundPosition, backgroundPosition)){
this.backgroundPosition = backgroundPosition;
this.backgroundPositionParsedCSSValues = backgroundPositionParsedCSSValues;
dirty = true;
}
if (!compare(this.backgroundSize, backgroundSize)){
this.backgroundSize = backgroundSize;
this.backgroundSizeParsedCSSValues = backgroundSizeParsedCSSValues;
dirty = true;
}
if (dirty){
this.invalidateSelf();
}
}
private static boolean compare(String str1, String str2) {
return (str1 == null ? str2 == null : str1.equals(str2));
} }
@Override @Override
@@ -281,6 +227,7 @@ public class BorderDrawable extends ColorDrawable {
} }
private static void drawClipPath(String clipPath, Canvas canvas, Paint paint, RectF bounds, float density) { private static void drawClipPath(String clipPath, Canvas canvas, Paint paint, RectF bounds, float density) {
// Sample string is polygon(20% 0%, 0% 20%, 30% 50%, 0% 80%, 20% 100%, 50% 70%, 80% 100%, 100% 80%, 70% 50%, 100% 20%, 80% 0%, 50% 30%);
String functionName = clipPath.substring(0, clipPath.indexOf("(")); String functionName = clipPath.substring(0, clipPath.indexOf("("));
String value = clipPath.replace(functionName+"(", "").replace(")", ""); String value = clipPath.replace(functionName+"(", "").replace(")", "");
@@ -469,7 +416,7 @@ public class BorderDrawable extends ColorDrawable {
return result; return result;
} }
private static float cssValueToDevicePixels(String source, float total, float density) { private static float cssValueToDevicePixels(String source, float total, float density) {
float result; float result;
source = source.trim(); source = source.trim();