diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt index ee75ffb7..7a6fe922 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.filemanager.adapters import android.content.Context import android.content.res.Resources -import android.graphics.Bitmap import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -13,14 +12,11 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.extensions.formatSize -import com.simplemobiletools.filemanager.extensions.getColoredIcon import com.simplemobiletools.filepicker.models.FileDirItem import kotlinx.android.synthetic.main.list_item.view.* class ItemsAdapter(context: Context, private val mItems: List) : BaseAdapter() { private val mInflater: LayoutInflater - private val mFileBmp: Bitmap - private val mDirectoryBmp: Bitmap private val mRes: Resources private val mContext: Context @@ -28,8 +24,6 @@ class ItemsAdapter(context: Context, private val mItems: List) : Ba mInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater mContext = context mRes = context.resources - mDirectoryBmp = mRes.getColoredIcon(R.color.lightGrey, R.mipmap.directory) - mFileBmp = mRes.getColoredIcon(R.color.lightGrey, R.mipmap.file) } override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { @@ -47,14 +41,10 @@ class ItemsAdapter(context: Context, private val mItems: List) : Ba viewHolder.name.text = item.name if (item.isDirectory) { - viewHolder.icon.setImageBitmap(mDirectoryBmp) + Glide.with(mContext).load(R.mipmap.directory).diskCacheStrategy(getCacheStrategy(item)).centerCrop().crossFade().into(viewHolder.icon) viewHolder.details.text = getChildrenCnt(item) } else { - if (item.isImage() || item.isVideo()) { - Glide.with(mContext).load(item.path).diskCacheStrategy(getCacheStrategy(item)).centerCrop().crossFade().into(viewHolder.icon) - } else { - viewHolder.icon.setImageBitmap(mFileBmp) - } + Glide.with(mContext).load(item.path).diskCacheStrategy(getCacheStrategy(item)).error(R.mipmap.file).centerCrop().crossFade().into(viewHolder.icon) viewHolder.details.text = item.size.formatSize() } diff --git a/app/src/main/res/mipmap-hdpi/directory.png b/app/src/main/res/mipmap-hdpi/directory.png index 02ea533a..e03b652d 100644 Binary files a/app/src/main/res/mipmap-hdpi/directory.png and b/app/src/main/res/mipmap-hdpi/directory.png differ diff --git a/app/src/main/res/mipmap-hdpi/file.png b/app/src/main/res/mipmap-hdpi/file.png index 84755e48..eb356c22 100644 Binary files a/app/src/main/res/mipmap-hdpi/file.png and b/app/src/main/res/mipmap-hdpi/file.png differ diff --git a/app/src/main/res/mipmap-mdpi/directory.png b/app/src/main/res/mipmap-mdpi/directory.png index 831d723b..9a876e50 100644 Binary files a/app/src/main/res/mipmap-mdpi/directory.png and b/app/src/main/res/mipmap-mdpi/directory.png differ diff --git a/app/src/main/res/mipmap-mdpi/file.png b/app/src/main/res/mipmap-mdpi/file.png index b51ce3ed..47495956 100644 Binary files a/app/src/main/res/mipmap-mdpi/file.png and b/app/src/main/res/mipmap-mdpi/file.png differ diff --git a/app/src/main/res/mipmap-xhdpi/directory.png b/app/src/main/res/mipmap-xhdpi/directory.png index 71a5a137..103d5baa 100644 Binary files a/app/src/main/res/mipmap-xhdpi/directory.png and b/app/src/main/res/mipmap-xhdpi/directory.png differ diff --git a/app/src/main/res/mipmap-xhdpi/file.png b/app/src/main/res/mipmap-xhdpi/file.png index 798ebd4e..9c24a91c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/file.png and b/app/src/main/res/mipmap-xhdpi/file.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/directory.png b/app/src/main/res/mipmap-xxhdpi/directory.png index b93d5a1e..89a7ae64 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/directory.png and b/app/src/main/res/mipmap-xxhdpi/directory.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/file.png b/app/src/main/res/mipmap-xxhdpi/file.png index f3e153b4..fe61924d 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/file.png and b/app/src/main/res/mipmap-xxhdpi/file.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/directory.png b/app/src/main/res/mipmap-xxxhdpi/directory.png index a1afbe9d..7fb56c07 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/directory.png and b/app/src/main/res/mipmap-xxxhdpi/directory.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/file.png b/app/src/main/res/mipmap-xxxhdpi/file.png index 5bd56903..0f6f6568 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/file.png and b/app/src/main/res/mipmap-xxxhdpi/file.png differ