Skip to content

Commit

Permalink
Resolves #200 Renamed getItemCount(boolean) to getMainItemCount()
Browse files Browse the repository at this point in the history
  • Loading branch information
@davideas
davideas committed Dec 4, 2016
1 parent eb79237 commit 5695cf9
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .../src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentEndlessScrolling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void showNewLayoutInfo(MenuItem item) {
public void noMoreLoad(int newItemsSize) {
Log.d(TAG, "newItemsSize=" + newItemsSize);
Log.d(TAG, "Total pages loaded=" + mAdapter.getEndlessCurrentPage());
Log.d(TAG, "Total items loaded=" + mAdapter.getItemCount(false));
Log.d(TAG, "Total items loaded=" + mAdapter.getMainItemCount());
}

/**
Expand Down
55 changes: 29 additions & 26 deletions flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public FlexibleAdapter addListener(@Nullable Object listener) {
if (listener instanceof OnUpdateListener) {
if (DEBUG) Log.i(TAG, "- OnUpdateListener");
mUpdateListener = (OnUpdateListener) listener;
mUpdateListener.onUpdateEmptyView(getItemCount(false));
mUpdateListener.onUpdateEmptyView(getMainItemCount());
}
return this;
}
Expand Down Expand Up @@ -475,8 +475,9 @@ public boolean isAnyChildSelected() {
/*--------------*/

/**
* Convenience method of {@link #updateDataSet(List, boolean)}.
* <p>In this case changes will NOT be animated: <b>Warning!</b>
* Convenience method of {@link #updateDataSet(List, boolean)} (You should read the comments
* of this method).
* <p>In this call, changes will NOT be animated: <b>Warning!</b>
* {@link #notifyDataSetChanged()} will be invoked.</p>
*
* @param items the new data set
Expand All @@ -491,9 +492,14 @@ public void updateDataSet(List<T> items) {
/**
* This method will refresh the entire data set content. Optionally, all changes can be
* animated, limited by the value previously set with {@link #setAnimateToLimit(int)}
* to improve performance on very big list. Should provide {@code animate = false} to
* directly invoke {@link #notifyDataSetChanged()} without any animations!
* <p><b>Note:</b> Scrollable Headers and Footers (if existent) will be restored in this call.</p>
* to improve performance on very big list. Should provide {@code animate=false} to
* directly invoke {@link #notifyDataSetChanged()} without any animations, if {@code stableIds}
* is not set!
* <p><b>Note:</b>
* <ul><li>Scrollable Headers and Footers (if existent) will be restored in this call.</li>
* <li>I strongly recommend to implement {@link #hashCode()} to all adapter items along with
* {@link #equals(Object)}: This Adapter is making use of HashSet to improve performance.</li>
* </ul></p>
* <b>Note:</b> The following methods will be also called at the end of the operation:
* <ol><li>{@link #expandItemsAtStartUp()}</li>
* <li>{@link #showAllHeaders()} if headers are shown</li>
Expand Down Expand Up @@ -549,13 +555,13 @@ public long getItemId(int position) {

/**
* Returns the total number of items in the data set held by the adapter (headers and footers
* INCLUDED). Use {@link #getItemCount(boolean)} with {@code false} as parameter to retrieve
* INCLUDED). Use {@link #getMainItemCount()} with {@code false} as parameter to retrieve
* only real items excluding headers and footers.
* <p><b>Note:</b> This method cannot be overridden since the selection and the internal
* methods rely on it.</p>
*
* @return the total number of items (headers and footers INCLUDED) held by the adapter
* @see #getItemCount(boolean)
* @see #getMainItemCount()
* @see #getItemCountOfTypes(Integer...)
* @see #isEmpty()
* @since 1.0.0
Expand All @@ -573,17 +579,14 @@ public final int getItemCount() {
* </ul>
* <b>Note:</b> This method cannot be overridden since internal methods rely on it.
*
* @param withHeadersFooters true to count also headers and footers, false to count only real items
* @return the total number of items held by the adapter, with or without headers and footers,
* depending by the provided parameter
* @see #getItemCount()
* @see #getItemCountOfTypes(Integer...))
* @since 5.0.0-rc1
*/
//TODO: Rename to getMainItemCount?
public final int getItemCount(boolean withHeadersFooters) {
return withHeadersFooters ? getItemCount() :
getItemCount() - mScrollableHeaders.size() - mScrollableFooters.size();
public final int getMainItemCount() {
return getItemCount() - mScrollableHeaders.size() - mScrollableFooters.size();
}

/**
Expand All @@ -592,7 +595,7 @@ public final int getItemCount(boolean withHeadersFooters) {
* @param viewTypes the viewTypes to count
* @return number of the viewTypes counted
* @see #getItemCount()
* @see #getItemCount(boolean)
* @see #getMainItemCount()
* @see #isEmpty()
* @since 5.0.0-b1
*/
Expand All @@ -613,7 +616,7 @@ public final int getItemCountOfTypes(Integer... viewTypes) {
* @param position the position limit where to stop counting (included)
* @param viewTypes the viewTypes to count
* @see #getItemCount()
* @see #getItemCount(boolean)
* @see #getMainItemCount()
* @see #getItemCountOfTypes(Integer...)
* @see #isEmpty()
* @since 5.0.0-b5
Expand Down Expand Up @@ -1860,7 +1863,7 @@ public boolean isEndlessScrollEnabled() {
* @since 5.0.0-rc1
*/
public int getEndlessCurrentPage() {
return Math.max(1, mEndlessPageSize > 0 ? getItemCount(false) / mEndlessPageSize : 0);
return Math.max(1, mEndlessPageSize > 0 ? getMainItemCount() / mEndlessPageSize : 0);
}

/**
Expand Down Expand Up @@ -2026,7 +2029,7 @@ public void run() {
// When the listener is not set, loading more is called upon a user request
if (mEndlessScrollListener != null) {
if (DEBUG) Log.d(TAG, "onLoadMore invoked!");
mEndlessScrollListener.onLoadMore(getItemCount(false), getEndlessCurrentPage());
mEndlessScrollListener.onLoadMore(getMainItemCount(), getEndlessCurrentPage());
}
}
});
Expand Down Expand Up @@ -2065,7 +2068,7 @@ public void onLoadMoreComplete(@Nullable List<T> newItems) {
public void onLoadMoreComplete(@Nullable List<T> newItems, @IntRange(from = -1) long delay) {
// 1. Calculate new items count
int newItemsSize = newItems == null ? 0 : newItems.size();
int totalItemCount = newItemsSize + getItemCount(false);
int totalItemCount = newItemsSize + getMainItemCount();
// 2. Add any new items
if (newItemsSize > 0) {
if (DEBUG)
Expand Down Expand Up @@ -2721,7 +2724,7 @@ public void run() {
/**
* Simply append the provided item to the end of the list.
* <p>Convenience method of {@link #addItem(int, IFlexible)} with
* {@code position = getItemCount()}.</p>
* {@code position = getMainItemCount()}.</p>
*
* @param item the item to add
* @return true if the internal list was successfully modified, false otherwise
Expand Down Expand Up @@ -2773,7 +2776,7 @@ public boolean addItems(@IntRange(from = 0) int position, @NonNull List<T> items
Log.e(TAG, "addItems No items to add!");
return false;
}
int initialCount = getItemCount(false);//Count only main items!
int initialCount = getMainItemCount();//Count only main items!
if (position < 0) {
Log.w(TAG, "addItems Position is negative! adding items to the end");
position = initialCount;
Expand All @@ -2790,7 +2793,7 @@ public boolean addItems(@IntRange(from = 0) int position, @NonNull List<T> items
}
//Call listener to update EmptyView
if (!recursive && mUpdateListener != null && !multiRange && initialCount == 0 && getItemCount() > 0)
mUpdateListener.onUpdateEmptyView(getItemCount(false));
mUpdateListener.onUpdateEmptyView(getMainItemCount());
return true;
}

Expand Down Expand Up @@ -3415,7 +3418,7 @@ public void removeRange(@IntRange(from = 0) int positionStart,

//Update empty view
if (mUpdateListener != null && !multiRange && initialCount > 0 && getItemCount() == 0)
mUpdateListener.onUpdateEmptyView(getItemCount(false));
mUpdateListener.onUpdateEmptyView(getMainItemCount());
}

/**
Expand Down Expand Up @@ -3599,7 +3602,7 @@ public void restoreDeletedItems() {
//Call listener to update EmptyView
multiRange = false;
if (mUpdateListener != null && initialCount == 0 && getItemCount() > 0)
mUpdateListener.onUpdateEmptyView(getItemCount(false));
mUpdateListener.onUpdateEmptyView(getMainItemCount());

emptyBin();
}
Expand Down Expand Up @@ -4916,7 +4919,7 @@ public interface OnUpdateListener {
* will represents only the main items.</p>
*
* @param size the current number of main items in the adapter, result of
* {@link FlexibleAdapter#getItemCount(boolean)}
* {@link FlexibleAdapter#getMainItemCount()}
* @since 5.0.0-b1
*/
void onUpdateEmptyView(int size);
Expand Down Expand Up @@ -5288,7 +5291,7 @@ private void postUpdate(boolean init) {
onPostUpdate();
//Update empty view
if (mUpdateListener != null) {
mUpdateListener.onUpdateEmptyView(getItemCount(false));
mUpdateListener.onUpdateEmptyView(getMainItemCount());
}
}

Expand All @@ -5311,7 +5314,7 @@ private void postFilter() {
onPostFilter();
//Call listener to update EmptyView, assuming the filter always made a change
if (mUpdateListener != null)
mUpdateListener.onUpdateEmptyView(getItemCount(hasSearchText()));
mUpdateListener.onUpdateEmptyView(getMainItemCount());
}

/**
Expand Down

0 comments on commit 5695cf9

Please sign in to comment.