Remove round transformations

6 files changed, 4 insertions, 66 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index f3eb8fe6..97abf5a2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -145,7 +145,7 @@ class LoginActivity : BaseActivity() {
     private suspend fun loadProfile(id: Long): Boolean = withMainContext {
         suspendCancellableCoroutine<Boolean> { cont ->
             profileLoader.load(profilePictureUrl(id))
-                .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
+                .transform(FrostGlide.circleCrop).listener(object : RequestListener<Drawable> {
                     override fun onResourceReady(
                         resource: Drawable?,
                         model: Any?,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
index 870e2ccd..537ad89c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
@@ -38,8 +38,6 @@ import okhttp3.Response
  * Each caller will generate a new one upon request
  */
 object FrostGlide {
-    val roundCorner
-        get() = RoundCornerTransformation()
     val circleCrop
         get() = CircleCrop()
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt
deleted file mode 100644
index b63c5588..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2018 Allan Wang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.pitchedapps.frost.glide
-
-import android.graphics.Bitmap
-import android.graphics.BitmapShader
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.Shader
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
-import com.pitchedapps.frost.utils.Prefs
-import java.security.MessageDigest
-
-/**
- * Created by Allan Wang on 27/12/17.
- */
-class RoundCornerTransformation : BitmapTransformation() {
-
-    override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-        messageDigest.update("FrostRoundCornerTransform".toByteArray())
-    }
-
-    override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
-
-        val width = toTransform.width
-        val height = toTransform.height
-
-        val bitmap = pool.get(width, height, Bitmap.Config.ARGB_8888)
-        bitmap.setHasAlpha(true)
-
-        val radius = Math.min(width, height) * 0.5f
-
-        val canvas = Canvas(bitmap)
-        val paint = Paint()
-        paint.isAntiAlias = true
-        paint.shader = BitmapShader(toTransform, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        canvas.drawRoundRect(
-            RectF(0f, 0f, width.toFloat(), height.toFloat()),
-            radius, radius, paint
-        )
-
-        return bitmap
-    }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
index 651a4a2a..d20e8cde 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
@@ -59,7 +59,7 @@ class MenuContentIItem(val data: MenuItem) :
             if (iconUrl != null)
                 GlideApp.with(itemView)
                     .load(iconUrl)
-                    .transform(FrostGlide.roundCorner)
+                    .transform(FrostGlide.circleCrop)
                     .into(icon.visible())
             else
                 icon.gone()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
index e8332955..8b196a64 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
@@ -106,7 +106,7 @@ class NotificationIItem(val notification: FrostNotif, val cookie: String) :
 
             val glide = glide
             glide.load(notif.img)
-                .transform(FrostGlide.roundCorner)
+                .transform(FrostGlide.circleCrop)
                 .into(avatar)
             if (notif.thumbnailUrl != null)
                 glide.load(notif.thumbnailUrl).into(thumbnail.visible())
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index d7a7de0e..d60ea7ed 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -53,7 +53,7 @@ class AccountItem(val cookie: CookieModel?) : KauIItem<AccountItem, AccountItem.
             if (cookie != null) {
                 text.text = cookie.name
                 GlideApp.with(itemView).load(profilePictureUrl(cookie.id))
-                    .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
+                    .transform(FrostGlide.circleCrop).listener(object : RequestListener<Drawable> {
                         override fun onResourceReady(
                             resource: Drawable?,
                             model: Any?,