浏览代码

Use getDefaultFolderIcon

Signed-off-by: Alper Ozturk <alperozturk@lions-macbook.local>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
Alper Ozturk 1 年之前
父节点
当前提交
8b9361f310

+ 1 - 1
app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -900,7 +900,7 @@ public final class ThumbnailsCacheManager {
                 } else {
                     if (mFile != null) {
                         if (mFile.isDirectory()) {
-                            imageView.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.folder));
+                            imageView.setImageDrawable(MimeTypeUtil.getDefaultFolderIcon(mContext, viewThemeUtils));
                         } else {
                             if (MimeTypeUtil.isVideo(mFile)) {
                                 imageView.setImageBitmap(ThumbnailsCacheManager.mDefaultVideo);

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -272,7 +272,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 .into(imageView);
         } else {
             if (MimeTypeUtil.isFolder(previewObject.getMimeType())) {
-                imageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder));
+                imageView.setImageDrawable(MimeTypeUtil.getDefaultFolderIcon(context, viewThemeUtils));
             } else {
                 imageView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(previewObject.getMimeType(),
                                                                         "",

+ 2 - 2
app/src/main/java/com/owncloud/android/ui/adapter/GroupfolderListAdapter.kt

@@ -23,7 +23,6 @@
 package com.owncloud.android.ui.adapter
 
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.graphics.drawable.LayerDrawable
 import android.view.LayoutInflater
 import android.view.View
@@ -35,6 +34,7 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.ListItemBinding
 import com.owncloud.android.ui.interfaces.GroupfolderListInterface
 import com.owncloud.android.utils.DrawableUtil
+import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.io.File
 
@@ -51,7 +51,7 @@ class GroupfolderListAdapter(
     }
 
     private fun getFolderIcon(): LayerDrawable? {
-        val folderDrawable = ContextCompat.getDrawable(context, R.drawable.folder) ?: return null
+        val folderDrawable = MimeTypeUtil.getDefaultFolderIcon(context, viewThemeUtils) ?: return null
         val overlayDrawable = ContextCompat.getDrawable(context, R.drawable.ic_folder_overlay_account_group) ?: return null
         val drawableUtil = DrawableUtil()
         return drawableUtil.addDrawableAsOverlay(folderDrawable, overlayDrawable, 6)

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java

@@ -244,7 +244,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
                                     Context context,
                                     ViewThemeUtils viewThemeUtils) {
         if (file.isDirectory()) {
-            thumbnailView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder));
+            thumbnailView.setImageDrawable(MimeTypeUtil.getDefaultFolderIcon(context, viewThemeUtils));
         } else {
             thumbnailView.setImageResource(R.drawable.file);
 

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java

@@ -220,7 +220,7 @@ public class TrashbinListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
     private void setThumbnail(TrashbinFile file, ImageView thumbnailView) {
         if (file.isFolder()) {
-            thumbnailView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder));
+            thumbnailView.setImageDrawable(MimeTypeUtil.getDefaultFolderIcon(context, viewThemeUtils));
         } else {
             if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) && file.getRemoteId() != null) {
                 // Thumbnail in cache?