Sitelet https://github.com/Omega-R/OmegaRecyclerView/pull/157
Skip to content

Develop - #157

Merged
anton-knyazev merged 52 commits into
masterfrom
develop
Sep 6, 2021
Merged

anton-knyazev merged 52 commits into
masterfrom
develop

Conversation

@anton-knyazev

Copy link
Copy Markdown
Contributor

No description provided.

R12rus and others added 30 commits January 31, 2019 17:15
…into feature/fastscroll

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java
#	omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/BaseStickyHeaderDecoration.java
#	omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java
#	omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java
#	omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyDecoration.java
#	omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java
…into feature/fastscroll

# Conflicts:
#	app/src/main/res/values/strings.xml
Sticky decoration width bug fixed.
Build gradle updated to 3.5.1
ViewPagerLayoutManager onRestoreInstanceState crash with not bundle i…
roman_tcaregorodtcev and others added 22 commits July 14, 2020 12:35
smoothScrollToRealPosition method added
…into feature/121_disable_swipe_menu

# Conflicts:
#	omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
…into feature/group_item_space

# Conflicts:
#	omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
Disable open other item when opening in progress.
@anton-knyazev
anton-knyazev merged commit 4028afe into master Sep 6, 2021
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.

3 participants