Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[WEEX-140][android]layout animation supported more property #904

Closed
wants to merge 1 commit into from
Closed

[WEEX-140][android]layout animation supported more property #904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 82 additions & 2 deletions android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ public class WXTransition {
LAYOUT_PROPERTIES.add(Constants.Name.MARGIN_BOTTOM);
LAYOUT_PROPERTIES.add(Constants.Name.MARGIN_LEFT);
LAYOUT_PROPERTIES.add(Constants.Name.MARGIN_RIGHT);
LAYOUT_PROPERTIES.add(Constants.Name.LEFT);
LAYOUT_PROPERTIES.add(Constants.Name.RIGHT);
LAYOUT_PROPERTIES.add(Constants.Name.TOP);
LAYOUT_PROPERTIES.add(Constants.Name.BOTTOM);
LAYOUT_PROPERTIES.add(Constants.Name.PADDING_LEFT);
LAYOUT_PROPERTIES.add(Constants.Name.PADDING_RIGHT);
LAYOUT_PROPERTIES.add(Constants.Name.PADDING_TOP);
LAYOUT_PROPERTIES.add(Constants.Name.PADDING_BOTTOM);
}

/**
Expand Down Expand Up @@ -396,12 +404,12 @@ private PropertyValuesHolder createLayoutPropertyValueHolder(String property, Ob
switch (property){
case Constants.Name.WIDTH:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.WIDTH, domObject.getLayoutWidth(),
WXViewUtils.getRealPxByWidth(WXUtils.getFloat(value), domObject.getViewPortWidth()));
WXViewUtils.getRealPxByWidth(WXUtils.getFloat(value, 0.0f), domObject.getViewPortWidth()));
}
break;
case Constants.Name.HEIGHT:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.HEIGHT, domObject.getLayoutHeight(),
WXViewUtils.getRealPxByWidth(WXUtils.getFloat(value), domObject.getViewPortWidth()));
WXViewUtils.getRealPxByWidth(WXUtils.getFloat(value, 0.0f), domObject.getViewPortWidth()));
}
break;
case Constants.Name.MARGIN_TOP:{
Expand All @@ -424,6 +432,46 @@ private PropertyValuesHolder createLayoutPropertyValueHolder(String property, Ob
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.LEFT:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.LEFT, domObject.getPositionLeft(),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.RIGHT:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.RIGHT, domObject.getPositionRight(),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.BOTTOM:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.BOTTOM, domObject.getPositionBottom(),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.TOP:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.TOP, domObject.getPositionTop(),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.PADDING_TOP:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.PADDING_TOP, domObject.getPadding().get(Spacing.TOP),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.PADDING_BOTTOM:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.PADDING_BOTTOM, domObject.getPadding().get(Spacing.BOTTOM),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.PADDING_LEFT:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.TOP, domObject.getPadding().get(Spacing.LEFT),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
case Constants.Name.PADDING_RIGHT:{
holder = PropertyValuesHolder.ofFloat(Constants.Name.TOP, domObject.getPadding().get(Spacing.RIGHT),
WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, domObject.getViewPortWidth()), domObject.getViewPortWidth()));
}
break;
default:
break;
}
Expand Down Expand Up @@ -466,6 +514,38 @@ public void onAnimationUpdate(ValueAnimator animation) {
domObject.setMargin(Spacing.BOTTOM, (Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.LEFT:{
domObject.setPositionLeft((Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.RIGHT:{
domObject.setPositionRight((Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.BOTTOM:{
domObject.setPositionBottom((Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.TOP:{
domObject.setPositionTop((Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.PADDING_TOP:{
domObject.setPadding(Spacing.TOP, (Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.PADDING_BOTTOM:{
domObject.setPadding(Spacing.BOTTOM, (Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.PADDING_LEFT:{
domObject.setPadding(Spacing.LEFT, (Float) animation.getAnimatedValue(property));
}
break;
case Constants.Name.PADDING_RIGHT:{
domObject.setPadding(Spacing.RIGHT, (Float) animation.getAnimatedValue(property));
}
break;
default:
break;
}
Expand Down