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

Compare commits

base: yobble:7dc4882f27e8a5bc5717e8331fc745efa24303b6
Branches Tags
yobble:main
yobble:test-view-open-chat
...
compare: yobble:d85921e9fe3b08c58bfc94f89c5974052fcf7dc4
Branches Tags
yobble:main
yobble:test-view-open-chat

2 Commits
7dc4882f27 ... d85921e9fe

Author SHA1 Message Date
cheykrym
d85921e9fe patch msg display 2025-12-13 03:07:06 +03:00
cheykrym
4d890a54a5 add navigation tab 2025-12-13 02:43:08 +03:00
3 changed files with 91 additions and 57 deletions
Show Stats Expand all files Collapse all files

1
yobble/Resources/Localizable.xcstrings
View File

@ -963,6 +963,7 @@
"comment" : "Contacts empty state title" "comment" : "Contacts empty state title"
}, },
"Контакты" : { "Контакты" : {
"comment" : "Contacts tab title",
"localizations" : { "localizations" : {
"en" : { "en" : {
"stringUnit" : { "stringUnit" : {

144
yobble/Views/Tab/ChatsTab.swift
View File

@ -1044,80 +1044,112 @@ private struct ChatRowView: View {
} }
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
if let officialName = officialDisplayName { HStack{
HStack(spacing: 6) { if let officialName = officialDisplayName {
HStack(spacing: 6) {
if #available(iOS 16.0, *) {
Text(officialName)
.fontWeight(.semibold)
.foregroundColor(.primary)
.lineLimit(1)
.truncationMode(.tail)
.strikethrough(isDeletedUser, color: Color.secondary)
} else {
Text(officialName)
.fontWeight(.semibold)
.foregroundColor(.primary)
.lineLimit(1)
.truncationMode(.tail)
}
Image(systemName: "checkmark.seal.fill")
.foregroundColor(Color.accentColor)
.font(.caption)
}
} else {
if #available(iOS 16.0, *) { if #available(iOS 16.0, *) {
Text(officialName) Text(title)
.fontWeight(.semibold) .fontWeight(chat.unreadCount > 0 ? .semibold : .regular)
.foregroundColor(.primary) .foregroundColor(.primary)
.lineLimit(1) .lineLimit(1)
.truncationMode(.tail) .truncationMode(.tail)
.strikethrough(isDeletedUser, color: Color.secondary) .strikethrough(isDeletedUser, color: Color.secondary)
} else { } else {
Text(officialName) Text(title)
.fontWeight(.semibold) .fontWeight(chat.unreadCount > 0 ? .semibold : .regular)
.foregroundColor(.primary) .foregroundColor(.primary)
.lineLimit(1) .lineLimit(1)
.truncationMode(.tail) .truncationMode(.tail)
} }
}
Image(systemName: "checkmark.seal.fill") if let timestamp {
.foregroundColor(Color.accentColor) Spacer()
.font(.caption) HStack(spacing: 4) {
} if shouldShowReadStatus {
} else { Image(systemName: readStatusIconName)
if #available(iOS 16.0, *) { .foregroundColor(readStatusColor)
Text(title) .font(.caption2)
.fontWeight(chat.unreadCount > 0 ? .semibold : .regular) }
.foregroundColor(.primary)
.lineLimit(1) Text(timestamp)
.truncationMode(.tail) .font(.caption)
.strikethrough(isDeletedUser, color: Color.secondary) .foregroundColor(.secondary)
} else { }
Text(title)
.fontWeight(chat.unreadCount > 0 ? .semibold : .regular)
.foregroundColor(.primary)
.lineLimit(1)
.truncationMode(.tail)
} }
} }
Text(messagePreview) HStack {
.font(.subheadline) Text(messagePreview)
.foregroundColor(subtitleColor) .font(.subheadline)
.lineLimit(messageLimitLine) .foregroundColor(subtitleColor)
.truncationMode(.tail) .lineLimit(messageLimitLine)
.truncationMode(.tail)
if chat.unreadCount > 0 {
Spacer()
Text("\(chat.unreadCount)")
.font(.caption2.bold())
.foregroundColor(.white)
.padding(.horizontal, 8)
.padding(.vertical, 4)
.background(
Capsule().fill(Color.accentColor)
)
}
}
} }
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
Spacer() // Spacer()
VStack(alignment: .trailing, spacing: 6) { // VStack(alignment: .trailing, spacing: 6) {
if let timestamp { //// if let timestamp {
HStack(spacing: 4) { //// HStack(spacing: 4) {
if shouldShowReadStatus { //// if shouldShowReadStatus {
Image(systemName: readStatusIconName) //// Image(systemName: readStatusIconName)
.foregroundColor(readStatusColor) //// .foregroundColor(readStatusColor)
.font(.caption2) //// .font(.caption2)
} //// }
////
Text(timestamp) //// Text(timestamp)
.font(.caption) //// .font(.caption)
.foregroundColor(.secondary) //// .foregroundColor(.secondary)
} //// }
} //// }
//
if chat.unreadCount > 0 { // if chat.unreadCount > 0 {
Text("\(chat.unreadCount)") // Text("\(chat.unreadCount)")
.font(.caption2.bold()) // .font(.caption2.bold())
.foregroundColor(.white) // .foregroundColor(.white)
.padding(.horizontal, 8) // .padding(.horizontal, 8)
.padding(.vertical, 4) // .padding(.vertical, 4)
.background( // .background(
Capsule().fill(Color.accentColor) // Capsule().fill(Color.accentColor)
) // )
} // }
} // }
} }
.padding(.vertical, 8) .padding(.vertical, 8)
} }

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

@ -81,6 +81,7 @@ struct ContactsTab: View {
} }
} }
} }
.navigationTitle(NSLocalizedString("Контакты", comment: "Contacts tab title"))
.background(Color(UIColor.systemBackground)) .background(Color(UIColor.systemBackground))
.listStyle(.plain) .listStyle(.plain)
.task { .task {