From 2686f80502d502b85ae56e1aa165c7f64afe4fed Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 2 Oct 2023 17:45:23 +0200 Subject: [PATCH] Change transfer call action label when more than one call --- app/src/main/res/layout-land/call_extra_actions.xml | 2 +- app/src/main/res/layout/call_extra_actions.xml | 2 +- app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout-land/call_extra_actions.xml b/app/src/main/res/layout-land/call_extra_actions.xml index 6e9492e92..dbb33d5ce 100644 --- a/app/src/main/res/layout-land/call_extra_actions.xml +++ b/app/src/main/res/layout-land/call_extra_actions.xml @@ -172,7 +172,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:paddingBottom="15dp" - android:text="@string/call_action_transfer" + android:text="@{callsViewModel.callsCount == 1 ? @string/call_action_blind_transfer : @string/call_action_attended_transfer, default=@string/call_action_blind_transfer}" app:layout_constraintEnd_toStartOf="@id/new_call_label" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/transfer"/> diff --git a/app/src/main/res/layout/call_extra_actions.xml b/app/src/main/res/layout/call_extra_actions.xml index 33e3f2832..4154ed25e 100644 --- a/app/src/main/res/layout/call_extra_actions.xml +++ b/app/src/main/res/layout/call_extra_actions.xml @@ -171,7 +171,7 @@ android:onClick="@{() -> viewModel.transferClicked()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@string/call_action_transfer" + android:text="@{callsViewModel.callsCount == 1 ? @string/call_action_blind_transfer : @string/call_action_attended_transfer, default=@string/call_action_blind_transfer}" app:layout_constraintTop_toBottomOf="@id/transfer" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/new_call_label"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68d887245..97d1af6cf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -296,7 +296,8 @@ Operation in progress, please wait - Transfer + Transfer + Attended transfer New call Calls list Dialer