mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-11-22 00:01:00 +00:00
Code Issues Projects Releases Wiki Activity

Conversation unread state

Browse source
This commit is contained in:
Justin Mazzocchi 2021-02-19 17:42:45 -08:00
parent 63f9b59135
commit 6294b1c52f
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
6 changed files with 60 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Localizations/Localizable.strings
View file

@ -107,6 +107,7 @@
"compose.visibility-button.accessibility-label-%@" = "Privacy: %@";
"compose-button.accessibility-label.post" = "Compose Post";
"compose-button.accessibility-label.toot" = "Compose Toot";
"conversation.unread" = "Unread";
"emoji.custom" = "Custom";
"emoji.default-skin-tone" = "Default skin tone";
"emoji.default-skin-tone-button.accessibility-label" = "Select default skin tone";

31
MastodonAPI/Sources/MastodonAPI/Endpoints/ConversationEndpoint.swift Normal file
View file

@ -0,0 +1,31 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import HTTP
import Mastodon
public enum ConversationEndpoint {
case read(id: Conversation.Id)
}
extension ConversationEndpoint: Endpoint {
public typealias ResultType = Conversation
public var context: [String] {
defaultContext + ["conversations"]
}
public var pathComponentsInContext: [String] {
switch self {
case let .read(id):
return [id, "read"]
}
}
public var method: HTTPMethod {
switch self {
case .read:
return .post
}
}
}

8
ServiceLayer/Sources/ServiceLayer/Services/ConversationsService.swift
View file

@ -26,6 +26,14 @@ public struct ConversationsService {
}
}
public extension ConversationsService {
func markConversationAsRead(id: Conversation.Id) -> AnyPublisher<Never, Error> {
mastodonAPIClient.request(ConversationEndpoint.read(id: id))
.flatMap { contentDatabase.insert(conversations: [$0]) }
.eraseToAnyPublisher()
}
}
extension ConversationsService: CollectionService {
public func request(maxId: String?, minId: String?, search: Search?) -> AnyPublisher<Never, Error> {
mastodonAPIClient.pagedRequest(ConversationsEndpoint.conversations, maxId: maxId, minId: minId)

4
ViewModels/Sources/ViewModels/View Models/CollectionItemsViewModel.swift
View file

@ -149,6 +149,10 @@ extension CollectionItemsViewModel: CollectionViewModel {
case let .conversation(conversation):
guard let status = conversation.lastStatus else { break }
(collectionService as? ConversationsService)?.markConversationAsRead(id: conversation.id)
.sink { _ in } receiveValue: { _ in }
.store(in: &cancellables)
send(event: .navigation(.collection(collectionService
.navigationService
.contextService(id: status.displayStatus.id))))

4
ViewModels/Sources/ViewModels/View Models/ConversationViewModel.swift
View file

@ -33,3 +33,7 @@ public final class ConversationViewModel: ObservableObject {
self.identityContext = identityContext
}
}
public extension ConversationViewModel {
var isUnread: Bool { conversationService.conversation.unread }
}

12
Views/UIKit/Content Views/ConversationView.swift
View file

@ -7,6 +7,9 @@ import ViewModels
final class ConversationView: UIView {
let avatarsView = ConversationAvatarsView()
let displayNamesLabel = UILabel()
let unreadIndicator = UIImageView(image: UIImage(
systemName: "circlebadge.fill",
withConfiguration: UIImage.SymbolConfiguration(scale: .small)))
let timeLabel = UILabel()
let statusBodyView = StatusBodyView()
@ -78,6 +81,7 @@ private extension ConversationView {
namesTimeStackView.spacing = .compactSpacing
namesTimeStackView.alignment = .top
namesTimeStackView.addArrangedSubview(displayNamesLabel)
namesTimeStackView.addArrangedSubview(unreadIndicator)
namesTimeStackView.addArrangedSubview(timeLabel)
mainStackView.axis = .vertical
@ -90,6 +94,9 @@ private extension ConversationView {
displayNamesLabel.adjustsFontForContentSizeCategory = true
displayNamesLabel.numberOfLines = 0
unreadIndicator.contentMode = .scaleAspectFit
unreadIndicator.setContentHuggingPriority(.required, for: .horizontal)
timeLabel.font = .preferredFont(forTextStyle: .subheadline)
timeLabel.adjustsFontForContentSizeCategory = true
timeLabel.textColor = .secondaryLabel
@ -126,6 +133,7 @@ private extension ConversationView {
view: displayNamesLabel)
mutableDisplayNames.resizeAttachments(toLineHeight: displayNamesLabel.font.lineHeight)
unreadIndicator.isHidden = !viewModel.isUnread
displayNamesLabel.attributedText = mutableDisplayNames
timeLabel.text = viewModel.statusViewModel?.time
timeLabel.accessibilityLabel = viewModel.statusViewModel?.accessibilityTime
@ -134,6 +142,10 @@ private extension ConversationView {
let accessibilityAttributedLabel = NSMutableAttributedString(attributedString: mutableDisplayNames)
if viewModel.isUnread {
accessibilityAttributedLabel.appendWithSeparator(NSLocalizedString("conversation.unread", comment: ""))
}
if let statusBodyAccessibilityAttributedLabel = statusBodyView.accessibilityAttributedLabel {
accessibilityAttributedLabel.appendWithSeparator(statusBodyAccessibilityAttributedLabel)
}