From 16296153de4b383cb93985d6bd800ea6daec21b4 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 13 Apr 2017 11:14:36 +0200
Subject: [PATCH] contact list: text is now in line with header round images

---
 .../ui/activity/ContactListFragment.java        | 17 ++++++++++-------
 src/main/res/layout/contactlist_fragment.xml    |  9 ++++++---
 src/main/res/layout/contactlist_list_item.xml   |  9 +++++----
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/activity/ContactListFragment.java b/src/main/java/com/owncloud/android/ui/activity/ContactListFragment.java
index 5290a67e3a..cf09890612 100644
--- a/src/main/java/com/owncloud/android/ui/activity/ContactListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/activity/ContactListFragment.java
@@ -27,14 +27,14 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
 import android.support.v7.app.AlertDialog;
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
@@ -45,8 +45,8 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckedTextView;
+import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.QuickContactBadge;
 import android.widget.TextView;
 
 import com.evernote.android.job.JobRequest;
@@ -57,6 +57,7 @@ import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.ContactsImportJob;
 import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.PermissionUtil;
 
 import java.io.File;
@@ -164,7 +165,7 @@ public class ContactListFragment extends FileFragment {
     }
 
     static class ContactItemViewHolder {
-        QuickContactBadge badge;
+        ImageView badge;
         TextView name;
     }
 
@@ -321,7 +322,7 @@ class ContactListAdapter extends ArrayAdapter<VCard> {
             convertView = LayoutInflater.from(getContext()).inflate(R.layout.contactlist_list_item, parent, false);
             viewHolder = new ContactListFragment.ContactItemViewHolder();
 
-            viewHolder.badge = (QuickContactBadge) convertView.findViewById(R.id.contactlist_item_icon);
+            viewHolder.badge = (ImageView) convertView.findViewById(R.id.contactlist_item_icon);
             viewHolder.name = (TextView) convertView.findViewById(R.id.contactlist_item_name);
 
             convertView.setTag(viewHolder);
@@ -336,11 +337,13 @@ class ContactListAdapter extends ArrayAdapter<VCard> {
             if (vcard.getPhotos().size() > 0) {
                 byte[] data = vcard.getPhotos().get(0).getData();
 
-                Drawable drawable = new BitmapDrawable(BitmapFactory.decodeByteArray(data, 0, data.length));
+                Bitmap thumbnail = BitmapFactory.decodeByteArray(data, 0, data.length);
+                RoundedBitmapDrawable drawable = BitmapUtils.bitmapToCircularBitmapDrawable(getContext().getResources(),
+                        thumbnail);
 
                 viewHolder.badge.setImageDrawable(drawable);
             } else {
-                viewHolder.badge.setImageToDefault();
+                viewHolder.badge.setImageResource(R.drawable.ic_user);
             }
 
             // name
diff --git a/src/main/res/layout/contactlist_fragment.xml b/src/main/res/layout/contactlist_fragment.xml
index 61b0d42b6f..f0441c17e3 100644
--- a/src/main/res/layout/contactlist_fragment.xml
+++ b/src/main/res/layout/contactlist_fragment.xml
@@ -27,9 +27,12 @@
         android:id="@+id/contactlist_listview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_margin="10dp"
-        android:choiceMode="multipleChoice"
-        android:layout_weight="1" />
+        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_weight="1"
+        android:choiceMode="multipleChoice"/>
 
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/contactlist_restore_selected"
diff --git a/src/main/res/layout/contactlist_list_item.xml b/src/main/res/layout/contactlist_list_item.xml
index 5a90135ae0..bdeec1b661 100644
--- a/src/main/res/layout/contactlist_list_item.xml
+++ b/src/main/res/layout/contactlist_list_item.xml
@@ -23,11 +23,12 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <QuickContactBadge
+    <ImageView
         android:id="@+id/contactlist_item_icon"
-        android:layout_width="?android:attr/listPreferredItemHeight"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:layout_margin="5dp"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_margin="0dp"
+        android:padding="7dp"
         android:scaleType="centerCrop"
         android:src="@drawable/ic_user"/>