feat(android): implement scrollToIndex animation support

tidev · Aug 16, 2021 · 2c542b8 · 2c542b8
1 parent 53f8bff
commit 2c542b8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewProxy.java
@@ -665,12 +665,18 @@ public void releaseViews()
 	public void scrollToIndex(int index, @Kroll.argument(optional = true) KrollDict animation)
 	{
 		final TiTableView tableView = getTableView();
+		final boolean animated = animation != null && animation.optBoolean(TiC.PROPERTY_ANIMATED, true);
 
 		if (tableView != null) {
 			final RecyclerView recyclerView = tableView.getRecyclerView();
 
 			if (recyclerView != null) {
-				recyclerView.scrollToPosition(tableView.getAdapterIndex(index));
+
+				if (animated) {
+					recyclerView.smoothScrollToPosition(tableView.getAdapterIndex(index));
+				} else {
+					recyclerView.scrollToPosition(tableView.getAdapterIndex(index));
+				}
 			}
 		}
 	}

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java
@@ -618,9 +618,10 @@ public void replaceSectionAt(int index, ListSectionProxy section,
 	 * @param itemIndex Index of item in section.
 	 */
 	@Kroll.method
-	public void scrollToItem(int sectionIndex, int itemIndex)
+	public void scrollToItem(int sectionIndex, int itemIndex, @Kroll.argument(optional = true) KrollDict animation)
 	{
 		final TiListView listView = getListView();
+		final boolean animated = animation != null && animation.optBoolean(TiC.PROPERTY_ANIMATED, true);
 
 		if (listView != null) {
 			final ListSectionProxy section = getSectionByIndex(sectionIndex);
@@ -629,7 +630,12 @@ public void scrollToItem(int sectionIndex, int itemIndex)
 				final ListItemProxy item = section.getListItemAt(itemIndex);
 
 				if (item != null) {
-					listView.getRecyclerView().smoothScrollToPosition(listView.getAdapterIndex(item.index));
+
+					if (animated) {
+						listView.getRecyclerView().smoothScrollToPosition(listView.getAdapterIndex(item.index));
+					} else {
+						listView.getRecyclerView().scrollToPosition(listView.getAdapterIndex(item.index));
+					}
 				}
 			}
 		}
@@ -644,7 +650,7 @@ public void scrollToItem(int sectionIndex, int itemIndex)
 	@Kroll.method
 	public void selectItem(int sectionIndex, int itemIndex)
 	{
-		scrollToItem(sectionIndex, itemIndex);
+		scrollToItem(sectionIndex, itemIndex, null);
 
 		final TiListView listView = getListView();