* [android] merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7031a924 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7031a924 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7031a924 Branch: refs/heads/0.16-dev Commit: 7031a924d94eb083ecf35f70e68a33ad568f7510 Parents: 2382887 8a8dfb8 Author: misakuo <misa...@apache.org> Authored: Tue Aug 15 17:13:36 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Tue Aug 15 17:13:36 2017 +0800 ---------------------------------------------------------------------- android/sdk/libs/x86/libweexjsc.so | Bin 7570392 -> 12121924 bytes .../java/com/taobao/weex/common/Constants.java | 2 + .../java/com/taobao/weex/dom/WXDomObject.java | 15 +- doc/source/_posts/arkit.md | 112 +++++++ doc/source/_posts/cn/hello.md | 6 - doc/source/_posts/hello_world.md | 7 - doc/source/_posts/test.md | 14 - doc/source/cn/blog/index.md | 4 - .../cn/references/advanced/extend-to-ios.md | 4 +- .../advanced/integrate-devtool-to-android.md | 86 ++++- doc/source/cn/references/common-style.md | 2 + doc/source/cn/references/components/text.md | 4 +- doc/source/cn/references/modules/animation.md | 2 +- doc/source/references/advanced/extend-to-ios.md | 5 +- doc/source/references/common-style.md | 2 + doc/source/references/components/text.md | 4 +- doc/source/references/modules/animation.md | 2 +- doc/themes/weex/layout/_partial/header.ejs | 1 + .../weex/layout/_partial/post/summary.ejs | 1 + doc/themes/weex/source/css/blog.scss | 3 + doc/themes/weex/source/css/media-queries.scss | 1 + doc/themes/weex/source/css/partial/header.scss | 6 +- html5/runtime/normalize.js | 13 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 24 +- .../Sources/Component/WXComponent_internal.h | 12 + .../WeexSDK/Sources/Component/WXListComponent.m | 4 +- .../Sources/Display/WXComponent+Display.m | 16 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 67 +++- .../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 --- .../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 ------- .../WeexSDK/Sources/Module/WXAnimationModule.h | 2 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 88 ++++-- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 43 +++ ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 311 +++++++++++++++++++ ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 3 +- package.json | 4 +- pre-build/native-bundle-main.js | 10 +- test/run.sh | 18 +- 39 files changed, 766 insertions(+), 299 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7031a924/android/sdk/src/main/java/com/taobao/weex/common/Constants.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/common/Constants.java index b9abceb,73c3399..92cb971 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@@ -170,7 -170,8 +170,9 @@@ public class Constants String OFFSET = "offset"; String ANIMATED = "animated"; String STABLE = "stable"; + String TRANSFORM = "transform"; + String TRANSFORM_ORIGIN = "transformOrigin"; + String KEEP_INDEX = "keepIndex"; String INSERT_CELL_ANIMATION = "insertAnimation"; String DELETE_CELL_ANIMATION = "deleteAnimation";
