oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix breakage from cell layout changes.

This commit is contained in:
Matthew Chen 2018-06-22 17:36:42 -04:00
parent f29d83c99f
commit fdd6174871
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
View File

@ -404,9 +404,9 @@ NS_ASSUME_NONNULL_BEGIN
[self.viewConstraints addObjectsFromArray:@[
[bodyTextView autoPinLeadingToSuperviewMarginWithInset:textInsets.leading],
[bodyTextView autoPinTrailingToSuperviewMarginWithInset:textInsets.trailing],
[bodyTextView autoSetDimension:ALDimensionWidth toSize:bodyTextContentSize.width],
[bodyTextView autoSetDimension:ALDimensionHeight toSize:bodyTextContentSize.height],
]];
[self.viewConstraints
addObject:[bodyTextView autoSetDimension:ALDimensionHeight toSize:bodyTextContentSize.height]];
if (lastSubview) {
[self.viewConstraints addObject:[bodyTextView autoPinEdge:ALEdgeTop

2
Signal/src/ViewControllers/ConversationView/ConversationLayoutInfo.swift
View File

@ -114,7 +114,7 @@ public class ConversationLayoutInfo: NSObject {
fullWidthContentWidth = viewWidth - (fullWidthGutterLeading + fullWidthGutterTrailing)
maxMessageWidth = floor(contentWidth * 0.8)
maxMessageWidth = floor(contentWidth * 0.9)
// TODO: Should this be different?
maxFooterWidth = maxMessageWidth - 10

12
Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
View File

@ -261,12 +261,18 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
return measurementCell;
}
- (CGFloat)vSpacingWithPreviousLayoutItem:(id<ConversationViewLayoutItem>)lastLayoutItem
- (CGFloat)vSpacingWithPreviousLayoutItem:(ConversationViewItem *)previousLayoutItem
{
OWSAssert(lastLayoutItem);
OWSAssert(lastItem);
if (self.interaction.interactionType == OWSInteractionType_UnreadIndicator
|| previousLayoutItem.interaction.interactionType == OWSInteractionType_UnreadIndicator) {
// The unread indicator has its own v-margins.
return 0.f;
}
// TODO:
return 0.f;
return 4.f;
}
- (ConversationViewCell *)dequeueCellForCollectionView:(UICollectionView *)collectionView

7
Signal/src/ViewControllers/MessageDetailViewController.swift
View File

@ -40,8 +40,6 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
var attachmentStream: TSAttachmentStream?
var messageBody: String?
var conversationLayoutInfo: ConversationLayoutInfo
private var contactShareViewHelper: ContactShareViewHelper
// MARK: Initializers
@ -59,7 +57,6 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
self.mode = mode
self.uiDatabaseConnection = OWSPrimaryStorage.shared().newDatabaseConnection()
self.contactShareViewHelper = ContactShareViewHelper(contactsManager: contactsManager)
self.conversationLayoutInfo = ConversationLayoutInfo(thread: thread)
super.init(nibName: nil, bundle: nil)
@ -345,7 +342,9 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
self.messageBubbleView = messageBubbleView
messageBubbleView.viewItem = viewItem
messageBubbleView.cellMediaCache = NSCache()
messageBubbleView.layoutInfo = self.conversationLayoutInfo
let conversationLayoutInfo = ConversationLayoutInfo(thread: thread)
conversationLayoutInfo.viewWidth = self.view.width()
messageBubbleView.layoutInfo = conversationLayoutInfo
messageBubbleView.configureViews()
messageBubbleView.loadContent()