From 26f17869d67cec030e78df1b45087b862b95a217 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:50:58 +0200
Subject: [PATCH] feat: Add message info to NotificationEditor
---
.../organisms/NotificationEditor.kt | 7 +++++++
.../myzel394/alibi/ui/components/atoms/MessageBox.kt | 10 +++++++---
app/src/main/res/values/strings.xml | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/CustomRecordingNotificationsScreen/organisms/NotificationEditor.kt b/app/src/main/java/app/myzel394/alibi/ui/components/CustomRecordingNotificationsScreen/organisms/NotificationEditor.kt
index 4cd077f..7aacc97 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/CustomRecordingNotificationsScreen/organisms/NotificationEditor.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/CustomRecordingNotificationsScreen/organisms/NotificationEditor.kt
@@ -40,6 +40,8 @@ import app.myzel394.alibi.db.NotificationSettings
import app.myzel394.alibi.ui.components.CustomRecordingNotificationsScreen.models.NotificationViewModel
import app.myzel394.alibi.ui.components.CustomRecordingNotificationsScreen.molecules.EditNotificationInput
import app.myzel394.alibi.ui.components.CustomRecordingNotificationsScreen.molecules.NotificationPresetsRoulette
+import app.myzel394.alibi.ui.components.atoms.MessageBox
+import app.myzel394.alibi.ui.components.atoms.MessageType
val HORIZONTAL_PADDING = 16.dp;
@@ -109,6 +111,11 @@ fun NotificationEditor(
.padding(horizontal = HORIZONTAL_PADDING),
verticalArrangement = Arrangement.spacedBy(16.dp),
) {
+ MessageBox(
+ type = MessageType.SURFACE,
+ message = stringResource(R.string.ui_settings_customNotifications_edit_help)
+ )
+
EditNotificationInput(
modifier = Modifier
.fillMaxWidth()
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt b/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
index cf0f0c9..1c594ff 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
@@ -29,17 +29,19 @@ fun MessageBox(
title: String? = null,
) {
val isDark = rememberIsInDarkMode()
- val containerColor = when(type) {
+ val containerColor = when (type) {
MessageType.ERROR -> MaterialTheme.colorScheme.errorContainer
MessageType.INFO -> MaterialTheme.colorScheme.tertiaryContainer
MessageType.SUCCESS -> Color.Green.copy(alpha = 0.3f)
MessageType.WARNING -> Color.Yellow.copy(alpha = 0.3f)
+ MessageType.SURFACE -> MaterialTheme.colorScheme.surfaceVariant
}
- val onContainerColor = when(type) {
+ val onContainerColor = when (type) {
MessageType.ERROR -> MaterialTheme.colorScheme.onError
MessageType.INFO -> MaterialTheme.colorScheme.onTertiaryContainer
MessageType.SUCCESS -> Color.Green
MessageType.WARNING -> Color.Yellow
+ MessageType.SURFACE -> MaterialTheme.colorScheme.onSurfaceVariant
}
val textColor = if (isDark) onContainerColor else MaterialTheme.colorScheme.onSurface
val backgroundColor = if (isDark) containerColor else onContainerColor
@@ -53,9 +55,10 @@ fun MessageBox(
.then(modifier)
) {
Icon(
- imageVector = when(type) {
+ imageVector = when (type) {
MessageType.ERROR -> Icons.Default.Error
MessageType.INFO -> Icons.Default.Info
+ MessageType.SURFACE -> Icons.Default.Info
MessageType.SUCCESS -> Icons.Default.Check
MessageType.WARNING -> Icons.Default.Warning
},
@@ -84,6 +87,7 @@ fun MessageBox(
enum class MessageType {
ERROR,
INFO,
+ SURFACE,
SUCCESS,
WARNING,
}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 40b54d9..33e9c64 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,4 +87,5 @@
Apply Preset \"%s\"
Show Duration
Update notification
+ This is a preview for your notification. You can edit the title and the message. At the bottom you can find some presets.
\ No newline at end of file