diff --git a/Packages/Explore/Sources/Explore/ExploreView.swift b/Packages/Explore/Sources/Explore/ExploreView.swift index 8754fffa..a21deb3c 100644 --- a/Packages/Explore/Sources/Explore/ExploreView.swift +++ b/Packages/Explore/Sources/Explore/ExploreView.swift @@ -184,7 +184,7 @@ public struct ExploreView: View { Section("explore.section.trending.posts") { ForEach(viewModel.trendingStatuses .prefix(upTo: viewModel.trendingStatuses.count > 3 ? 3 : viewModel.trendingStatuses.count)) { status in - StatusRowView(viewModel: { .init(status: status, client: client, routerPath: routerPath) }) + StatusRowView(viewModel: { .init(status: status, client: client, routerPath: routerPath) }) .listRowBackground(theme.primaryBackgroundColor) .padding(.vertical, 8) } diff --git a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift index 13a0d997..1c477df3 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift @@ -55,11 +55,12 @@ struct NotificationRowView: View { ZStack(alignment: .center) { Circle() .strokeBorder(Color.white, lineWidth: 1) - .background(Circle().foregroundColor(type.tintColor())) + .background(Circle().foregroundColor(type.tintColor(isPrivate: notification.status?.visibility == .priv))) .frame(width: 24, height: 24) - Image(systemName: type.iconName()) + Image(systemName: type.iconName(isPrivate: notification.status?.visibility == .priv)) .resizable() + .scaledToFit() .frame(width: 12, height: 12) .foregroundColor(.white) } diff --git a/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift b/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift index 2b181349..256d4d33 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift @@ -45,7 +45,10 @@ extension Models.Notification.NotificationType { } } - func iconName() -> String { + func iconName(isPrivate: Bool) -> String { + if isPrivate { + return "tray.fill" + } switch self { case .status: return "pencil" @@ -64,7 +67,10 @@ extension Models.Notification.NotificationType { } } - func tintColor() -> Color { + func tintColor(isPrivate: Bool) -> Color { + if isPrivate { + return Color.orange.opacity(0.80) + } switch self { case .status, .mention, .update, .poll: return Theme.shared.tintColor.opacity(0.80) diff --git a/Packages/Notifications/Sources/Notifications/NotificationsListView.swift b/Packages/Notifications/Sources/Notifications/NotificationsListView.swift index 6fc25403..30d9c1c5 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationsListView.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationsListView.swift @@ -43,7 +43,7 @@ public struct NotificationsListView: View { Button { viewModel.selectedType = type } label: { - Label(type.menuTitle(), systemImage: type.iconName()) + Label(type.menuTitle(), systemImage: type.iconName(isPrivate: false)) } } }