Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved chat room view in chat rooms list when last message is file transfer

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-27 10:03:03 +01:00
parent 8d59ee89f2
commit 82dabdf27d
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java
View file

@ -42,16 +42,12 @@ import org.linphone.core.Participant;
import org.linphone.views.ContactAvatar; import org.linphone.views.ContactAvatar;
public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
private Bitmap mDefaultBitmap;
private Bitmap mDefaultGroupBitmap;
public TextView lastMessageView; public TextView lastMessageView;
public TextView date; public TextView date;
public TextView displayName; public TextView displayName;
public TextView unreadMessages; public TextView unreadMessages;
public CheckBox delete; public CheckBox delete;
public RelativeLayout avatarLayout; public RelativeLayout avatarLayout;
public ImageView lastMessageFileTransfer;
public Context mContext; public Context mContext;
public ChatRoom mRoom; public ChatRoom mRoom;
private ClickListener mListener; private ClickListener mListener;
@ -59,9 +55,6 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
public ChatRoomViewHolder(Context context, View itemView, ClickListener listener) { public ChatRoomViewHolder(Context context, View itemView, ClickListener listener) {
super(itemView); super(itemView);
mDefaultBitmap = ContactsManager.getInstance().getDefaultAvatarBitmap();
mDefaultGroupBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.chat_group_avatar);
mContext = context; mContext = context;
lastMessageView = itemView.findViewById(R.id.lastMessage); lastMessageView = itemView.findViewById(R.id.lastMessage);
date = itemView.findViewById(R.id.date); date = itemView.findViewById(R.id.date);
@ -69,7 +62,6 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
unreadMessages = itemView.findViewById(R.id.unreadMessages); unreadMessages = itemView.findViewById(R.id.unreadMessages);
delete = itemView.findViewById(R.id.delete_chatroom); delete = itemView.findViewById(R.id.delete_chatroom);
avatarLayout = itemView.findViewById(R.id.avatar_layout); avatarLayout = itemView.findViewById(R.id.avatar_layout);
lastMessageFileTransfer = itemView.findViewById(R.id.lastMessageFileTransfer);
mListener = listener; mListener = listener;
itemView.setOnClickListener(this); itemView.setOnClickListener(this);
@ -79,7 +71,6 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
public void bindChatRoom(ChatRoom room) { public void bindChatRoom(ChatRoom room) {
mRoom = room; mRoom = room;
ChatMessage lastMessage = mRoom.getLastMessageInHistory(); ChatMessage lastMessage = mRoom.getLastMessageInHistory();
lastMessageFileTransfer.setVisibility(View.GONE);
if (lastMessage != null) { if (lastMessage != null) {
String text = lastMessage.getTextContent(); String text = lastMessage.getTextContent();
@ -87,12 +78,13 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
lastMessageView.setText(getSender(mRoom) + text); lastMessageView.setText(getSender(mRoom) + text);
} }
date.setText(LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format)); date.setText(LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format));
String files = "";
for (Content c : lastMessage.getContents()) { for (Content c : lastMessage.getContents()) {
if (c.isFile() || c.isFileTransfer()) { if (c.isFile() || c.isFileTransfer()) {
lastMessageView.setText(getSender(mRoom)); files += c.getName() + " ";
lastMessageFileTransfer.setVisibility(View.VISIBLE);
} }
} }
lastMessageView.setText(getSender(mRoom) + files);
} else { } else {
date.setText(""); date.setText("");
lastMessageView.setText(""); lastMessageView.setText("");

8
app/src/main/res/layout/chatlist_cell.xml
View file

@ -90,14 +90,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/font11"/> style="@style/font11"/>
<ImageView
android:id="@+id/lastMessageFileTransfer"
android:src="@drawable/chat_file"
android:layout_marginLeft="5dp"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>