From 98adcc1abdb51e2bdf7a382b9327b2dda672a306 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 25 Feb 2025 10:35:54 +0100
Subject: [PATCH] Fix issue with names not displayed fully

---
 .../ui/drawer/NotificationAdapter.java        | 20 ++++++++++++-------
 .../mastodon/ui/drawer/StatusAdapter.java     |  2 +-
 .../layouts/mastodon/layout/drawer_status.xml |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/NotificationAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/NotificationAdapter.java
index f37fe5bb..76f5d172 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/NotificationAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/NotificationAdapter.java
@@ -382,19 +382,22 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             }
             statusManagement(context, statusesVM, searchVM, holderStatus, mRecyclerView, this, null, notification.status, Timeline.TimeLineEnum.NOTIFICATION, false, true, false, null);
             holderStatus.bindingNotification.status.dateShort.setText(Helper.dateDiff(context, notification.created_at));
-            holderStatus.bindingNotification.status.pronouns.setVisibility(View.INVISIBLE);
+            holderStatus.bindingNotification.status.pronouns.setVisibility(View.GONE);
             if (getItemViewType(position) == TYPE_MENTION || getItemViewType(position) == TYPE_STATUS || getItemViewType(position) == TYPE_REACTION) {
                 holderStatus.bindingNotification.status.actionButtons.setVisibility(View.VISIBLE);
                 String title = "";
                 if (getItemViewType(position) == TYPE_MENTION) {
-                    title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_mention));
+                    //title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_mention));
+                    title = notification.account.display_name;
                 } else if (getItemViewType(position) == TYPE_STATUS) {
-                    title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_status));
+                   // title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_status));
+                    title = notification.account.display_name;
                 } else if (getItemViewType(position) == TYPE_REACTION) {
                     if (notification.emoji == null) {
                         notification.emoji = "";
                     }
-                    title = String.format(Locale.getDefault(), "%s reacted with %s", notification.account.username, notification.emoji);
+                    //title = String.format(Locale.getDefault(), "%s reacted with %s", notification.account.username, notification.emoji);
+                    title = notification.account.username;
                     MastodonHelper.loadPPMastodon(holderStatus.bindingNotification.status.avatar, notification.account);
                     holderStatus.bindingNotification.status.statusUserInfo.setOnClickListener(v -> {
                         Intent intent = new Intent(context, ProfileActivity.class);
@@ -425,11 +428,14 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 String title = "";
                 MastodonHelper.loadPPMastodon(holderStatus.binding.avatar, notification.account);
                 if (getItemViewType(position) == TYPE_FAVOURITE) {
-                    title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_favourite));
+                   // title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_favourite));
+                    title = notification.account.display_name;
                 } else if (getItemViewType(position) == TYPE_REBLOG) {
-                    title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_reblog));
+                   // title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_reblog));
+                    title = notification.account.display_name;
                 } else if (getItemViewType(position) == TYPE_UPDATE) {
-                    title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_update));
+                  //  title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_update));
+                    title = notification.account.display_name;
                 } else if (getItemViewType(position) == TYPE_POLL) {
                     title = context.getString(R.string.notif_poll);
                 } else if (getItemViewType(position) == TYPE_POLL) {
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
index 596d25fa..9bd082e2 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
@@ -501,7 +501,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             holder.binding.pronouns.setVisibility(View.VISIBLE);
             holder.binding.pronouns.setText(statusToDeal.pronouns);
         } else {
-            holder.binding.pronouns.setVisibility(View.INVISIBLE);
+            holder.binding.pronouns.setVisibility(View.GONE);
         }
         if (statusToDeal.quote != null && (statusToDeal.spoiler_text == null || statusToDeal.spoiler_text.trim().isEmpty() || statusToDeal.isExpended)) {
             holder.binding.quotedMessage.cardviewContainer.setCardElevation((int) Helper.convertDpToPixel(5, context));
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
index 0328d756..cb178842 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
@@ -168,9 +168,9 @@
                         app:layout_constraintStart_toEndOf="@+id/display_name"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/date_short_container"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="6dp"
+                        android:layout_marginHorizontal="3dp"
                         android:visibility="invisible"
                         tools:visibility="visible"
                         android:textColor="?colorPrimary"