From 1f08682340cd20f002a8f56e6830a1b7c03f33b6 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 14 Nov 2024 16:30:58 +0100 Subject: [PATCH] Fixed in-call/conf bottom sheet action label color not matching icon status --- app/src/main/res/layout-land/call_actions_bottom_sheet.xml | 3 ++- .../res/layout-land/call_conference_actions_bottom_sheet.xml | 2 ++ app/src/main/res/layout/call_actions_bottom_sheet.xml | 3 ++- .../main/res/layout/call_conference_actions_bottom_sheet.xml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml index 91131413d..d8c0c2f14 100644 --- a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml @@ -275,10 +275,11 @@ style="@style/in_call_extra_action_label_style" android:id="@+id/pause_call_label" android:onClick="@{() -> viewModel.togglePause()}" - android:enabled="@{viewModel.canBePaused}" android:layout_width="0dp" android:layout_height="wrap_content" 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}" app:layout_constraintEnd_toStartOf="@id/record_call_label" app:layout_constraintStart_toEndOf="@id/chat_label" diff --git a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml index c9453dff8..01a83d734 100644 --- a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml @@ -257,6 +257,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" 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}" app:layout_constraintTop_toBottomOf="@id/pause_call" app:layout_constraintStart_toEndOf="@id/chat_label" diff --git a/app/src/main/res/layout/call_actions_bottom_sheet.xml b/app/src/main/res/layout/call_actions_bottom_sheet.xml index aecefb1e9..0437465fd 100644 --- a/app/src/main/res/layout/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_actions_bottom_sheet.xml @@ -271,10 +271,11 @@ style="@style/in_call_extra_action_label_style" android:id="@+id/pause_call_label" android:onClick="@{() -> viewModel.togglePause()}" - android:enabled="@{viewModel.canBePaused}" android:layout_width="0dp" android:layout_height="wrap_content" 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}" app:layout_constraintTop_toBottomOf="@id/pause_call" app:layout_constraintStart_toStartOf="@id/new_call_label" diff --git a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml index 571efb59f..95710d6ae 100644 --- a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml @@ -253,6 +253,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" 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}" app:layout_constraintTop_toBottomOf="@id/pause_call" app:layout_constraintStart_toStartOf="@id/participants_label"