Merge pull request #9660 from rafaeltonholo/feat/9312/in-app-notification-message-list-integration

feat(notifications): in-app notifications with Message List integration

Author: rafaeltonholo

feature/debug-settings/src/main/kotlin/net/thunderbird/feature/debug/settings/notification/DebugNotificationSectionViewModel.kt

@@ -201,20 +201,26 @@ internal class DebugNotificationSectionViewModel(
         state: State,
     ): Notification? = when (notificationType) {
         AuthenticationErrorNotification::class -> AuthenticationErrorNotification(
+            isIncomingServerError = true,
             accountUuid = selectedAccount.uuid,
             accountDisplayName = accountDisplay,
+            accountNumber = 0,
         )
 
         CertificateErrorNotification::class -> CertificateErrorNotification(
+            isIncomingServerError = true,
             accountUuid = selectedAccount.uuid,
             accountDisplayName = accountDisplay,
+            accountNumber = 0,
         )
 
         FailedToCreateNotification::class -> FailedToCreateNotification(
             accountUuid = selectedAccount.uuid,
             failedNotification = AuthenticationErrorNotification(
+                isIncomingServerError = true,
                 accountUuid = selectedAccount.uuid,
                 accountDisplayName = accountDisplay,
+                accountNumber = 0,
             ),
         )
 

feature/notification/api/src/androidMain/kotlin/net/thunderbird/feature/notification/api/ui/InAppNotificationHost.kt

@@ -100,7 +100,7 @@ fun InAppNotificationHost(
 
     val state by hostStateHolder.currentInAppNotificationHostState.collectAsState()
 
-    LaunchedEffect(inAppNotificationEvents) {
+    LaunchedEffect(inAppNotificationEvents, eventFilter) {
         val event = inAppNotificationEvents
         if (event != null && eventFilter(event)) {
             when (event) {

feature/notification/api/src/androidMain/kotlin/net/thunderbird/feature/notification/api/ui/layout/InAppNotificationHostLayout.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.layout.SubcomposeMeasureScope
 import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.constrainHeight
 import androidx.compose.ui.util.fastForEach
 import androidx.compose.ui.util.fastMap
 import androidx.compose.ui.util.fastMaxBy
@@ -73,10 +74,17 @@ internal fun InAppNotificationHostLayout(
         // In case the maxHeight is not defined (for example when no content is passed to the content lambda),
         // we manually calculate the layout height to avoid a crash caused by the pre-condition check
         // of the layout function.
-        val layoutHeight = if (constraints.maxHeight == Constraints.Infinity) {
-            bannerGlobalHeight + bannerInlineListHeight.roundToInt() + mainContentHeight
-        } else {
-            constraints.maxHeight
+        val layoutHeight = when {
+            constraints.minHeight == 0 ||
+                constraints.maxHeight == Constraints.Infinity -> {
+                constraints.constrainHeight(
+                    bannerGlobalHeight + bannerInlineListHeight.roundToInt() + mainContentHeight,
+                )
+            }
+
+            else -> {
+                constraints.maxHeight
+            }
         }
 
         layout(layoutWidth, layoutHeight) {

feature/notification/api/src/commonMain/composeResources/values/strings.xml

@@ -15,23 +15,23 @@
     <string name="notification_notify_error_text">An error has occurred while trying to create a system notification for a new message. The reason is most likely a missing notification sound.\n\nTap to open notification settings.</string>
 
     <string name="notification_authentication_error_title">Authentication failed</string>
-    <string name="notification_authentication_error_text">Authentication failed for %s. Update your server settings.</string>
+    <string name="notification_authentication_error_text">Authentication failed for %1$s. Update your server settings.</string>
 
     <string name="notification_certificate_error_public">Certificate error</string>
-    <string name="notification_certificate_error_title">Certificate error for %s</string>
+    <string name="notification_certificate_error_title">Certificate error for %1$s</string>
     <string name="notification_certificate_error_text">Check your server settings</string>
 
     <string name="notification_bg_sync_ticker">Checking mail: %1$s: %2$s</string>
     <string name="notification_bg_sync_title">Checking mail</string>
     <string name="notification_bg_sync_text">%1$s: %2$s</string>
-    <string name="notification_bg_send_ticker">Sending mail: %s</string>
+    <string name="notification_bg_send_ticker">Sending mail: %1$s</string>
     <string name="notification_bg_send_title">Sending mail</string>
 
     <string name="send_failure_subject">Failed to send some messages</string>
 
     <plurals name="notification_new_messages_title">
-        <item quantity="one">%d new message</item>
-        <item quantity="other">%d new messages</item>
+        <item quantity="one">%1$d new message</item>
+        <item quantity="other">%1$d new messages</item>
     </plurals>
     <string name="notification_additional_messages">+ %1$d more on %2$s</string>
 

feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/AppNotification.kt

@@ -30,6 +30,7 @@ import net.thunderbird.feature.notification.api.ui.style.SystemNotificationStyle
  * @see AppNotification
  */
 sealed interface Notification {
+    val accountUuid: String?
     val title: String
     val accessibilityText: String
     val contentText: String?

feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/AuthenticationErrorNotification.kt

@@ -6,6 +6,7 @@ import net.thunderbird.feature.notification.api.ui.action.NotificationAction
 import net.thunderbird.feature.notification.api.ui.icon.AuthenticationError
 import net.thunderbird.feature.notification.api.ui.icon.NotificationIcon
 import net.thunderbird.feature.notification.api.ui.icon.NotificationIcons
+import net.thunderbird.feature.notification.api.ui.style.inAppNotificationStyle
 import net.thunderbird.feature.notification.resources.api.Res
 import net.thunderbird.feature.notification.resources.api.notification_authentication_error_text
 import net.thunderbird.feature.notification.resources.api.notification_authentication_error_title
@@ -18,16 +19,25 @@ import org.jetbrains.compose.resources.getString
  */
 @ConsistentCopyVisibility
 data class AuthenticationErrorNotification private constructor(
+    val isIncomingServerError: Boolean,
+    override val accountUuid: String,
+    val accountNumber: Int,
     override val title: String,
     override val contentText: String?,
     override val channel: NotificationChannel,
     override val icon: NotificationIcon = NotificationIcons.AuthenticationError,
 ) : AppNotification(), SystemNotification, InAppNotification {
     override val severity: NotificationSeverity = NotificationSeverity.Fatal
-    override val actions: Set<NotificationAction> = setOf(
-        NotificationAction.Retry,
-        NotificationAction.UpdateServerSettings,
-    )
+    override val actions: Set<NotificationAction> = buildSet {
+        val action = if (isIncomingServerError) {
+            NotificationAction.UpdateIncomingServerSettings(accountUuid, accountNumber)
+        } else {
+            NotificationAction.UpdateOutgoingServerSettings(accountUuid, accountNumber)
+        }
+        add(action)
+        add(NotificationAction.Tap(override = action))
+    }
+    override val inAppNotificationStyle = inAppNotificationStyle { bannerInline() }
 
     override fun asLockscreenNotification(): SystemNotification.LockscreenNotification =
         SystemNotification.LockscreenNotification(
@@ -45,12 +55,17 @@ data class AuthenticationErrorNotification private constructor(
         suspend operator fun invoke(
             accountUuid: String,
             accountDisplayName: String,
+            accountNumber: Int,
+            isIncomingServerError: Boolean,
         ): AuthenticationErrorNotification = AuthenticationErrorNotification(
-            title = getString(
-                resource = Res.string.notification_authentication_error_title,
+            isIncomingServerError = isIncomingServerError,
+            accountUuid = accountUuid,
+            accountNumber = accountNumber,
+            title = getString(resource = Res.string.notification_authentication_error_title),
+            contentText = getString(
+                resource = Res.string.notification_authentication_error_text,
                 accountDisplayName,
             ),
-            contentText = getString(resource = Res.string.notification_authentication_error_text),
             channel = NotificationChannel.Miscellaneous(accountUuid = accountUuid),
         )
     }

feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/CertificateErrorNotification.kt

@@ -20,14 +20,23 @@ import org.jetbrains.compose.resources.getString
  */
 @ConsistentCopyVisibility
 data class CertificateErrorNotification private constructor(
+    val isIncomingServerError: Boolean,
+    override val accountUuid: String,
+    val accountNumber: Int,
     override val title: String,
     override val contentText: String,
     val lockScreenTitle: String,
     override val channel: NotificationChannel,
     override val icon: NotificationIcon = NotificationIcons.CertificateError,
 ) : AppNotification(), SystemNotification, InAppNotification {
     override val severity: NotificationSeverity = NotificationSeverity.Fatal
-    override val actions: Set<NotificationAction> = setOf(NotificationAction.UpdateServerSettings)
+    override val actions: Set<NotificationAction> = setOf(
+        if (isIncomingServerError) {
+            NotificationAction.UpdateIncomingServerSettings(accountUuid, accountNumber)
+        } else {
+            NotificationAction.UpdateOutgoingServerSettings(accountUuid, accountNumber)
+        },
+    )
 
     override fun asLockscreenNotification(): SystemNotification.LockscreenNotification =
         SystemNotification.LockscreenNotification(
@@ -45,7 +54,12 @@ data class CertificateErrorNotification private constructor(
         suspend operator fun invoke(
             accountUuid: String,
             accountDisplayName: String,
+            accountNumber: Int,
+            isIncomingServerError: Boolean,
         ): CertificateErrorNotification = CertificateErrorNotification(
+            isIncomingServerError = isIncomingServerError,
+            accountUuid = accountUuid,
+            accountNumber = accountNumber,
             title = getString(resource = Res.string.notification_certificate_error_title, accountDisplayName),
             lockScreenTitle = getString(resource = Res.string.notification_certificate_error_public),
             contentText = getString(resource = Res.string.notification_certificate_error_text),

feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/FailedToCreateNotification.kt

@@ -18,6 +18,7 @@ import org.jetbrains.compose.resources.getString
  */
 @ConsistentCopyVisibility
 data class FailedToCreateNotification private constructor(
+    override val accountUuid: String,
     override val title: String,
     override val contentText: String?,
     override val channel: NotificationChannel,
@@ -38,6 +39,7 @@ data class FailedToCreateNotification private constructor(
             accountUuid: String,
             failedNotification: AppNotification,
         ): FailedToCreateNotification = FailedToCreateNotification(
+            accountUuid = accountUuid,
             title = getString(resource = Res.string.notification_notify_error_title),
             contentText = getString(resource = Res.string.notification_notify_error_text),
             channel = NotificationChannel.Miscellaneous(accountUuid = accountUuid),

feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/MailNotification.kt

@@ -34,6 +34,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
     override val severity: NotificationSeverity = NotificationSeverity.Information
 
     data class Fetching(
+        override val accountUuid: String,
         override val title: String,
         override val accessibilityText: String,
         override val contentText: String?,
@@ -61,6 +62,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
             ): Fetching {
                 val title = getString(resource = Res.string.notification_bg_sync_title)
                 return Fetching(
+                    accountUuid = accountUuid,
                     title = title,
                     accessibilityText = folderName?.let { folderName ->
                         getString(
@@ -83,6 +85,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
     }
 
     data class Sending(
+        override val accountUuid: String,
         override val title: String,
         override val accessibilityText: String,
         override val contentText: String?,
@@ -106,6 +109,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
                 accountUuid: String,
                 accountDisplayName: String,
             ): Sending = Sending(
+                accountUuid = accountUuid,
                 title = getString(resource = Res.string.notification_bg_send_title),
                 accessibilityText = getString(
                     resource = Res.string.notification_bg_send_ticker,
@@ -118,6 +122,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
     }
 
     data class SendFailed(
+        override val accountUuid: String,
         override val title: String,
         override val contentText: String?,
         override val channel: NotificationChannel,
@@ -143,6 +148,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
                 accountUuid: String,
                 exception: Exception,
             ): SendFailed = SendFailed(
+                accountUuid = accountUuid,
                 title = getString(resource = Res.string.send_failure_subject),
                 contentText = exception.rootCauseMassage,
                 channel = NotificationChannel.Miscellaneous(accountUuid = accountUuid),
@@ -163,7 +169,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
      * @property group The notification group this notification belongs to, if any.
      */
     data class NewMailSingleMail(
-        val accountUuid: String,
+        override val accountUuid: String,
         val accountName: String,
         val messagesNotificationChannelSuffix: String,
         val summary: String,
@@ -208,7 +214,7 @@ sealed class MailNotification : AppNotification(), SystemNotification {
      */
     @ConsistentCopyVisibility
     data class NewMailSummaryMail private constructor(
-        val accountUuid: String,
+        override val accountUuid: String,
         val accountName: String,
         val messagesNotificationChannelSuffix: String,
         override val title: String,

feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/NotificationFactoryCoroutineCompat.kt

@@ -0,0 +1,10 @@
+package net.thunderbird.feature.notification.api.content
+
+import androidx.annotation.Discouraged
+import kotlinx.coroutines.runBlocking
+
+object NotificationFactoryCoroutineCompat {
+    @JvmStatic
+    @Discouraged("Should not be used outside a Java class.")
+    fun <T> create(builder: suspend () -> T): T = runBlocking { builder() }
+}