diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java
index ffdee6dcd..464122a57 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java
@@ -64,7 +64,7 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement
this.context = context;
accountsFollowRequestAdapter = this;
}
-
+
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
@@ -78,7 +78,8 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement
final Account account = accounts.get(position);
holder.btn_authorize.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.green_1), PorterDuff.Mode.MULTIPLY);
holder.btn_reject.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.red_1), PorterDuff.Mode.MULTIPLY);
- holder.account_un.setText(String.format("@%s", account.getUsername()));
+ holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name(),true));
+ holder.account_un.setText(account.getAcct());
//Profile picture
Glide.with(holder.account_pp.getContext())
.load(account.getAvatar())
@@ -89,6 +90,12 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement
openAccountDetails(account);
}
});
+ holder.account_dn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ openAccountDetails(account);
+ }
+ });
holder.account_un.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -157,11 +164,13 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement
ImageView account_pp;
Button btn_authorize;
Button btn_reject;
+ TextView account_dn;
TextView account_un;
public ViewHolder(View itemView) {
super(itemView);
account_pp = itemView.findViewById(R.id.account_pp);
+ account_dn = itemView.findViewById(R.id.account_dn);
account_un = itemView.findViewById(R.id.account_un);
btn_authorize = itemView.findViewById(R.id.btn_authorize);
btn_reject = itemView.findViewById(R.id.btn_reject);
diff --git a/app/src/main/res/layout/drawer_account_follow_request.xml b/app/src/main/res/layout/drawer_account_follow_request.xml
index 8790f1b3a..93e2d94c6 100644
--- a/app/src/main/res/layout/drawer_account_follow_request.xml
+++ b/app/src/main/res/layout/drawer_account_follow_request.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_marginBottom="5dp">
+
+ android:layout_gravity="center"
+ android:contentDescription="@string/profile_picture"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+
+
-
-
-
-
+ android:layout_marginLeft="5dp"
+ android:layout_marginRight="5dp"
+ android:maxLines="1"
+ android:textSize="15sp"
+ app:layout_constraintBottom_toTopOf="@id/btn_top_barrier"
+ app:layout_constraintLeft_toRightOf="@id/account_pp"
+ app:layout_constraintTop_toBottomOf="@id/account_dn" />
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file