mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Merge branch 'charlesmchen/fixCellLayoutBreakage'
This commit is contained in:
commit
92f63cdb16
5 changed files with 15 additions and 8 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -261,12 +261,18 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
|
|||
return measurementCell;
|
||||
}
|
||||
|
||||
- (CGFloat)vSpacingWithPreviousLayoutItem:(id<ConversationViewLayoutItem>)lastLayoutItem
|
||||
- (CGFloat)vSpacingWithPreviousLayoutItem:(ConversationViewItem *)previousLayoutItem
|
||||
{
|
||||
OWSAssert(lastLayoutItem);
|
||||
OWSAssert(previousLayoutItem);
|
||||
|
||||
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
|
||||
|
|
|
@ -23,7 +23,7 @@ typedef NS_ENUM(NSInteger, ConversationViewLayoutAlignment) {
|
|||
|
||||
- (ConversationViewLayoutAlignment)layoutAlignment;
|
||||
|
||||
- (CGFloat)vSpacingWithPreviousLayoutItem:(id<ConversationViewLayoutItem>)lastLayoutItem;
|
||||
- (CGFloat)vSpacingWithPreviousLayoutItem:(id<ConversationViewLayoutItem>)previousLayoutItem;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -345,7 +345,8 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
|
|||
self.messageBubbleView = messageBubbleView
|
||||
messageBubbleView.viewItem = viewItem
|
||||
messageBubbleView.cellMediaCache = NSCache()
|
||||
messageBubbleView.layoutInfo = self.conversationLayoutInfo
|
||||
let conversationLayoutInfo = ConversationLayoutInfo(thread: thread)
|
||||
messageBubbleView.layoutInfo = conversationLayoutInfo
|
||||
messageBubbleView.configureViews()
|
||||
messageBubbleView.loadContent()
|
||||
|
||||
|
|
Loading…
Reference in a new issue