Przeglądaj źródła

add thumbnail corners on grid and list mode fix to 8dp

Signed-off-by: Abdourahamane BOINAIDI <abdourahamane.boinaidi@infomaniak.com>
Abdourahamane BOINAIDI 5 lat temu
rodzic
commit
8779f633ab

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

@@ -427,7 +427,6 @@ public final class ThumbnailsCacheManager {
         private String mImageKey;
         private FileDataStorageManager mStorageManager;
         private GetMethod getMethod;
-        private boolean roundedCorners = false;
         private Listener mListener;
 
         public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager, Account account)
@@ -435,16 +434,6 @@ public final class ThumbnailsCacheManager {
             this(imageView, storageManager, account, null);
         }
 
-        public ThumbnailGenerationTask(ImageView imageView,
-                                       FileDataStorageManager storageManager,
-                                       Account account,
-                                       List<ThumbnailGenerationTask> asyncTasks,
-                                       boolean roundedCorners)
-            throws IllegalArgumentException {
-            this(imageView, storageManager, account, asyncTasks);
-            this.roundedCorners = roundedCorners;
-        }
-
         public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager,
                                        Account account, List<ThumbnailGenerationTask> asyncTasks)
                 throws IllegalArgumentException {
@@ -543,11 +532,7 @@ public final class ThumbnailsCacheManager {
                         tagId = String.valueOf(((TrashbinFile) mFile).getRemoteId());
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
-                        if (roundedCorners) {
-                            BitmapUtils.setRoundedBitmap(bitmap, imageView);
-                        } else {
-                            imageView.setImageBitmap(bitmap);
-                        }
+                        BitmapUtils.setRoundedBitmap(bitmap, imageView);
                     }
                 }
             }

+ 2 - 7
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -642,11 +642,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         Bitmap withOverlay = ThumbnailsCacheManager.addVideoOverlay(thumbnail);
                         thumbnailView.setImageBitmap(withOverlay);
                     } else {
-                        if (gridView) {
-                            thumbnailView.setImageBitmap(thumbnail);
-                        } else {
-                            BitmapUtils.setRoundedBitmap(thumbnail, thumbnailView);
-                        }
+                        BitmapUtils.setRoundedBitmap(thumbnail, thumbnailView);
                     }
                 } else {
                     // generate new thumbnail
@@ -656,8 +652,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                                 new ThumbnailsCacheManager.ThumbnailGenerationTask(thumbnailView,
                                                                                    storageManager,
                                                                                    user.toPlatformAccount(),
-                                                                                   asyncTasks,
-                                                                                   !gridView);
+                                                                                   asyncTasks);
                             if (thumbnail == null) {
                                 thumbnail = BitmapUtils.drawableToBitmap(
                                     MimeTypeUtil.getFileTypeIcon(file.getMimeType(),