From 11fac47ae78741e267e196178e90217a175f081f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 7 Mar 2019 15:35:42 +0100
Subject: [PATCH] fix #115, use rounded avatars

---
 .../contacts/pro/activities/ContactActivity.kt     |  3 +++
 .../contacts/pro/adapters/ContactsAdapter.kt       | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt
index 66a45a4f..190672a9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.contacts.pro.activities
 
 import android.graphics.Bitmap
+import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.provider.ContactsContract
 import android.widget.ImageView
@@ -53,9 +54,11 @@ abstract class ContactActivity : SimpleActivity() {
                 .load(bitmap ?: path)
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .apply(options)
+                .apply(RequestOptions.circleCropTransform())
                 .listener(object : RequestListener<Drawable> {
                     override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
                         photoView.setPadding(0, 0, 0, 0)
+                        photoView.background = ColorDrawable(0)
                         return false
                     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
index 4b3de60a..b5181b86 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
@@ -295,7 +295,12 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
                                 .error(placeholderImage)
                                 .centerCrop()
 
-                        Glide.with(activity).load(contact.photoUri).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(contact_tmb)
+                        Glide.with(activity)
+                                .load(contact.photoUri)
+                                .transition(DrawableTransitionOptions.withCrossFade())
+                                .apply(options)
+                                .apply(RequestOptions.circleCropTransform())
+                                .into(contact_tmb)
                     }
                     contact.photo != null -> {
                         val options = RequestOptions()
@@ -304,7 +309,12 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
                                 .error(placeholderImage)
                                 .centerCrop()
 
-                        Glide.with(activity).load(contact.photo).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(contact_tmb)
+                        Glide.with(activity)
+                                .load(contact.photo)
+                                .transition(DrawableTransitionOptions.withCrossFade())
+                                .apply(options)
+                                .apply(RequestOptions.circleCropTransform())
+                                .into(contact_tmb)
                     }
                     else -> contact_tmb.setImageDrawable(placeholderImage)
                 }