fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-06-05 21:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hold_unhold' into conference_call

Browse Source 
# Conflicts:
#	app/src/main/res/layout/activity_call.xml
This commit is contained in:
Mysochenko Yuriy
2022-05-14 16:06:33 +03:00
parent 1736dfd3e3 fc97cc2f57
commit a2bff29d59
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt
View File

@ -320,7 +320,7 @@ class CallActivity : SimpleActivity() {
private fun toggleHold() { private fun toggleHold() {
val isOnHold = CallManager.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.setImageDrawable(getDrawable(drawable))
call_toggle_hold.contentDescription = getString(if (isOnHold) R.string.resume_call else R.string.hold_call) call_toggle_hold.contentDescription = getString(if (isOnHold) R.string.resume_call else R.string.hold_call)
hold_status_label.beVisibleIf(isOnHold) hold_status_label.beVisibleIf(isOnHold)
@ -393,6 +393,10 @@ class CallActivity : SimpleActivity() {
if (statusTextId != 0) { if (statusTextId != 0) {
call_status_label.text = getString(statusTextId) 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() { private fun acceptCall() {

5
app/src/main/res/drawable/ic_call_vector.xml
View File

@ -1,5 +0,0 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M20.01,15.38c-1.23,0 -2.42,-0.2 -3.53,-0.56 -0.35,-0.12 -0.74,-0.03 -1.01,0.24l-1.57,1.97c-2.83,-1.35 -5.48,-3.9 -6.89,-6.83l1.95,-1.66c0.27,-0.28 0.35,-0.67 0.24,-1.02 -0.37,-1.11 -0.56,-2.3 -0.56,-3.53 0,-0.54 -0.45,-0.99 -0.99,-0.99H4.19C3.65,3 3,3.24 3,3.99 3,13.28 10.73,21 20.01,21c0.71,0 0.99,-0.63 0.99,-1.18v-3.45c0,-0.54 -0.45,-0.99 -0.99,-0.99z"/>
</vector>

7
app/src/main/res/drawable/ic_pause_inset.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/ic_pause_vector"
android:insetLeft="4dp"
android:insetTop="4dp"
android:insetRight="4dp"
android:insetBottom="4dp" />

14
app/src/main/res/layout/activity_call.xml
View File

@ -117,8 +117,7 @@
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_microphone_vector" android:src="@drawable/ic_microphone_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/call_toggle_speaker"
app:layout_constraintHorizontal_bias="0.15"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.6" /> app:layout_constraintVertical_bias="0.6" />
@ -131,8 +130,8 @@
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_speaker_off_vector" android:src="@drawable/ic_speaker_off_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/call_dialpad"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@+id/call_toggle_microphone"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.6" /> app:layout_constraintVertical_bias="0.6" />
@ -146,8 +145,7 @@
android:src="@drawable/ic_dialpad_vector" android:src="@drawable/ic_dialpad_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.85" app:layout_constraintStart_toEndOf="@+id/call_toggle_speaker"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.6" /> app:layout_constraintVertical_bias="0.6" />
@ -158,8 +156,8 @@
android:layout_marginTop="@dimen/bigger_margin" android:layout_marginTop="@dimen/bigger_margin"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_pause_vector" android:src="@drawable/ic_pause_inset"
app:layout_constraintEnd_toStartOf="@+id/call_conference" app:layout_constraintEnd_toStartOf="@id/call_conference"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" /> app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" />