From a91c8d7334f709918a24609ff722e1ecc92e5cb8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 15 Apr 2020 19:48:54 +0200
Subject: [PATCH] moving the group colored icon creator in Commons

---
 app/build.gradle                                 |  2 +-
 .../adapters/ConversationsAdapter.kt             |  9 ++-------
 .../res/drawable/group_conversation_icon.xml     | 16 ----------------
 3 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 app/src/main/res/drawable/group_conversation_icon.xml

diff --git a/app/build.gradle b/app/build.gradle
index 48de5e0e..bcdd855a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,7 +56,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.25.18'
+    implementation 'com.simplemobiletools:commons:5.25.19'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.klinkerapps:android-smsmms:5.2.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
index 61aef15b..d33aee50 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
@@ -1,7 +1,6 @@
 package com.simplemobiletools.smsmessenger.adapters
 
 import android.graphics.Typeface
-import android.graphics.drawable.LayerDrawable
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
@@ -9,10 +8,9 @@ import android.widget.TextView
 import com.bumptech.glide.Glide
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
-import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.formatDateOrTime
+import com.simplemobiletools.commons.extensions.getColoredGroupIcon
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.commons.helpers.letterBackgroundColors
 import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.smsmessenger.R
@@ -143,10 +141,7 @@ class ConversationsAdapter(
 
             // at group conversations we use an icon as the placeholder, not any letter
             val placeholder = if (conversation.isGroupConversation) {
-                val icon = activity.resources.getDrawable(R.drawable.group_conversation_icon)
-                val bgColor = letterBackgroundColors[Math.abs(conversation.title.hashCode()) % letterBackgroundColors.size].toInt()
-                (icon as LayerDrawable).findDrawableByLayerId(R.id.attendee_circular_background).applyColorFilter(bgColor)
-                icon
+                activity.getColoredGroupIcon(conversation.title)
             } else {
                 null
             }
diff --git a/app/src/main/res/drawable/group_conversation_icon.xml b/app/src/main/res/drawable/group_conversation_icon.xml
deleted file mode 100644
index eef63aa5..00000000
--- a/app/src/main/res/drawable/group_conversation_icon.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/attendee_circular_background">
-        <shape android:shape="oval">
-            <solid android:color="@color/color_primary" />
-        </shape>
-    </item>
-
-    <item
-        android:bottom="@dimen/medium_margin"
-        android:drawable="@drawable/ic_people_vector"
-        android:left="@dimen/medium_margin"
-        android:right="@dimen/medium_margin"
-        android:top="@dimen/medium_margin" />
-
-</layer-list>