Improved filter engine - #362 - Filter items with optional originalList

davideas · May 11, 2017 · dbbe6c0 · dbbe6c0
1 parent 0164675
commit dbbe6c0
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 41 deletions.
diff --git a/...-app/src/main/java/eu/davidea/samples/flexibleadapter/services/DatabaseConfiguration.java b/...-app/src/main/java/eu/davidea/samples/flexibleadapter/services/DatabaseConfiguration.java
@@ -21,7 +21,7 @@ public class DatabaseConfiguration {
 	public static int maxSize = 10000;//max number of items
 	public static int maxSearchDelay = 1000;//max search delay in ms
 	public static int size = 1000;//items
-	public static int delay = 200;//ms
+	public static int delay = 300;//ms
 	public static int animateToLimit = maxSize;//start with maxSize
 	public static boolean animateWithDiffUtil = false;
 	public static boolean notifyChange = true;

diff --git a/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java b/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java
@@ -4100,16 +4100,8 @@ private synchronized void filterItemsAsync(@NonNull List<T> unfilteredItems) {
 		if (hasSearchText() && hasNewSearchText(mSearchText)) { //skip when text is unchanged
 			for (T item : unfilteredItems) {
 				if (mFilterAsyncTask != null && mFilterAsyncTask.isCancelled()) return;
-				if (filterExpandableObject(item)) {
-					T header = (T) getHeaderOf(item);
-					if (headersShown && hasHeader(item) && !filteredItems.contains(header)) {
-						header.setHidden(false);
-						filteredItems.add(header);
-					}
-					addFilteredSubItems(filteredItems, item); //Adds filtered item + recursive add
-				} else {
-					item.setHidden(true);
-				}
+				// Filter normal AND expandable objects
+				filterObject(item, filteredItems);
 			}
 		} else if (hasNewSearchText(mSearchText)) { //this is better than checking emptiness
 			filteredItems = unfilteredItems; //original items with no filter
@@ -4149,9 +4141,34 @@ public boolean isFiltering() {
 	 * @return true, if the object should be in the filteredResult, false otherwise
 	 * @since 5.0.0-b1
 	 */
-	private boolean filterExpandableObject(T item) {
+	private boolean filterObject(T item, List<T> values) {
+		// Start to compose the filteredItems to maintain the order of addition
+		// It will be discarded if no subItem will be filtered
+		List<T> filteredItems = new ArrayList<>();
+		filteredItems.add(item);
+		// Filter subItems
+		boolean filtered = filterSubItems(item, filteredItems);
+		// If no subItem was filtered, fallback to Normal filter
+		if (!filtered) {
+			filtered = filterObject(item, getSearchText());
+		}
+		if (filtered) {
+			// Check if header has to be added too
+			T header = (T) getHeaderOf(item);
+			if (headersShown && hasHeader(item) && !values.contains(header)) {
+				header.setHidden(false);
+				values.add(header);
+			}
+			values.addAll(filteredItems);
+		}
+		item.setHidden(!filtered);
+		return filtered;
+	}
+
+	private boolean filterSubItems(T item, List<T> filteredItems) {
 		// Reset expansion flag
 		boolean filtered = false;
+		// Is item an expandable?
 		if (isExpandable(item)) {
 			IExpandable expandable = (IExpandable) item;
 			// Save which expandable was originally expanded before filtering it out
@@ -4162,17 +4179,23 @@ private boolean filterExpandableObject(T item) {
 			}
 			// Children scan filter
 			for (T subItem : getCurrentChildren(expandable)) {
-				// Reuse normal filter for Children
-				subItem.setHidden(!filterObject(subItem, getSearchText()));
-				if (!filtered && !subItem.isHidden()) {
+				if (subItem instanceof IExpandable && filterObject(subItem, filteredItems)) {
 					filtered = true;
+				} else {
+					// Use normal filter for subItems
+					subItem.setHidden(!filterObject(subItem, getSearchText()));
+					if (!subItem.isHidden()) {
+						filtered = true;
+						if (mOriginalList == null || (mOriginalList != null && !expandable.isExpanded())) {
+							filteredItems.add(subItem);
+						}
+					}
 				}
 			}
 			// Expand if filter found text in subItems
 			expandable.setExpanded(filtered);
 		}
-		// if not filtered already, fallback to Normal filter
-		return filtered || filterObject(item, getSearchText());
+		return filtered;
 	}
 
 	/**
@@ -4197,30 +4220,6 @@ protected boolean filterObject(T item, String constraint) {
 		return item instanceof IFilterable && ((IFilterable) item).filter(constraint);
 	}
 
-	/**
-	 * Adds to the final list also the filtered subItems.
-	 */
-	private void addFilteredSubItems(List<T> values, T item) {
-		// Add the main item
-		values.add(item);
-		// Add the subItems if filtered
-		if (isExpandable(item)) {
-			IExpandable expandable = (IExpandable) item;
-			if (hasSubItems(expandable)) {
-				if (mOriginalList != null && expandable.isExpanded()) return;
-				// Add subItems if not hidden by filterObject()
-				List<T> filteredSubItems = new ArrayList<>();
-				List<T> subItems = expandable.getSubItems();
-				for (T subItem : subItems) {
-					if (subItem instanceof IExpandable && filterExpandableObject(subItem)) {
-						addFilteredSubItems(filteredSubItems, subItem);
-					} else if (!subItem.isHidden()) filteredSubItems.add(subItem);
-				}
-				values.addAll(filteredSubItems);
-			}
-		}
-	}
-
 	/**
 	 * Clears flags after searchText is cleared out for Expandable items and sub items.
 	 */