mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-20 13:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix chat separator

Browse source
This commit is contained in:
Erwan Croze 2018-08-21 12:01:08 +02:00
parent 301b59701c
commit 226d74bfc1
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
res/layout/chat_bubble.xml
View file

@ -62,10 +62,17 @@
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/delete_message">
<LinearLayout
android:id="@+id/separator"
android:layout_width="100dp"
android:layout_height="10dp"
android:orientation="horizontal"/>
<LinearLayout
android:id="@+id/background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/separator"
android:orientation="horizontal">
<RelativeLayout

9
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -183,6 +183,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
holder.eventLayout.setVisibility(View.GONE);
holder.bubbleLayout.setVisibility(View.GONE);
holder.separatorLayout.setVisibility(i == 0 ? View.GONE : View.VISIBLE); // Hide separator if first item in list
holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.GONE);
holder.messageText.setVisibility(View.GONE);
holder.messageImage.setVisibility(View.GONE);
@ -212,13 +213,13 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
EventLog previousEvent = (EventLog)getItem(i-1);
if (previousEvent.getType() == EventLog.Type.ConferenceChatMessage) {
ChatMessage previousMessage = previousEvent.getChatMessage();
/*if (previousMessage.getFromAddress().weakEqual(message.getFromAddress())) {
if (previousMessage.getFromAddress().weakEqual(message.getFromAddress())) {
holder.separatorLayout.setVisibility(View.GONE);
}*/
}/* else {
}
} else {
// No separator if previous event is not a message
holder.separatorLayout.setVisibility(View.GONE);
}*/
}
}
holder.messageId = message.getMessageId();