Skip to content

Commit

Permalink
Remove BrickDataManager.addAfterItem(BaseBrick, List<BaseBrick) (#245)
Browse files Browse the repository at this point in the history
Fixes #244
  • Loading branch information
thusson13 authored Feb 12, 2021
1 parent 1941bad commit 1a431f8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 76 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -422,49 +422,6 @@ class BrickDataManagerTest {
verify(dataSetChangedListener).onDataSetChanged()
}

@Test
fun testAddItemsAfterLastItem() {
manager.addAfterItem(manager.recyclerViewItems[3], listOf(TestBrick(), TestBrick(), TestBrick()))

assertEquals(7, manager.recyclerViewItems.size)
assertEquals(7, manager.dataManagerItems.size)
verify(observer).onItemRangeInserted(4, 3)
verify(observer).onItemRangeChanged(4, 0, null)
verify(dataSetChangedListener).onDataSetChanged()
}

@Test
fun testAddItemsWithOneHiddenAfterLastItem() {
manager.addAfterItem(manager.recyclerViewItems[3], listOf(TestBrick(), HiddenTestBrick(), TestBrick()))

assertEquals(6, manager.recyclerViewItems.size)
assertEquals(7, manager.dataManagerItems.size)
verify(observer).onItemRangeInserted(4, 2)
verify(observer).onItemRangeChanged(4, 0, null)
verify(dataSetChangedListener).onDataSetChanged()
}

@Test
fun testAddItemsWithAllHiddenAfterLastItem() {
manager.addAfterItem(manager.recyclerViewItems[3], listOf(HiddenTestBrick(), HiddenTestBrick(), HiddenTestBrick()))

assertEquals(4, manager.recyclerViewItems.size)
assertEquals(7, manager.dataManagerItems.size)
verifyZeroInteractions(observer)
verify(dataSetChangedListener, never()).onDataSetChanged()
}

@Test
fun testAddItemsAfterMissingItem() {
manager.addAfterItem(TestBrick(), listOf(TestBrick(), TestBrick(), TestBrick()))

assertEquals(7, manager.recyclerViewItems.size)
assertEquals(7, manager.dataManagerItems.size)
verify(observer).onItemRangeInserted(4, 3)
verify(observer).onItemRangeChanged(4, 0, null)
verify(dataSetChangedListener).onDataSetChanged()
}

@Test
fun testRemoveFirstItem() {
manager.removeItem(manager.recyclerViewItems[0])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -437,39 +437,6 @@ public void addAfterItem(BaseBrick anchor, BaseBrick item) {
}
}

/**
* Inserts brick before the anchor brick.
*
* @param anchor brick to insert before
* @param items the bricks to add
*/
public void addAfterItem(BaseBrick anchor, Collection<? extends BaseBrick> items) {
int index = this.items.indexOf(anchor);

if (index == -1) {
index = getRecyclerViewItems().size();
} else {
index++;
}
this.items.addAll(index, items);
for (BaseBrick item : items) {
item.setDataManager(this);
}

int visibleCount = getVisibleCount(items);
if (visibleCount > 0) {
BaseBrick firstVisibleItem = getFirstVisibleItem(items);
dataHasChanged();

if (brickRecyclerAdapter != null) {
int refreshStartIndex = getRefreshStartIndexForBrick(firstVisibleItem);
safeNotifyItemRangeInserted(firstVisibleItem, visibleCount);
int itemCount = getRecyclerViewItems().size() - visibleCount - refreshStartIndex;
brickRecyclerAdapter.safeNotifyItemRangeChanged(refreshStartIndex, itemCount);
}
}
}

/**
* Remove a brick.
*
Expand Down

0 comments on commit 1a431f8

Please sign in to comment.