Added possibility to filter in the Header item of a section AND to ke…

…ep header also if a subItem has been filtered #73.
davideas · Apr 25, 2016 · 491e6af · 491e6af
1 parent 98a29b2
commit 491e6af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/models/HeaderItem.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/models/HeaderItem.java
@@ -10,6 +10,7 @@
 
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractHeaderItem;
+import eu.davidea.flexibleadapter.items.IFilterable;
 import eu.davidea.flexibleadapter.items.ISectionable;
 import eu.davidea.samples.flexibleadapter.R;
 import eu.davidea.viewholders.FlexibleViewHolder;
@@ -19,7 +20,7 @@
  * <p>A Section should not contain others Sections!</p>
  * Headers are not Sectionable!
  */
-public class HeaderItem extends AbstractHeaderItem<HeaderItem.HeaderViewHolder> {
+public class HeaderItem extends AbstractHeaderItem<HeaderItem.HeaderViewHolder> implements IFilterable {
 
 	private static final long serialVersionUID = -7408637077727563374L;
 
@@ -89,6 +90,11 @@ public void bindViewHolder(FlexibleAdapter adapter, HeaderViewHolder holder, int
 		holder.mSubtitle.setText(subTitle);
 	}
 
+	@Override
+	public boolean filter(String constraint) {
+		return getTitle() != null && getTitle().toLowerCase().trim().contains(constraint);
+	}
+
 	static class HeaderViewHolder extends FlexibleViewHolder {
 
 		public TextView mTitle;

diff --git a/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java b/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java
@@ -2410,12 +2410,21 @@ public synchronized void filterItems(@NonNull List<T> unfilteredItems) {
 		if (hasSearchText()) {
 			int newOriginalPosition = -1;
 			for (T item : unfilteredItems) {
+				//Check header first
+				T header = (T) getHeaderOf(item);
+				if (header != null && filterObject(header, getSearchText())
+						&& !values.contains(getHeaderOf(item))) {
+					values.add(header);
+				}
 				if (filterExpandableObject(item, getSearchText())) {
 					RestoreInfo restoreInfo = getPendingRemovedItem(item);
 					if (restoreInfo != null) {
 						//If found point to the new reference while filtering
 						restoreInfo.filterRefItem = ++newOriginalPosition < values.size() ? values.get(newOriginalPosition) : null;
 					} else {
+						if (hasHeader(item) && !values.contains(getHeaderOf(item))) {
+							values.add((T) getHeaderOf(item));
+						}
 						values.add(item);
 						newOriginalPosition++;
 						if (isExpandable(item)) {