Commit Graph

18 Commits

Author SHA1 Message Date
Morgan Pretty c25f378c54 Merge branch 'feature/database-refactor' into emoji-reacts
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Context Menu/ContextMenuVC+Action.swift
#	Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
#	Session/Conversations/Context Menu/ContextMenuVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewItem.h
#	Session/Conversations/ConversationViewItem.m
#	Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
#	Session/Conversations/Message Cells/MessageCell.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Conversations/Views & Modals/BodyTextView.swift
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Jobs/MessageSendJob.swift
#	SessionMessagingKit/Messages/Signal/TSMessage.h
#	SessionMessagingKit/Messages/Signal/TSMessage.m
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionNotificationServiceExtension/NSENotificationPresenter.swift
#	SignalUtilitiesKit/Utilities/DisplayableText.swift
#	SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
#	SignalUtilitiesKit/Utilities/Notification+Loki.swift
2022-07-25 15:39:56 +10:00
Ryan Zhao ee9d856e3c ui: fix reaction views automatically collapse 2022-06-23 16:21:02 +10:00
Ryan Zhao b6b99fac69 refactor: use view model for reaction button 2022-06-23 10:49:01 +10:00
Ryan Zhao ab05b5ecf4 minor fix 2022-06-20 16:50:36 +10:00
Ryan Zhao 30ebb3f53f ui: fix reaction container view 2022-06-20 16:41:45 +10:00
Ryan Zhao c91bdb3aeb refactor: persist recent used emojis 2022-06-20 15:31:54 +10:00
Ryan Zhao c33680fe70 do not show number when there is only 1 react per emoji in 1-1 convos 2022-06-06 16:42:35 +10:00
ryanzhao b5c7902833 WIP: reactions list 2022-06-01 17:06:02 +10:00
ryanzhao 49706f620f dynamic number of emojis per line 2022-05-31 11:59:24 +10:00
Ryan Zhao d3cc3c810d align outgoing message reacts to right 2022-05-30 16:20:55 +10:00
ryanzhao 947869ef4c expand & collapse emoji reacts 2022-05-20 16:44:53 +10:00
Ryan Zhao 38665e6c33 wip: expand/collapse emojis 2022-05-19 17:20:50 +10:00
Ryan Zhao 6af2d29582 ui: add to do for expand button 2022-05-19 17:15:36 +10:00
Ryan Zhao 5feb87f069 ui: add interaction to reaction view 2022-05-19 17:10:53 +10:00
Ryan Zhao acddafd131 minor fix on remove stack view's subviews 2022-05-19 14:34:21 +10:00
Ryan Zhao 9d795d4bfb ui: add expand react button 2022-05-19 14:02:52 +10:00
Ryan Zhao 3239aa521e add border to reacts including current user 2022-05-19 11:57:45 +10:00
ryanzhao 692df74af6 wip: emoji reacts message cell ui 2022-05-18 17:19:11 +10:00