Add light purple background to notifications about statuses with priv…

…ate visibility, as on the web Contributes to #399 [BUG] Multiple interactions do not collapse into a single notification
mastodon · Feb 18, 2025 · 619bb27 · 619bb27
1 parent 523ff0a
commit 619bb27
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Mastodon/In Progress New Layout and Datamodel/NotificationListViewController.swift b/Mastodon/In Progress New Layout and Datamodel/NotificationListViewController.swift
@@ -1,6 +1,7 @@
 // Copyright © 2025 Mastodon gGmbH. All rights reserved.
 
 import Combine
+import MastodonAsset
 import MastodonCore
 import MastodonLocalization
 import MastodonSDK
@@ -166,6 +167,12 @@ struct NotificationListView: View {
         case .groupedNotification(let viewModel):
             // TODO: implement unread using Mastodon.Entity.Marker
             NotificationRowView(viewModel: viewModel)
+                .padding(.vertical, 4)
+                .listRowBackground(
+                    Rectangle()
+                        .fill(viewModel.usePrivateBackground ?  Asset.Colors.accent.swiftUIColor : .clear)
+                        .opacity(0.1)
+                )
         }
     }
 

diff --git a/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift b/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift
@@ -19,6 +19,7 @@ class NotificationRowViewModel: ObservableObject {
     let presentError: (Error) -> Void
     let defaultNavigation: (() -> Void)?
     let iconStyle: GroupedNotificationType.MainIconStyle?
+    let usePrivateBackground: Bool
     let actionSuperheader: (iconName: String, text: String, color: Color)?
 
     @Published public var headerComponents: [NotificationViewComponent] = []
@@ -58,6 +59,8 @@ class NotificationRowViewModel: ObservableObject {
         self.navigateToScene = navigateToScene
         self.presentError = presentError
         self.defaultNavigation = notificationInfo.defaultNavigation
+
+        var needsPrivateBackground = false
 
         switch notificationInfo.groupedNotificationType {
 
@@ -99,6 +102,7 @@ class NotificationRowViewModel: ObservableObject {
                             ?? "")
                 ]
                 contentComponents = [.status(statusViewModel)]
+                needsPrivateBackground = statusViewModel.visibility == .direct
             } else {
                 actionSuperheader = nil
                 headerTextComponents = [._other("POST BY UNKNOWN ACCOUNT")]
@@ -116,6 +120,7 @@ class NotificationRowViewModel: ObservableObject {
                             ?? "")
                 ]
                 contentComponents = [.status(statusViewModel)]
+                needsPrivateBackground = statusViewModel.visibility == .direct
             } else {
                 headerTextComponents = [
                     ._other("REBLOGGED/FAVOURITED BY UNKNOWN ACCOUNT")
@@ -133,6 +138,7 @@ class NotificationRowViewModel: ObservableObject {
                             ?? "")
                 ]
                 contentComponents = [.status(statusViewModel)]
+                needsPrivateBackground = statusViewModel.visibility == .direct
             } else {
                 headerTextComponents = [
                     ._other("POLL/UPDATE FROM UNKNOWN ACCOUNT")
@@ -208,6 +214,9 @@ class NotificationRowViewModel: ObservableObject {
                 ._other("UNEXPECTED NOTIFICATION TYPE: \(text)")
             ]
         }
+
+        usePrivateBackground = needsPrivateBackground
+
         resetHeaderComponents()
     }