From 03b586905648fb30bca0f15072ccbc2a16650aba Mon Sep 17 00:00:00 2001 From: Gibran Chevalley Date: Fri, 23 Feb 2024 13:30:23 +0100 Subject: [PATCH] Add file upload progress in root files --- .../com/infomaniak/drive/ui/home/RootFilesFragment.kt | 11 +++++++++++ app/src/main/res/layout/fragment_root_files.xml | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/app/src/main/java/com/infomaniak/drive/ui/home/RootFilesFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/home/RootFilesFragment.kt index 901585bb9b..11c79b2d6f 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/home/RootFilesFragment.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/home/RootFilesFragment.kt @@ -34,6 +34,7 @@ import com.infomaniak.drive.data.cache.DriveInfosController import com.infomaniak.drive.data.cache.FolderFilesProvider.SourceRestrictionType.ONLY_FROM_LOCAL import com.infomaniak.drive.data.cache.FolderFilesProvider.SourceRestrictionType.ONLY_FROM_REMOTE import com.infomaniak.drive.data.models.File +import com.infomaniak.drive.data.models.UploadFile import com.infomaniak.drive.databinding.FragmentRootFilesBinding import com.infomaniak.drive.ui.MainViewModel import com.infomaniak.drive.ui.fileList.FileListViewModel @@ -81,6 +82,12 @@ class RootFilesFragment : Fragment() { noNetworkBinding = noNetworkInclude, noNetworkBindingDirectParent = contentLinearLayout, ) + rootFilesUploadFileInProgressView.setUploadFileInProgress(this@RootFilesFragment, Utils.OTHER_ROOT_ID) + } + + override fun onResume() { + super.onResume() + showPendingFiles() } private fun setupDriveToolbar() = with(binding) { @@ -184,5 +191,9 @@ class RootFilesFragment : Fragment() { } } + private fun showPendingFiles() { + binding.rootFilesUploadFileInProgressView.updateUploadFileInProgress(UploadFile.getCurrentUserPendingUploadsCount()) + } + data class FolderToOpen(val id: Int, val name: String) } diff --git a/app/src/main/res/layout/fragment_root_files.xml b/app/src/main/res/layout/fragment_root_files.xml index 94748c7da6..5d80386801 100644 --- a/app/src/main/res/layout/fragment_root_files.xml +++ b/app/src/main/res/layout/fragment_root_files.xml @@ -63,6 +63,17 @@ android:id="@+id/noNetworkInclude" layout="@layout/layout_no_network_small" /> + + +