diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt index 0293bf4f..4703ccca 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -320,7 +320,7 @@ class CallActivity : SimpleActivity() { private fun toggleHold() { val isOnHold = CallManager.toggleHold() - val drawable = if (isOnHold) R.drawable.ic_call_vector else R.drawable.ic_pause_vector + val drawable = if (isOnHold) R.drawable.ic_phone_vector else R.drawable.ic_pause_inset call_toggle_hold.setImageDrawable(getDrawable(drawable)) call_toggle_hold.contentDescription = getString(if (isOnHold) R.string.resume_call else R.string.hold_call) hold_status_label.beVisibleIf(isOnHold) @@ -393,6 +393,10 @@ class CallActivity : SimpleActivity() { if (statusTextId != 0) { call_status_label.text = getString(statusTextId) } + + val isActiveCall = state == Call.STATE_ACTIVE || state == Call.STATE_HOLDING + call_toggle_hold.isEnabled = isActiveCall + call_toggle_hold.alpha = if (isActiveCall) 1.0f else 0.5f } private fun acceptCall() { diff --git a/app/src/main/res/drawable/ic_call_vector.xml b/app/src/main/res/drawable/ic_call_vector.xml deleted file mode 100644 index 2aba8add..00000000 --- a/app/src/main/res/drawable/ic_call_vector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_pause_inset.xml b/app/src/main/res/drawable/ic_pause_inset.xml new file mode 100644 index 00000000..2bb9cabe --- /dev/null +++ b/app/src/main/res/drawable/ic_pause_inset.xml @@ -0,0 +1,7 @@ + + diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml index 452d1038..f7b11b25 100644 --- a/app/src/main/res/layout/activity_call.xml +++ b/app/src/main/res/layout/activity_call.xml @@ -117,8 +117,7 @@ android:padding="@dimen/medium_margin" android:src="@drawable/ic_microphone_vector" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.15" + app:layout_constraintEnd_toStartOf="@+id/call_toggle_speaker" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.6" /> @@ -131,8 +130,8 @@ android:padding="@dimen/medium_margin" android:src="@drawable/ic_speaker_off_vector" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@+id/call_dialpad" + app:layout_constraintStart_toEndOf="@+id/call_toggle_microphone" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.6" /> @@ -146,8 +145,7 @@ android:src="@drawable/ic_dialpad_vector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.85" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintStart_toEndOf="@+id/call_toggle_speaker" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.6" /> @@ -158,8 +156,8 @@ android:layout_marginTop="@dimen/bigger_margin" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/medium_margin" - android:src="@drawable/ic_pause_vector" - app:layout_constraintEnd_toStartOf="@+id/call_conference" + android:src="@drawable/ic_pause_inset" + app:layout_constraintEnd_toStartOf="@id/call_conference" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" />