diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt index c9d98cf8..f79f9711 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt @@ -5,7 +5,6 @@ import android.media.AudioAttributes import android.media.MediaPlayer import android.text.format.DateUtils import android.widget.Toast -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -26,6 +25,8 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.CallMade +import androidx.compose.material.icons.automirrored.filled.CallReceived import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -39,10 +40,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -171,11 +170,12 @@ private fun Details(ctx: Context, details: ArrayList
) { ) { items(details) { detail -> Row(verticalAlignment = Alignment.CenterVertically) { - Image( - painter = painterResource( - if (callUp(detail.direction)) R.drawable.call_up else R.drawable.call_down - ), - colorFilter = ColorFilter.tint(colorResource(id = callTint(detail.direction))), + Icon( + imageVector = if (callUp(detail.direction)) + Icons.AutoMirrored.Filled.CallMade + else + Icons.AutoMirrored.Filled.CallReceived, + tint = colorResource(id = callTint(detail.direction)), contentDescription = "Direction", modifier = Modifier.width(64.dp) .clickable { diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt index 95773c9d..f8e69019 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt @@ -4,7 +4,6 @@ import android.content.Context import android.content.Intent import androidx.activity.compose.BackHandler import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable @@ -29,6 +28,8 @@ import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.CallMade +import androidx.compose.material.icons.automirrored.filled.CallReceived import androidx.compose.material.icons.filled.AccountCircle import androidx.compose.material.icons.filled.Menu import androidx.compose.material3.ExperimentalMaterial3Api @@ -50,11 +51,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.scale -import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -404,11 +403,13 @@ private fun Calls( recordings = true if (count > 3) continue - Image( - painter = painterResource( - if (callUp(d.direction)) R.drawable.call_up else R.drawable.call_down - ), - colorFilter = ColorFilter.tint(colorResource(id = callTint(d.direction))), + Icon( + imageVector = if (callUp(d.direction)) + Icons.AutoMirrored.Filled.CallMade + else + Icons.AutoMirrored.Filled.CallReceived, + modifier = Modifier.size(20.dp), + tint = colorResource(id = callTint(d.direction)), contentDescription = "Direction" ) count++ diff --git a/app/src/main/res/drawable/call_down.xml b/app/src/main/res/drawable/call_down.xml deleted file mode 100644 index 22e85516..00000000 --- a/app/src/main/res/drawable/call_down.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/call_up.xml b/app/src/main/res/drawable/call_up.xml deleted file mode 100644 index dcf0f52c..00000000 --- a/app/src/main/res/drawable/call_up.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -