tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/animation' into 'master'

Browse Source 
Feature/animation



See merge request !38
This commit is contained in:
pengfeizhou
2019-11-29 20:48:37 +08:00
parent ca27e8a26e 6b4bc9cd0f
commit a559ba362d
5 changed files with 53 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Android/doric/src/main/java/pub/doric/shader/ViewNode.java
View File

@@ -203,6 +203,17 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
prop.asObject().getProperty("color").asNumber().toInt());
}
break;
case "alpha":
if (isAnimating()) {
addAnimator(ObjectAnimator.ofFloat(
this,
name,
getAlpha(),
prop.asNumber().toFloat()));
} else {
setAlpha(prop.asNumber().toFloat());
}
break;
case "corners":
if (prop.isNumber()) {
if (isAnimating()) {
@@ -270,6 +281,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
} else {
setScaleX(prop.asNumber().toFloat());
}
break;
case "scaleY":
if (isAnimating()) {
addAnimator(ObjectAnimator.ofFloat(
@@ -280,6 +292,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
} else {
setScaleY(prop.asNumber().toFloat());
}
break;
case "pivotX":
if (isAnimating()) {
addAnimator(ObjectAnimator.ofFloat(
@@ -313,28 +326,6 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
setRotation(prop.asNumber().toFloat());
}
break;
case "rotationX":
if (isAnimating()) {
addAnimator(ObjectAnimator.ofFloat(
this,
name,
getRotationX(),
prop.asNumber().toFloat()));
} else {
setRotationX(prop.asNumber().toFloat());
}
break;
case "rotationY":
if (isAnimating()) {
addAnimator(ObjectAnimator.ofFloat(
this,
name,
getRotationY(),
prop.asNumber().toFloat()));
} else {
setRotationY(prop.asNumber().toFloat());
}
break;
default:
break;
}
@@ -540,6 +531,16 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
mView.setBackgroundColor(color);
}
@DoricMethod
public void setAlpha(float alpha) {
getNodeView().setAlpha(alpha);
}
@DoricMethod
public float getAlpha() {
return getNodeView().getAlpha();
}
@DoricMethod
public void setCorners(float corner) {
requireDoricLayer().setCornerRadius(DoricUtils.dp2px(corner));
@@ -601,26 +602,6 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
return getNodeView().getRotation() / 180;
}
@DoricMethod
public void setRotationX(float rotation) {
getNodeView().setRotationX(rotation * 180);
}
@DoricMethod
public float getRotationX() {
return getNodeView().getRotationX() / 180;
}
@DoricMethod
public void setRotationY(float rotation) {
getNodeView().setRotationY(rotation * 180);
}
@DoricMethod
public float getRotationY() {
return getNodeView().getRotationY() / 180;
}
@DoricMethod
public void setPivotX(float v) {
getNodeView().setPivotX(v * getNodeView().getWidth());