Skip to content

fix: recalculate grid span count after rotation #4894

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
himu-gupta wants to merge 4 commits into
base: master
Choose a base branch
from
+17 −3
Open

fix: recalculate grid span count after rotation #4894

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89fa4da
fix: recalculate grid span count after rotation
himu-gupta Jun 18, 2026
c889d0b
chore: add calens file
himu-gupta Jun 18, 2026
afe11e5
chore: update calens file
himu-gupta Jun 24, 2026
8f8534b
fix: address grid span review comments
himu-gupta Jun 24, 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
6 changes: 6 additions & 0 deletions changelog/unreleased/4884
View file
Open in desktop
Comment thread
joragua marked this conversation as resolved.
Outdated
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Grid mode after rotation

Grid mode now recalculates its column count after device rotation, keeping
file tiles in the correct layout for the new orientation.

https://github.com/owncloud/android/issues/4884
21 changes: 18 additions & 3 deletions ...pp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ class MainFileListFragment : Fragment(),
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
updateConfigDependentSizes()
if (::viewType.isInitialized && viewType == ViewType.VIEW_TYPE_GRID) {
updateRecyclerViewLayoutForCurrentViewType()
}
Comment thread
joragua marked this conversation as resolved.
Outdated
}

private fun updateConfigDependentSizes() {
Expand Down Expand Up @@ -998,17 +1001,30 @@ class MainFileListFragment : Fragment(),
}

override fun onViewTypeListener(viewType: ViewType) {
this.viewType = viewType
binding.optionsLayout.viewTypeSelected = viewType

if (viewType == ViewType.VIEW_TYPE_LIST) {
mainFileListViewModel.setListModeAsPreferred()
layoutManager.spanCount = 1

} else {
mainFileListViewModel.setGridModeAsPreferred()
layoutManager.spanCount = ColumnQuantity(requireContext(), R.layout.grid_item).calculateNoOfColumns()
}

updateRecyclerViewLayoutForCurrentViewType()
}

private fun updateRecyclerViewLayoutForCurrentViewType() {
if (!::layoutManager.isInitialized || !::fileListAdapter.isInitialized) {
return
}
Comment thread
joragua marked this conversation as resolved.
Outdated

layoutManager.spanCount = when (viewType) {
ViewType.VIEW_TYPE_LIST -> 1
ViewType.VIEW_TYPE_GRID -> ColumnQuantity(requireContext(), R.layout.grid_item).calculateNoOfColumns()
}
layoutManager.invalidateSpanAssignments()
binding.recyclerViewMainFileList.requestLayout()
Comment thread
joragua marked this conversation as resolved.
Outdated
fileListAdapter.notifyItemRangeChanged(0, fileListAdapter.itemCount)
}

Expand Down Expand Up @@ -1675,4 +1691,3 @@ class MainFileListFragment : Fragment(),
}
}
}