robonen/mayday
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feat: enhance notification handling with improved data structure and API integration

Browse Source
This commit is contained in:
Andrew Robonen
2026-03-15 06:13:22 +07:00
parent 7675f66488
commit 0947c048c1
10 changed files with 349 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mayday/Views/Notifications/NotificationDetailView.swift
+6 -4
View File
@@ -70,7 +70,7 @@ struct NotificationDetailView: View {
}
VStack(spacing: 6) {
Text(notification.subject)
Text(notification.subject ?? "")
.font(.title3.bold())
.multilineTextAlignment(.center)
@@ -212,13 +212,15 @@ struct NotificationDetailView: View {
private var channelLabel: String {
switch notification.channel {
case .inApp: return String(localized: "channel_in_app")
case .push: return "Push"
case .apns: return "Push"
case .email: return "Email"
case .telegram: return "Telegram"
case .webhook: return "Webhook"
}
}
private var topicIcon: String {
let lowered = notification.topic.lowercased()
let lowered = (notification.source ?? "").lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return "flame.fill"
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {
@@ -233,7 +235,7 @@ struct NotificationDetailView: View {
}
private var topicColor: Color {
let lowered = notification.topic.lowercased()
let lowered = (notification.source ?? "").lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return .red
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {
Mayday/Views/Notifications/NotificationsView.swift
+17 -13
View File
@@ -146,15 +146,17 @@ struct ActiveNotificationCard: View {
var body: some View {
VStack(alignment: .leading, spacing: 12) {
HStack(alignment: .top) {
NotificationIconView(topic: notification.topic, isActive: true)
NotificationIconView(source: notification.source, isActive: true)
VStack(alignment: .leading, spacing: 2) {
Text(notification.subject)
Text(notification.subject ?? "")
.font(.headline)
.foregroundStyle(.white)
Text(notification.topic)
.font(.subheadline)
.foregroundStyle(.white.opacity(0.8))
if let source = notification.source {
Text(source)
.font(.subheadline)
.foregroundStyle(.white.opacity(0.8))
}
}
Spacer()
@@ -204,15 +206,17 @@ struct ResolvedNotificationCard: View {
var body: some View {
VStack(alignment: .leading, spacing: 10) {
HStack(alignment: .top) {
NotificationIconView(topic: notification.topic, isActive: false)
NotificationIconView(source: notification.source, isActive: false)
VStack(alignment: .leading, spacing: 2) {
Text(notification.subject)
Text(notification.subject ?? "")
.font(.headline)
.foregroundStyle(.primary)
Text(notification.topic)
.font(.subheadline)
.foregroundStyle(.secondary)
if let source = notification.source {
Text(source)
.font(.subheadline)
.foregroundStyle(.secondary)
}
}
Spacer()
@@ -255,11 +259,11 @@ struct ResolvedNotificationCard: View {
// MARK: - Notification Icon
struct NotificationIconView: View {
let topic: String
let source: String?
let isActive: Bool
private var iconName: String {
let lowered = topic.lowercased()
let lowered = (source ?? "").lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return "flame.fill"
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {
@@ -274,7 +278,7 @@ struct NotificationIconView: View {
}
private var iconColor: Color {
let lowered = topic.lowercased()
let lowered = (source ?? "").lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return .red
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {