mirror of
https://codeberg.org/tom79/Fedilab.git
synced 2025-07-08 21:00:29 +03:00
Fix issue with names not displayed fully
This commit is contained in:
parent
ef50b5261a
commit
98adcc1abd
3 changed files with 16 additions and 10 deletions
|
@ -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);
|
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.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) {
|
if (getItemViewType(position) == TYPE_MENTION || getItemViewType(position) == TYPE_STATUS || getItemViewType(position) == TYPE_REACTION) {
|
||||||
holderStatus.bindingNotification.status.actionButtons.setVisibility(View.VISIBLE);
|
holderStatus.bindingNotification.status.actionButtons.setVisibility(View.VISIBLE);
|
||||||
String title = "";
|
String title = "";
|
||||||
if (getItemViewType(position) == TYPE_MENTION) {
|
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) {
|
} 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) {
|
} else if (getItemViewType(position) == TYPE_REACTION) {
|
||||||
if (notification.emoji == null) {
|
if (notification.emoji == null) {
|
||||||
notification.emoji = "";
|
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);
|
MastodonHelper.loadPPMastodon(holderStatus.bindingNotification.status.avatar, notification.account);
|
||||||
holderStatus.bindingNotification.status.statusUserInfo.setOnClickListener(v -> {
|
holderStatus.bindingNotification.status.statusUserInfo.setOnClickListener(v -> {
|
||||||
Intent intent = new Intent(context, ProfileActivity.class);
|
Intent intent = new Intent(context, ProfileActivity.class);
|
||||||
|
@ -425,11 +428,14 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
String title = "";
|
String title = "";
|
||||||
MastodonHelper.loadPPMastodon(holderStatus.binding.avatar, notification.account);
|
MastodonHelper.loadPPMastodon(holderStatus.binding.avatar, notification.account);
|
||||||
if (getItemViewType(position) == TYPE_FAVOURITE) {
|
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) {
|
} 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) {
|
} 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) {
|
} else if (getItemViewType(position) == TYPE_POLL) {
|
||||||
title = context.getString(R.string.notif_poll);
|
title = context.getString(R.string.notif_poll);
|
||||||
} else if (getItemViewType(position) == TYPE_POLL) {
|
} else if (getItemViewType(position) == TYPE_POLL) {
|
||||||
|
|
|
@ -501,7 +501,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
||||||
holder.binding.pronouns.setVisibility(View.VISIBLE);
|
holder.binding.pronouns.setVisibility(View.VISIBLE);
|
||||||
holder.binding.pronouns.setText(statusToDeal.pronouns);
|
holder.binding.pronouns.setText(statusToDeal.pronouns);
|
||||||
} else {
|
} 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)) {
|
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));
|
holder.binding.quotedMessage.cardviewContainer.setCardElevation((int) Helper.convertDpToPixel(5, context));
|
||||||
|
|
|
@ -168,9 +168,9 @@
|
||||||
app:layout_constraintStart_toEndOf="@+id/display_name"
|
app:layout_constraintStart_toEndOf="@+id/display_name"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/date_short_container"
|
app:layout_constraintEnd_toStartOf="@+id/date_short_container"
|
||||||
android:layout_width="0dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="6dp"
|
android:layout_marginHorizontal="3dp"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
tools:visibility="visible"
|
tools:visibility="visible"
|
||||||
android:textColor="?colorPrimary"
|
android:textColor="?colorPrimary"
|
||||||
|
|
Loading…
Reference in a new issue