fix: local file indicator in grid view

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt

@@ -254,11 +254,9 @@ class OCFileListDelegate(
         val isFolderPickerActivity = (context is FolderPickerActivity)
         gridViewHolder.checkbox.setVisibleIf(isMultiSelect && !isFolderPickerActivity)
 
-        // download state
-        gridViewHolder.localFileIndicator.visibility = View.GONE // default first
-
         // metadata (downloaded, favorite)
-        bindGridMetadataViews(file, gridViewHolder)
+        showLocalFileIndicator(file, gridViewHolder)
+        gridViewHolder.favorite.setVisibleIf(file.isFavorite && showMetadata)
 
         // shares
         val shouldHideShare = (
@@ -352,16 +350,6 @@ class OCFileListDelegate(
         }
     }
 
-    private fun bindGridMetadataViews(file: OCFile, gridViewHolder: ListViewHolder) {
-        if (showMetadata) {
-            showLocalFileIndicator(file, gridViewHolder)
-            gridViewHolder.favorite.visibility = if (file.isFavorite) View.VISIBLE else View.GONE
-        } else {
-            gridViewHolder.localFileIndicator.visibility = View.GONE
-            gridViewHolder.favorite.visibility = View.GONE
-        }
-    }
-
     private suspend fun isFolderFullyDownloaded(file: OCFile): Boolean = withContext(Dispatchers.IO) {
         file.isFolder &&
             storageManager.getSubfiles(file.fileId, user.accountName)
@@ -379,38 +367,28 @@ class OCFileListDelegate(
     }
 
     private fun showLocalFileIndicator(file: OCFile, holder: ListViewHolder) {
-        val icon = when {
-            isSynchronizing(file) -> R.drawable.ic_synchronizing
-            file.etagInConflict != null -> R.drawable.ic_synchronizing_error
-            file.isDown -> R.drawable.ic_synced
-            else -> null
-        }
-
-        holder.localFileIndicator.run {
-            if (icon != null) {
-                setImageResource(icon)
-                visibility = View.VISIBLE
-            } else {
-                visibility = View.GONE
-            }
-        }
-
-        checkLocalFolderIndicatorAsynchronously(file, holder)
-    }
-
-    private fun checkLocalFolderIndicatorAsynchronously(file: OCFile, holder: ListViewHolder) {
-        if (!file.isFolder) {
-            return
-        }
-
         ioScope.launch {
-            if (!isFolderFullyDownloaded(file)) {
-                return@launch
+            val isFullyDownloaded = isFolderFullyDownloaded(file)
+            val isSyncing = isSynchronizing(file)
+            val hasConflict = (file.etagInConflict != null)
+            val isDown = file.isDown
+
+            val icon = when {
+                isSyncing -> R.drawable.ic_synchronizing
+                hasConflict -> R.drawable.ic_synchronizing_error
+                isDown || isFullyDownloaded -> R.drawable.ic_synced
+                else -> null
             }
 
             withContext(Dispatchers.Main) {
-                holder.localFileIndicator.setImageResource(R.drawable.ic_synced)
-                holder.localFileIndicator.visibility = View.VISIBLE
+                holder.localFileIndicator.run {
+                    if (icon != null && showMetadata) {
+                        setImageResource(icon)
+                        visibility = View.VISIBLE
+                    } else {
+                        visibility = View.GONE
+                    }
+                }
             }
         }
     }

app/src/main/res/layout/grid_item.xml

@@ -124,6 +124,7 @@
             android:layout_marginEnd="@dimen/grid_layout_margin_end"
             android:contentDescription="@string/synced_icon"
             android:src="@drawable/ic_synced"
+            android:visibility="gone"
             tools:visibility="visible" />
 
     </LinearLayout>

app/src/main/res/layout/list_item.xml

@@ -48,6 +48,8 @@
             android:layout_width="@dimen/list_item_local_file_indicator_layout_width"
             android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
             android:contentDescription="@string/downloader_download_succeeded_ticker"
+            android:visibility="gone"
+            tools:visibility="visible"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_synced"
             app:layout_constraintBottom_toBottomOf="@+id/thumbnail_container"

app/src/main/res/layout/recommended_file_item.xml

@@ -119,6 +119,7 @@
             android:layout_width="@dimen/grid_layout_item_size"
             android:layout_height="@dimen/grid_layout_item_size"
             android:layout_marginEnd="@dimen/grid_layout_margin_end"
+            android:visibility="gone"
             android:contentDescription="@string/synced_icon"
             android:src="@drawable/ic_synced"
             tools:visibility="visible" />