You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/11/24 05:42:59 UTC
incubator-weex git commit: [WEEX-140][android]layout animation
supported more property close #904 [Forced Update!]
Repository: incubator-weex
Updated Branches:
refs/heads/master 84a8b17d4 -> daecf9af1 (forced update)
[WEEX-140][android]layout animation supported more property close #904
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/daecf9af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/daecf9af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/daecf9af
Branch: refs/heads/master
Commit: daecf9af13a1b4716e030785cdea27b351e591c0
Parents: da1f70e
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Thu Nov 23 14:46:53 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Nov 24 13:41:16 2017 +0800
----------------------------------------------------------------------
.../weex/dom/transition/WXTransition.java | 84 +++++++++++++++++++-
1 file changed, 82 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/daecf9af/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java b/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java
index 41fcd12..b77db98 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java
@@ -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);
}
/**
@@ -396,12 +404,12 @@ public class WXTransition {
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:{
@@ -424,6 +432,46 @@ public class WXTransition {
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;
}
@@ -466,6 +514,38 @@ public class WXTransition {
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;
}