You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2019/04/01 09:41:09 UTC
[incubator-weex] branch master updated: [Android] Add "isDragging"
property to scroll event of a list component. (#2264)
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new 04af94a [Android] Add "isDragging" property to scroll event of a list component. (#2264)
04af94a is described below
commit 04af94a18b28df81984c04505cefe39595f89f39
Author: sunshl <su...@gmail.com>
AuthorDate: Mon Apr 1 17:41:04 2019 +0800
[Android] Add "isDragging" property to scroll event of a list component. (#2264)
* feature: Add "isDragging" property to scroll event of a list component.
* doc pr: https://github.com/apache/incubator-weex-site/pull/361
---
android/sdk/src/main/java/com/taobao/weex/common/Constants.java | 1 +
.../java/com/taobao/weex/ui/component/list/BasicListComponent.java | 7 ++++---
.../weex/ui/component/list/template/WXRecyclerTemplateList.java | 7 ++++---
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index 9d58e6a..74fab40 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -179,6 +179,7 @@ public class Constants {
String OFFSET_ACCURACY = "offsetAccuracy";
String CONTENT_SIZE = "contentSize";
String CONTENT_OFFSET = "contentOffset";
+ String ISDRAGGING = "isDragging";
String X = "x";
String Y = "y";
String RETURN_KEY_TYPE = "returnKeyType";
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 1d7e743..3432483 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -1369,9 +1369,9 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
}
}
- Map<String, Object> event = new HashMap<>(2);
- Map<String, Object> contentSize = new HashMap<>(2);
- Map<String, Object> contentOffset = new HashMap<>(2);
+ Map<String, Object> event = new HashMap<>(3);
+ Map<String, Object> contentSize = new HashMap<>(3);
+ Map<String, Object> contentOffset = new HashMap<>(3);
contentSize.put(Constants.Name.WIDTH, WXViewUtils.getWebPxByWidth(contentWidth, getInstance().getInstanceViewPortWidth()));
contentSize.put(Constants.Name.HEIGHT, WXViewUtils.getWebPxByWidth(contentHeight, getInstance().getInstanceViewPortWidth()));
@@ -1380,6 +1380,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
contentOffset.put(Constants.Name.Y, - WXViewUtils.getWebPxByWidth(offsetY, getInstance().getInstanceViewPortWidth()));
event.put(Constants.Name.CONTENT_SIZE, contentSize);
event.put(Constants.Name.CONTENT_OFFSET, contentOffset);
+ event.put(Constants.Name.ISDRAGGING, recyclerView.getScrollState() == RecyclerView.SCROLL_STATE_DRAGGING);
return event;
}
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java
index bc3e648..33f6de6 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java
@@ -1205,9 +1205,9 @@ public class WXRecyclerTemplateList extends WXVContainer<BounceRecyclerView> imp
int contentWidth = recyclerView.getMeasuredWidth() + recyclerView.computeHorizontalScrollRange();
int contentHeight = calcContentSize();
- Map<String, Object> event = new HashMap<>(2);
- Map<String, Object> contentSize = new HashMap<>(2);
- Map<String, Object> contentOffset = new HashMap<>(2);
+ Map<String, Object> event = new HashMap<>(3);
+ Map<String, Object> contentSize = new HashMap<>(3);
+ Map<String, Object> contentOffset = new HashMap<>(3);
contentSize.put(Constants.Name.WIDTH, WXViewUtils.getWebPxByWidth(contentWidth, getInstance().getInstanceViewPortWidth()));
contentSize.put(Constants.Name.HEIGHT, WXViewUtils.getWebPxByWidth(contentHeight, getInstance().getInstanceViewPortWidth()));
@@ -1216,6 +1216,7 @@ public class WXRecyclerTemplateList extends WXVContainer<BounceRecyclerView> imp
contentOffset.put(Constants.Name.Y, - WXViewUtils.getWebPxByWidth(offsetY, getInstance().getInstanceViewPortWidth()));
event.put(Constants.Name.CONTENT_SIZE, contentSize);
event.put(Constants.Name.CONTENT_OFFSET, contentOffset);
+ event.put(Constants.Name.ISDRAGGING, recyclerView.getScrollState() == RecyclerView.SCROLL_STATE_DRAGGING);
return event;
}