@@ -3,6 +3,7 @@ package com.simplemobiletools.filemanager.adapters
33import android.content.Intent
44import android.graphics.drawable.Drawable
55import android.net.Uri
6+ import android.os.Build
67import android.support.v7.view.ActionMode
78import android.support.v7.widget.RecyclerView
89import android.util.SparseArray
@@ -11,11 +12,17 @@ import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback
1112import com.bignerdranch.android.multiselector.MultiSelector
1213import com.bignerdranch.android.multiselector.SwappingHolder
1314import com.bumptech.glide.Glide
15+ import com.bumptech.glide.load.engine.DiskCacheStrategy
16+ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
17+ import com.bumptech.glide.request.RequestOptions
1418import com.simplemobiletools.commons.dialogs.ConfirmationDialog
1519import com.simplemobiletools.commons.dialogs.FilePickerDialog
1620import com.simplemobiletools.commons.dialogs.PropertiesDialog
1721import com.simplemobiletools.commons.dialogs.RenameItemDialog
18- import com.simplemobiletools.commons.extensions.*
22+ import com.simplemobiletools.commons.extensions.formatSize
23+ import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
24+ import com.simplemobiletools.commons.extensions.getMimeTypeFromPath
25+ import com.simplemobiletools.commons.extensions.toast
1926import com.simplemobiletools.commons.models.FileDirItem
2027import com.simplemobiletools.filemanager.R
2128import com.simplemobiletools.filemanager.activities.SimpleActivity
@@ -321,8 +328,13 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
321328 item_icon.setImageDrawable(folderDrawable)
322329 item_details.text = getChildrenCnt(fileDirItem)
323330 } else {
331+ val options = RequestOptions ()
332+ .diskCacheStrategy(DiskCacheStrategy .RESOURCE )
333+ .error(fileDrawable)
334+ .centerCrop()
335+
324336 val path = fileDirItem.path
325- Glide .with (activity).load(path).diskCacheStrategy(path.getCacheStrategy ()).error(fileDrawable).centerCrop().crossFade( ).into(item_icon)
337+ Glide .with (activity).load(path).transition( DrawableTransitionOptions .withCrossFade ()).apply (options ).into(item_icon)
326338 item_details.text = fileDirItem.size.formatSize()
327339 }
328340
@@ -359,7 +371,9 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
359371 }
360372
361373 fun stopLoad () {
362- Glide .clear(view.item_icon)
374+ if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .JELLY_BEAN_MR1 && ! activity.isDestroyed) {
375+ Glide .with (activity).clear(view.item_icon)
376+ }
363377 }
364378 }
365379
0 commit comments