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

Added back image when file transfer in last chat room message

Browse source
This commit is contained in:
Sylvain Berfini 2018-09-06 11:59:05 +02:00
parent 2683440cef
commit 32ff9d1368
5 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
res/layout-land/chatlist_cell.xml
View file

@ -118,6 +118,14 @@
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_message"
android:layout_marginLeft="5dp"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

8
res/layout-sw533dp-land/chatlist_cell.xml
View file

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

8
res/layout-sw533dp/chatlist_cell.xml
View file

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

8
res/layout/chatlist_cell.xml
View file

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

24
src/android/org/linphone/chat/ChatRoomViewHolder.java
View file

@ -35,8 +35,10 @@ import org.linphone.activities.LinphoneActivity;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
import org.linphone.contacts.LinphoneContact; import org.linphone.contacts.LinphoneContact;
import org.linphone.core.Address; import org.linphone.core.Address;
import org.linphone.core.ChatMessage;
import org.linphone.core.ChatRoom; import org.linphone.core.ChatRoom;
import org.linphone.core.ChatRoomCapabilities; import org.linphone.core.ChatRoomCapabilities;
import org.linphone.core.Content;
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 mDefaultBitmap;
@ -49,6 +51,7 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
public TextView unreadMessages; public TextView unreadMessages;
public CheckBox delete; public CheckBox delete;
public ImageView contactPicture; public ImageView contactPicture;
public ImageView lastMessageFileTransfer;
public Context mContext; public Context mContext;
public ChatRoom mRoom; public ChatRoom mRoom;
private ClickListener mListener; private ClickListener mListener;
@ -67,6 +70,7 @@ 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);
contactPicture = itemView.findViewById(R.id.contact_picture); contactPicture = itemView.findViewById(R.id.contact_picture);
lastMessageFileTransfer = itemView.findViewById(R.id.lastMessageFileTransfer);
mListener = listener; mListener = listener;
itemView.setOnClickListener(this); itemView.setOnClickListener(this);
@ -75,9 +79,25 @@ 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();
lastMessageView.setVisibility(View.GONE);
lastMessageFileTransfer.setVisibility(View.GONE);
if (lastMessage != null) {
String text = lastMessage.getTextContent();
if (text != null && text.length() > 0) {
lastMessageView.setVisibility(View.VISIBLE);
lastMessageView.setText(text);
}
date.setText(LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format));
for (Content c : lastMessage.getContents()) {
if (c.isFile() || c.isFileTransfer()) {
lastMessageFileTransfer.setVisibility(View.VISIBLE);
}
}
}
lastMessageSenderView.setText(getSender(mRoom)); lastMessageSenderView.setText(getSender(mRoom));
lastMessageView.setText(mRoom.getLastMessageInHistory() != null ? mRoom.getLastMessageInHistory().getTextContent() : "");
date.setText(mRoom.getLastMessageInHistory() != null ? LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format) : "");
displayName.setText(getContact(mRoom)); displayName.setText(getContact(mRoom));
unreadMessages.setText(String.valueOf(LinphoneManager.getInstance().getUnreadCountForChatRoom(mRoom))); unreadMessages.setText(String.valueOf(LinphoneManager.getInstance().getUnreadCountForChatRoom(mRoom)));
getAvatar(mRoom); getAvatar(mRoom);