Skip to content
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

Jump to bottom

Filtering has been controlled on all screens #3502

Merged
merged 1 commit into from
Jan 18, 2022
Merged

Filtering has been controlled on all screens #3502

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
21 changes: 8 additions & 13 deletions ...src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import android.widget.TextView
import androidx.appcompat.widget.SearchView
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.google.android.material.snackbar.Snackbar
Expand Down Expand Up @@ -157,10 +156,6 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
mainFileListViewModel.getFilesListStatusLiveData.observe(viewLifecycleOwner, Event.EventObserver {
it.onSuccess { data ->
updateFileListData(filesList = data ?: emptyList())
val sortedFiles = mainFileListViewModel.sortList(files)
fileListAdapter.updateFileList(filesToAdd = sortedFiles)
registerListAdapterDataObserver()
binding.swipeRefreshMainFileList.cancel()
}
})

Expand All @@ -186,6 +181,14 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
})
}

private fun updateFileListData(filesList: List<OCFile>) {
files = filesList
val sortedFiles = mainFileListViewModel.sortList(files)
fileListAdapter.updateFileList(filesToAdd = sortedFiles)
registerListAdapterDataObserver()
binding.swipeRefreshMainFileList.cancel()
}

fun listDirectory(directory: OCFile) {
mainFileListViewModel.listDirectory(directory = directory)
}
Expand Down Expand Up @@ -221,7 +224,6 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
fileListAdapter.notifyItemRangeChanged(0, fileListAdapter.itemCount)
}


override fun onSortSelected(sortType: SortType) {
binding.optionsLayout.sortTypeSelected = sortType

Expand Down Expand Up @@ -252,13 +254,6 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
_binding = null
}

private fun updateFileListData(filesList: List<OCFile>) {
files = filesList
fileListAdapter.updateFileList(filesToAdd = files)
registerListAdapterDataObserver()
binding.swipeRefreshMainFileList.cancel()
}

fun updateFileListOption(newFileListOption: FileListOption) {
fileListOption = newFileListOption
when (newFileListOption) {
Expand Down