[TIMOB-19200] Android: implement 'noresults' event on ListView

tidev · Jul 29, 2015 · 93932e3 · 93932e3
1 parent 67c708a
commit 93932e3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java
@@ -941,7 +941,7 @@ public boolean isFilterOn() {
 		return false;
 	}
 
-	public void applyFilter(String searchText) {
+	public int applyFilter(String searchText) {
 		//Clear previous result
 		filterIndices.clear();
 		boolean caseInsensitive = getListView().getCaseInsensitive();
@@ -958,6 +958,7 @@ public void applyFilter(String searchText) {
 				filterIndices.add(i);
 			}
 		}
+		return filterIndices.size();
 	}
 
 	public void release() {

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
@@ -650,12 +650,16 @@ private void setHeaderOrFooterView (Object viewObj, boolean isHeader) {
 	}
 
 	private void reFilter(String searchText) {
+		int numResults = 0;
 		if (searchText != null) {
 			for (int i = 0; i < sections.size(); ++i) {
 				ListSectionProxy section = sections.get(i);
-				section.applyFilter(searchText);
+				numResults += section.applyFilter(searchText);
 			}
 		}
+		if (numResults == 0) {
+			fireEvent(TiC.EVENT_NO_RESULTS, null);
+		}
 		if (adapter != null) {
 			adapter.notifyDataSetChanged();
 		}

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
@@ -136,6 +136,9 @@ public void reIndexItems() {
 					index.add(i);
 				}
 			}
+			if (index.size() == 0) {
+				proxy.fireEvent(TiC.EVENT_NO_RESULTS, null);
+			}
 		}
 
 		public int getCount() {

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -217,6 +217,11 @@ public class TiC
 	 */
 	public static final String EVENT_NEW_INTENT = "newintent";
 
+	/**
+	 * @module.api
+	 */
+	public static final String EVENT_NO_RESULTS = "noresults";
+
 	/**
 	 * @module.api
 	 */

diff --git a/apidoc/Titanium/UI/ListView.yml b/apidoc/Titanium/UI/ListView.yml
@@ -356,8 +356,11 @@ events:
 
         While the `searchView` API automatically shows a **No Results** cell in the list view, the `searchText` API does not do so.
         Developers can listen to this event and perform appropriate actions when the search result set is empty.
-    platforms: [iphone, ipad]
-    since: "3.3.0"
+    platforms: [android, iphone, ipad]
+    since:
+        android: 4.2.0
+        iphone: 3.3.0
+        ipad: 3.3.0
     properties:
       - name: bubbles
         summary: false. This event does not bubble.