signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

DRY out showing the MemberActionSheet in ConversationViewController

Browse Source
This commit is contained in:
Sasha Weiss 2022-08-23 21:07:12 -07:00 committed by GitHub
parent 86d5999bf7
commit 299e3869a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Signal/src/ViewControllers/ConversationView/ConversationViewController+BodyTextItems.swift
View File

@ -183,16 +183,7 @@ extension ConversationViewController {
if address.isLocalAddress ||
Self.contactsManagerImpl.isKnownRegisteredUserWithSneakyTransaction(address: address) {
let groupViewHelper: GroupViewHelper? = {
guard threadViewModel.isGroupThread else {
return nil
}
let groupViewHelper = GroupViewHelper(threadViewModel: threadViewModel)
groupViewHelper.delegate = self
return groupViewHelper
}()
let actionSheet = MemberActionSheet(address: address, groupViewHelper: groupViewHelper)
actionSheet.present(from: self)
showMemberActionSheet(forAddress: address, withHapticFeedback: false)
return
}
@ -356,10 +347,6 @@ extension ConversationViewController {
private func didTapOrLongPressMention(_ mention: Mention) {
AssertIsOnMainThread()
ImpactHapticFeedback.impactOccured(style: .light)
let groupViewHelper = GroupViewHelper(threadViewModel: threadViewModel)
groupViewHelper.delegate = self
let actionSheet = MemberActionSheet(address: mention.address, groupViewHelper: groupViewHelper)
actionSheet.present(from: self)
showMemberActionSheet(forAddress: mention.address, withHapticFeedback: true)
}
}

7
Signal/src/ViewControllers/ConversationView/ConversationViewController+CVComponentDelegate.swift
View File

@ -123,11 +123,8 @@ extension ConversationViewController: CVComponentDelegate {
owsFailDebug("not an incoming message.")
return
}
let groupViewHelper = GroupViewHelper(threadViewModel: threadViewModel)
groupViewHelper.delegate = self
let actionSheet = MemberActionSheet(address: incomingMessage.authorAddress,
groupViewHelper: groupViewHelper)
actionSheet.present(from: self)
showMemberActionSheet(forAddress: incomingMessage.authorAddress, withHapticFeedback: false)
}
public func cvc_shouldAllowReplyForItem(_ itemViewModel: CVItemViewModelImpl) -> Bool {

19
Signal/src/ViewControllers/ConversationView/ConversationViewController+Misc.swift
View File

@ -275,6 +275,25 @@ public extension ConversationViewController {
return Array(viewControllers.prefix(upTo: index + 1))
}
// MARK: - Member Action Sheet
func showMemberActionSheet(forAddress address: SignalServiceAddress, withHapticFeedback: Bool) {
AssertIsOnMainThread()
if withHapticFeedback {
ImpactHapticFeedback.impactOccured(style: .light)
}
var groupViewHelper: GroupViewHelper?
if threadViewModel.isGroupThread {
groupViewHelper = GroupViewHelper(threadViewModel: threadViewModel)
groupViewHelper!.delegate = self
}
let actionSheet = MemberActionSheet(address: address, groupViewHelper: groupViewHelper)
actionSheet.present(from: self)
}
}
// MARK: -