mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix for m3 after rebase

Browse source 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey 2022-10-14 21:02:15 +02:00
parent 2513d07821
commit 53e091fc68
No known key found for this signature in database
GPG key ID: 2585783189A62105
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/androidTest/java/com/owncloud/android/ui/fragment/GalleryFragmentIT.kt
View file

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

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

@ -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(