mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-11 14:54:09 +01:00
Remove avatars from last message
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
175f64b8c3
commit
31ce180c6d
@ -100,7 +100,6 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
|
|||||||
Context context = NextcloudTalkApplication.Companion.getSharedApplication().getApplicationContext();
|
Context context = NextcloudTalkApplication.Companion.getSharedApplication().getApplicationContext();
|
||||||
|
|
||||||
holder.dialogAvatar.setController(null);
|
holder.dialogAvatar.setController(null);
|
||||||
holder.dialogLastMessageUserAvatar.setController(null);
|
|
||||||
|
|
||||||
if (adapter.hasFilter()) {
|
if (adapter.hasFilter()) {
|
||||||
FlexibleUtils.highlightText(holder.dialogName, conversation.getDisplayName(),
|
FlexibleUtils.highlightText(holder.dialogName, conversation.getDisplayName(),
|
||||||
@ -146,7 +145,6 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
|
|||||||
System.currentTimeMillis(), 0, DateUtils.FORMAT_ABBREV_RELATIVE));
|
System.currentTimeMillis(), 0, DateUtils.FORMAT_ABBREV_RELATIVE));
|
||||||
|
|
||||||
if (!TextUtils.isEmpty(conversation.getLastMessage().getSystemMessage()) || Conversation.ConversationType.ROOM_SYSTEM.equals(conversation.getType())) {
|
if (!TextUtils.isEmpty(conversation.getLastMessage().getSystemMessage()) || Conversation.ConversationType.ROOM_SYSTEM.equals(conversation.getType())) {
|
||||||
holder.dialogLastMessageUserAvatar.setVisibility(View.GONE);
|
|
||||||
holder.dialogLastMessage.setText(conversation.getLastMessage().getText());
|
holder.dialogLastMessage.setText(conversation.getLastMessage().getText());
|
||||||
} else {
|
} else {
|
||||||
String authorDisplayName = "";
|
String authorDisplayName = "";
|
||||||
@ -169,48 +167,12 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
|
|||||||
}
|
}
|
||||||
|
|
||||||
holder.dialogLastMessage.setText(text);
|
holder.dialogLastMessage.setText(text);
|
||||||
|
|
||||||
if (conversation.getLastMessage().getActorType().equals("guests")) {
|
|
||||||
if (TextUtils.isEmpty(authorDisplayName)) {
|
|
||||||
authorDisplayName = NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest);
|
|
||||||
}
|
}
|
||||||
holder.dialogLastMessageUserAvatar.setVisibility(View.VISIBLE);
|
|
||||||
|
|
||||||
DraweeController draweeController = Fresco.newDraweeControllerBuilder()
|
|
||||||
.setOldController(holder.dialogLastMessageUserAvatar.getController())
|
|
||||||
.setAutoPlayAnimations(true)
|
|
||||||
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithNameForGuests(userEntity.getBaseUrl(), authorDisplayName, R.dimen.smaller_item_height), userEntity))
|
|
||||||
.build();
|
|
||||||
holder.dialogLastMessageUserAvatar.setController(draweeController);
|
|
||||||
} else if (conversation.getLastMessage().getActorId().equals(userEntity.getUserId())
|
|
||||||
|| !conversation.getType().equals(Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL)) {
|
|
||||||
holder.dialogLastMessageUserAvatar.setVisibility(View.VISIBLE);
|
|
||||||
|
|
||||||
if (!"bots".equals(conversation.getLastMessage().getActorType())) {
|
|
||||||
DraweeController draweeController = Fresco.newDraweeControllerBuilder()
|
|
||||||
.setOldController(holder.dialogLastMessageUserAvatar.getController())
|
|
||||||
.setAutoPlayAnimations(true)
|
|
||||||
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), conversation.getLastMessage().getActorId(), R.dimen.smaller_item_height), userEntity))
|
|
||||||
.build();
|
|
||||||
holder.dialogLastMessageUserAvatar.setController(draweeController);
|
|
||||||
} else {
|
|
||||||
TextDrawable drawable =
|
|
||||||
TextDrawable.builder().beginConfig().bold().endConfig().buildRound(">", context.getResources().getColor(R.color.black));
|
|
||||||
holder.dialogLastMessageUserAvatar.setImageDrawable(drawable);
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
holder.dialogLastMessageUserAvatar.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
holder.dialogDate.setVisibility(View.GONE);
|
holder.dialogDate.setVisibility(View.GONE);
|
||||||
holder.dialogLastMessageUserAvatar.setVisibility(View.GONE);
|
|
||||||
holder.dialogLastMessage.setText(R.string.nc_no_messages_yet);
|
holder.dialogLastMessage.setText(R.string.nc_no_messages_yet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
holder.dialogAvatar.setVisibility(View.VISIBLE);
|
holder.dialogAvatar.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
boolean shouldLoadAvatar = true;
|
boolean shouldLoadAvatar = true;
|
||||||
@ -288,8 +250,6 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
|
|||||||
EmojiTextView dialogName;
|
EmojiTextView dialogName;
|
||||||
@BindView(R.id.dialogDate)
|
@BindView(R.id.dialogDate)
|
||||||
TextView dialogDate;
|
TextView dialogDate;
|
||||||
@BindView(R.id.dialogLastMessageUserAvatar)
|
|
||||||
SimpleDraweeView dialogLastMessageUserAvatar;
|
|
||||||
@BindView(R.id.dialogLastMessage)
|
@BindView(R.id.dialogLastMessage)
|
||||||
EmojiTextView dialogLastMessage;
|
EmojiTextView dialogLastMessage;
|
||||||
@BindView(R.id.dialogUnreadBubble)
|
@BindView(R.id.dialogUnreadBubble)
|
||||||
|
@ -101,15 +101,6 @@
|
|||||||
tools:background="@drawable/bubble_circle_unread"
|
tools:background="@drawable/bubble_circle_unread"
|
||||||
tools:text="99+" />
|
tools:text="99+" />
|
||||||
|
|
||||||
<com.facebook.drawee.view.SimpleDraweeView
|
|
||||||
android:id="@id/dialogLastMessageUserAvatar"
|
|
||||||
android:layout_width="@dimen/smaller_item_height"
|
|
||||||
android:layout_height="@dimen/smaller_item_height"
|
|
||||||
android:layout_marginEnd="8dp"
|
|
||||||
android:contentDescription="@null"
|
|
||||||
app:roundAsCircle="true"
|
|
||||||
tools:src="@drawable/ic_call_black_24dp" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
Loading…
Reference in New Issue
Block a user