add icons
This commit is contained in:
parent
0b38486169
commit
14f49c8a2b
|
@ -135,6 +135,14 @@ class CallActivity : SimpleActivity() {
|
||||||
toggleHold()
|
toggleHold()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
call_conference.setOnClickListener {
|
||||||
|
/*if (is conference) {
|
||||||
|
// show manage conference screen
|
||||||
|
} else {
|
||||||
|
// show dialpad and contacts
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
|
||||||
call_end.setOnClickListener {
|
call_end.setOnClickListener {
|
||||||
endCall()
|
endCall()
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,14 @@ class CallManager {
|
||||||
return !isOnHold
|
return !isOnHold
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun swap() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
fun merge() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
fun registerCallback(callback: Call.Callback) {
|
fun registerCallback(callback: Call.Callback) {
|
||||||
call?.registerCallback(callback)
|
call?.registerCallback(callback)
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,18 +2,22 @@ package com.simplemobiletools.dialer.services
|
||||||
|
|
||||||
import android.telecom.Call
|
import android.telecom.Call
|
||||||
import android.telecom.InCallService
|
import android.telecom.InCallService
|
||||||
|
import android.util.Log
|
||||||
import com.simplemobiletools.dialer.activities.CallActivity
|
import com.simplemobiletools.dialer.activities.CallActivity
|
||||||
import com.simplemobiletools.dialer.extensions.isOutgoing
|
import com.simplemobiletools.dialer.extensions.isOutgoing
|
||||||
import com.simplemobiletools.dialer.extensions.powerManager
|
import com.simplemobiletools.dialer.extensions.powerManager
|
||||||
import com.simplemobiletools.dialer.helpers.CallManager
|
import com.simplemobiletools.dialer.helpers.CallManager
|
||||||
import com.simplemobiletools.dialer.helpers.CallNotificationManager
|
import com.simplemobiletools.dialer.helpers.CallNotificationManager
|
||||||
|
|
||||||
|
const val TAG = "SimpleDialer:CallService"
|
||||||
|
|
||||||
class CallService : InCallService() {
|
class CallService : InCallService() {
|
||||||
private val callNotificationManager by lazy { CallNotificationManager(this) }
|
private val callNotificationManager by lazy { CallNotificationManager(this) }
|
||||||
|
|
||||||
private val callListener = object : Call.Callback() {
|
private val callListener = object : Call.Callback() {
|
||||||
override fun onStateChanged(call: Call, state: Int) {
|
override fun onStateChanged(call: Call, state: Int) {
|
||||||
super.onStateChanged(call, state)
|
super.onStateChanged(call, state)
|
||||||
|
Log.d(TAG, "onStateChanged: $call")
|
||||||
if (state != Call.STATE_DISCONNECTED) {
|
if (state != Call.STATE_DISCONNECTED) {
|
||||||
callNotificationManager.setupNotification()
|
callNotificationManager.setupNotification()
|
||||||
}
|
}
|
||||||
|
@ -22,6 +26,7 @@ class CallService : InCallService() {
|
||||||
|
|
||||||
override fun onCallAdded(call: Call) {
|
override fun onCallAdded(call: Call) {
|
||||||
super.onCallAdded(call)
|
super.onCallAdded(call)
|
||||||
|
Log.d(TAG, "onCallAdded: $call")
|
||||||
if (!powerManager.isInteractive || call.isOutgoing()) {
|
if (!powerManager.isInteractive || call.isOutgoing()) {
|
||||||
startActivity(CallActivity.getStartIntent(this))
|
startActivity(CallActivity.getStartIntent(this))
|
||||||
}
|
}
|
||||||
|
@ -33,6 +38,7 @@ class CallService : InCallService() {
|
||||||
|
|
||||||
override fun onCallRemoved(call: Call) {
|
override fun onCallRemoved(call: Call) {
|
||||||
super.onCallRemoved(call)
|
super.onCallRemoved(call)
|
||||||
|
Log.d(TAG, "onCallRemoved: $call")
|
||||||
CallManager.call = null
|
CallManager.call = null
|
||||||
CallManager.inCallService = null
|
CallManager.inCallService = null
|
||||||
callNotificationManager.cancelNotification()
|
callNotificationManager.cancelNotification()
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
<vector android:height="24dp"
|
||||||
|
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,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM21,6h-3V3h-2v3h-3v2h3v3h2V8h3z"/>
|
||||||
|
</vector>
|
|
@ -0,0 +1,5 @@
|
||||||
|
<vector android:autoMirrored="true" android:height="24dp"
|
||||||
|
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="M17,20.41L18.41,19 15,15.59 13.59,17 17,20.41zM7.5,8H11v5.59L5.59,19 7,20.41l6,-6V8h3.5L12,3.5 7.5,8z"/>
|
||||||
|
</vector>
|
|
@ -0,0 +1,5 @@
|
||||||
|
<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="M18,4l-4,4h3v7c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2V8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8v7H2l4,4 4,-4H7V8c0,-1.1 0.9,-2 2,-2s2,0.9 2,2v7c0,2.21 1.79,4 4,4s4,-1.79 4,-4V8h3l-4,-4z"/>
|
||||||
|
</vector>
|
|
@ -0,0 +1,12 @@
|
||||||
|
<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:fillType="evenOdd" android:pathData="M16.67,13.13C18.04,14.06 19,15.32 19,17v3h4v-3C23,14.82 19.43,13.53 16.67,13.13z"/>
|
||||||
|
<path android:fillColor="@android:color/white"
|
||||||
|
android:fillType="evenOdd" android:pathData="M9,8m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"/>
|
||||||
|
<path android:fillColor="@android:color/white"
|
||||||
|
android:fillType="evenOdd" android:pathData="M15,12c2.21,0 4,-1.79 4,-4c0,-2.21 -1.79,-4 -4,-4c-0.47,0 -0.91,0.1 -1.33,0.24C14.5,5.27 15,6.58 15,8s-0.5,2.73 -1.33,3.76C14.09,11.9 14.53,12 15,12z"/>
|
||||||
|
<path android:fillColor="@android:color/white"
|
||||||
|
android:fillType="evenOdd" android:pathData="M9,13c-2.67,0 -8,1.34 -8,4v3h16v-3C17,14.34 11.67,13 9,13z"/>
|
||||||
|
</vector>
|
|
@ -160,7 +160,6 @@
|
||||||
android:padding="@dimen/medium_margin"
|
android:padding="@dimen/medium_margin"
|
||||||
android:src="@drawable/ic_pause_vector"
|
android:src="@drawable/ic_pause_vector"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/call_conference"
|
app:layout_constraintEnd_toStartOf="@+id/call_conference"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
|
||||||
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" />
|
||||||
|
|
||||||
|
@ -171,12 +170,25 @@
|
||||||
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_plus_vector"
|
android:src="@drawable/ic_add_call_vector"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toStartOf="@id/manage_conference"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/call_toggle_hold"
|
app:layout_constraintStart_toEndOf="@+id/call_toggle_hold"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" />
|
app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/manage_conference"
|
||||||
|
android:layout_width="@dimen/dialpad_button_size"
|
||||||
|
android:layout_height="@dimen/dialpad_button_size"
|
||||||
|
android:layout_marginTop="@dimen/bigger_margin"
|
||||||
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
|
android:padding="@dimen/medium_margin"
|
||||||
|
android:src="@drawable/ic_people_vector"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/call_conference"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/call_end"
|
android:id="@+id/call_end"
|
||||||
android:layout_width="@dimen/dialpad_button_size"
|
android:layout_width="@dimen/dialpad_button_size"
|
||||||
|
|
Loading…
Reference in New Issue