Skip to content

bugfix: restore scroll position on Contributions page after activity recreation #6725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amahuli03 wants to merge 4 commits into
base: main
Choose a base branch
from
+35 −8
Open

bugfix: restore scroll position on Contributions page after activity recreation #6725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a4fbfe
fix: preserve fragment instance on theme change to restore scroll pos…
amahuli03 Mar 11, 2026
4ba3f3c
fix: restore scroll position after data loads on theme change
amahuli03 Mar 11, 2026
925dd93
remove debug logs
amahuli03 Mar 11, 2026
9133c1b
Merge branch 'main' into 6610/scroll-position-contribution-list
RitikaPahwa4444 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL

private var contributionsSize = 0
private var userName: String? = null
private var pendingScrollState: Parcelable? = null

private val galleryPickLauncherForResult = registerForActivityResult<Intent, ActivityResult>(
StartActivityForResult()
Expand Down Expand Up @@ -271,7 +272,12 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
if (list != null) {
contributionsSize = list.size
}
adapter!!.submitList(list)
adapter!!.submitList(list) {
pendingScrollState?.let { state ->
rvContributionsList?.layoutManager?.onRestoreInstanceState(state)
pendingScrollState = null
}
}
if (callback != null) {
callback!!.notifyDataSetChanged()
}
Expand All @@ -284,7 +290,8 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
if (callback != null) {
callback!!.notifyDataSetChanged()
}
if (itemCount > 0 && positionStart == 0) {
val countBeforeInsertion = adapter!!.itemCount - itemCount
if (itemCount > 0 && positionStart == 0 && countBeforeInsertion > 0) {
if (adapter!!.getContributionForPosition(positionStart) != null) {
rvContributionsList!!
.scrollToPosition(0) //Newly upload items are always added to the top
Expand Down Expand Up @@ -470,9 +477,8 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
override fun onViewStateRestored(savedInstanceState: Bundle?) {
super.onViewStateRestored(savedInstanceState)
if (null != savedInstanceState) {
val savedRecyclerLayoutState =
pendingScrollState =
BundleCompat.getParcelable(savedInstanceState, RV_STATE, Parcelable::class.java)
rvContributionsList!!.layoutManager!!.onRestoreInstanceState(savedRecyclerLayoutState)
}
Comment on lines 477 to 482
}

Expand Down
29 changes: 25 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,18 +359,39 @@ after opening the app.
}

private fun restoreActiveFragment(fragmentName: String) {
val existing = supportFragmentManager.findFragmentById(R.id.fragmentContainer)
if (fragmentName == ActiveFragment.CONTRIBUTIONS.name) {
title = getString(R.string.contributions_fragment)
loadFragment(newInstance(), false)
if (existing is ContributionsFragment) {
Copy link
Collaborator

@RitikaPahwa4444 RitikaPahwa4444 Mar 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about simplifying this block and making it DRYer? Do we really need the fragmentName anymore?

contributionsFragment = existing
activeFragment = ActiveFragment.CONTRIBUTIONS
} else {
loadFragment(newInstance(), false)
}
} else if (fragmentName == ActiveFragment.NEARBY.name) {
title = getString(R.string.nearby_fragment)
loadFragment(NearbyParentFragment.newInstance(), false)
if (existing is NearbyParentFragment) {
nearbyParentFragment = existing
activeFragment = ActiveFragment.NEARBY
} else {
loadFragment(NearbyParentFragment.newInstance(), false)
}
} else if (fragmentName == ActiveFragment.EXPLORE.name) {
title = getString(R.string.navigation_item_explore)
loadFragment(ExploreFragment.newInstance(), false)
if (existing is ExploreFragment) {
exploreFragment = existing
activeFragment = ActiveFragment.EXPLORE
} else {
loadFragment(ExploreFragment.newInstance(), false)
}
} else if (fragmentName == ActiveFragment.BOOKMARK.name) {
title = getString(R.string.bookmarks)
loadFragment(BookmarkFragment.newInstance(), false)
if (existing is BookmarkFragment) {
bookmarkFragment = existing
activeFragment = ActiveFragment.BOOKMARK
} else {
loadFragment(BookmarkFragment.newInstance(), false)
}
}
}

Expand Down
Loading