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

android:fix isAnimating's name is same

Browse Source
This commit is contained in:
pengfei.zhou
2021-10-12 21:01:38 +08:00
committed by osborn
parent c60ba612f5
commit 51ac1d698b
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
doric-android/doric/src/main/java/pub/doric/shader/ViewNode.java
View File

@@ -179,7 +179,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -193,7 +193,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -207,7 +207,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -221,7 +221,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -232,7 +232,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
} }
break; break;
case "backgroundColor": case "backgroundColor":
if (isAnimating()) { if (isInAnimator()) {
if (prop.isNumber()) { if (prop.isNumber()) {
ObjectAnimator animator = ObjectAnimator.ofInt( ObjectAnimator animator = ObjectAnimator.ofInt(
this, this,
@@ -343,7 +343,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -355,7 +355,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
break; break;
case "corners": case "corners":
if (prop.isNumber()) { if (prop.isNumber()) {
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -392,7 +392,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -406,7 +406,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -420,7 +420,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -434,7 +434,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -448,7 +448,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -462,7 +462,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -476,7 +476,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -490,7 +490,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -504,7 +504,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
if (!prop.isNumber()) { if (!prop.isNumber()) {
return; return;
} }
if (isAnimating()) { if (isInAnimator()) {
addAnimator(ObjectAnimator.ofFloat( addAnimator(ObjectAnimator.ofFloat(
this, this,
name, name,
@@ -723,7 +723,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
} }
} }
protected boolean isAnimating() { protected boolean isInAnimator() {
return getDoricContext().getAnimatorSet() != null; return getDoricContext().getAnimatorSet() != null;
} }