From fd1fcf3b97bdc8fa0d0d794311e4f7a0cb6536eb Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 21 Sep 2019 21:35:51 +0200
Subject: [PATCH] upgrade glide (#1489)

---
 app/build.gradle                              |  5 ++--
 .../adapter/StatusDetailedViewHolder.java     | 26 ++++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f78ce2f7..4cd93818 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -152,9 +152,8 @@ dependencies {
     implementation 'androidx.paging:paging-runtime-ktx:2.1.0'
 
     //Glide
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:4.9.0'
-    implementation 'jp.wasabeef:glide-transformations:3.1.1'  // intentionally use 3.x version because of 2mb smaller apk
+    implementation 'com.github.bumptech.glide:glide:4.10.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.10.0'
 
     //Add some useful extensions
     implementation 'androidx.core:core-ktx:1.2.0-alpha01'
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
index 930a6ee3..df0fb923 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
@@ -18,6 +18,7 @@ import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.entity.Card;
 import com.keylesspalace.tusky.entity.Status;
@@ -29,12 +30,9 @@ import com.keylesspalace.tusky.viewdata.StatusViewData;
 import java.text.DateFormat;
 import java.util.Date;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-
 class StatusDetailedViewHolder extends StatusBaseViewHolder {
     private TextView reblogs;
     private TextView favourites;
@@ -172,7 +170,13 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
 
                 if (!TextUtils.isEmpty(card.getImage())) {
 
-                    RoundedCornersTransformation.CornerType cornertype;
+                    int topLeftRadius = 0;
+                    int topRightRadius = 0;
+                    int bottomRightRadius = 0;
+                    int bottomLeftRadius = 0;
+
+                    int radius = cardImage.getContext().getResources()
+                            .getDimensionPixelSize(R.dimen.card_radius);
 
                     if (card.getWidth() > card.getHeight()) {
                         cardView.setOrientation(LinearLayout.VERTICAL);
@@ -182,7 +186,8 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
                         cardImage.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
                         cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
                         cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
-                        cornertype = RoundedCornersTransformation.CornerType.TOP;
+                        topLeftRadius = radius;
+                        topRightRadius = radius;
                     } else {
                         cardView.setOrientation(LinearLayout.HORIZONTAL);
                         cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
@@ -190,15 +195,18 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
                                 .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
                         cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
                         cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
-                        cornertype = RoundedCornersTransformation.CornerType.LEFT;
+                        topLeftRadius = radius;
+                        bottomLeftRadius = radius;
                     }
 
-                    int radius = cardImage.getContext().getResources()
-                            .getDimensionPixelSize(R.dimen.card_radius);
+
 
                     Glide.with(cardImage)
                             .load(card.getImage())
-                            .transform(new CenterCrop(), new RoundedCornersTransformation(radius, 0, cornertype))
+                            .transform(
+                                    new CenterCrop(),
+                                    new GranularRoundedCorners(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius)
+                            )
                             .into(cardImage);
 
                 } else {