Skip to content

Mantain filters state when navigating away from media list #17524

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
daniele-verducci wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −5
Open

Mantain filters state when navigating away from media list #17524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ private void openFavoritesTab() {
}

private void openMediaTab(int menuItemId) {
GalleryFragment.Companion.clearSavedScrollState();
GalleryFragment.Companion.clearSavedViewState();
resetOnlyPersonalAndOnDevice();
setupToolbar();
startPhotoSearch(menuItemId);
Expand Down
12 changes: 9 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ class GalleryFragment :
photoSearchTask?.cancel()
savedScrollState = recyclerView?.layoutManager?.onSaveInstanceState()
savedLoadedItemCount = loadedItemCount
savedMediaState = bottomSheet?.currMediaState
}

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
Expand All @@ -177,6 +178,9 @@ class GalleryFragment :
menuItemAddRemoveValue = MenuItemAddRemove.REMOVE_GRID_AND_SORT
requireActivity().invalidateOptionsMenu()

if (savedMediaState != null) {
bottomSheet?.currMediaState = savedMediaState!!
}
updateSubtitle(bottomSheet?.currMediaState)

// Restore the previously loaded window so a saved scroll position still resolves to a valid item.
Expand Down Expand Up @@ -321,7 +325,7 @@ class GalleryFragment :
// TODO: Fix folder change, it seems it doesn't work at all
loadedItemCount = INITIAL_GALLERY_WINDOW
restoreScrollPending = false
clearSavedScrollState()
clearSavedViewState()
endDate = System.currentTimeMillis() / 1000
isPhotoSearchQueryRunning = true
runGallerySearchTask()
Expand Down Expand Up @@ -393,7 +397,7 @@ class GalleryFragment :
override fun updateMediaContent(mediaState: MediaState) {
loadedItemCount = INITIAL_GALLERY_WINDOW
restoreScrollPending = false
clearSavedScrollState()
clearSavedViewState()
showAllGalleryItems()
}

Expand Down Expand Up @@ -488,10 +492,12 @@ class GalleryFragment :
// so the grid reopens at the same scroll position and with the same loaded window.
private var savedScrollState: Parcelable? = null
private var savedLoadedItemCount: Int? = null
private var savedMediaState: MediaState? = null

fun clearSavedScrollState() {
fun clearSavedViewState() {
savedScrollState = null
savedLoadedItemCount = null
savedMediaState = null
}
}
}
5 changes: 4 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,11 @@ class GalleryFragmentBottomSheetDialog :
actions?.updateMediaContent(currentMediaState)
}

val currMediaState: MediaState
var currMediaState: MediaState
get() = currentMediaState
set(value) {
currentMediaState = value
}

enum class MediaState {
MEDIA_STATE_DEFAULT,
Expand Down
Loading