You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/02 03:28:59 UTC
[25/25] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev-suppport-recycler-component' into 0.11-dev-recycler
Merge remote-tracking branch 'upstream/0.11-dev-suppport-recycler-component' into 0.11-dev-recycler
# Conflicts:
# android/sdk/src/main/java/com/taobao/weex/common/Constants.java
# ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3ad72fb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3ad72fb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3ad72fb4
Branch: refs/heads/0.11-dev-recycler
Commit: 3ad72fb4ee901e3538f30acb959ffd3f2bdf836f
Parents: fa1c8b0 02920b6
Author: cxfeng <yi...@alibaba-inc.com>
Authored: Thu Mar 2 11:27:51 2017 +0800
Committer: cxfeng <yi...@alibaba-inc.com>
Committed: Thu Mar 2 11:27:51 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXSDKEngine.java | 9 +-
.../java/com/taobao/weex/common/Constants.java | 13 +-
.../main/java/com/taobao/weex/dom/WXAttr.java | 96 +++-
.../java/com/taobao/weex/dom/WXDomHandler.java | 2 +
.../java/com/taobao/weex/dom/WXDomManager.java | 1 +
.../java/com/taobao/weex/dom/WXDomModule.java | 8 +-
.../taobao/weex/dom/WXRecyclerDomObject.java | 317 +++++++++++
.../weex/ui/component/WXBasicComponentType.java | 2 +
.../com/taobao/weex/ui/component/WXHeader.java | 4 +-
.../ui/component/list/BasicListComponent.java | 29 +-
.../ui/component/list/ListComponentView.java | 3 -
.../ui/component/list/SimpleListComponent.java | 6 +-
.../weex/ui/component/list/WXListComponent.java | 91 +++-
.../listview/ExtendedLinearLayoutManager.java | 25 +
.../weex/ui/view/listview/WXRecyclerView.java | 43 +-
.../listview/adapter/ListBaseViewHolder.java | 8 +-
.../adapter/RecyclerViewBaseAdapter.java | 21 +-
.../adapter/WXRecyclerViewOnScrollListener.java | 107 ++--
.../ui/view/refresh/wrapper/BaseBounceView.java | 19 +-
.../refresh/wrapper/BounceRecyclerView.java | 23 +-
.../refresh/wrapper/BounceScrollerView.java | 1 +
examples/vue/components/waterfall.vue | 455 ++++++++++++++++
examples/vue/index.vue | 1 +
ios/playground/WeexDemo/DemoDefine.h | 2 +-
ios/playground/WeexDemo/UIView+UIThreadCheck.m | 2 +-
ios/playground/WeexDemo/WXDemoViewController.m | 3 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 75 ++-
.../Component/Recycler/WXMultiColumnLayout.h | 42 ++
.../Component/Recycler/WXMultiColumnLayout.m | 385 ++++++++++++++
.../Component/Recycler/WXRecyclerComponent.h | 12 +
.../Component/Recycler/WXRecyclerComponent.m | 525 +++++++++++++++++++
.../Recycler/WXRecyclerDataController.h | 34 ++
.../Recycler/WXRecyclerDataController.m | 114 ++++
.../Recycler/WXRecyclerUpdateController.h | 32 ++
.../Recycler/WXRecyclerUpdateController.m | 239 +++++++++
.../Recycler/WXSectionDataController.h | 33 ++
.../Recycler/WXSectionDataController.m | 81 +++
.../WeexSDK/Sources/Component/WXCellComponent.h | 22 +-
.../WeexSDK/Sources/Component/WXCellComponent.m | 27 +-
.../Component/WXComponent+GradientColor.h | 15 +-
.../Component/WXComponent+GradientColor.m | 15 +-
.../Sources/Component/WXFooterComponent.h | 13 +
.../Sources/Component/WXFooterComponent.m | 13 +
.../Sources/Component/WXHeaderComponent.h | 27 +
.../Sources/Component/WXHeaderComponent.m | 68 +++
.../WeexSDK/Sources/Component/WXListComponent.h | 12 -
.../WeexSDK/Sources/Component/WXListComponent.m | 71 +--
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 18 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 2 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 8 +-
ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 2 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 29 +
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h | 38 ++
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m | 186 +++++++
ios/sdk/WeexSDK/Sources/Utility/WXLength.h | 13 +-
ios/sdk/WeexSDK/Sources/Utility/WXLength.m | 45 +-
58 files changed, 3256 insertions(+), 237 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ad72fb4/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 e6e61e9,eed5191..125ae3a
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@@ -349,9 -351,8 +353,11 @@@ public class Constants
String RETURN_KEY_TYPE = "returnKeyType";
String OFFSET = "offset";
String ANIMATED = "animated";
+
+ String INSERT_CELL_ANIMATION = "insertAnimation";
+ String DELETE_CELL_ANIMATION = "deleteAnimation";
+ String AUTO = "auto";
+ String NORMAL = "normal";
}
public interface Value {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ad72fb4/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ad72fb4/ios/playground/WeexDemo/WXDemoViewController.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ad72fb4/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ad72fb4/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
index 2c40cd8,d3358fd..aff5ab1
--- a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
@@@ -13,9 -28,9 +28,10 @@@
@property (nonatomic, strong) NSString *scope;
@property (nonatomic, assign) BOOL isRecycle;
+ @property (nonatomic, assign) BOOL isLayoutComplete;
@property (nonatomic, assign) UITableViewRowAnimation insertAnimation;
@property (nonatomic, assign) UITableViewRowAnimation deleteAnimation;
- @property (nonatomic, weak) WXListComponent *list;
+@property (nonatomic, assign) BOOL keepScrollPosition;
+ @property (nonatomic, weak) id<WXCellRenderDelegate> delegate;
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ad72fb4/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3ad72fb4/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------