diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index 333066cf3..c9371e86b 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -155,7 +155,7 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C org.linphone.R.string.toast_call_transfer_successful, displayName ) - val icon = org.linphone.R.drawable.transfer + val icon = org.linphone.R.drawable.phone_transfer greenToastToShowEvent.postValue(Event(Pair(message, icon))) } diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt index ef52922eb..3584cb45b 100644 --- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt @@ -157,7 +157,7 @@ class CallActivity : GenericActivity() { it.consume { remote -> showGreenToast( getString(R.string.toast_call_transfer_in_progress, remote), - R.drawable.transfer + R.drawable.phone_transfer ) } } diff --git a/app/src/main/res/drawable/phone_transfer.xml b/app/src/main/res/drawable/phone_transfer.xml new file mode 100644 index 000000000..6b0b59d1a --- /dev/null +++ b/app/src/main/res/drawable/phone_transfer.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/transfer.xml b/app/src/main/res/drawable/transfer.xml deleted file mode 100644 index 22384d444..000000000 --- a/app/src/main/res/drawable/transfer.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 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 cea4f8841..79bfd6145 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 @@ -48,7 +48,7 @@ android:layout_marginTop="@dimen/call_extra_button_top_margin" android:background="@drawable/in_call_button_background_red" android:padding="@dimen/call_button_icon_padding" - android:src="@drawable/transfer" + android:src="@drawable/phone_transfer" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="@id/transfer_label" app:layout_constraintStart_toStartOf="@id/transfer_label" @@ -236,7 +236,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:paddingBottom="15dp" - android:text="@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_constraintStart_toEndOf="@id/chat_label" app:layout_constraintTop_toBottomOf="@id/pause_call" /> 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 e2f6d04c2..34af09cf3 100644 --- a/app/src/main/res/layout/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_actions_bottom_sheet.xml @@ -45,7 +45,7 @@ android:layout_marginTop="@dimen/call_extra_button_top_margin" android:padding="@dimen/call_button_icon_padding" android:background="@drawable/in_call_button_background_red" - android:src="@drawable/transfer" + android:src="@drawable/phone_transfer" app:tint="@color/in_call_button_tint_color" app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toStartOf="@id/transfer_label" @@ -228,7 +228,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:paddingBottom="15dp" - android:text="@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_constraintStart_toStartOf="@id/new_call_label" app:layout_constraintEnd_toEndOf="@id/new_call_label" />