mirror of
https://github.com/nextcloud/android.git
synced 2024-11-22 21:25:35 +03:00
Check thumbnail existence and shimmering
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
parent
45e3febb96
commit
8d5fe93192
2 changed files with 40 additions and 21 deletions
|
@ -1015,6 +1015,15 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
|||
return lastTimestamp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
|
||||
super.onViewRecycled(holder);
|
||||
if (holder instanceof ListGridImageViewHolder listGridImageViewHolder) {
|
||||
LoaderImageView thumbnailShimmer = listGridImageViewHolder.getShimmerThumbnail();
|
||||
DisplayUtils.stopShimmer(thumbnailShimmer, listGridImageViewHolder.getThumbnail());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
|
||||
((ImageView) callContext).setImageDrawable(avatarDrawable);
|
||||
|
|
|
@ -927,12 +927,20 @@ public final class DisplayUtils {
|
|||
Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
|
||||
ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.getRemoteId());
|
||||
|
||||
if (thumbnail != null) {
|
||||
// If thumbnail is already in cache, display it immediately
|
||||
thumbnailView.setImageBitmap(thumbnail);
|
||||
stopShimmer(shimmerThumbnail, thumbnailView);
|
||||
return;
|
||||
}
|
||||
|
||||
for (ThumbnailsCacheManager.ThumbnailGenerationTask task : asyncTasks) {
|
||||
if (file.getRemoteId() != null && task.getImageKey() != null &&
|
||||
file.getRemoteId().equals(task.getImageKey())) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
final ThumbnailsCacheManager.ThumbnailGenerationTask task =
|
||||
new ThumbnailsCacheManager.ThumbnailGenerationTask(thumbnailView,
|
||||
|
@ -941,7 +949,6 @@ public final class DisplayUtils {
|
|||
asyncTasks,
|
||||
gridView,
|
||||
file.getRemoteId());
|
||||
if (thumbnail == null) {
|
||||
Drawable drawable = MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
|
||||
file.getFileName(),
|
||||
context,
|
||||
|
@ -957,17 +964,20 @@ public final class DisplayUtils {
|
|||
|
||||
int px = ThumbnailsCacheManager.getThumbnailDimension();
|
||||
thumbnail = BitmapUtils.drawableToBitmap(drawable, px, px);
|
||||
}
|
||||
final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
|
||||
new ThumbnailsCacheManager.AsyncThumbnailDrawable(context.getResources(),
|
||||
thumbnail, task);
|
||||
|
||||
if (shimmerThumbnail != null && shimmerThumbnail.getVisibility() == View.GONE) {
|
||||
if (shimmerThumbnail != null) {
|
||||
shimmerThumbnail.postDelayed(() -> {
|
||||
if (thumbnailView.getDrawable() == null) {
|
||||
if (gridView) {
|
||||
configShimmerGridImageSize(shimmerThumbnail, preferences.getGridColumns());
|
||||
}
|
||||
startShimmer(shimmerThumbnail, thumbnailView);
|
||||
}
|
||||
}, 100); // 100ms delay, adjust as needed
|
||||
}
|
||||
|
||||
task.setListener(new ThumbnailsCacheManager.ThumbnailGenerationTask.Listener() {
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue