diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt index fd77f4a60..3fbfbc821 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt @@ -189,6 +189,11 @@ class ConversationInfoViewModel @UiThread constructor() : ViewModel() { } } + @UiThread + fun call() { + // TODO + } + @UiThread fun toggleParticipantsExpand() { expandParticipants.value = expandParticipants.value == false diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml index e062f4442..97d41bfd3 100644 --- a/app/src/main/res/layout/chat_bubble_incoming.xml +++ b/app/src/main/res/layout/chat_bubble_incoming.xml @@ -156,7 +156,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-5dp" - android:layout_marginStart="-35dp" android:layout_marginBottom="5dp" android:orientation="horizontal" android:background="@drawable/shape_chat_bubble_reactions_incoming_background" @@ -168,7 +167,7 @@ android:paddingTop="12dp" android:paddingBottom="12dp" android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}" - app:layout_constraintStart_toEndOf="@id/background" + app:layout_constraintEnd_toEndOf="@id/background" app:layout_constraintTop_toBottomOf="@id/background" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml index c25591430..058f33c2e 100644 --- a/app/src/main/res/layout/chat_bubble_outgoing.xml +++ b/app/src/main/res/layout/chat_bubble_outgoing.xml @@ -99,9 +99,7 @@ android:onClick="@{showReactionInfoClickListener}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="-10dp" - android:layout_marginStart="5dp" - android:layout_marginEnd="5dp" + android:layout_marginTop="-5dp" android:layout_marginBottom="5dp" android:orientation="horizontal" android:background="@drawable/shape_chat_bubble_reactions_outgoing_background" diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml index d468b2097..38d2ce033 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/app/src/main/res/layout/chat_info_fragment.xml @@ -120,7 +120,7 @@ android:padding="16dp" android:src="@{viewModel.isMuted ? @drawable/bell_simple : @drawable/bell_simple_slash, default=@drawable/bell_simple_slash}" app:tint="@color/gray_main2_500" - app:layout_constraintEnd_toStartOf="@id/meeting" + app:layout_constraintEnd_toStartOf="@id/call" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" /> @@ -137,6 +137,33 @@ app:layout_constraintStart_toStartOf="@id/mute" app:layout_constraintEnd_toEndOf="@id/mute"/> + + + +