Skip to content

Androidx#4

Merged
longforus merged 53 commits intolongforus:masterfrom
CymChad:androidx
Oct 28, 2019
Merged

Androidx#4
longforus merged 53 commits intolongforus:masterfrom
CymChad:androidx

Conversation

@longforus
Copy link
Copy Markdown
Owner

update

shichaohui and others added 30 commits December 17, 2016 17:30
Merge branch 'master' from origin
修复之前来回拖动后对section区间计算出错的问题
fix setEmptyView crash because mHeadAndEmptyEnable, mFootAndEmptyEnab…
new setNewDiffData();
new BaseQuickDiffCallback.
修复OnItemClickListener在item被移除快速点击问题
fix OnItemSwipeListener.onItemSwiped position
# Conflicts:
#	README-cn.md
#	README.md
2. merge master to androidx
AllenCoder and others added 23 commits July 21, 2019 22:12
# Conflicts:
#	app/src/main/java/com/chad/baserecyclerviewadapterhelper/decoration/GridSectionAverageGapItemDecoration.java
#	library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
Merge remote-tracking branch 'remotes/remote/master' into androidx
# Conflicts:
#	README-cn.md
#	app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DataBindingUseAdapter.java
#	app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/ItemClickAdapter.java
#	app/src/main/java/com/chad/baserecyclerviewadapterhelper/base/BaseDataBindingAdapter.java
#	library/src/main/java/com/chad/library/adapter/base/BaseSectionMultiItemQuickAdapter.java
#	library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java
…Helper into androidx

# Conflicts:
#	README-cn.md
…Helper into androidx

# Conflicts:
#	README-cn.md
@longforus longforus merged commit 749adbf into longforus:master Oct 28, 2019
@limuyang2 limuyang2 deleted the androidx branch May 30, 2023 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants