TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-16 11:16:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(monitor): Show disable hint in foreground notification when extra notification is enabled

Browse Source
This commit is contained in:
darken
2026-03-03 15:26:10 +00:00
committed by Matthias Urhahn
parent dcf2ade9ec
commit e13331dfcf
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorService.kt
+2 -1
View File
@@ -172,9 +172,10 @@ class MonitorService : Service() {
.distinctUntilChanged() .distinctUntilChanged()
.throttleLatest(1000) .throttleLatest(1000)
.onEach { currentDevice -> .onEach { currentDevice ->
val useExtraNotification = generalSettings.useExtraMonitorNotification.value
notificationManager.notify( notificationManager.notify(
MonitorNotifications.NOTIFICATION_ID, MonitorNotifications.NOTIFICATION_ID,
notifications.getNotification(currentDevice), notifications.getNotification(currentDevice, showHint = useExtraNotification),
) )
if (generalSettings.useExtraMonitorNotification.value && currentDevice != null) { if (generalSettings.useExtraMonitorNotification.value && currentDevice != null) {
notificationManager.notify( notificationManager.notify(
app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
+11 -4
View File
@@ -57,10 +57,17 @@ class MonitorNotifications @Inject constructor(
setOngoing(true) setOngoing(true)
} }
private fun getBuilder(device: PodDevice?, channelId: String): NotificationCompat.Builder { private fun getBuilder(device: PodDevice?, channelId: String, showHint: Boolean = false): NotificationCompat.Builder {
if (device == null) { if (device == null) {
return baseBuilder(channelId).apply { return baseBuilder(channelId).apply {
setStyle(NotificationCompat.BigTextStyle()) if (showHint) {
setStyle(
NotificationCompat.BigTextStyle()
.bigText(context.getString(R.string.monitor_notification_extra_enabled_hint))
)
} else {
setStyle(NotificationCompat.BigTextStyle())
}
setContentTitle(context.getString(R.string.pods_none_label_short)) setContentTitle(context.getString(R.string.pods_none_label_short))
setSubText(context.getString(R.string.app_name)) setSubText(context.getString(R.string.app_name))
} }
@@ -136,8 +143,8 @@ class MonitorNotifications @Inject constructor(
} }
} }
fun getNotification(podDevice: PodDevice?): Notification = fun getNotification(podDevice: PodDevice?, showHint: Boolean = false): Notification =
getBuilder(podDevice, NOTIFICATION_CHANNEL_ID).build() getBuilder(podDevice, NOTIFICATION_CHANNEL_ID, showHint).build()
fun getNotificationConnected(podDevice: PodDevice?): Notification = fun getNotificationConnected(podDevice: PodDevice?): Notification =
getBuilder(podDevice, NOTIFICATION_CHANNEL_ID_CONNECTED).build() getBuilder(podDevice, NOTIFICATION_CHANNEL_ID_CONNECTED).build()
app/src/main/res/values/strings.xml
+1
View File
@@ -66,6 +66,7 @@
<string name="notification_channel_device_status_label">Device status</string> <string name="notification_channel_device_status_label">Device status</string>
<string name="notification_channel_device_status_connected_label">Connected device</string> <string name="notification_channel_device_status_connected_label">Connected device</string>
<string name="monitor_notification_extra_enabled_hint">You can disable this notification in system settings.</string>
<string name="support_debuglog_label">Debug log</string> <string name="support_debuglog_label">Debug log</string>
<string name="support_debuglog_desc">Record everything the app is doing into a text file that you can share.</string> <string name="support_debuglog_desc">Record everything the app is doing into a text file that you can share.</string>