felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 09:02:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2

Browse Source 
Message bubbles: Layout for media (part 2)
This commit is contained in:
SBiOSoftWhare
2022-02-01 17:52:19 +01:00
committed by GitHub
parent e54db687f6 1f24033fbf
commit 22f72fdf28
58 changed files with 1377 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+80 -14
View File
@@ -2672,17 +2672,35 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
}
else if (bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage || bubbleData.attachment.type == MXKAttachmentTypeAudio)
{
if (bubbleData.isPaginationFirstBubble)
if (bubbleData.isIncoming)
{
cellIdentifier = RoomTimelineCellIdentifierVoiceMessageWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = RoomTimelineCellIdentifierVoiceMessageWithoutSenderInfo;
if (bubbleData.isPaginationFirstBubble)
{
cellIdentifier = RoomTimelineCellIdentifierIncomingVoiceMessageWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = RoomTimelineCellIdentifierIncomingVoiceMessageWithoutSenderInfo;
}
else
{
cellIdentifier = RoomTimelineCellIdentifierIncomingVoiceMessage;
}
}
else
{
cellIdentifier = RoomTimelineCellIdentifierVoiceMessage;
if (bubbleData.isPaginationFirstBubble)
{
cellIdentifier = RoomTimelineCellIdentifierOutgoingVoiceMessageWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = RoomTimelineCellIdentifierOutgoingVoiceMessageWithoutSenderInfo;
}
else
{
cellIdentifier = RoomTimelineCellIdentifierOutgoingVoiceMessage;
}
}
}
else if (bubbleData.tag == RoomBubbleCellDataTagPoll)
@@ -2702,17 +2720,35 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
}
else if (bubbleData.tag == RoomBubbleCellDataTagLocation)
{
if (bubbleData.isPaginationFirstBubble)
if (bubbleData.isIncoming)
{
cellIdentifier = RoomTimelineCellIdentifierLocationWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = RoomTimelineCellIdentifierLocationWithoutSenderInfo;
if (bubbleData.isPaginationFirstBubble)
{
cellIdentifier = RoomTimelineCellIdentifierIncomingLocationWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = RoomTimelineCellIdentifierIncomingLocationWithoutSenderInfo;
}
else
{
cellIdentifier = RoomTimelineCellIdentifierIncomingLocation;
}
}
else
{
cellIdentifier = RoomTimelineCellIdentifierLocation;
if (bubbleData.isPaginationFirstBubble)
{
cellIdentifier = RoomTimelineCellIdentifierOutgoingLocationWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = RoomTimelineCellIdentifierOutgoingLocationWithoutSenderInfo;
}
else
{
cellIdentifier = RoomTimelineCellIdentifierOutgoingLocation;
}
}
}
else if (bubbleData.isIncoming)
@@ -2737,6 +2773,21 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierIncomingAttachmentEncrypted : RoomTimelineCellIdentifierIncomingAttachment;
}
}
else if (bubbleData.isAttachment)
{
if (bubbleData.isPaginationFirstBubble)
{
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierIncomingAttachmentWithoutThumbnailEncryptedWithPaginationTitle : RoomTimelineCellIdentifierIncomingAttachmentWithoutThumbnailWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierIncomingAttachmentWithoutThumbnailEncryptedWithoutSenderInfo : RoomTimelineCellIdentifierIncomingAttachmentWithoutThumbnailWithoutSenderInfo;
}
else
{
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierIncomingAttachmentWithoutThumbnailEncrypted : RoomTimelineCellIdentifierIncomingAttachmentWithoutThumbnail;
}
}
else
{
if (bubbleData.isPaginationFirstBubble)
@@ -2787,6 +2838,21 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierOutgoingAttachmentEncrypted : RoomTimelineCellIdentifierOutgoingAttachment;
}
}
else if (bubbleData.isAttachment)
{
if (bubbleData.isPaginationFirstBubble)
{
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierOutgoingAttachmentWithoutThumbnailEncryptedWithPaginationTitle : RoomTimelineCellIdentifierOutgoingAttachmentWithoutThumbnailWithPaginationTitle;
}
else if (bubbleData.shouldHideSenderInformation)
{
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierOutgoingAttachmentWithoutThumbnailEncryptedWithoutSenderInfo : RoomTimelineCellIdentifierOutgoingAttachmentWithoutThumbnailWithoutSenderInfo;
}
else
{
cellIdentifier = showEncryptionBadge ? RoomTimelineCellIdentifierOutgoingAttachmentWithoutThumbnailEncrypted : RoomTimelineCellIdentifierOutgoingAttachmentWithoutThumbnail;
}
}
else
{
if (bubbleData.isPaginationFirstBubble)