From b3b3f2a88de350dab2986bf76eff26ee114d9163 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 12 Mar 2017 12:45:36 +0100
Subject: [PATCH] Circle avatars in follow lists

---
 .../keylesspalace/tusky/FollowAdapter.java    | 10 +--
 app/src/main/res/layout/item_account.xml      | 77 ++++++++-----------
 2 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/FollowAdapter.java b/app/src/main/java/com/keylesspalace/tusky/FollowAdapter.java
index d15708cf..248fa6b6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/FollowAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/FollowAdapter.java
@@ -24,8 +24,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.keylesspalace.tusky.entity.Account;
+import com.pkmmte.view.CircularImageView;
 import com.squareup.picasso.Picasso;
 
+import butterknife.ButterKnife;
+
 /** Both for follows and following lists. */
 class FollowAdapter extends AccountAdapter {
     private static final int VIEW_TYPE_ACCOUNT = 0;
@@ -77,8 +80,7 @@ class FollowAdapter extends AccountAdapter {
         private View container;
         private TextView username;
         private TextView displayName;
-        private TextView note;
-        private ImageView avatar;
+        private CircularImageView avatar;
         private String id;
 
         AccountViewHolder(View itemView) {
@@ -86,8 +88,7 @@ class FollowAdapter extends AccountAdapter {
             container = itemView.findViewById(R.id.account_container);
             username = (TextView) itemView.findViewById(R.id.account_username);
             displayName = (TextView) itemView.findViewById(R.id.account_display_name);
-            note = (TextView) itemView.findViewById(R.id.account_note);
-            avatar = (ImageView) itemView.findViewById(R.id.account_avatar);
+            avatar = (CircularImageView) itemView.findViewById(R.id.account_avatar);
         }
 
         void setupWithAccount(Account account) {
@@ -96,7 +97,6 @@ class FollowAdapter extends AccountAdapter {
             String formattedUsername = String.format(format, account.username);
             username.setText(formattedUsername);
             displayName.setText(account.getDisplayName());
-            note.setText(account.note);
             Context context = avatar.getContext();
             Picasso.with(context)
                     .load(account.avatar)
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 44f5739c..afe79fb0 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,56 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="72dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
+    android:gravity="center_vertical"
     android:id="@+id/account_container">
 
-    <RelativeLayout
-        android:paddingTop="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <com.pkmmte.view.CircularImageView
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_centerVertical="true"
+        android:id="@+id/account_avatar"
+        android:layout_marginRight="24dp" />
 
-        <ImageView
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:id="@+id/account_avatar"
-            android:layout_marginRight="10dp" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:layout_toRightOf="@id/account_avatar">
 
-        <LinearLayout
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:id="@+id/account_display_name"
+            android:text="Display name"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textSize="16sp"
+            android:textColor="?android:textColorPrimary"
+            android:textStyle="normal|bold" />
 
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/account_avatar">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="\@username"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textSize="14sp"
+            android:textColor="?android:textColorSecondary"
+            android:id="@+id/account_username" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/account_display_name"
-                android:text="Display name"
-                android:textColor="?android:textColorPrimary"
-                android:textStyle="normal|bold" />
+    </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="\@username"
-                android:textColor="?android:textColorSecondary"
-                android:id="@+id/account_username" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/account_note"
-        android:paddingTop="4dp"
-        android:paddingBottom="8dp"
-        android:textColor="?android:textColorTertiary" />
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file