pull/1/head
Matthew Chen 7 years ago
parent 9dd18c46ea
commit db32dcc6a2

@ -136,7 +136,6 @@ NS_ASSUME_NONNULL_BEGIN
[self.stackView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:self.topVMargin],
[self.stackView autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:self.bottomVMargin],
// TODO: Honor "full-width gutters"?
[self.stackView autoPinEdgeToSuperviewEdge:ALEdgeLeading
withInset:self.conversationStyle.fullWidthGutterLeading],
[self.stackView autoPinEdgeToSuperviewEdge:ALEdgeTrailing

@ -415,7 +415,6 @@ NS_ASSUME_NONNULL_BEGIN
[self configureBodyTextView];
[textViews addObject:self.bodyTextView];
// TODO: Media?
OWSAssert(bodyTextSize);
[self.viewConstraints addObjectsFromArray:@[
[self.bodyTextView autoSetDimension:ALDimensionHeight toSize:bodyTextSize.CGSizeValue.height],
@ -554,7 +553,6 @@ NS_ASSUME_NONNULL_BEGIN
UIStackView *textStackView = [[UIStackView alloc] initWithArrangedSubviews:textViews];
textStackView.axis = UILayoutConstraintAxisVertical;
// TODO: Review
textStackView.spacing = self.textViewVSpacing;
textStackView.layoutMarginsRelativeArrangement = YES;
textStackView.layoutMargins = UIEdgeInsetsMake(self.conversationStyle.textInsetTop,

@ -204,28 +204,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
return [self.cachedCellSize CGSizeValue];
}
- (ConversationViewLayoutAlignment)layoutAlignment
{
switch (self.interaction.interactionType) {
case OWSInteractionType_Unknown:
DDLogVerbose(@"%@ Unknown interaction type: %@", self.logTag, self.interaction.debugDescription);
OWSFail(@"%@ Unknown interaction type", self.logTag);
return ConversationViewLayoutAlignment_Center;
case OWSInteractionType_IncomingMessage:
return ConversationViewLayoutAlignment_Incoming;
case OWSInteractionType_OutgoingMessage:
return ConversationViewLayoutAlignment_Outgoing;
case OWSInteractionType_Error:
case OWSInteractionType_Info:
case OWSInteractionType_Call:
return ConversationViewLayoutAlignment_Center;
case OWSInteractionType_UnreadIndicator:
return ConversationViewLayoutAlignment_FullWidth;
case OWSInteractionType_Offer:
return ConversationViewLayoutAlignment_Center;
}
}
- (nullable ConversationViewCell *)measurementCell
{
OWSAssertIsOnMainThread();

@ -4,15 +4,6 @@
NS_ASSUME_NONNULL_BEGIN
// TODO: Remove this enum.
typedef NS_ENUM(NSInteger, ConversationViewLayoutAlignment) {
// We use incoming/outgoing, not left/right to support RTL.
ConversationViewLayoutAlignment_Incoming,
ConversationViewLayoutAlignment_Outgoing,
ConversationViewLayoutAlignment_FullWidth,
ConversationViewLayoutAlignment_Center,
};
@class ConversationStyle;
@class YapDatabaseConnection;
@class YapDatabaseReadTransaction;
@ -21,8 +12,6 @@ typedef NS_ENUM(NSInteger, ConversationViewLayoutAlignment) {
- (CGSize)cellSizeWithTransaction:(YapDatabaseReadTransaction *)transaction;
- (ConversationViewLayoutAlignment)layoutAlignment;
- (CGFloat)vSpacingWithPreviousLayoutItem:(id<ConversationViewLayoutItem>)previousLayoutItem;
@end

Loading…
Cancel
Save