fix(android): include totalItemCount and visibleItemCount properties

tidev · Jan 19, 2021 · d1079c3 · d1079c3
1 parent b7609ff
commit d1079c3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -88,6 +88,12 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy)
 			{
 				super.onScrolled(recyclerView, dx, dy);
 
+				if (dx == 0 && dy == 0) {
+
+					// Not scrolled, skip.
+					return;
+				}
+
 				if (!isScrolling) {
 					isScrolling = true;
 					proxy.fireSyncEvent(TiC.EVENT_SCROLLSTART, generateScrollPayload());
@@ -269,6 +275,11 @@ public KrollDict generateScrollPayload()
 		final int firstVisibleSectionIndex = proxy.getIndexOfSection(firstVisibleSection);
 		payload.put(TiC.PROPERTY_FIRST_VISIBLE_SECTION_INDEX, firstVisibleSectionIndex);
 
+		// Define visible item count.
+		final int visibleItemCount =
+			layoutManager.findLastVisibleItemPosition() - layoutManager.findFirstVisibleItemPosition();
+		payload.put(TiC.PROPERTY_VISIBLE_ITEM_COUNT, visibleItemCount);
+
 		return payload;
 	}
 

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java
@@ -63,6 +63,8 @@ public class TiTableView extends TiSwipeRefreshLayout implements OnSearchChangeL
 	private int scrollOffsetX = 0;
 	private int scrollOffsetY = 0;
 
+	private int totalRowCount;
+
 	public TiTableView(TableViewProxy proxy)
 	{
 		super(proxy.getActivity());
@@ -106,6 +108,12 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy)
 			{
 				super.onScrolled(recyclerView, dx, dy);
 
+				if (dx == 0 && dy == 0) {
+
+					// Not scrolled, skip.
+					return;
+				}
+
 				isScrolling = true;
 
 				// Update scroll offsets.
@@ -260,6 +268,14 @@ public KrollDict generateScrollPayload()
 		final int firstVisibleIndex = firstVisibleProxy.getIndexInSection();
 		payload.put(TiC.PROPERTY_FIRST_VISIBLE_ITEM, firstVisibleIndex);
 
+		// Define visible item count.
+		final int visibleItemCount =
+			layoutManager.findLastVisibleItemPosition() - layoutManager.findFirstVisibleItemPosition();
+		payload.put(TiC.PROPERTY_VISIBLE_ITEM_COUNT, visibleItemCount);
+
+		// Define total item count.
+		payload.put(TiC.PROPERTY_TOTAL_ITEM_COUNT, totalRowCount);
+
 		// Obtain scroll offset for content.
 		final KrollDict contentOffset = new KrollDict();
 		final TiDimension scrollOffsetXDimension = new TiDimension(scrollOffsetX, TiDimension.TYPE_WIDTH);
@@ -524,6 +540,7 @@ public void updateModels()
 			// Update row index, ignoring placeholder entries.
 			row.index = i++;
 		}
+		totalRowCount = i;
 
 		final Activity activity = TiApplication.getAppCurrentActivity();
 		final View previousFocus = activity != null ? activity.getCurrentFocus() : null;

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -3361,6 +3361,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_TOP = "top";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_TOTAL_ITEM_COUNT = "totalItemCount";
+
 	/**
 	 * @module.api
 	 */
@@ -3501,6 +3506,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_VISIBILITY = "visibility";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_VISIBLE_ITEM_COUNT = "visibleItemCount";
+
 	/**
 	 * @module.api
 	 */