From a8f32f02c80cb8a892c805332fc36d038a1b1f1e Mon Sep 17 00:00:00 2001
From: stefan-niedermann <info@niedermann.it>
Date: Fri, 4 Oct 2019 20:16:32 +0200
Subject: [PATCH] Display avatars in account chooser

---
 .../notes/android/activity/NotesListViewActivity.java    | 9 ++++++++-
 app/src/main/res/layout/item_account.xml                 | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index db71013f..e37492d2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -16,6 +16,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -227,7 +228,13 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
         accountChooser.removeAllViews();
         for (LocalAccount account : db.getAccounts()) {
             View v = getLayoutInflater().inflate(R.layout.item_account, null);
-            ((TextView) v.findViewById(R.id.accountItemLabel)).setText(account.getUserName());
+            ((TextView) v.findViewById(R.id.accountItemLabel)).setText(account.getAccountName());
+            Glide
+                    .with(this)
+                    .load(account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64")
+                    .error(R.drawable.ic_account_circle_grey_24dp)
+                    .apply(RequestOptions.circleCropTransform())
+                    .into(((ImageView) v.findViewById(R.id.accountItemAvatar)));
             v.setOnClickListener(clickedView -> {
                 SingleAccountHelper.setCurrentAccount(getApplicationContext(), account.getAccountName());
                 db.getNoteServerSyncHelper().updateAccount();
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index b391bba1..dc06797d 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -26,8 +26,10 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="64dp"
         android:layout_marginStart="64dp"
-        android:ellipsize="end"
-        android:lines="1"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="middle"
+        android:singleLine="true"
         android:textAppearance="@style/NavigationItem"
         tools:hint="Username"/>