From 721b7dbaedb0a6f5b37b0e82d6325aace86cc9c6 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Fri, 21 Nov 2025 05:33:28 +0200
Subject: [PATCH] Replaced call and hangup drawables with Material Desing icons

---
 .../kotlin/com/tutpro/baresip/MainScreen.kt   | 29 ++++++++++---------
 app/src/main/res/drawable/call.xml            |  5 ----
 app/src/main/res/drawable/hangup.xml          |  5 ----
 3 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/res/drawable/call.xml
 delete mode 100644 app/src/main/res/drawable/hangup.xml

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
index 3bfde795..b36a2cbe 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
@@ -56,6 +56,8 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Chat
+import androidx.compose.material.icons.filled.Call
+import androidx.compose.material.icons.filled.CallEnd
 import androidx.compose.material.icons.filled.Dialpad
 import androidx.compose.material.icons.filled.History
 import androidx.compose.material.icons.filled.KeyboardArrowDown
@@ -118,6 +120,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
@@ -1344,12 +1347,12 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
                 enabled=callButtonEnabled.value
             ) {
                 Icon(
-                    imageVector = if (callButtonEnabled.value)
-                        ImageVector.vectorResource(id = R.drawable.call)
-                    else
-                        ImageVector.vectorResource(id = R.drawable.call_yellow),
+                    imageVector = Icons.Filled.Call,
                     modifier = Modifier.size(48.dp),
-                    tint = Color.Unspecified,
+                    tint = colorResource(if (callButtonEnabled.value)
+                        R.color.colorTrafficGreen
+                    else
+                        R.color.colorTrafficYellow),
                     contentDescription = null,
                 )
             }
@@ -1374,9 +1377,9 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
                 },
             ) {
                 Icon(
-                    imageVector = ImageVector.vectorResource(id = R.drawable.hangup),
+                    imageVector = Icons.Filled.CallEnd,
                     modifier = Modifier.size(48.dp),
-                    tint = Color.Unspecified,
+                    tint = colorResource(R.color.colorTrafficRed),
                     contentDescription = null,
                 )
             }
@@ -1400,9 +1403,9 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
                 }
             ) {
                 Icon(
-                    imageVector = ImageVector.vectorResource(id = R.drawable.hangup),
+                    imageVector = Icons.Filled.CallEnd,
                     modifier = Modifier.size(48.dp),
-                    tint = Color.Unspecified,
+                    tint = colorResource(R.color.colorTrafficRed),
                     contentDescription = null,
                 )
             }
@@ -1790,9 +1793,9 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
                 },
             ) {
                 Icon(
-                    imageVector = ImageVector.vectorResource(id = R.drawable.call),
+                    imageVector = Icons.Filled.Call,
                     modifier = Modifier.size(48.dp),
-                    tint = Color.Unspecified,
+                    tint = colorResource(R.color.colorTrafficGreen),
                     contentDescription = null,
                 )
             }
@@ -1806,9 +1809,9 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
                 },
             ) {
                 Icon(
-                    imageVector = ImageVector.vectorResource(id = R.drawable.hangup),
+                    imageVector = Icons.Filled.CallEnd,
                     modifier = Modifier.size(48.dp),
-                    tint = Color.Unspecified,
+                    tint = colorResource(R.color.colorTrafficRed),
                     contentDescription = null,
                 )
             }
diff --git a/app/src/main/res/drawable/call.xml b/app/src/main/res/drawable/call.xml
deleted file mode 100644
index a1133773..00000000
--- a/app/src/main/res/drawable/call.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:width="48dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/colorTrafficGreen" android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/hangup.xml b/app/src/main/res/drawable/hangup.xml
deleted file mode 100644
index 6605ad35..00000000
--- a/app/src/main/res/drawable/hangup.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:width="48dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/colorTrafficRed" android:pathData="M12,9c-1.6,0 -3.15,0.25 -4.6,0.72v3.1c0,0.39 -0.23,0.74 -0.56,0.9 -0.98,0.49 -1.87,1.12 -2.66,1.85 -0.18,0.18 -0.43,0.28 -0.7,0.28 -0.28,0 -0.53,-0.11 -0.71,-0.29L0.29,13.08c-0.18,-0.17 -0.29,-0.42 -0.29,-0.7 0,-0.28 0.11,-0.53 0.29,-0.71C3.34,8.78 7.46,7 12,7s8.66,1.78 11.71,4.67c0.18,0.18 0.29,0.43 0.29,0.71 0,0.28 -0.11,0.53 -0.29,0.71l-2.48,2.48c-0.18,0.18 -0.43,0.29 -0.71,0.29 -0.27,0 -0.52,-0.11 -0.7,-0.28 -0.79,-0.74 -1.69,-1.36 -2.67,-1.85 -0.33,-0.16 -0.56,-0.5 -0.56,-0.9v-3.1C15.15,9.25 13.6,9 12,9z"/>
-</vector>