mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added call button (does nothing yet) in chat room info + updated reactions layout

Browse source
This commit is contained in:
Sylvain Berfini 2023-10-24 17:10:15 +02:00
parent b80f520162
commit 98488e5798
4 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
View file

@ -189,6 +189,11 @@ class ConversationInfoViewModel @UiThread constructor() : ViewModel() {
}
}
@UiThread
fun call() {
// TODO
}
@UiThread
fun toggleParticipantsExpand() {
expandParticipants.value = expandParticipants.value == false

3
app/src/main/res/layout/chat_bubble_incoming.xml
View file

@ -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" />

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

@ -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"

31
app/src/main/res/layout/chat_info_fragment.xml
View file

@ -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"/>
<ImageView
android:id="@+id/call"
android:onClick="@{() -> viewModel.call()}"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="40dp"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/phone"
app:tint="@color/gray_main2_500"
app:layout_constraintStart_toEndOf="@id/mute"
app:layout_constraintEnd_toStartOf="@id/meeting"
app:layout_constraintTop_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/call_label"
android:onClick="@{() -> viewModel.call()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/conversation_action_call"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/call"
app:layout_constraintStart_toStartOf="@id/call"
app:layout_constraintEnd_toEndOf="@id/call"/>
<ImageView
android:id="@+id/meeting"
android:onClick="@{scheduleMeetingClickListener}"
@ -148,7 +175,7 @@
android:src="@drawable/users_three"
app:tint="@color/gray_main2_500"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/mute"
app:layout_constraintStart_toEndOf="@id/call"
app:layout_constraintTop_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView