Resolved #281 - Delegate spanSize to IFlexible item

davideas · Feb 13, 2017 · 5bc79ac · 5bc79ac
1 parent f156c4c
commit 5bc79ac
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 15 deletions.
diff --git a/...p/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentHeadersSections.java b/...p/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentHeadersSections.java
@@ -190,20 +190,8 @@ protected GridLayoutManager createNewGridLayoutManager() {
 		gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
 			@Override
 			public int getSpanSize(int position) {
-				// NOTE: If you use simple integers to identify the ViewType,
-				// here, you should use them and not Layout integers
-				switch (mAdapter.getItemViewType(position)) {
-					case R.layout.recycler_scrollable_usecase_item:
-					case R.layout.recycler_scrollable_header_item:
-					case R.layout.recycler_scrollable_footer_item:
-					case R.layout.recycler_scrollable_layout_item:
-					case R.layout.recycler_scrollable_uls_item:
-					case R.layout.recycler_header_item:
-					case R.layout.recycler_expandable_header_item:
-						return mColumnCount;
-					default:
-						return 1;
-				}
+				//noinspection ConstantConditions
+				return mAdapter.getItem(position).getSpanSize(mColumnCount, position);
 			}
 		});
 		return gridLayoutManager;

diff --git a/...pter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ExpandableHeaderItem.java b/...pter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ExpandableHeaderItem.java
@@ -95,6 +95,11 @@ public void addSubItem(int position, SubItem subItem) {
 			addSubItem(subItem);
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return spanCount;
+	}
+
 	@Override
 	public int getLayoutRes() {
 		return R.layout.recycler_expandable_header_item;

diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/HeaderItem.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/HeaderItem.java
@@ -72,6 +72,11 @@ public void setSubtitle(String subtitle) {
 		this.subtitle = subtitle;
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return spanCount;
+	}
+
 	@Override
 	public int getLayoutRes() {
 		return R.layout.recycler_header_item;

diff --git a/...pter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableFooterItem.java b/...pter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableFooterItem.java
@@ -30,6 +30,11 @@ public ScrollableFooterItem(String id) {
 		super(id);
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return spanCount;
+	}
+
 	@Override
 	public int getLayoutRes() {
 		return R.layout.recycler_scrollable_footer_item;

diff --git a/...pter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableLayoutItem.java b/...pter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableLayoutItem.java
@@ -27,6 +27,11 @@ public ScrollableLayoutItem(String id) {
 		super(id);
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return spanCount;
+	}
+
 	@Override
 	public int getLayoutRes() {
 		return R.layout.recycler_scrollable_layout_item;

diff --git a/...adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableULSItem.java b/...adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableULSItem.java
@@ -28,6 +28,11 @@ public ScrollableULSItem(String id) {
 		super(id);
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return spanCount;
+	}
+
 	@Override
 	public int getLayoutRes() {
 		return R.layout.recycler_scrollable_uls_item;

diff --git a/...ter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableUseCaseItem.java b/...ter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/ScrollableUseCaseItem.java
@@ -30,6 +30,11 @@ public ScrollableUseCaseItem(String title, String subTitle) {
 		setSubtitle(subTitle);
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return spanCount;
+	}
+
 	@Override
 	public int getLayoutRes() {
 		return R.layout.recycler_scrollable_usecase_item;

diff --git a/...apter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/StaggeredHeaderItem.java b/...apter-app/src/main/java/eu/davidea/samples/flexibleadapter/items/StaggeredHeaderItem.java
@@ -48,6 +48,11 @@ public void setTitle(String title) {
 		this.title = title;
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return spanCount;
+	}
+
 	@Override
 	public int getLayoutRes() {
 		return R.layout.recycler_staggered_header_item;

diff --git a/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/items/AbstractFlexibleItem.java b/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/items/AbstractFlexibleItem.java
@@ -86,6 +86,11 @@ public void setHidden(boolean hidden) {
 		mHidden = hidden;
 	}
 
+	@Override
+	public int getSpanSize(int spanCount, int position) {
+		return 1;
+	}
+
 	/*--------------------*/
 	/* SELECTABLE METHODS */
 	/*--------------------*/

diff --git a/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/items/IFlexible.java b/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/items/IFlexible.java
@@ -71,6 +71,15 @@ public interface IFlexible<VH extends RecyclerView.ViewHolder> {
 	 */
 	void setHidden(boolean hidden);
 
+	/**
+	 * Individual item's span size.
+	 *
+	 * @param spanCount current column count
+	 * @param position  the adapter position of the item
+	 * @return the number of span occupied by the item at position.
+	 */
+	int getSpanSize(int spanCount, int position);
+
 	/*--------------------*/
 	/* SELECTABLE METHODS */
 	/*--------------------*/
@@ -92,7 +101,6 @@ public interface IFlexible<VH extends RecyclerView.ViewHolder> {
 	/*-------------------*/
 	/* TOUCHABLE METHODS */
 	/*-------------------*/
-	//TODO: All these methods could be deprecated in favour of the same methods in FlexibleViewHolder
 
 	boolean isDraggable();