From 2badbbc8b7dcdae7ce74912ef2c2c5e443eafc0e Mon Sep 17 00:00:00 2001 From: Mysochenko Yuriy Date: Fri, 13 May 2022 13:57:20 +0300 Subject: [PATCH 1/2] update icons disable hold button when the call is not active yet --- .../dialer/activities/CallActivity.kt | 6 +++++- app/src/main/res/drawable/ic_call_hold.xml | 5 +++++ app/src/main/res/drawable/ic_call_vector.xml | 5 ----- app/src/main/res/layout/activity_call.xml | 17 ++--------------- 4 files changed, 12 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable/ic_call_hold.xml delete mode 100644 app/src/main/res/drawable/ic_call_vector.xml 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 94d4c682..59370852 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -312,7 +312,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_call_hold 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) @@ -385,6 +385,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_hold.xml b/app/src/main/res/drawable/ic_call_hold.xml new file mode 100644 index 00000000..f701d6f8 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_hold.xml @@ -0,0 +1,5 @@ + + + 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/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml index b2f10215..9cc0560d 100644 --- a/app/src/main/res/layout/activity_call.xml +++ b/app/src/main/res/layout/activity_call.xml @@ -158,23 +158,10 @@ 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" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" /> - - Date: Fri, 13 May 2022 15:32:40 +0300 Subject: [PATCH 2/2] use drawable inset to make the icon smaller --- .../simplemobiletools/dialer/activities/CallActivity.kt | 2 +- app/src/main/res/drawable/ic_call_hold.xml | 5 ----- app/src/main/res/drawable/ic_pause_inset.xml | 7 +++++++ app/src/main/res/layout/activity_call.xml | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_call_hold.xml create mode 100644 app/src/main/res/drawable/ic_pause_inset.xml 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 59370852..035012f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -312,7 +312,7 @@ class CallActivity : SimpleActivity() { private fun toggleHold() { val isOnHold = CallManager.toggleHold() - val drawable = if (isOnHold) R.drawable.ic_phone_vector else R.drawable.ic_call_hold + 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) diff --git a/app/src/main/res/drawable/ic_call_hold.xml b/app/src/main/res/drawable/ic_call_hold.xml deleted file mode 100644 index f701d6f8..00000000 --- a/app/src/main/res/drawable/ic_call_hold.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 9cc0560d..88ce148c 100644 --- a/app/src/main/res/layout/activity_call.xml +++ b/app/src/main/res/layout/activity_call.xml @@ -158,7 +158,7 @@ android:layout_marginTop="@dimen/bigger_margin" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/medium_margin" - android:src="@drawable/ic_call_hold" + android:src="@drawable/ic_pause_inset" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent"