yobble/ios_app_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix button when delete accounts

Browse Source
This commit is contained in:
cheykrym 2025-12-09 22:44:25 +03:00
parent fd96ca7cbc
commit 520f63f74a
5 changed files with 98 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yobble/Network/APIModels.swift
View File

@ -32,7 +32,7 @@ struct MessagePayload: Decodable {
struct BlockedUserInfo: Decodable {
let userId: UUID
let login: String
let login: String?
let fullName: String?
let customName: String?
let createdAt: Date

2
yobble/Network/ContactsService.swift
View File

@ -18,7 +18,7 @@ enum ContactsServiceError: LocalizedError {
struct ContactPayload: Decodable {
let userId: UUID
let login: String
let login: String?
let fullName: String?
let customName: String?
let friendCode: Bool

1
yobble/Resources/Localizable.xcstrings
View File

@ -1377,6 +1377,7 @@
}
},
"Неизвестный пользователь" : {
"comment" : "Deleted user display name",
"localizations" : {
"en" : {
"stringUnit" : {

71
yobble/Views/Tab/ContactsTab.swift
View File

@ -32,6 +32,7 @@ struct ContactsTab: View {
.contentShape(Rectangle())
}
.buttonStyle(.plain)
// .disabled(contact.isDeleted)
.contextMenu {
Button {
handleContactAction(.edit, for: contact)
@ -41,6 +42,7 @@ struct ContactsTab: View {
systemImage: "square.and.pencil"
)
}
// .disabled(contact.isDeleted)
Button {
handleContactAction(.block, for: contact)
@ -50,6 +52,7 @@ struct ContactsTab: View {
systemImage: "hand.raised.fill"
)
}
// .disabled(contact.isDeleted)
Button(role: .destructive) {
handleContactAction(.delete, for: contact)
@ -59,6 +62,7 @@ struct ContactsTab: View {
systemImage: "trash"
)
}
// .disabled(contact.isDeleted)
}
.listRowInsets(EdgeInsets(top: 0, leading: 12, bottom: 0, trailing: 12))
.onAppear {
@ -238,19 +242,35 @@ private struct ContactRow: View {
var body: some View {
HStack(alignment: .top, spacing: 10) {
Circle()
.fill(Color.accentColor.opacity(0.15))
.fill(contact.isDeleted ? Color(.systemGray5) : Color.accentColor.opacity(0.15))
.frame(width: 40, height: 40)
.overlay(
Text(contact.initials)
.font(.headline)
.foregroundColor(.accentColor)
Group {
if contact.isDeleted {
Image(systemName: "person.slash")
.font(.headline)
.foregroundColor(Color(.systemGray2))
} else {
Text(contact.initials)
.font(.headline)
.foregroundColor(.accentColor)
}
}
)
VStack(alignment: .leading, spacing: 3) {
HStack(alignment: .firstTextBaseline) {
Text(contact.displayName)
.font(.subheadline.weight(.semibold))
.foregroundColor(.primary)
if #available(iOS 16.0, *) {
Text(contact.displayName)
.font(.subheadline.weight(.semibold))
.foregroundColor(.primary)
.strikethrough(contact.isDeleted, color: .secondary)
} else {
Text(contact.displayName)
.font(.subheadline.weight(.semibold))
.foregroundColor(.primary)
.strikethrough(contact.isDeleted)
}
Spacer()
Text(contact.formattedCreatedAt)
.font(.caption2)
@ -285,7 +305,7 @@ private struct ContactRow: View {
private struct Contact: Identifiable, Equatable {
let id: UUID
let login: String
let login: String?
let fullName: String?
let customName: String?
let friendCode: Bool
@ -294,7 +314,13 @@ private struct Contact: Identifiable, Equatable {
let displayName: String
let handle: String?
var isDeleted: Bool {
login?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
}
var initials: String {
if isDeleted { return "" }
let nameSource: String?
if let customName, !customName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
nameSource = customName
@ -312,7 +338,7 @@ private struct Contact: Identifiable, Equatable {
}
}
return String(login.prefix(1)).uppercased()
return String(login!.prefix(1)).uppercased()
}
var formattedCreatedAt: String {
@ -327,18 +353,25 @@ private struct Contact: Identifiable, Equatable {
self.friendCode = payload.friendCode
self.createdAt = payload.createdAt
if let customName = payload.customName, !customName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = customName
} else if let fullName = payload.fullName, !fullName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = fullName
} else {
self.displayName = payload.login
}
let isUserDeleted = payload.login?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
if !payload.login.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.handle = "@\(payload.login)"
} else {
if isUserDeleted {
self.displayName = NSLocalizedString("Неизвестный пользователь", comment: "Deleted user display name")
self.handle = nil
} else {
if let customName = payload.customName, !customName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = customName
} else if let fullName = payload.fullName, !fullName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = fullName
} else {
self.displayName = payload.login!
}
if let login = payload.login, !login.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.handle = "@\(login)"
} else {
self.handle = nil
}
}
}

61
yobble/Views/Tab/Settings/BlockedUsersView.swift
View File

@ -102,16 +102,31 @@ struct BlockedUsersView: View {
private func userRow(_ user: BlockedUser, index: Int) -> some View {
HStack(spacing: 12) {
Circle()
.fill(Color.accentColor.opacity(0.15))
.fill(user.isDeleted ? Color(.systemGray5) : Color.accentColor.opacity(0.15))
.frame(width: 44, height: 44)
.overlay(
Text(user.initials)
.font(.headline)
.foregroundColor(.accentColor)
Group {
if user.isDeleted {
Image(systemName: "person.slash")
.font(.headline)
.foregroundColor(Color(.systemGray2))
} else {
Text(user.initials)
.font(.headline)
.foregroundColor(.accentColor)
}
}
)
VStack(alignment: .leading, spacing: 4) {
Text(user.displayName)
.font(.body)
if #available(iOS 16.0, *) {
Text(user.displayName)
.font(.body)
.strikethrough(user.isDeleted, color: .secondary)
} else {
Text(user.displayName)
.font(.body)
.strikethrough(user.isDeleted)
}
if let handle = user.handle {
Text(handle)
.font(.caption)
@ -128,6 +143,7 @@ struct BlockedUsersView: View {
} label: {
Label(NSLocalizedString("Разблокировать", comment: ""), systemImage: "person.crop.circle.badge.xmark")
}
// .disabled(removingUserIds.contains(user.id) || user.isDeleted)
.disabled(removingUserIds.contains(user.id))
}
.onAppear {
@ -218,7 +234,7 @@ struct BlockedUsersView: View {
private struct BlockedUser: Identifiable, Equatable {
let id: UUID
let login: String
let login: String?
let fullName: String?
let customName: String?
let createdAt: Date
@ -226,7 +242,13 @@ private struct BlockedUser: Identifiable, Equatable {
private(set) var displayName: String
private(set) var handle: String?
var isDeleted: Bool {
login?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
}
var initials: String {
if isDeleted { return "" }
let nameSource: String?
if let customName, !customName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
nameSource = customName
@ -244,7 +266,7 @@ private struct BlockedUser: Identifiable, Equatable {
}
}
return String(login.prefix(1)).uppercased()
return String(login!.prefix(1)).uppercased()
}
init(payload: BlockedUserInfo) {
@ -254,18 +276,21 @@ private struct BlockedUser: Identifiable, Equatable {
self.customName = payload.customName
self.createdAt = payload.createdAt
if let customName = payload.customName, !customName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = customName
} else if let fullName = payload.fullName, !fullName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = fullName
} else {
self.displayName = payload.login
}
let isUserDeleted = payload.login?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
if !payload.login.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.handle = "@\(payload.login)"
} else {
if isUserDeleted {
self.displayName = NSLocalizedString("Неизвестный пользователь", comment: "Deleted user display name")
self.handle = nil
} else {
if let customName = payload.customName, !customName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = customName
} else if let fullName = payload.fullName, !fullName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
self.displayName = fullName
} else {
self.displayName = payload.login!
}
self.handle = "@\(payload.login!)"
}
}
}