Skip to content

Add configurable double-tap actions and shared reaction entrance #6364

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

Closed
notwafel wants to merge 2 commits into from
Closed

Add configurable double-tap actions and shared reaction entrance #6364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1872459
Add configurable double-tap actions.
notwafel Oct 9, 2026
cad5201
Add reaction height reflow and entrance animation.
notwafel Oct 10, 2026
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
4 changes: 4 additions & 0 deletions Signal.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,7 @@
88B2234A283F290400A25048 /* StoryPrivacySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B22349283F290400A25048 /* StoryPrivacySettingsViewController.swift */; };
88B2234C284FABE600A25048 /* StoryThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B2234B284FABE600A25048 /* StoryThumbnailView.swift */; };
88B688B0238F0D1000286F82 /* ReactionsDetailSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B688AF238F0D1000286F82 /* ReactionsDetailSheet.swift */; };
E8F4A2022A3B4C5D6E7F8002 /* ReactionLayoutPending.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8F4A2012A3B4C5D6E7F8001 /* ReactionLayoutPending.swift */; };
88B6D673280770C4005D86EC /* TextAttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 885275BF27E26775003F2F9B /* TextAttachmentView.swift */; };
88B6D674280770C4005D86EC /* StoryMessage+SignalUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B6D67128076F37005D86EC /* StoryMessage+SignalUI.swift */; };
88B986F4287F5B6500F8C74D /* NewGroupStoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B986F3287F5B6500F8C74D /* NewGroupStoryViewController.swift */; };
Expand Down Expand Up @@ -6138,6 +6139,7 @@
88B22349283F290400A25048 /* StoryPrivacySettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryPrivacySettingsViewController.swift; sourceTree = "<group>"; };
88B2234B284FABE600A25048 /* StoryThumbnailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryThumbnailView.swift; sourceTree = "<group>"; };
88B688AF238F0D1000286F82 /* ReactionsDetailSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionsDetailSheet.swift; sourceTree = "<group>"; };
E8F4A2012A3B4C5D6E7F8001 /* ReactionLayoutPending.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionLayoutPending.swift; sourceTree = "<group>"; };
88B6D67128076F37005D86EC /* StoryMessage+SignalUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StoryMessage+SignalUI.swift"; sourceTree = "<group>"; };
88B986F3287F5B6500F8C74D /* NewGroupStoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewGroupStoryViewController.swift; sourceTree = "<group>"; };
88BCCC8023837B7D00CE5FE6 /* InteractionReactionState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InteractionReactionState.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -10347,6 +10349,7 @@
8855DF88238F2E690066D96F /* EmojiCountsCollectionView.swift */,
8855DF86238F1E0C0066D96F /* EmojiReactorsTableView.swift */,
88BCCC8023837B7D00CE5FE6 /* InteractionReactionState.swift */,
E8F4A2012A3B4C5D6E7F8001 /* ReactionLayoutPending.swift */,
88B688AF238F0D1000286F82 /* ReactionsDetailSheet.swift */,
);
path = Reactions;
Expand Down Expand Up @@ -19254,6 +19257,7 @@
88863A56280CD04B00977F69 /* ReactionFlybyAnimation.swift in Sources */,
D9E43C0B2CC194140001536E /* ReactionsBurstView.swift in Sources */,
88B688B0238F0D1000286F82 /* ReactionsDetailSheet.swift in Sources */,
E8F4A2022A3B4C5D6E7F8002 /* ReactionLayoutPending.swift in Sources */,
D9E43C0C2CC194140001536E /* ReactionsSink.swift in Sources */,
8809CE8A22F93C2200D38867 /* RecentPhotoCollectionView.swift in Sources */,
04E66D402DFC825B0059DBAC /* RecoveryKeyReminderMegaphone.swift in Sources */,
Expand Down
6 changes: 6 additions & 0 deletions Signal/ConversationView/CVCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ public class CVCell: UICollectionViewCell, CVRootComponentHost {
if !isReusingDedicatedCell {
layoutMargins = .zero
contentView.layoutMargins = .zero
// reconfigureItems skips prepareForReuse — without this, configureForRendering
// hits addSubviewToFillSuperviewEdges on views that still have a superview.
if componentView != nil {
contentView.removeAllSubviews()
componentView?.reset()
}
}

configureForHosting(
Expand Down
53 changes: 53 additions & 0 deletions Signal/ConversationView/CVItemViewModelImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,59 @@ extension CVItemViewModelImpl {
return DependenciesBridge.shared.editManager.canShowEditMenu(interaction: interaction, thread: thread)
}

enum DoubleTapAction {
case edit
case react
case reply
}

var doubleTapAction: DoubleTapAction? {
guard let message = interaction as? TSMessage, !message.wasRemotelyDeleted else {
return nil
}

return SSKEnvironment.shared.databaseStorageRef.read { tx -> DoubleTapAction? in
if message is TSIncomingMessage {
switch SSKPreferences.doubleTapOthersMessagesAction(transaction: tx) {
case .off: return nil
case .react: return canDoubleTapReact(tx: tx) ? .react : nil
case .reply: return canDoubleTapReply ? .reply : nil
}
}
if message is TSOutgoingMessage {
switch SSKPreferences.doubleTapOwnMessagesAction(transaction: tx) {
case .off: return nil
case .edit: return canEditMessage ? .edit : nil
case .reply: return canDoubleTapReply ? .reply : nil
}
}
return nil
}
}

private func canDoubleTapReact(tx: DBReadTransaction) -> Bool {
guard thread.canSendReactionToThread, !thread.isTerminatedGroup else {
return false
}
if let groupThread = thread as? TSGroupThread,
!groupThread.groupModel.groupMembership.isLocalUserFullMember
{
return false
}
switch messageCellType {
case .stickerMessage:
return SSKPreferences.isDoubleTapReactEnabledForStickers(transaction: tx)
case .bodyMedia:
return SSKPreferences.isDoubleTapReactEnabledForPhotos(transaction: tx)
default:
return true
}
}

private var canDoubleTapReply: Bool {
!thread.isReleaseNotesThread && !thread.isTerminatedGroup && !thread.isBlockedByAnnouncementOnly
}

var canCopyOrShareOrSpeakText: Bool {
guard !isViewOnce else {
return false
Expand Down
3 changes: 3 additions & 0 deletions Signal/ConversationView/CVViewState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public class CVViewState: NSObject {

public var activeCellAnimations = Set<UUID>()

public var lastDoubleTapReactAtByMessageId = [String: CFAbsoluteTime]()

public func beginCellAnimation(identifier: UUID) {
activeCellAnimations.insert(identifier)
}
Expand Down Expand Up @@ -124,6 +126,7 @@ public class CVViewState: NSObject {
public var collectionViewActiveContextMenuInteraction: ChatHistoryContextMenuInteraction?
public var longPressHandler: CVLongPressHandler?
public var panHandler: CVPanHandler?
public var deferredSingleTap: (() -> Bool)?

// MARK: -

Expand Down
Loading