From 6cb8a44a4eed89a1a9db29be50168837a2b8d8c0 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Thu, 3 Mar 2022 21:18:59 -0500
Subject: [PATCH] A bit more perpy

---
 src/cheogram/res/values/themes.xml                        | 8 ++++----
 .../siacs/conversations/services/NotificationService.java | 2 +-
 .../conversations/ui/widget/UnreadCountCustomView.java    | 4 ++--
 src/main/res/values/colors.xml                            | 3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/cheogram/res/values/themes.xml b/src/cheogram/res/values/themes.xml
index 2a07db5960caca8560cf1819520fc475600f3f4b..daf92ce7f499d46c587e3951a62dfc56a7db1aa0 100644
--- a/src/cheogram/res/values/themes.xml
+++ b/src/cheogram/res/values/themes.xml
@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">#7401CF</item>
+        <item name="colorPrimary">@color/perpy</item>
         <item name="colorPrimaryDark">#1E0036</item>
         <item name="colorAccent">#1E0036</item>
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
@@ -70,7 +70,7 @@
             @drawable/message_bubble_received
         </item>
 
-        <item name="unread_count">@color/green700_desaturated</item>
+        <item name="unread_count">@color/perpy</item>
 
         <item name="conversations_overview_background">@color/green700</item>
 
@@ -149,7 +149,7 @@
     </style>
 
     <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorPrimary">#7401CF</item>
+        <item name="colorPrimary">@color/perpy</item>
         <item name="colorPrimaryDark">#1E0036</item>
         <item name="colorAccent">#FFC700</item>
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item>
@@ -226,7 +226,7 @@
             @drawable/message_bubble_received_dark
         </item>
 
-        <item name="unread_count">@color/green900_desaturated</item>
+        <item name="unread_count">@color/perpy</item>
 
         <item name="conversations_overview_background">@color/green900</item>
 
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 8ce8325fa4ae6684f5dc1a72fe4af2db8da35cc5..3fb362d80ec3f2827f1ebbfacd34215c0a913143 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -687,7 +687,7 @@ public class NotificationService {
     }
 
     private void setNotificationColor(final Builder mBuilder) {
-        mBuilder.setColor(ContextCompat.getColor(mXmppConnectionService, R.color.green600));
+        mBuilder.setColor(ContextCompat.getColor(mXmppConnectionService, R.color.perpy));
     }
 
     public void updateNotification() {
diff --git a/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java
index 380b929e35abd305213b76ca54204c02a1db7965..ab5d6e49a96596b6cafc94a9eb3f8ff8520baedc 100644
--- a/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java
+++ b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java
@@ -38,7 +38,7 @@ public class UnreadCountCustomView extends View {
 
     private void initXMLAttrs(Context context, AttributeSet attrs) {
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.UnreadCountCustomView);
-        setBackgroundColor(a.getColor(a.getIndex(0), ContextCompat.getColor(context, R.color.green700_desaturated)));
+        setBackgroundColor(a.getColor(a.getIndex(0), ContextCompat.getColor(context, R.color.perpy)));
         a.recycle();
     }
 
@@ -74,4 +74,4 @@ public class UnreadCountCustomView extends View {
     public void setBackgroundColor(int backgroundColor) {
         this.backgroundColor = backgroundColor;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 0bbba7c0a4be03b8ebb0c5922e51debe07b7d252..bd2236fb25eb942016832131ec27bcd760338e42 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<color name="perpy">#7401CF</color>
 	<color name="black">#ff000000</color>
 	<color name="black87">#de000000</color>
 	<color name="black54">#8a000000</color>
@@ -44,4 +45,4 @@
 	<color name="splash_screen_status_bar">#ffe0e0e0</color> <!-- gray300 -->
 
 	<color name="blue500">#ff2196f3</color>
-</resources>
\ No newline at end of file
+</resources>