From ef0b0fe9eecb9ebd2d2644e326bacbed366bb8ac Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 18 Jan 2020 16:22:54 +0100
Subject: [PATCH 1/7] images: slightly rounded corners

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../datamodel/ThumbnailsCacheManager.java     |  7 ++++++-
 .../android/ui/adapter/OCFileListAdapter.java |  9 +++++++-
 .../owncloud/android/utils/BitmapUtils.java   | 21 ++++++++++++++++++-
 src/main/res/values/dims.xml                  |  1 +
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 5db9a29605..ba0fc22b05 100644
--- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -508,7 +508,12 @@ public final class ThumbnailsCacheManager {
                         tagId = String.valueOf(((TrashbinFile) mFile).getRemoteId());
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
-                        imageView.setImageBitmap(bitmap);
+                        Resources resources = MainApp.getAppContext().getResources();
+
+                        BitmapUtils.setRoundedBitmap(resources,
+                                                     bitmap,
+                                                     resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
+                                                     imageView);
                     }
                 }
             }
diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index 7bf1148cc4..beeca6e63b 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -52,6 +52,7 @@ import com.bumptech.glide.request.target.BitmapImageViewTarget;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -602,7 +603,13 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         Bitmap withOverlay = ThumbnailsCacheManager.addVideoOverlay(thumbnail);
                         thumbnailView.setImageBitmap(withOverlay);
                     } else {
-                        thumbnailView.setImageBitmap(thumbnail);
+                        Resources resources = MainApp.getAppContext().getResources();
+
+                        BitmapUtils.setRoundedBitmap(resources,
+                                                     thumbnail,
+                                                     resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
+                                                     thumbnailView);
+
                     }
                 } else {
                     // generate new thumbnail
diff --git a/src/main/java/com/owncloud/android/utils/BitmapUtils.java b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
index 99e99a1446..d7d834cd16 100644
--- a/src/main/java/com/owncloud/android/utils/BitmapUtils.java
+++ b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
@@ -26,6 +26,7 @@ import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.widget.ImageView;
 
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -376,16 +377,34 @@ public final class BitmapUtils {
      * @param bitmap the original bitmap
      * @return the circular bitmap
      */
-    public static RoundedBitmapDrawable bitmapToCircularBitmapDrawable(Resources resources, Bitmap bitmap) {
+    public static RoundedBitmapDrawable bitmapToCircularBitmapDrawable(Resources resources,
+                                                                       Bitmap bitmap,
+                                                                       float radius) {
         if (bitmap == null) {
             return null;
         }
 
         RoundedBitmapDrawable roundedBitmap = RoundedBitmapDrawableFactory.create(resources, bitmap);
         roundedBitmap.setCircular(true);
+
+        if (radius != -1) {
+            roundedBitmap.setCornerRadius(20);
+        }
+
         return roundedBitmap;
     }
 
+    public static RoundedBitmapDrawable bitmapToCircularBitmapDrawable(Resources resources, Bitmap bitmap) {
+        return bitmapToCircularBitmapDrawable(resources, bitmap, -1);
+    }
+
+    public static void setRoundedBitmap(Resources resources, Bitmap bitmap, float radius, ImageView imageView) {
+
+        imageView.setImageDrawable(BitmapUtils.bitmapToCircularBitmapDrawable(resources,
+                                                                              bitmap,
+                                                                              radius));
+    }
+
     public static Bitmap drawableToBitmap(Drawable drawable) {
         if (drawable instanceof BitmapDrawable) {
             BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml
index 42a3bd131b..67d98e6b59 100644
--- a/src/main/res/values/dims.xml
+++ b/src/main/res/values/dims.xml
@@ -30,6 +30,7 @@
     <dimen name="list_item_avatar_icon_radius">20dp</dimen>
     <dimen name="file_icon_size">40dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
+    <dimen name="file_icon_rounded_corner_radius">20dp</dimen>
     <dimen name="file_avatar_size">128dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
     <dimen name="standard_double_padding">32dp</dimen>

From 4fb140d275061e028d70b3a24fa3af36713daba0 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 22 Jan 2020 13:45:31 +0100
Subject: [PATCH 2/7] round corners only in list view

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../datamodel/ThumbnailsCacheManager.java     | 25 +++++++++++++++----
 .../android/ui/adapter/OCFileListAdapter.java | 17 ++++++++-----
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index ba0fc22b05..0124bacd5d 100644
--- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -410,12 +410,23 @@ public final class ThumbnailsCacheManager {
         private String mImageKey;
         private FileDataStorageManager mStorageManager;
         private GetMethod getMethod;
+        private boolean roundedCorners = false;
 
         public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager, Account account)
                 throws IllegalArgumentException {
             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 {
@@ -508,12 +519,16 @@ public final class ThumbnailsCacheManager {
                         tagId = String.valueOf(((TrashbinFile) mFile).getRemoteId());
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
-                        Resources resources = MainApp.getAppContext().getResources();
+                        if (roundedCorners) {
+                            Resources resources = MainApp.getAppContext().getResources();
 
-                        BitmapUtils.setRoundedBitmap(resources,
-                                                     bitmap,
-                                                     resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
-                                                     imageView);
+                            BitmapUtils.setRoundedBitmap(resources,
+                                                         bitmap,
+                                                         resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
+                                                         imageView);
+                        } else {
+                            imageView.setImageBitmap(bitmap);
+                        }
                     }
                 }
             }
diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index beeca6e63b..b201e088ca 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -603,12 +603,16 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         Bitmap withOverlay = ThumbnailsCacheManager.addVideoOverlay(thumbnail);
                         thumbnailView.setImageBitmap(withOverlay);
                     } else {
-                        Resources resources = MainApp.getAppContext().getResources();
+                        if (gridView) {
+                            thumbnailView.setImageBitmap(thumbnail);
+                        } else {
+                            Resources resources = MainApp.getAppContext().getResources();
 
-                        BitmapUtils.setRoundedBitmap(resources,
-                                                     thumbnail,
-                                                     resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
-                                                     thumbnailView);
+                            BitmapUtils.setRoundedBitmap(resources,
+                                                         thumbnail,
+                                                         resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
+                                                         thumbnailView);
+                        }
 
                     }
                 } else {
@@ -619,7 +623,8 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                                 new ThumbnailsCacheManager.ThumbnailGenerationTask(thumbnailView,
                                                                                    mStorageManager,
                                                                                    user.toPlatformAccount(),
-                                                                                   asyncTasks);
+                                                                                   asyncTasks,
+                                                                                   !gridView);
 
                             if (thumbnail == null) {
                                 thumbnail = BitmapUtils.drawableToBitmap(

From 82dd14f6bcf68b2d6d5dd6e698213e460ce476a7 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 30 Jan 2020 20:31:45 +0100
Subject: [PATCH 3/7] extract doubled code

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../android/datamodel/ThumbnailsCacheManager.java     |  7 +------
 .../android/ui/adapter/OCFileListAdapter.java         |  9 +--------
 .../java/com/owncloud/android/utils/BitmapUtils.java  | 11 +++++++++++
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 0124bacd5d..8bd377cba7 100644
--- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -520,12 +520,7 @@ public final class ThumbnailsCacheManager {
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
                         if (roundedCorners) {
-                            Resources resources = MainApp.getAppContext().getResources();
-
-                            BitmapUtils.setRoundedBitmap(resources,
-                                                         bitmap,
-                                                         resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
-                                                         imageView);
+                            BitmapUtils.setRoundedBitmap(bitmap, imageView);
                         } else {
                             imageView.setImageBitmap(bitmap);
                         }
diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index b201e088ca..e4ccc8c0dc 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -52,7 +52,6 @@ import com.bumptech.glide.request.target.BitmapImageViewTarget;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.preferences.AppPreferences;
-import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -606,14 +605,8 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         if (gridView) {
                             thumbnailView.setImageBitmap(thumbnail);
                         } else {
-                            Resources resources = MainApp.getAppContext().getResources();
-
-                            BitmapUtils.setRoundedBitmap(resources,
-                                                         thumbnail,
-                                                         resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
-                                                         thumbnailView);
+                            BitmapUtils.setRoundedBitmap(thumbnail, thumbnailView);
                         }
-
                     }
                 } else {
                     // generate new thumbnail
diff --git a/src/main/java/com/owncloud/android/utils/BitmapUtils.java b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
index d7d834cd16..711df4969b 100644
--- a/src/main/java/com/owncloud/android/utils/BitmapUtils.java
+++ b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
@@ -28,6 +28,8 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.apache.commons.codec.binary.Hex;
@@ -426,4 +428,13 @@ public final class BitmapUtils {
         drawable.draw(canvas);
         return bitmap;
     }
+
+    public static void setRoundedBitmap(Bitmap thumbnail, ImageView imageView) {
+        Resources resources = MainApp.getAppContext().getResources();
+
+        BitmapUtils.setRoundedBitmap(resources,
+                                     thumbnail,
+                                     resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
+                                     imageView);
+    }
 }

From 763ee606d1aa3574686f337cff30ac0f62e312b7 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 30 Jan 2020 21:39:54 +0100
Subject: [PATCH 4/7] use radius, and do not only test for it

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 src/main/java/com/owncloud/android/utils/BitmapUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/owncloud/android/utils/BitmapUtils.java b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
index 711df4969b..086fd63b18 100644
--- a/src/main/java/com/owncloud/android/utils/BitmapUtils.java
+++ b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
@@ -390,7 +390,7 @@ public final class BitmapUtils {
         roundedBitmap.setCircular(true);
 
         if (radius != -1) {
-            roundedBitmap.setCornerRadius(20);
+            roundedBitmap.setCornerRadius(radius);
         }
 
         return roundedBitmap;

From d6275c48332afac1d6f1370855c6f4a3e62d86a4 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 31 Jan 2020 07:20:14 +0100
Subject: [PATCH 5/7] use 10dp

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 src/main/res/values/dims.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml
index 67d98e6b59..2b894e5e48 100644
--- a/src/main/res/values/dims.xml
+++ b/src/main/res/values/dims.xml
@@ -30,7 +30,7 @@
     <dimen name="list_item_avatar_icon_radius">20dp</dimen>
     <dimen name="file_icon_size">40dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
-    <dimen name="file_icon_rounded_corner_radius">20dp</dimen>
+    <dimen name="file_icon_rounded_corner_radius">10dp</dimen>
     <dimen name="file_avatar_size">128dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
     <dimen name="standard_double_padding">32dp</dimen>

From 66b78e0eb75881304527f49b248d2e307892faa9 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 3 Feb 2020 06:58:39 +0100
Subject: [PATCH 6/7] changed to 8dp

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 src/main/res/values/dims.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml
index 2b894e5e48..00860d18dc 100644
--- a/src/main/res/values/dims.xml
+++ b/src/main/res/values/dims.xml
@@ -30,7 +30,7 @@
     <dimen name="list_item_avatar_icon_radius">20dp</dimen>
     <dimen name="file_icon_size">40dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
-    <dimen name="file_icon_rounded_corner_radius">10dp</dimen>
+    <dimen name="file_icon_rounded_corner_radius">8dp</dimen>
     <dimen name="file_avatar_size">128dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
     <dimen name="standard_double_padding">32dp</dimen>

From b787284ab6c0a389d0d57e71877d1d4cd301ed8c Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 3 Feb 2020 11:53:37 +0100
Subject: [PATCH 7/7] bump spotbugs

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 scripts/analysis/findbugs-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt
index 5c9fe11c04..d1b9f6a9c4 100644
--- a/scripts/analysis/findbugs-results.txt
+++ b/scripts/analysis/findbugs-results.txt
@@ -1 +1 @@
-413
\ No newline at end of file
+414