renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create and use UnreadCountFormatter. Fix #3892.

Browse Source
This commit is contained in:
Brent Simmons
2024-10-26 21:57:58 -07:00
parent 4adbd2cdec
commit eb84862379
8 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
iOS/Feeds/Cell/FeedTableViewCell.swift
View File

@@ -26,7 +26,8 @@ class FeedTableViewCell : VibrantTableViewCell {
get {
if unreadCount > 0 {
let unreadLabel = NSLocalizedString("unread", comment: "Unread label for accessiblity")
return "\(name) \(unreadCount) \(unreadLabel)"
let unreadCountString = UnreadCountFormatter.string(from: unreadCount)
return "\(name) \(unreadCountString) \(unreadLabel)"
} else {
return name
}

3
iOS/Feeds/Cell/FeedTableViewSectionHeader.swift
View File

@@ -23,7 +23,8 @@ class FeedTableViewSectionHeader: UITableViewHeaderFooterView {
get {
if unreadCount > 0 {
let unreadLabel = NSLocalizedString("unread", comment: "Unread label for accessiblity")
return "\(name) \(unreadCount) \(unreadLabel) \(expandedStateMessage) "
let unreadCountString = UnreadCountFormatter.string(from: unreadCount)
return "\(name) \(unreadCountString) \(unreadLabel) \(expandedStateMessage) "
} else {
return "\(name) \(expandedStateMessage) "
}

2
iOS/Feeds/Cell/FeedUnreadCountView.swift
View File

@@ -35,7 +35,7 @@ class FeedUnreadCountView : UIView {
}
var unreadCountString: String {
return unreadCount < 1 ? "" : "\(unreadCount)"
UnreadCountFormatter.string(from: unreadCount)
}
private var contentSizeIsValid = false