Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

always show the selected reaction in menu #2151

Merged
merged 1 commit into from
Apr 8, 2024
Merged

always show the selected reaction in menu #2151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 32 additions & 14 deletions deltachat-ios/Chat/ChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,10 +1932,17 @@ extension ChatViewController {
private func appendReactionItems(to menuElements: inout [UIMenuElement], indexPath: IndexPath) {
let messageId = messageIds[indexPath.row]
let myReactions = getMyReactions(messageId: messageId)
var myReactionChecked = false

for reaction in DefaultReactions.allCases {
let sentThisReaction = myReactions.contains(where: { $0 == reaction.emoji })
let title = sentThisReaction ? (reaction.emoji + "✓") : reaction.emoji
let title: String
if sentThisReaction {
title = reaction.emoji + "✓"
myReactionChecked = true
} else {
title = reaction.emoji
}
menuElements.append(UIAction(title: title) { [weak self] _ in
guard let self else { return }

Expand All @@ -1948,23 +1955,34 @@ extension ChatViewController {
})
}

let showPicker = myReactions.isEmpty || myReactionChecked
let title: String
if showPicker {
title = "•••"
} else {
title = (myReactions.first ?? "?") + "✓"
}
menuElements.append(
UIAction(title: "•••") { [weak self] _ in
UIAction(title: title) { [weak self] _ in
guard let self else { return }
reactionMessageId = self.messageIds[indexPath.row]

let pickerViewController = MCEmojiPickerViewController()
pickerViewController.navigationItem.title = String.localized("react")
pickerViewController.delegate = self

let navigationController = UINavigationController(rootViewController: pickerViewController)
if #available(iOS 15.0, *) {
if let sheet = navigationController.sheetPresentationController {
sheet.detents = [.medium(), .large()]
sheet.preferredCornerRadius = 20
let messageId = self.messageIds[indexPath.row]
if showPicker {
reactionMessageId = messageId
let pickerViewController = MCEmojiPickerViewController()
pickerViewController.navigationItem.title = String.localized("react")
pickerViewController.delegate = self

let navigationController = UINavigationController(rootViewController: pickerViewController)
if #available(iOS 15.0, *) {
if let sheet = navigationController.sheetPresentationController {
sheet.detents = [.medium(), .large()]
sheet.preferredCornerRadius = 20
}
}
present(navigationController, animated: true)
} else {
dcContext.sendReaction(messageId: messageId, reaction: nil)
}
present(navigationController, animated: true)
}
)
}
Expand Down
Loading