Browse Source

Fix for m3 after rebase

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 years ago
parent
commit
53e091fc68

+ 0 - 2
app/src/androidTest/java/com/owncloud/android/ui/fragment/GalleryFragmentIT.kt

@@ -55,9 +55,7 @@ class GalleryFragmentIT : AbstractIT() {
         createImage(1, true, 700, 300)
         createImage(2, true, 500, 300)
 
-
         createImage(7, true, 300, 400)
-
     }
 
     @After

+ 4 - 8
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt

@@ -45,8 +45,8 @@ import com.owncloud.android.ui.fragment.SearchType
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface
 import com.owncloud.android.utils.BitmapUtils
 import com.owncloud.android.utils.DisplayUtils
-import com.owncloud.android.utils.theme.ViewThemeUtils
 import com.owncloud.android.utils.MimeTypeUtil
+import com.owncloud.android.utils.theme.ViewThemeUtils
 
 @Suppress("LongParameterList", "TooManyFunctions")
 class OCFileListDelegate(
@@ -117,8 +117,7 @@ class OCFileListDelegate(
             asyncGalleryTasks,
             context,
             shimmer,
-            themeColorUtils,
-            themeDrawableUtils,
+            viewThemeUtils,
             galleryRowHolder,
             width
         )
@@ -135,8 +134,7 @@ class OCFileListDelegate(
         asyncTasks: MutableList<GalleryImageGenerationTask>,
         context: Context,
         shimmerThumbnail: LoaderImageView?,
-        themeColorUtils: ThemeColorUtils?,
-        themeDrawableUtils: ThemeDrawableUtils?,
+        viewThemeUtils: ViewThemeUtils,
         galleryRowHolder: GalleryRowHolder,
         width: Int
     ) {
@@ -159,10 +157,8 @@ class OCFileListDelegate(
                 var drawable = MimeTypeUtil.getFileTypeIcon(
                     file.mimeType,
                     file.fileName,
-                    user,
                     context,
-                    themeColorUtils,
-                    themeDrawableUtils
+                    viewThemeUtils
                 )
                 if (drawable == null) {
                     drawable = ResourcesCompat.getDrawable(