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

Include URL previews in addVerticalWhitespaceToString:forEvent: and remove heightForCellData:withMaximumWidth: from the various TextMsgBubbleCell subclasses.

Browse Source 
Use the bubble cell data's available width when sizing URL previews and update the defaultAvailableWidth and reducedWidthThreshold accordingly.
This commit is contained in:
Doug
2021-09-23 17:30:24 +01:00
parent 7eb387c9e7
commit 6561b2151a
8 changed files with 33 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/CellData/RoomBubbleCellData.m
+29 -1
View File
@@ -535,6 +535,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
{
CGFloat additionalVerticalHeight = 0;
// Add vertical whitespace in case of a url preview.
additionalVerticalHeight+= [self urlPreviewHeightForEventId:eventId];
// Add vertical whitespace in case of reactions.
additionalVerticalHeight+= [self reactionHeightForEventId:eventId];
// Add vertical whitespace in case of read receipts.
@@ -554,6 +556,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
{
NSString *eventId = bubbleComponent.event.eventId;
height+= [self urlPreviewHeightForEventId:eventId];
height+= [self reactionHeightForEventId:eventId];
height+= [self readReceiptHeightForEventId:eventId];
}
@@ -593,6 +596,29 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
self.shouldUpdateAdditionalContentHeight = YES;
}
- (CGFloat)urlPreviewHeightForEventId:(NSString*)eventId
{
if (!RiotSettings.shared.roomScreenShowsURLPreviews || !self.showURLPreview)
{
return 0;
}
NSInteger index = [self bubbleComponentIndexForEventId:eventId];
if (index >= bubbleComponents.count)
{
return 0;
}
MXKRoomBubbleComponent *component = self.bubbleComponents[index];
if (!component.link)
{
return 0;
}
return RoomBubbleCellLayout.urlPreviewViewTopMargin + [URLPreviewView contentViewHeightFor:self.urlPreviewData
fitting:self.maxTextViewWidth];
}
- (CGFloat)reactionHeightForEventId:(NSString*)eventId
{
CGFloat height = 0;
@@ -1117,8 +1143,10 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
success:^(URLPreviewData * _Nonnull urlPreviewData) {
MXStrongifyAndReturnIfNil(self);
// Update the preview data and send a notification for refresh
// Update the preview data, indicate that the data layout needs refreshing and send a notification for refresh
self.urlPreviewData = urlPreviewData;
[self setNeedsUpdateContent];
[self setNeedsUpdateAdditionalContentHeight];
dispatch_async(dispatch_get_main_queue(), ^{
[NSNotificationCenter.defaultCenter postNotificationName:URLPreviewDidUpdateNotification object:nil userInfo:userInfo];