Skip to content

Commit 20b41b3

Browse files
committed
Updated selected row color
1 parent 856de71 commit 20b41b3

File tree

4 files changed

+42
-22
lines changed

4 files changed

+42
-22
lines changed

Session/Conversations/Context Menu/ContextMenuVC+Action.swift

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -340,29 +340,23 @@ extension ContextMenuVC {
340340
delegate: ContextMenuActionDelegate?,
341341
using dependencies: Dependencies
342342
) -> [Action]? {
343-
let canCopy: Bool = (
344-
cellViewModel.cellType == .textOnlyMessage || (
345-
(
346-
cellViewModel.cellType == .genericAttachment ||
347-
cellViewModel.cellType == .mediaMessage
348-
) &&
349-
(cellViewModel.attachments ?? []).count == 1 &&
350-
(cellViewModel.attachments ?? []).first?.isVisualMedia == true &&
351-
(cellViewModel.attachments ?? []).first?.isValid == true && (
352-
(cellViewModel.attachments ?? []).first?.state == .downloaded ||
353-
(cellViewModel.attachments ?? []).first?.state == .uploaded
354-
)
355-
)
356-
)
357-
358343
let canDelete: Bool = (MessageViewModel.DeletionBehaviours.deletionActions(
359344
for: [cellViewModel],
360345
with: threadViewModel,
361346
using: dependencies
362347
) != nil)
348+
349+
var showDelete: Bool {
350+
cellViewModel.attachments != nil && canDelete
351+
}
352+
353+
var showCopy: Bool {
354+
cellViewModel.cellType == .textOnlyMessage
355+
}
356+
363357
let generatedActions: [Action] = [
364-
(canCopy ? Action.copy(cellViewModel, delegate) : nil),
365-
(canDelete ? Action.delete(cellViewModel, delegate) : nil),
358+
(showCopy ? Action.copy(cellViewModel, delegate) : nil),
359+
(showDelete ? Action.delete(cellViewModel, delegate) : nil),
366360
Action.info(cellViewModel, delegate)
367361
]
368362
.compactMap { $0 }

Session/Conversations/ConversationVC+Interaction.swift

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3526,6 +3526,14 @@ extension ConversationVC {
35263526
// MARK: - Multiple selection handling
35273527
extension ConversationVC {
35283528
func shouldHandleMessageSelection(for message: MessageViewModel, in cell: UITableViewCell) {
3529+
guard message.variant == .standardIncoming || (
3530+
message.variant == .standardOutgoing &&
3531+
message.state != .failed &&
3532+
message.state != .sending
3533+
) else {
3534+
return
3535+
}
3536+
35293537
if let selectedIndex = selectedMessages.firstIndex(where: { $0 == message }) {
35303538
selectedMessages.remove(at: selectedIndex)
35313539
} else {
@@ -3575,4 +3583,19 @@ extension ConversationVC: SelectionManagerDelegate {
35753583
inset: Values.largeSpacing + (inputAccessoryView?.frame.height ?? 0)
35763584
)
35773585
}
3586+
3587+
func showInfo(for message: MessageViewModel, withSender sender: UIBarButtonItem) {
3588+
/*guard
3589+
let actions = ContextMenuVC.navigationActions(
3590+
for: message,
3591+
in: viewModel.threadData,
3592+
delegate: self,
3593+
using: viewModel.dependencies
3594+
)
3595+
else { return }*/
3596+
3597+
// TODO: - Show context menu below navigationbar for now navigate to info page
3598+
info(message)
3599+
resetSelection()
3600+
}
35783601
}

Session/Conversations/Message Cells/MessageCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class MessageCell: UITableViewCell {
4646
}
4747

4848
func setSelectedState(_ selected: Bool) {
49-
contentView.backgroundColor = selected ? .orange : .clear
49+
themeBackgroundColor = selected ? .backgroundSecondary : .clear
5050
}
5151

5252
func setUpGestureRecognizers() {

Session/Conversations/Selection/MessageSelectionManager.swift

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ protocol SelectionManagerDelegate: ContextMenuActionDelegate {
88
func willDeleteMessages(_ messages: [MessageViewModel], completion: @escaping () -> Void)
99
func shouldResetSelectionState()
1010
func shouldShowCopyToast()
11+
func showInfo(for message: MessageViewModel, withSender sender: UIBarButtonItem)
1112

1213
var selectedMessages: Set<MessageViewModel> { get }
1314
}
@@ -140,13 +141,15 @@ class MessageSelectionManager: NSObject {
140141
}
141142

142143
@objc
143-
func moreOptions() {
144+
func moreOptions(_ sender: UIBarButtonItem) {
144145
guard let selectedMessage = selectedMessages.first else {
145146
return
146147
}
147-
// TODO: Show drop down instead
148-
delegate?.info(selectedMessage)
149148

150-
delegate?.shouldResetSelectionState()
149+
// TODO: Show drop down instead
150+
delegate?.showInfo(for: selectedMessage, withSender: sender)
151+
// delegate?.info(selectedMessage)
152+
//
153+
// delegate?.shouldResetSelectionState()
151154
}
152155
}

0 commit comments

Comments
 (0)