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

Chat bubbles improvements (grouping/selection in edit mode)

Browse source
This commit is contained in:
Sylvain Berfini 2020-08-21 13:18:41 +02:00
parent c582b18b28
commit 03d8cb54f9
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
View file

@ -46,7 +46,7 @@ import org.linphone.utils.LifecycleViewHolder
class ChatMessagesListAdapter(val selectionViewModel: ListTopBarViewModel) : LifecycleListAdapter<EventLog, LifecycleViewHolder>(ChatMessageDiffCallback()) {
companion object {
const val MAX_TIME_TO_GROUP_MESSAGES = 300 // 5 minutes
const val MAX_TIME_TO_GROUP_MESSAGES = 60 // 1 minute
}
val resendMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {

4
app/src/main/res/layout/chat_message_list_cell.xml
View file

@ -70,6 +70,7 @@
<LinearLayout
android:id="@+id/background"
android:onClick="@{clickListener}"
android:onLongClick="@{contextMenuClickListener}"
android:background="@{viewModel.backgroundRes, default=@drawable/chat_bubble_outgoing_full}"
android:descendantFocusability="blocksDescendants"
@ -81,7 +82,7 @@
android:layout_below="@id/time"
android:layout_marginBottom="1dp"
android:layout_marginRight="3dp"
android:layout_marginLeft="@{!viewModel.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? @dimen/incoming_chat_message_bubble_left_margin : @dimen/outgoing_chat_message_bubble_left_margin}"
android:layout_marginLeft="@{selectionListViewModel.isEditionEnabled ? @dimen/edit_chat_message_bubble_left_margin : !viewModel.chatMessage.outgoing ? @dimen/incoming_chat_message_bubble_left_margin : @dimen/outgoing_chat_message_bubble_left_margin}"
android:paddingTop="5dp"
android:paddingBottom="5dp">
@ -128,6 +129,7 @@
app:justifyContent="center"/>
<org.linphone.activities.main.chat.views.MultiLineWrapContentWidthTextView
android:onClick="@{clickListener}"
android:onLongClick="@{contextMenuClickListener}"
android:text="@{viewModel.text}"
android:visibility="@{viewModel.text.length > 0 ? View.VISIBLE : View.GONE}"

1
app/src/main/res/values/dimen.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="edit_chat_message_bubble_left_margin">10dp</dimen>
<dimen name="incoming_chat_message_bubble_left_margin">0dp</dimen>
<dimen name="outgoing_chat_message_bubble_left_margin">45dp</dimen>
<dimen name="chat_message_bubble_image_height_big">200dp</dimen>