From cc3adfdfa405879573e35a8f6c5569246c43bb7c Mon Sep 17 00:00:00 2001
From: RaindropsSys <contact@minteck.org>
Date: Sun, 7 May 2023 13:51:46 +0200
Subject: Updated 5 files and added 5 files (automated)

---
 app/build.gradle                                         |   4 ++--
 .../main/java/io/heckel/ntfy/msg/NotificationService.kt  |   2 ++
 app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt     |   1 +
 app/src/main/java/io/heckel/ntfy/util/Util.kt            |   2 +-
 .../main/res/drawable-anydpi/ic_category_requests.xml    |  15 +++++++++++++++
 app/src/main/res/drawable-hdpi/ic_category_requests.png  | Bin 0 -> 356 bytes
 app/src/main/res/drawable-mdpi/ic_category_requests.png  | Bin 0 -> 245 bytes
 app/src/main/res/drawable-xhdpi/ic_category_requests.png | Bin 0 -> 484 bytes
 .../main/res/drawable-xxhdpi/ic_category_requests.png    | Bin 0 -> 722 bytes
 app/src/main/res/values/strings.xml                      |   3 ++-
 10 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-anydpi/ic_category_requests.xml
 create mode 100644 app/src/main/res/drawable-hdpi/ic_category_requests.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_category_requests.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_category_requests.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_category_requests.png

diff --git a/app/build.gradle b/app/build.gradle
index 8eb3cd2..691747c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         minSdkVersion 27
         targetSdkVersion 33
 
-        versionCode 139
-        versionName "3.1.2"
+        versionCode 141
+        versionName "3.1.4"
         buildConfigField 'String', "NTFY_VERSION", '"1.16.0"'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
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 80773cf..081a7f8 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
@@ -102,6 +102,8 @@ class NotificationService(val context: Context) {
             R.drawable.ic_category_pleasure
         } else if (tags.contains("delta")) {
             R.drawable.ic_category_delta
+        } else if (tags.contains("requests")) {
+            R.drawable.ic_category_requests
         } else if (tags.contains("emergency")) {
             R.drawable.ic_category_emergency
         } else if (tags.contains("travelling")) {
diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
index 4cdeb1a..3a3f564 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
@@ -103,6 +103,7 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
                 "wakeup" -> context.getString(R.string.category_wakeup)
                 "pleasure" -> context.getString(R.string.category_pleasure)
                 "delta" -> context.getString(R.string.category_delta)
+                "requests" -> context.getString(R.string.category_requests)
                 "emergency" -> context.getString(R.string.category_emergency)
                 "travelling" -> context.getString(R.string.category_travelling)
                 "alarm" -> context.getString(R.string.category_alarm)
diff --git a/app/src/main/java/io/heckel/ntfy/util/Util.kt b/app/src/main/java/io/heckel/ntfy/util/Util.kt
index a1b27dd..1b9e4dc 100644
--- a/app/src/main/java/io/heckel/ntfy/util/Util.kt
+++ b/app/src/main/java/io/heckel/ntfy/util/Util.kt
@@ -71,7 +71,7 @@ fun getName(topic: String, fallback: String = "Unknown channel ($topic)") : Stri
         "public-switches-raindrops" -> "Switch notifications (Raindrops)"
         "public-switches-cloudburst" -> "Switch notifications (Cloudburst)"
         "pleasure" -> "Pleasure alerts"
-        "delta" -> "Delta kiosk management"
+        "delta" -> "Delta administrator alerts"
         "stargrove" -> "Stargrove notifications"
         "motivation" -> "Motivational messages"
         "test" -> "Test channel"
diff --git a/app/src/main/res/drawable-anydpi/ic_category_requests.xml b/app/src/main/res/drawable-anydpi/ic_category_requests.xml
new file mode 100644
index 0000000..a00181a
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_category_requests.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.92"
+      android:scaleY="0.92"
+      android:translateX="0.96"
+      android:translateY="0.96">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,2H4C2.9,2 2,2.9 2,4v18l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM13.57,11.57L12,15l-1.57,-3.43L7,10l3.43,-1.57L12,5l1.57,3.43L17,10L13.57,11.57z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_category_requests.png b/app/src/main/res/drawable-hdpi/ic_category_requests.png
new file mode 100644
index 0000000..360cf9c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_category_requests.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_category_requests.png b/app/src/main/res/drawable-mdpi/ic_category_requests.png
new file mode 100644
index 0000000..a2173f6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_category_requests.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_category_requests.png b/app/src/main/res/drawable-xhdpi/ic_category_requests.png
new file mode 100644
index 0000000..605e1b7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_category_requests.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_category_requests.png b/app/src/main/res/drawable-xxhdpi/ic_category_requests.png
new file mode 100644
index 0000000..9ccd17b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_category_requests.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 086f565..1986fba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -377,10 +377,11 @@
     <string name="category_default">Unknown (%1$s)</string>
     <string name="category_bits">Money tracker</string>
     <string name="category_switch">Switches</string>
+    <string name="category_requests">Delta change requests</string>
     <string name="category_wakeup">Wake-up alerts</string>
     <string name="category_pleasure">Pleasure alerts</string>
     <string name="category_emergency">Emergency alerts</string>
-    <string name="category_delta">Delta kiosk requests</string>
+    <string name="category_delta">Delta Kiosk requests</string>
     <string name="category_travelling">System travelling updates</string>
     <string name="category_alarm">Automated alarms</string>
     <string name="category_status">Server status updates</string>
-- 
cgit