diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index e7bd4df2..31f5b97e 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -901,7 +901,7 @@ class BaresipService: Service() { val caller = Utils.friendlyUri(this, peerUri, ua.account) val person = Person.Builder().setName(caller).build() nb.setSmallIcon(R.drawable.ic_stat_call) - .setColor(ContextCompat.getColor(this, R.color.colorBaresip)) + .setColor(ContextCompat.getColor(this, R.color.colorPrimary)) .setContentIntent(pi) .setCategory(Notification.CATEGORY_CALL) .setAutoCancel(false) @@ -985,7 +985,7 @@ class BaresipService: Service() { val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID) val target = Utils.friendlyUri(this, ev[1], ua.account) nb.setSmallIcon(R.drawable.ic_stat_call) - .setColor(ContextCompat.getColor(this, R.color.colorBaresip)) + .setColor(ContextCompat.getColor(this, R.color.colorPrimary)) .setContentIntent(pi) .setDefaults(Notification.DEFAULT_SOUND) .setAutoCancel(true) @@ -1082,7 +1082,7 @@ class BaresipService: Service() { intent, piFlags) val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID) nb.setSmallIcon(R.drawable.ic_stat_phone_missed) - .setColor(ContextCompat.getColor(this, R.color.colorBaresip)) + .setColor(ContextCompat.getColor(this, R.color.colorPrimary)) .setContentIntent(pi) .setCategory(Notification.CATEGORY_CALL) .setAutoCancel(true) @@ -1181,7 +1181,7 @@ class BaresipService: Service() { .addMessage(text, timeStamp, senderPerson) val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID) .setSmallIcon(R.drawable.ic_stat_message) - .setColor(ContextCompat.getColor(this, R.color.colorBaresip)) + .setColor(ContextCompat.getColor(this, R.color.colorPrimary)) .setContentIntent(pi) .setSound(Settings.System.DEFAULT_NOTIFICATION_URI) .setAutoCancel(true) diff --git a/app/src/main/kotlin/com/tutpro/baresip/Colors.kt b/app/src/main/kotlin/com/tutpro/baresip/Colors.kt index 4f7b952b..869fc538 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Colors.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Colors.kt @@ -14,7 +14,7 @@ val Tertiary = Color(0xFF8A8378) val OnTertiary = Color(0xFFFFFFFF) val TertiaryContainer = Color(0xFFE6E2DC) val OnTertiaryContainer = Color(0xFF33302C) -val Error = Color(0xFFBA1A1A) +val Error = Color(0xFFBA1A1A) // 0xFFE0E0E0 val OnError = Color(0xFFFFFFFF) val ErrorContainer = Color(0xFFFFDAD6) val OnErrorContainer = Color(0xFF93000A) @@ -44,7 +44,7 @@ val TertiaryDark = Color(0xFFE6E0D8) val OnTertiaryDark = Color(0xFF4C4943) val TertiaryContainerDark = Color(0xFF666159) val OnTertiaryContainerDark = Color(0xFFE6E2DC) -val ErrorDark = Color(0xFFFFB4AB) +val ErrorDark = Color(0xFFFFB4AB) // 0xFF4C2415 val OnErrorDark = Color(0xFF690005) val ErrorContainerDark = Color(0xFF93000A) val OnErrorContainerDark = Color(0xFFFFDAD6) diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index c6e6541f..a292da35 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -2,8 +2,6 @@ #84C1E6 #7FE6D8 - #4C2415 - #0ca1fd #ffffff #df0101 #2E7D32 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 27dc9871..28349af6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,8 +2,6 @@ #0ca1fd #00B9A1 - #e0e0e0 - #0ca1fd #ffffff #ff0000 #4CAF50