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

feat: enhance models and services with Sendable conformance, add preview data for debugging

Browse Source
This commit is contained in:
Andrew Robonen
2026-03-14 07:18:35 +07:00
parent a4b475b13f
commit 758f5ec05f
17 changed files with 851 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mayday/Views/Notifications/NotificationDetailView.swift
+228 -47
View File
@@ -6,63 +6,244 @@ struct NotificationDetailView: View {
var body: some View {
ScrollView {
VStack(alignment: .leading, spacing: 20) {
VStack(alignment: .leading, spacing: 8) {
Text(notification.topic)
.font(.caption)
.foregroundStyle(.secondary)
Text(notification.subject)
.font(.title2.bold())
VStack(spacing: 0) {
// Hero header
headerSection
// Info cards
VStack(spacing: 16) {
detailsCard
if let metadata = notification.metadata, !metadata.isEmpty {
metadataCard(metadata)
}
statusCard
}
.padding(.horizontal, 16)
.padding(.top, 24)
.padding(.bottom, 32)
Divider()
VStack(alignment: .leading, spacing: 8) {
Text("Подробности:")
.font(.headline)
Text(notification.body)
.font(.body)
}
if let metadata = notification.metadata, !metadata.isEmpty {
Divider()
VStack(alignment: .leading, spacing: 8) {
Text("Метаданные:")
// Mark as read button for unread notifications
if !notification.isRead {
Button {
Task { await viewModel.markAsRead(notification) }
} label: {
Text("Отметить прочитанным")
.font(.headline)
ForEach(metadata.sorted(by: { $0.key < $1.key }), id: \.key) { key, value in
HStack {
Text(key).foregroundStyle(.secondary)
Spacer()
Text(value)
}
.font(.footnote)
}
.foregroundStyle(.red)
.frame(maxWidth: .infinity)
.padding(.vertical, 14)
.background(
RoundedRectangle(cornerRadius: 16)
.fill(Color.red.opacity(0.1))
)
}
.padding(.horizontal, 16)
.padding(.bottom, 20)
}
Divider()
VStack(alignment: .leading, spacing: 8) {
LabeledContent("Получено") {
Text(notification.createdAt.formatted(date: .abbreviated, time: .shortened))
}
LabeledContent("Статус") {
Text(notification.status.rawValue)
}
LabeledContent("Канал") {
Text(notification.channel.rawValue)
}
}
.font(.footnote)
Spacer()
}
.padding()
}
.navigationTitle("Уведомление")
.background(Color(.systemGroupedBackground))
.navigationTitle("Подробности")
.navigationBarTitleDisplayMode(.inline)
.task {
await viewModel.markAsRead(notification)
}
}
// MARK: - Hero Header
private var headerSection: some View {
VStack(spacing: 16) {
ZStack {
Circle()
.fill(.white)
.frame(width: 88, height: 88)
.shadow(color: topicColor.opacity(0.3), radius: 12, y: 4)
Circle()
.fill(topicColor.opacity(0.15))
.frame(width: 80, height: 80)
Image(systemName: topicIcon)
.font(.system(size: 32))
.foregroundStyle(topicColor)
}
VStack(spacing: 6) {
Text(notification.subject)
.font(.title3.bold())
.multilineTextAlignment(.center)
Text(notification.createdAt.formatted(date: .abbreviated, time: .shortened))
.font(.subheadline)
.foregroundStyle(.secondary)
}
statusBadge
}
.padding(.vertical, 28)
.frame(maxWidth: .infinity)
}
// MARK: - Status Badge
private var statusBadge: some View {
let (text, color): (String, Color) = notification.isRead
? ("Прочитано", .green)
: ("Новое", .red)
return Text(text)
.font(.caption.bold())
.foregroundStyle(color)
.padding(.horizontal, 14)
.padding(.vertical, 6)
.background(color.opacity(0.12))
.clipShape(Capsule())
}
// MARK: - Details Card
private var detailsCard: some View {
VStack(alignment: .leading, spacing: 12) {
Label("Подробности", systemImage: "doc.text.fill")
.font(.subheadline.bold())
.foregroundStyle(.primary)
Text(notification.body)
.font(.body)
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(16)
.background(.white)
.clipShape(RoundedRectangle(cornerRadius: 16))
.shadow(color: .black.opacity(0.04), radius: 6, y: 2)
}
// MARK: - Metadata Card
private func metadataCard(_ metadata: [String: String]) -> some View {
VStack(alignment: .leading, spacing: 12) {
Label("Информация", systemImage: "info.circle.fill")
.font(.subheadline.bold())
.foregroundStyle(.primary)
let sortedKeys = metadata.keys.sorted()
let columns = min(sortedKeys.count, 2)
if columns == 1 {
ForEach(sortedKeys, id: \.self) { key in
metadataItem(key: key, value: metadata[key] ?? "")
}
} else {
LazyVGrid(columns: Array(repeating: GridItem(.flexible(), spacing: 12), count: 2), spacing: 12) {
ForEach(sortedKeys, id: \.self) { key in
metadataItem(key: key, value: metadata[key] ?? "")
}
}
}
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(16)
.background(.white)
.clipShape(RoundedRectangle(cornerRadius: 16))
.shadow(color: .black.opacity(0.04), radius: 6, y: 2)
}
private func metadataItem(key: String, value: String) -> some View {
VStack(alignment: .leading, spacing: 2) {
Text(key)
.font(.caption)
.foregroundStyle(.secondary)
.textCase(.uppercase)
Text(value)
.font(.subheadline.bold())
.foregroundStyle(.primary)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(12)
.background(Color(.systemGroupedBackground))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
// MARK: - Status Card
private var statusCard: some View {
VStack(alignment: .leading, spacing: 12) {
Label("Статус", systemImage: "clock.fill")
.font(.subheadline.bold())
.foregroundStyle(.primary)
VStack(spacing: 8) {
infoRow(icon: "paperplane.fill", label: "Канал", value: channelLabel)
Divider()
infoRow(icon: "clock", label: "Получено", value: notification.createdAt.formatted(date: .abbreviated, time: .shortened))
if let readAt = notification.readAt {
Divider()
infoRow(icon: "checkmark.circle.fill", label: "Прочитано", value: readAt.formatted(date: .abbreviated, time: .shortened))
}
}
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(16)
.background(.white)
.clipShape(RoundedRectangle(cornerRadius: 16))
.shadow(color: .black.opacity(0.04), radius: 6, y: 2)
}
private func infoRow(icon: String, label: String, value: String) -> some View {
HStack {
Image(systemName: icon)
.font(.caption)
.foregroundStyle(.secondary)
.frame(width: 20)
Text(label)
.font(.subheadline)
.foregroundStyle(.secondary)
Spacer()
Text(value)
.font(.subheadline)
.foregroundStyle(.primary)
}
}
// MARK: - Helpers
private var channelLabel: String {
switch notification.channel {
case .inApp: return "В приложении"
case .push: return "Push"
case .email: return "Email"
}
}
private var topicIcon: String {
let lowered = notification.topic.lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return "flame.fill"
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {
return "heart.fill"
} else if lowered.contains("security") || lowered.contains("безопас") {
return "shield.fill"
} else if lowered.contains("water") || lowered.contains("вод") || lowered.contains("затоп") {
return "drop.fill"
} else {
return "exclamationmark.triangle.fill"
}
}
private var topicColor: Color {
let lowered = notification.topic.lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return .red
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {
return .green
} else if lowered.contains("security") || lowered.contains("безопас") {
return .blue
} else if lowered.contains("water") || lowered.contains("вод") || lowered.contains("затоп") {
return .cyan
} else {
return .orange
}
}
}
Mayday/Views/Notifications/NotificationsView.swift
+223 -39
View File
@@ -5,6 +5,14 @@ struct NotificationsView: View {
@StateObject private var viewModel = NotificationsViewModel()
@State private var showSettings = false
private var unreadNotifications: [AppNotification] {
viewModel.notifications.filter { !$0.isRead }
}
private var readNotifications: [AppNotification] {
viewModel.notifications.filter { $0.isRead }
}
var body: some View {
NavigationStack {
Group {
@@ -26,13 +34,28 @@ struct NotificationsView: View {
notificationsList
}
}
.background(Color(.systemGroupedBackground))
.navigationTitle("Уведомления")
.toolbar {
#if DEBUG
if PreviewData.isPreviewMode {
ToolbarItem(placement: .topBarLeading) {
Text("ДЕМО")
.font(.caption2.bold())
.foregroundStyle(.white)
.padding(.horizontal, 8)
.padding(.vertical, 3)
.background(.orange)
.clipShape(Capsule())
}
}
#endif
ToolbarItem(placement: .topBarTrailing) {
Button {
showSettings = true
} label: {
Image(systemName: "gear")
Image(systemName: "gearshape.fill")
.foregroundStyle(.secondary)
}
}
}
@@ -54,63 +77,224 @@ struct NotificationsView: View {
}
var notificationsList: some View {
List {
ForEach(viewModel.notifications) { notification in
NavigationLink(destination: NotificationDetailView(notification: notification, viewModel: viewModel)) {
NotificationRowView(notification: notification)
}
.swipeActions(edge: .leading) {
if !notification.isRead {
Button {
Task { await viewModel.markAsRead(notification) }
} label: {
Label("Прочитано", systemImage: "checkmark")
ScrollView {
LazyVStack(spacing: 0) {
if !unreadNotifications.isEmpty {
sectionHeader("Активные")
ForEach(unreadNotifications) { notification in
NavigationLink(destination: NotificationDetailView(notification: notification, viewModel: viewModel)) {
ActiveNotificationCard(notification: notification)
}
.buttonStyle(.plain)
.padding(.horizontal, 16)
.padding(.bottom, 12)
.onAppear {
if notification.id == viewModel.notifications.last?.id {
Task { await viewModel.loadMore() }
}
}
.tint(.blue)
}
}
.onAppear {
if notification.id == viewModel.notifications.last?.id {
Task { await viewModel.loadMore() }
}
}
}
if viewModel.isLoadingMore {
HStack {
Spacer()
if !readNotifications.isEmpty {
sectionHeader("Завершённые")
ForEach(readNotifications) { notification in
NavigationLink(destination: NotificationDetailView(notification: notification, viewModel: viewModel)) {
ResolvedNotificationCard(notification: notification)
}
.buttonStyle(.plain)
.padding(.horizontal, 16)
.padding(.bottom, 12)
.onAppear {
if notification.id == viewModel.notifications.last?.id {
Task { await viewModel.loadMore() }
}
}
}
}
if viewModel.isLoadingMore {
ProgressView()
Spacer()
.padding(.vertical, 20)
}
}
.padding(.top, 4)
}
.listStyle(.plain)
}
func sectionHeader(_ title: String) -> some View {
HStack {
Text(title)
.font(.subheadline)
.fontWeight(.semibold)
.foregroundStyle(.secondary)
.textCase(.uppercase)
Spacer()
}
.padding(.horizontal, 20)
.padding(.top, 16)
.padding(.bottom, 8)
}
}
struct NotificationRowView: View {
// MARK: - Active (Unread) Card
struct ActiveNotificationCard: View {
let notification: AppNotification
var body: some View {
HStack(spacing: 12) {
Circle()
.fill(notification.isRead ? Color.clear : Color.blue)
.frame(width: 8, height: 8)
VStack(alignment: .leading, spacing: 12) {
HStack(alignment: .top) {
NotificationIconView(topic: notification.topic, isActive: true)
VStack(alignment: .leading, spacing: 2) {
Text(notification.subject)
.font(.headline)
.foregroundStyle(.white)
Text(notification.topic)
.font(.subheadline)
.foregroundStyle(.white.opacity(0.8))
}
Spacer()
VStack(alignment: .leading, spacing: 4) {
Text(notification.topic)
.font(.footnote)
.foregroundStyle(.secondary)
Text(notification.subject)
.font(.body)
.fontWeight(notification.isRead ? .regular : .semibold)
Text(notification.createdAt, style: .relative)
.font(.caption)
.foregroundStyle(.secondary)
.foregroundStyle(.white.opacity(0.7))
}
Spacer()
if !notification.body.isEmpty {
Text(notification.body)
.font(.subheadline)
.foregroundStyle(.white.opacity(0.85))
.lineLimit(2)
}
HStack {
Spacer()
Text("Открыть")
.font(.subheadline.bold())
.foregroundStyle(Color.red)
.padding(.horizontal, 32)
.padding(.vertical, 10)
.background(.white)
.clipShape(RoundedRectangle(cornerRadius: 12))
Spacer()
}
}
.padding(16)
.background(
LinearGradient(
colors: [Color.red, Color.red.opacity(0.85)],
startPoint: .topLeading,
endPoint: .bottomTrailing
)
)
.clipShape(RoundedRectangle(cornerRadius: 20))
.shadow(color: .red.opacity(0.3), radius: 8, y: 4)
}
}
// MARK: - Resolved (Read) Card
struct ResolvedNotificationCard: View {
let notification: AppNotification
var body: some View {
VStack(alignment: .leading, spacing: 10) {
HStack(alignment: .top) {
NotificationIconView(topic: notification.topic, isActive: false)
VStack(alignment: .leading, spacing: 2) {
Text(notification.subject)
.font(.headline)
.foregroundStyle(.primary)
Text(notification.topic)
.font(.subheadline)
.foregroundStyle(.secondary)
}
Spacer()
VStack(alignment: .trailing, spacing: 2) {
Text(notification.createdAt.formatted(date: .abbreviated, time: .omitted))
.font(.caption)
.foregroundStyle(.secondary)
Text(notification.createdAt.formatted(date: .omitted, time: .shortened))
.font(.caption2)
.foregroundStyle(.tertiary)
}
}
if !notification.body.isEmpty {
Text(notification.body)
.font(.subheadline)
.foregroundStyle(.secondary)
.lineLimit(2)
}
if let readAt = notification.readAt {
HStack(spacing: 4) {
Image(systemName: "checkmark")
.font(.caption2)
.foregroundStyle(.green)
Text("прочитано \(readAt.formatted(date: .abbreviated, time: .shortened))")
.font(.caption)
.foregroundStyle(.secondary)
}
}
}
.padding(16)
.background(.white)
.clipShape(RoundedRectangle(cornerRadius: 20))
.shadow(color: .black.opacity(0.06), radius: 8, y: 2)
}
}
// MARK: - Notification Icon
struct NotificationIconView: View {
let topic: String
let isActive: Bool
private var iconName: String {
let lowered = topic.lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return "flame.fill"
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {
return "heart.fill"
} else if lowered.contains("security") || lowered.contains("безопас") {
return "shield.fill"
} else if lowered.contains("water") || lowered.contains("вод") || lowered.contains("затоп") {
return "drop.fill"
} else {
return "exclamationmark.triangle.fill"
}
}
private var iconColor: Color {
let lowered = topic.lowercased()
if lowered.contains("fire") || lowered.contains("пожар") || lowered.contains("огонь") {
return .red
} else if lowered.contains("medical") || lowered.contains("медиц") || lowered.contains("здоров") {
return .green
} else if lowered.contains("security") || lowered.contains("безопас") {
return .blue
} else if lowered.contains("water") || lowered.contains("вод") || lowered.contains("затоп") {
return .cyan
} else {
return .orange
}
}
var body: some View {
ZStack {
Circle()
.fill(isActive ? .white.opacity(0.25) : iconColor.opacity(0.12))
.frame(width: 40, height: 40)
Image(systemName: iconName)
.font(.body)
.foregroundStyle(isActive ? .white : iconColor)
}
.padding(.vertical, 4)
}
}