From 900466b88fe8e7d7afe3e396194413e622497244 Mon Sep 17 00:00:00 2001
From: Kasun <kasun@tuta.io>
Date: Sat, 22 Jun 2019 09:55:24 +0530
Subject: [PATCH] display username in accounts info

---
 .../activities/AccountReportActivity.java     |  5 ++++-
 .../main/res/layout/activity_admin_report.xml | 22 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
index c6a59fcba..e46cd086d 100644
--- a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
@@ -49,7 +49,7 @@ import es.dmoral.toasty.Toasty;
 
 public class AccountReportActivity extends BaseActivity implements OnAdminActionInterface {
 
-    TextView permissions, email, email_status, login_status, joined, recent_ip;
+    TextView permissions, username, email, email_status, login_status, joined, recent_ip;
     Button warn, disable, silence;
     private String account_id;
 
@@ -94,6 +94,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
         silence = findViewById(R.id.silence);
 
         permissions = findViewById(R.id.permissions);
+        username = findViewById(R.id.username);
         email = findViewById(R.id.email);
         email_status = findViewById(R.id.email_status);
         login_status = findViewById(R.id.login_status);
@@ -160,6 +161,8 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
                 break;
         }
 
+        username.setText(String.format("@%s", accountAdmin.getAccount().getAcct()));
+
         email.setText(accountAdmin.getEmail());
         email_status.setText(accountAdmin.isConfirmed()?getString(R.string.confirmed):getString(R.string.unconfirmed));
 
diff --git a/app/src/main/res/layout/activity_admin_report.xml b/app/src/main/res/layout/activity_admin_report.xml
index 3a6810ae7..3416c9a3f 100644
--- a/app/src/main/res/layout/activity_admin_report.xml
+++ b/app/src/main/res/layout/activity_admin_report.xml
@@ -52,6 +52,17 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/username_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/account"
+                app:layout_constraintEnd_toStartOf="@id/stats_label_end_barrier"
+                app:layout_constraintHorizontal_bias="1"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/permissions_label" />
+
             <TextView
                 android:id="@+id/email_label"
                 android:layout_width="wrap_content"
@@ -61,7 +72,7 @@
                 app:layout_constraintEnd_toStartOf="@id/stats_label_end_barrier"
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/permissions_label" />
+                app:layout_constraintTop_toBottomOf="@id/username_label" />
 
             <TextView
                 android:id="@+id/email_status_label"
@@ -124,6 +135,15 @@
                 app:layout_constraintStart_toEndOf="@id/stats_label_end_barrier"
                 app:layout_constraintTop_toTopOf="@id/permissions_label" />
 
+            <TextView
+                android:id="@+id/username"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                app:layout_constraintBottom_toBottomOf="@id/username_label"
+                app:layout_constraintStart_toEndOf="@id/stats_label_end_barrier"
+                app:layout_constraintTop_toTopOf="@id/username_label" />
+
             <TextView
                 android:id="@+id/email"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34163e7a7..6abace3fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1058,6 +1058,7 @@
     <string name="confirmed">Confirmed</string>
     <string name="unconfirmed">Not confirmed</string>
     <string name="list_reported_statuses">Reported statuses</string>
+    <string name="account">Account</string>
     <plurals name="number_of_vote">
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>