Compare commits

...

3 Commits

Author SHA1 Message Date
910eef3703 edit view contact list 2025-10-23 23:22:52 +03:00
e6d7258b70 edit view contacts 2025-10-23 23:18:11 +03:00
374bd1713b edit view contacts 2025-10-23 23:15:22 +03:00
2 changed files with 91 additions and 44 deletions

View File

@ -1240,6 +1240,7 @@
} }
}, },
"Обновить" : { "Обновить" : {
"comment" : "Contacts retry button",
"localizations" : { "localizations" : {
"en" : { "en" : {
"stringUnit" : { "stringUnit" : {
@ -1828,6 +1829,9 @@
} }
} }
}, },
"Просмотр \"%1$@\" появится позже." : {
"comment" : "Contacts placeholder message"
},
"Профиль" : { "Профиль" : {
"localizations" : { "localizations" : {
"en" : { "en" : {
@ -2055,7 +2059,7 @@
"comment" : "Search placeholder copy" "comment" : "Search placeholder copy"
}, },
"Скоро" : { "Скоро" : {
"comment" : "Add blocked user placeholder title" "comment" : "Add blocked user placeholder title\nContacts placeholder title"
}, },
"Скоро появится мини-игра, где можно заработать очки для кастомизации профиля. Следите за обновлениями!" : { "Скоро появится мини-игра, где можно заработать очки для кастомизации профиля. Следите за обновлениями!" : {
"comment" : "Concept tab placeholder description" "comment" : "Concept tab placeholder description"

View File

@ -1,4 +1,5 @@
import SwiftUI import SwiftUI
import Foundation
struct ContactsTab: View { struct ContactsTab: View {
@State private var contacts: [Contact] = [] @State private var contacts: [Contact] = []
@ -17,15 +18,23 @@ struct ContactsTab: View {
} else if contacts.isEmpty { } else if contacts.isEmpty {
emptyState emptyState
} else { } else {
Section(header: Text(NSLocalizedString("Контакты", comment: ""))) {
ForEach(contacts) { contact in ForEach(contacts) { contact in
Button {
activeAlert = .info(
title: NSLocalizedString("Скоро", comment: "Contacts placeholder title"),
message: String(format: NSLocalizedString("Просмотр \"%1$@\" появится позже.", comment: "Contacts placeholder message"), contact.displayName)
)
} label: {
ContactRow(contact: contact) ContactRow(contact: contact)
.contentShape(Rectangle())
}
.buttonStyle(.plain)
.listRowInsets(EdgeInsets(top: 0, leading: 12, bottom: 0, trailing: 12))
} }
} }
} }
} .background(Color(UIColor.systemBackground))
.listStyle(.insetGrouped) .listStyle(.plain)
.background(Color(.systemGroupedBackground))
.task { .task {
await loadContacts() await loadContacts()
} }
@ -40,30 +49,50 @@ struct ContactsTab: View {
message: Text(message), message: Text(message),
dismissButton: .default(Text(NSLocalizedString("OK", comment: "Common OK"))) dismissButton: .default(Text(NSLocalizedString("OK", comment: "Common OK")))
) )
case .info(_, let title, let message):
return Alert(
title: Text(title),
message: Text(message),
dismissButton: .default(Text(NSLocalizedString("OK", comment: "Common OK")))
)
} }
} }
} }
private var loadingState: some View { private var loadingState: some View {
Section { HStack {
Spacer()
ProgressView() ProgressView()
.frame(maxWidth: .infinity, alignment: .center) .progressViewStyle(CircularProgressViewStyle())
Spacer()
} }
.padding(.vertical, 18)
.listRowInsets(EdgeInsets(top: 18, leading: 12, bottom: 18, trailing: 12))
.listRowSeparator(.hidden)
} }
private func errorState(_ message: String) -> some View { private func errorState(_ message: String) -> some View {
Section { HStack(alignment: .center, spacing: 8) {
Image(systemName: "exclamationmark.triangle.fill")
.foregroundColor(.orange)
Text(message) Text(message)
.foregroundColor(.red) .font(.subheadline)
.frame(maxWidth: .infinity, alignment: .center) .foregroundColor(.orange)
Spacer()
Button(action: { Task { await loadContacts() } }) {
Text(NSLocalizedString("Обновить", comment: "Contacts retry button"))
.font(.subheadline)
} }
} }
.padding(.vertical, 10)
.listRowInsets(EdgeInsets(top: 10, leading: 12, bottom: 10, trailing: 12))
.listRowSeparator(.hidden)
}
private var emptyState: some View { private var emptyState: some View {
Section {
VStack(spacing: 12) { VStack(spacing: 12) {
Image(systemName: "person.crop.circle.badge.questionmark") Image(systemName: "person.crop.circle.badge.questionmark")
.font(.system(size: 48)) .font(.system(size: 52))
.foregroundColor(.secondary) .foregroundColor(.secondary)
Text(NSLocalizedString("Контактов пока нет", comment: "Contacts empty state title")) Text(NSLocalizedString("Контактов пока нет", comment: "Contacts empty state title"))
.font(.headline) .font(.headline)
@ -74,8 +103,9 @@ struct ContactsTab: View {
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
} }
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.padding(.vertical, 24) .padding(.vertical, 28)
} .listRowInsets(EdgeInsets(top: 20, leading: 12, bottom: 20, trailing: 12))
.listRowSeparator(.hidden)
} }
@MainActor @MainActor
@ -104,38 +134,50 @@ private struct ContactRow: View {
let contact: Contact let contact: Contact
var body: some View { var body: some View {
HStack(spacing: 12) { HStack(alignment: .top, spacing: 10) {
Circle() Circle()
.fill(Color.accentColor.opacity(0.15)) .fill(Color.accentColor.opacity(0.15))
.frame(width: 44, height: 44) .frame(width: 40, height: 40)
.overlay( .overlay(
Text(contact.initials) Text(contact.initials)
.font(.headline) .font(.headline)
.foregroundColor(.accentColor) .foregroundColor(.accentColor)
) )
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 3) {
HStack(alignment: .firstTextBaseline) {
Text(contact.displayName) Text(contact.displayName)
.font(.body) .font(.subheadline.weight(.semibold))
if let handle = contact.handle { .foregroundColor(.primary)
Text(handle) Spacer()
.font(.caption)
.foregroundColor(.secondary)
}
HStack(spacing: 8) {
if contact.friendCode {
Label(NSLocalizedString("Код дружбы", comment: "Friend code badge"), systemImage: "heart.circle")
.font(.caption2)
.foregroundColor(.secondary)
}
Text(contact.formattedCreatedAt) Text(contact.formattedCreatedAt)
.font(.caption2) .font(.caption2)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
if let handle = contact.handle {
Text(handle)
.font(.caption2)
.foregroundColor(.secondary)
} }
Spacer()
if contact.friendCode {
friendCodeBadge
} }
.padding(.vertical, 4) }
.frame(maxWidth: .infinity, alignment: .leading)
}
.padding(.vertical, 6)
}
private var friendCodeBadge: some View {
Text(NSLocalizedString("Код дружбы", comment: "Friend code badge"))
.font(.caption2.weight(.medium))
.foregroundColor(Color.accentColor)
.padding(.horizontal, 6)
.padding(.vertical, 3)
.background(Color.accentColor.opacity(0.12))
.clipShape(Capsule())
} }
} }
@ -203,10 +245,11 @@ private struct Contact: Identifiable, Equatable {
private enum ContactsAlert: Identifiable { private enum ContactsAlert: Identifiable {
case error(id: UUID = UUID(), message: String) case error(id: UUID = UUID(), message: String)
case info(id: UUID = UUID(), title: String, message: String)
var id: String { var id: String {
switch self { switch self {
case .error(let id, _): case .error(let id, _), .info(let id, _, _):
return id.uuidString return id.uuidString
} }
} }