From f9232c685796d327d0b0d1e9a67491466c74351f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 1 Jun 2023 12:12:08 +0200
Subject: [PATCH] Fix notifcation color crash, use solid toolbar color

---
 .../main/java/io/heckel/ntfy/msg/NotificationService.kt  | 3 +--
 .../java/io/heckel/ntfy/service/SubscriberService.kt     | 3 +--
 app/src/main/res/values/styles.xml                       | 9 ++++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
index eec1e59..0771545 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
@@ -13,7 +13,6 @@ import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
 import io.heckel.ntfy.R
 import io.heckel.ntfy.db.*
 import io.heckel.ntfy.db.Notification
@@ -95,7 +94,7 @@ class NotificationService(val context: Context) {
                 (repository.getInsistentMaxPriorityEnabled() || subscription.insistent == Repository.INSISTENT_MAX_PRIORITY_ENABLED)
         val builder = NotificationCompat.Builder(context, channelId)
             .setSmallIcon(R.drawable.ic_notification)
-            .setColor(ContextCompat.getColor(context, Colors.notificationIcon(context)))
+            .setColor(Colors.notificationIcon(context))
             .setContentTitle(title)
             .setOnlyAlertOnce(true) // Do not vibrate or play sound if already showing (updates!)
             .setAutoCancel(true) // Cancel when notification is clicked
diff --git a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
index 192cfc9..a7454c8 100644
--- a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
@@ -9,7 +9,6 @@ import android.os.IBinder
 import android.os.PowerManager
 import android.os.SystemClock
 import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
 import io.heckel.ntfy.BuildConfig
 import io.heckel.ntfy.R
 import io.heckel.ntfy.app.Application
@@ -291,7 +290,7 @@ class SubscriberService : Service() {
         }
         return NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_notification_instant)
-            .setColor(ContextCompat.getColor(this, Colors.notificationIcon(this)))
+            .setColor(Colors.notificationIcon(this))
             .setContentTitle(title)
             .setContentText(text)
             .setContentIntent(pendingIntent)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fb7407d..e0f2fa9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -29,8 +29,10 @@
         <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
 
         <item name="switchPreferenceCompatStyle">@style/MaterialSwitch</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">?colorPrimaryInverse</item>
         <item name="actionModeBackground">?backgroundColor</item>
+        <item name="android:actionBarStyle">@style/ActionBarStyle</item>
+        <item name="actionBarStyle">@style/ActionBarStyle</item>
     </style>
 
     <style name="AppTheme" parent="BaseTheme">
@@ -57,4 +59,9 @@
     <style name="MaterialSwitch" parent="@style/Preference.SwitchPreferenceCompat.Material">
         <item name="widgetLayout">@layout/view_preference_switch</item>
     </style>
+
+    <!-- Action bar with custom background color -->
+    <style name="ActionBarStyle" parent="@style/Widget.Material3.ActionBar.Solid">
+        <item name="background">?colorPrimaryInverse</item>
+    </style>
 </resources>