Added navigation bar dropdown option

mikoldin123 · mikoldin123 · commit 940abfb0f3b9 · 2025-10-21T15:10:03.000+08:00
diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj
@@ -1174,6 +1174,8 @@
 		FDFE75B52ABD46B700655640 /* MockUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD83B9D127D59495005E1583 /* MockUserDefaults.swift */; };
 		FDFF9FDF2A787F57005E0628 /* JSONEncoder+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDFF9FDE2A787F57005E0628 /* JSONEncoder+Utilities.swift */; };
 		FE2883272EA70C640097E240 /* MessageSelectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE2883262EA70C640097E240 /* MessageSelectionManager.swift */; };
+		FE28832B2EA74D440097E240 /* ManualDropdownPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE28832A2EA74D440097E240 /* ManualDropdownPresenter.swift */; };
+		FE28832D2EA74D680097E240 /* CustomMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE28832C2EA74D680097E240 /* CustomMenuView.swift */; };
 		FED288F32E4C28CF00C31171 /* AppReviewPromptDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED288F22E4C28CF00C31171 /* AppReviewPromptDialog.swift */; };
 		FED288F82E4C3BE100C31171 /* AppReviewPromptModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED288F72E4C3BE100C31171 /* AppReviewPromptModel.swift */; };
 /* End PBXBuildFile section */
@@ -2469,6 +2471,8 @@
 		FDFE75B02ABD2D2400655640 /* _030_MakeBrokenProfileTimestampsNullable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _030_MakeBrokenProfileTimestampsNullable.swift; sourceTree = "<group>"; };
 		FDFF9FDE2A787F57005E0628 /* JSONEncoder+Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSONEncoder+Utilities.swift"; sourceTree = "<group>"; };
 		FE2883262EA70C640097E240 /* MessageSelectionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageSelectionManager.swift; sourceTree = "<group>"; };
+		FE28832A2EA74D440097E240 /* ManualDropdownPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualDropdownPresenter.swift; sourceTree = "<group>"; };
+		FE28832C2EA74D680097E240 /* CustomMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomMenuView.swift; sourceTree = "<group>"; };
 		FED288F22E4C28CF00C31171 /* AppReviewPromptDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppReviewPromptDialog.swift; sourceTree = "<group>"; };
 		FED288F72E4C3BE100C31171 /* AppReviewPromptModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppReviewPromptModel.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -5306,6 +5310,8 @@
 		FE2883252EA70C5D0097E240 /* Selection */ = {
 			isa = PBXGroup;
 			children = (
+				FE28832C2EA74D680097E240 /* CustomMenuView.swift */,
+				FE28832A2EA74D440097E240 /* ManualDropdownPresenter.swift */,
 				FE2883262EA70C640097E240 /* MessageSelectionManager.swift */,
 			);
 			path = Selection;
@@ -7073,6 +7079,7 @@
 				34BECE2E1F7ABCE000D7438D /* GifPickerViewController.swift in Sources */,
 				9422568C2C23F8C800C0FDBF /* DisplayNameScreen.swift in Sources */,
 				7B9F71D72853100A006DFE7B /* Emoji+Available.swift in Sources */,
+				FE28832D2EA74D680097E240 /* CustomMenuView.swift in Sources */,
 				FD09C5E628260FF9000CE219 /* MediaGalleryViewModel.swift in Sources */,
 				7B9F71D32852EEE2006DFE7B /* Emoji.swift in Sources */,
 				C328250F25CA06020062D0A7 /* VoiceMessageView.swift in Sources */,
@@ -7084,6 +7091,7 @@
 				FD4B200E283492210034334B /* InsetLockableTableView.swift in Sources */,
 				FD12A8472AD63C3400EEBA0D /* PagedObservationSource.swift in Sources */,
 				FDC1BD682CFE6EEB002CDC71 /* DeveloperSettingsViewModel.swift in Sources */,
+				FE28832B2EA74D440097E240 /* ManualDropdownPresenter.swift in Sources */,
 				7B0EFDF0275084AA00FFAAE7 /* CallMessageCell.swift in Sources */,
 				C3AAFFF225AE99710089E6DD /* AppDelegate.swift in Sources */,
 				FD10AF0C2AF32B9A007709E5 /* SessionListViewModel.swift in Sources */,
diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
@@ -3585,17 +3585,28 @@ extension ConversationVC: SelectionManagerDelegate {
     }
     
     func showInfo(for message: MessageViewModel, withSender sender: UIBarButtonItem) {
-        /*guard
-            let actions = ContextMenuVC.navigationActions(
-                for: message,
-                in: viewModel.threadData,
-                delegate: self,
-                using: viewModel.dependencies
-            )
-        else { return }*/
+        if dropdownPresenter != nil {
+            dropdownPresenter?.hide()
+            dropdownPresenter = nil
+        }
+
+        let actions = ContextMenuVC.navigationActions(
+            for: message,
+            in: viewModel.threadData,
+            delegate: self,
+            using: viewModel.dependencies
+        ) ?? []
         
-        // TODO: - Show context menu below navigationbar for now navigate to info page
-        info(message)
-        resetSelection()
+        let presenter = ManualDropdownPresenter()
+        self.dropdownPresenter = presenter
+        
+        presenter.show(
+            actions: actions,
+            anchorView: navigationController?.navigationBar.subviews.first,
+            using: viewModel.dependencies
+        ) { [weak self] in
+            self?.dropdownPresenter = nil
+            self?.resetSelection()
+        }
     }
 }
diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
@@ -124,6 +124,10 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
         delegate: self
     )
     
+    // Reference to dropdown view
+    var dropdownPresenter: ManualDropdownPresenter?
+    
+    // Search
     lazy var searchController: ConversationSearchController = {
         let result: ConversationSearchController = ConversationSearchController(
             threadId: self.viewModel.threadData.threadId
@@ -1738,12 +1742,9 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
                     tableSize: tableView.bounds.size,
                     using: viewModel.dependencies
                 )
+                cell.setSelectedState(selectedMessages.contains(cellViewModel))
                 cell.delegate = self
                 
-                let isSelected = selectedMessages.contains(cellViewModel)
-
-                cell.setSelectedState(isSelected)
-                
                 return cell
                 
             default: preconditionFailure("Other sections should have no content")
diff --git a/Session/Conversations/Message Cells/MessageCell.swift b/Session/Conversations/Message Cells/MessageCell.swift
@@ -153,7 +153,7 @@ protocol MessageCellDelegate: ReactionDelegate {
     func showReactionList(_ cellViewModel: MessageViewModel, selectedReaction: EmojiWithSkinTones?)
     func needsLayout(for cellViewModel: MessageViewModel, expandingReactions: Bool)
     func handleReadMoreButtonTapped(_ cell: UITableViewCell, for cellViewModel: MessageViewModel)
-    func handleCellSelection(for cellViewModel: MessageViewModel, cell: UITableViewCell)
+    func handleCellSelection(for cellViewModel: MessageViewModel, cell: UITableViewCell)  // Added for selection handling of tapped item and tapped cell
 }
 
 extension MessageCellDelegate {
diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift
@@ -1032,7 +1032,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
 
     override func handleTap(_ gestureRecognizer: UITapGestureRecognizer) {
         guard let cellViewModel: MessageViewModel = self.viewModel else { return }
-        
+
         let location = gestureRecognizer.location(in: self)
         let tappedAuthorName: Bool = (
             authorLabel.bounds.contains(authorLabel.convert(location, from: self)) &&
diff --git a/Session/Conversations/Selection/CustomMenuView.swift b/Session/Conversations/Selection/CustomMenuView.swift
@@ -0,0 +1,56 @@
+// Copyright © 2025 Rangeproof Pty Ltd. All rights reserved.
+
+import UIKit
+import SessionUtilitiesKit
+import SessionUIKit
+
+class CustomMenuView: UIView {
+    private lazy var stackView: UIStackView = {
+        let result = UIStackView()
+        result.axis = .vertical
+        result.spacing = 0
+        result.distribution = .fillEqually
+        result.translatesAutoresizingMaskIntoConstraints = false
+        return result
+    }()
+    
+    init() {
+        super.init(frame: .zero)
+        setupView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupView() {
+        self.themeBackgroundColor = .contextMenu_background
+        self.layer.cornerRadius = 8
+        self.clipsToBounds = true
+
+        addSubview(stackView)
+        
+        NSLayoutConstraint.activate([
+            stackView.topAnchor.constraint(equalTo: self.topAnchor),
+            stackView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
+            stackView.trailingAnchor.constraint(equalTo: self.trailingAnchor),
+            stackView.bottomAnchor.constraint(equalTo: self.bottomAnchor)
+        ])
+    }
+    
+    func createMenuButtons(_ actions: [ContextMenuVC.Action], using dependencies: Dependencies, dismiss: @escaping () -> Void) {
+        actions.forEach { action in
+            let item = ContextMenuVC.ActionView(
+                for: action,
+                using: dependencies,
+                dismiss: dismiss
+            )
+            stackView.addArrangedSubview(item)
+        }
+        
+        let buttonHeight: CGFloat = Values.largeButtonHeight
+        let menuWidth: CGFloat = Values.menuContainerWidth
+        let totalHeight = buttonHeight * CGFloat(actions.count)
+        self.frame = CGRect(origin: .zero, size: CGSize(width: menuWidth, height: totalHeight))
+    }
+}
diff --git a/Session/Conversations/Selection/ManualDropdownPresenter.swift b/Session/Conversations/Selection/ManualDropdownPresenter.swift
@@ -0,0 +1,81 @@
+// Copyright © 2025 Rangeproof Pty Ltd. All rights reserved.
+
+import UIKit
+import SessionUtilitiesKit
+
+class ManualDropdownPresenter: NSObject {
+    private lazy var menuView: CustomMenuView = {
+        let result = CustomMenuView()
+        result.layer.shadowOffset = CGSize.zero
+        result.layer.shadowOpacity = 0.4
+        result.layer.shadowRadius = 4
+        return result
+    }()
+    
+    private lazy var overlayView: UIView = {
+        let result = UIView()
+        result.backgroundColor = .black.withAlphaComponent(0.01)
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(hide))
+        result.addGestureRecognizer(tapGesture)
+        return result
+    }()
+    
+    private weak var presentingViewController: UIViewController?
+    
+    @MainActor
+    func show(actions: [ContextMenuVC.Action], anchorView: UIView?, using dependencies: Dependencies, completion: @escaping () -> Void) {
+        guard
+            let topViewController = dependencies[singleton: .appContext].frontMostViewController,
+            let barButtonView = anchorView
+        else {
+            return
+        }
+        
+        menuView.createMenuButtons(
+            actions,
+            using: dependencies
+        ) { [weak self] in
+            self?.menuView.removeFromSuperview()
+            self?.overlayView.removeFromSuperview()
+            
+            completion()
+        }
+        
+        self.presentingViewController = topViewController
+        
+        guard let targetView = topViewController.view else {
+            return
+        }
+        
+        overlayView.frame = targetView.bounds
+        targetView.addSubview(overlayView)
+
+        targetView.addSubview(menuView)
+
+        let buttonFrame = barButtonView.convert(barButtonView.bounds, to: targetView)
+        
+        let menuX = buttonFrame.maxX - menuView.frame.width
+        let menuY = buttonFrame.maxY + 5
+        
+        menuView.frame.origin = CGPoint(x: menuX, y: menuY)
+        menuView.alpha = 0
+        menuView.transform = CGAffineTransform(scaleX: 0.9, y: 0.9)
+        
+        UIView.animate(withDuration: 0.2) {
+            self.menuView.alpha = 1
+            self.menuView.transform = .identity
+        }
+    }
+    
+    @objc func hide() {
+        UIView.animate(withDuration: 0.2, animations: {
+            self.menuView.alpha = 0
+            self.menuView.transform = CGAffineTransform(scaleX: 0.9, y: 0.9)
+        }) { _ in
+            self.menuView.removeFromSuperview()
+            self.overlayView.removeFromSuperview()
+            
+            self.presentingViewController = nil
+        }
+    }
+}
diff --git a/Session/Conversations/Selection/MessageSelectionManager.swift b/Session/Conversations/Selection/MessageSelectionManager.swift
@@ -24,45 +24,61 @@ class MessageSelectionManager: NSObject {
     }
     
     private func onButtonCreation(icon: UIImage?, accessibilityLabel: String, action: Selector) -> UIBarButtonItem? {
-        let item = UIBarButtonItem(
+        let result = UIBarButtonItem(
             image: icon,
             style: .plain,
             target: self,
             action: action
         )
-        item.accessibilityLabel = accessibilityLabel
-        item.isAccessibilityElement = true
-        return item
+        result.accessibilityLabel = accessibilityLabel
+        result.isAccessibilityElement = true
+        return result
     }
 
     @MainActor
     func createNavigationActions() -> [UIBarButtonItem] {
         // Create all possible buttons, using selectors pointing to the Manager's methods
         let replyButtonItem = onButtonCreation(
-            icon: Lucide.image(icon: .reply, size: 24),
+            icon: Lucide.image(
+                icon: .reply,
+                size: IconSize.medium.size
+            ),
             accessibilityLabel: "Reply",
             action: #selector(replySelected)
         )
         let downloadButtonItem = onButtonCreation(
-            icon: Lucide.image(icon: .download, size: 24),
+            icon: Lucide.image(
+                icon: .download,
+                size: IconSize.medium.size
+            ),
             accessibilityLabel: "Download",
             action: #selector(saveSelected)
         )
         let copyButtonItem = onButtonCreation(
-            icon: Lucide.image(icon: .copy, size: 24),
+            icon: Lucide.image(
+                icon: .copy,
+                size: IconSize.medium.size
+            ),
             accessibilityLabel: "Copy",
             action: #selector(copySelected)
         )
         let deleteButtonItem = onButtonCreation(
-            icon: Lucide.image(icon: .trash2, size: 24),
+            icon: Lucide.image(
+                icon: .trash2,
+                size: IconSize.medium.size
+            ),
             accessibilityLabel: "Delete",
             action: #selector(deleteSelected)
         )
         let moreButtonItem = onButtonCreation(
-            icon: Lucide.image(icon: .ellipsisVertical, size: 24),
+            icon: Lucide.image(
+                icon: .ellipsisVertical,
+                size: IconSize.medium.size
+            ),
             accessibilityLabel: "More",
             action: #selector(moreOptions)
         )
+        moreButtonItem?.tag = 99
         
         var showDownload: Bool {
             guard
@@ -145,11 +161,6 @@ class MessageSelectionManager: NSObject {
         guard let selectedMessage = selectedMessages.first else {
             return
         }
-        
-        // TODO: Show drop down instead
         delegate?.showInfo(for: selectedMessage, withSender: sender)
-//        delegate?.info(selectedMessage)
-//        
-//        delegate?.shouldResetSelectionState()
     }
 }
diff --git a/SessionUIKit/Style Guide/Values.swift b/SessionUIKit/Style Guide/Values.swift
@@ -28,6 +28,8 @@ public enum Values {
     public static let largeButtonHeight = isIPhone5OrSmaller ? CGFloat(40) : CGFloat(45)
     public static let alertButtonHeight: CGFloat = 51 // 19px tall font with 16px margins
     
+    public static let menuContainerWidth: CGFloat = isIPhone5OrSmaller ? CGFloat(180) : CGFloat(210)
+    
     public static let accentLineThickness = CGFloat(4)
     
     public static let searchBarHeight = CGFloat(36)

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ protocol MessageCellDelegate: ReactionDelegate {`
`153`	`153`	`func showReactionList(_ cellViewModel: MessageViewModel, selectedReaction: EmojiWithSkinTones?)`
`154`	`154`	`func needsLayout(for cellViewModel: MessageViewModel, expandingReactions: Bool)`
`155`	`155`	`func handleReadMoreButtonTapped(_ cell: UITableViewCell, for cellViewModel: MessageViewModel)`
`156`		`- func handleCellSelection(for cellViewModel: MessageViewModel, cell: UITableViewCell)`
	`156`	`+ func handleCellSelection(for cellViewModel: MessageViewModel, cell: UITableViewCell) // Added for selection handling of tapped item and tapped cell`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`extension MessageCellDelegate {`