mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-04-28 13:46:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed in-call/conf bottom sheet action label color not matching icon status

Browse source
This commit is contained in:
Sylvain Berfini 2024-11-14 16:30:58 +01:00
parent 1e4066163f
commit 1f08682340
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout-land/call_actions_bottom_sheet.xml
View file

@ -275,10 +275,11 @@
style="@style/in_call_extra_action_label_style" style="@style/in_call_extra_action_label_style"
android:id="@+id/pause_call_label" android:id="@+id/pause_call_label"
android:onClick="@{() -> viewModel.togglePause()}" android:onClick="@{() -> viewModel.togglePause()}"
android:enabled="@{viewModel.canBePaused}"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp" android:paddingBottom="15dp"
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}" android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
app:layout_constraintEnd_toStartOf="@id/record_call_label" app:layout_constraintEnd_toStartOf="@id/record_call_label"
app:layout_constraintStart_toEndOf="@id/chat_label" app:layout_constraintStart_toEndOf="@id/chat_label"

2
app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
View file

@ -257,6 +257,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp" android:paddingBottom="15dp"
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}" android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
app:layout_constraintTop_toBottomOf="@id/pause_call" app:layout_constraintTop_toBottomOf="@id/pause_call"
app:layout_constraintStart_toEndOf="@id/chat_label" app:layout_constraintStart_toEndOf="@id/chat_label"

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

@ -271,10 +271,11 @@
style="@style/in_call_extra_action_label_style" style="@style/in_call_extra_action_label_style"
android:id="@+id/pause_call_label" android:id="@+id/pause_call_label"
android:onClick="@{() -> viewModel.togglePause()}" android:onClick="@{() -> viewModel.togglePause()}"
android:enabled="@{viewModel.canBePaused}"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp" android:paddingBottom="15dp"
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}" android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
app:layout_constraintTop_toBottomOf="@id/pause_call" app:layout_constraintTop_toBottomOf="@id/pause_call"
app:layout_constraintStart_toStartOf="@id/new_call_label" app:layout_constraintStart_toStartOf="@id/new_call_label"

2
app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
View file

@ -253,6 +253,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp" android:paddingBottom="15dp"
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}" android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
app:layout_constraintTop_toBottomOf="@id/pause_call" app:layout_constraintTop_toBottomOf="@id/pause_call"
app:layout_constraintStart_toStartOf="@id/participants_label" app:layout_constraintStart_toStartOf="@id/participants_label"