From 9e51d96afb0ed86a509a5871e406eb518cfe2cda Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 15 Apr 2020 19:55:19 +0200
Subject: [PATCH] using the colored circle icons at groups too

---
 app/build.gradle                                      |  2 +-
 .../contacts/pro/adapters/GroupsAdapter.kt            | 10 +---------
 app/src/main/res/layout/item_group.xml                | 11 ++++++++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fa35c8f2..49730254 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.25.18'
+    implementation 'com.simplemobiletools:commons:5.25.19'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
index f6ab3476..9b9c0235 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
@@ -25,8 +25,6 @@ import java.util.*
 class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList<Group>, val refreshListener: RefreshContactsListener?, recyclerView: MyRecyclerView,
                     fastScroller: FastScroller, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
 
-    private var smallPadding = activity.resources.getDimension(R.dimen.small_margin).toInt()
-    private var bigPadding = activity.resources.getDimension(R.dimen.normal_margin).toInt()
     private var textToHighlight = ""
 
     var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
@@ -165,17 +163,11 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList<Group>, val
                 setTextColor(textColor)
                 setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
                 text = groupTitle
-
-                if (showContactThumbnails) {
-                    setPadding(smallPadding, bigPadding, bigPadding, bigPadding)
-                } else {
-                    setPadding(bigPadding, bigPadding, bigPadding, bigPadding)
-                }
             }
 
             group_tmb.beVisibleIf(showContactThumbnails)
             if (showContactThumbnails) {
-                group_tmb.applyColorFilter(textColor)
+                group_tmb.setImageDrawable(activity.getColoredGroupIcon(group.title))
             }
         }
     }
diff --git a/app/src/main/res/layout/item_group.xml b/app/src/main/res/layout/item_group.xml
index 98f7ea11..b57021ff 100644
--- a/app/src/main/res/layout/item_group.xml
+++ b/app/src/main/res/layout/item_group.xml
@@ -13,16 +13,19 @@
         android:id="@+id/group_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/tiny_margin"
+        android:minHeight="@dimen/min_row_height"
+        android:paddingStart="@dimen/tiny_margin"
+        android:paddingTop="@dimen/medium_margin"
         android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/tiny_margin">
+        android:paddingBottom="@dimen/medium_margin">
 
         <ImageView
             android:id="@+id/group_tmb"
             android:layout_width="@dimen/normal_icon_size"
             android:layout_height="@dimen/normal_icon_size"
             android:layout_centerVertical="true"
-            android:padding="@dimen/medium_margin"
+            android:layout_marginStart="@dimen/small_margin"
+            android:padding="@dimen/tiny_margin"
             android:src="@drawable/ic_people_vector" />
 
         <TextView
@@ -34,6 +37,8 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
+            android:paddingStart="@dimen/medium_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:textSize="@dimen/big_text_size"
             tools:text="Family" />