jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced colorBaresip with colorPrimary and removed unused color resources

Browse Source
This commit is contained in:
Juha Heinanen
2025-11-03 09:12:46 +02:00
parent c85f824da4
commit 8953f8f189
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+4 -4
View File
@@ -901,7 +901,7 @@ class BaresipService: Service() {
val caller = Utils.friendlyUri(this, peerUri, ua.account) val caller = Utils.friendlyUri(this, peerUri, ua.account)
val person = Person.Builder().setName(caller).build() val person = Person.Builder().setName(caller).build()
nb.setSmallIcon(R.drawable.ic_stat_call) nb.setSmallIcon(R.drawable.ic_stat_call)
.setColor(ContextCompat.getColor(this, R.color.colorBaresip)) .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
.setContentIntent(pi) .setContentIntent(pi)
.setCategory(Notification.CATEGORY_CALL) .setCategory(Notification.CATEGORY_CALL)
.setAutoCancel(false) .setAutoCancel(false)
@@ -985,7 +985,7 @@ class BaresipService: Service() {
val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID) val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID)
val target = Utils.friendlyUri(this, ev[1], ua.account) val target = Utils.friendlyUri(this, ev[1], ua.account)
nb.setSmallIcon(R.drawable.ic_stat_call) nb.setSmallIcon(R.drawable.ic_stat_call)
.setColor(ContextCompat.getColor(this, R.color.colorBaresip)) .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
.setContentIntent(pi) .setContentIntent(pi)
.setDefaults(Notification.DEFAULT_SOUND) .setDefaults(Notification.DEFAULT_SOUND)
.setAutoCancel(true) .setAutoCancel(true)
@@ -1082,7 +1082,7 @@ class BaresipService: Service() {
intent, piFlags) intent, piFlags)
val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID) val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID)
nb.setSmallIcon(R.drawable.ic_stat_phone_missed) nb.setSmallIcon(R.drawable.ic_stat_phone_missed)
.setColor(ContextCompat.getColor(this, R.color.colorBaresip)) .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
.setContentIntent(pi) .setContentIntent(pi)
.setCategory(Notification.CATEGORY_CALL) .setCategory(Notification.CATEGORY_CALL)
.setAutoCancel(true) .setAutoCancel(true)
@@ -1181,7 +1181,7 @@ class BaresipService: Service() {
.addMessage(text, timeStamp, senderPerson) .addMessage(text, timeStamp, senderPerson)
val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID) val nb = NotificationCompat.Builder(this, HIGH_CHANNEL_ID)
.setSmallIcon(R.drawable.ic_stat_message) .setSmallIcon(R.drawable.ic_stat_message)
.setColor(ContextCompat.getColor(this, R.color.colorBaresip)) .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
.setContentIntent(pi) .setContentIntent(pi)
.setSound(Settings.System.DEFAULT_NOTIFICATION_URI) .setSound(Settings.System.DEFAULT_NOTIFICATION_URI)
.setAutoCancel(true) .setAutoCancel(true)
app/src/main/kotlin/com/tutpro/baresip/Colors.kt
+2 -2
View File
@@ -14,7 +14,7 @@ val Tertiary = Color(0xFF8A8378)
val OnTertiary = Color(0xFFFFFFFF) val OnTertiary = Color(0xFFFFFFFF)
val TertiaryContainer = Color(0xFFE6E2DC) val TertiaryContainer = Color(0xFFE6E2DC)
val OnTertiaryContainer = Color(0xFF33302C) val OnTertiaryContainer = Color(0xFF33302C)
val Error = Color(0xFFBA1A1A) val Error = Color(0xFFBA1A1A) // 0xFFE0E0E0
val OnError = Color(0xFFFFFFFF) val OnError = Color(0xFFFFFFFF)
val ErrorContainer = Color(0xFFFFDAD6) val ErrorContainer = Color(0xFFFFDAD6)
val OnErrorContainer = Color(0xFF93000A) val OnErrorContainer = Color(0xFF93000A)
@@ -44,7 +44,7 @@ val TertiaryDark = Color(0xFFE6E0D8)
val OnTertiaryDark = Color(0xFF4C4943) val OnTertiaryDark = Color(0xFF4C4943)
val TertiaryContainerDark = Color(0xFF666159) val TertiaryContainerDark = Color(0xFF666159)
val OnTertiaryContainerDark = Color(0xFFE6E2DC) val OnTertiaryContainerDark = Color(0xFFE6E2DC)
val ErrorDark = Color(0xFFFFB4AB) val ErrorDark = Color(0xFFFFB4AB) // 0xFF4C2415
val OnErrorDark = Color(0xFF690005) val OnErrorDark = Color(0xFF690005)
val ErrorContainerDark = Color(0xFF93000A) val ErrorContainerDark = Color(0xFF93000A)
val OnErrorContainerDark = Color(0xFFFFDAD6) val OnErrorContainerDark = Color(0xFFFFDAD6)
app/src/main/res/values-night/colors.xml
-2
View File
@@ -2,8 +2,6 @@
<resources> <resources>
<color name="colorPrimary">#84C1E6</color> <color name="colorPrimary">#84C1E6</color>
<color name="colorSecondary">#7FE6D8</color> <color name="colorSecondary">#7FE6D8</color>
<color name="colorAccent">#4C2415</color>
<color name="colorBaresip">#0ca1fd</color>
<color name="colorWhite">#ffffff</color> <color name="colorWhite">#ffffff</color>
<color name="colorRed">#df0101</color> <color name="colorRed">#df0101</color>
<color name="colorTrafficGreen">#2E7D32</color> <color name="colorTrafficGreen">#2E7D32</color>
app/src/main/res/values/colors.xml
-2
View File
@@ -2,8 +2,6 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<color name="colorPrimary">#0ca1fd</color> <color name="colorPrimary">#0ca1fd</color>
<color name="colorSecondary">#00B9A1</color> <color name="colorSecondary">#00B9A1</color>
<color name="colorAccent">#e0e0e0</color>
<color name="colorBaresip">#0ca1fd</color>
<color name="colorWhite">#ffffff</color> <color name="colorWhite">#ffffff</color>
<color name="colorRed">#ff0000</color> <color name="colorRed">#ff0000</color>
<color name="colorTrafficGreen">#4CAF50</color> <color name="colorTrafficGreen">#4CAF50</color>