Merge branch 'master' into api-v3

Infomaniak · May 13, 2024 · 14d0d38 · 14d0d38
2 parents 57badd1 + 23aeb61
commit 14d0d38
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/FileAdapter.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/FileAdapter.kt
@@ -65,7 +65,6 @@ open class FileAdapter(
     var onMenuClicked: ((selectedFile: File) -> Unit)? = null
     var onStopUploadButtonClicked: ((index: Int, fileName: String) -> Unit)? = null
 
-    var offlineMode = false
     var selectFolder = false
     var showShareFileButton = true
     var viewHolderType: DisplayType = DisplayType.LIST
@@ -75,6 +74,7 @@ open class FileAdapter(
     var isComplete = false
     var isHomeOffline = false
 
+    private var offlineMode = false
     private var pendingWifiConnection = false
     private var showLoading = false
     private var fileAdapterObserver: AdapterDataObserver? = null

diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt
@@ -331,7 +331,7 @@ open class FileListFragment : MultiSelectFragment(MATOMO_CATEGORY), SwipeRefresh
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         fileListViewModel.isListMode.value?.let { isListMode ->
-            if (!isListMode) fileRecyclerView?.layoutManager = createLayoutManager(isListMode)
+            if (!isListMode) fileRecyclerView?.layoutManager = createLayoutManager(isListMode = false)
         }
     }
 
@@ -409,17 +409,16 @@ open class FileListFragment : MultiSelectFragment(MATOMO_CATEGORY), SwipeRefresh
             val newListMode = !UiSettings(requireContext()).listMode
             trackEvent("displayStyle", if (newListMode) "viewList" else "viewGrid")
             UiSettings(requireContext()).listMode = newListMode
-            fileListViewModel.isListMode.value = newListMode
+            fileListViewModel.isListMode.value = getListMode(newListMode)
         }
     }
 
     private fun setupListMode() {
-        fileListViewModel.isListMode.apply {
-            observe(viewLifecycleOwner) { setupDisplayMode(it) }
-            value = UiSettings(requireContext()).listMode
-        }
+        fileListViewModel.isListMode.observe(viewLifecycleOwner, ::setupDisplayMode)
     }
 
+    private fun getListMode(newListMode: Boolean) = newListMode || this@FileListFragment is UploadInProgressFragment
+
     private fun setupSortButton() {
         binding.sortButton.apply {
             setText(fileListViewModel.sortType.translation)

diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListViewModel.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListViewModel.kt
@@ -52,7 +52,7 @@ class FileListViewModel(application: Application) : AndroidViewModel(application
 
     var isSharedWithMe = false
 
-    val isListMode = SingleLiveEvent<Boolean>()
+    val isListMode = SingleLiveEvent(UiSettings(context).listMode)
 
     var lastItemCount: FileCount? = null