Respond to CR.

pull/1/head
Matthew Chen 7 years ago
parent ffb1c35383
commit 7634e3a44d

@ -212,7 +212,6 @@ NS_ASSUME_NONNULL_BEGIN
UIStackView *labelsView = [UIStackView new]; UIStackView *labelsView = [UIStackView new];
labelsView.axis = UILayoutConstraintAxisVertical; labelsView.axis = UILayoutConstraintAxisVertical;
labelsView.spacing = [OWSAudioMessageView labelVSpacing]; labelsView.spacing = [OWSAudioMessageView labelVSpacing];
labelsView.alignment = UIStackViewAlignmentFill;
[self addArrangedSubview:labelsView]; [self addArrangedSubview:labelsView];
NSString *filename = self.attachmentStream.sourceFilename; NSString *filename = self.attachmentStream.sourceFilename;

@ -72,8 +72,6 @@ NS_ASSUME_NONNULL_BEGIN
]]; ]];
buttonStackView.axis = UILayoutConstraintAxisVertical; buttonStackView.axis = UILayoutConstraintAxisVertical;
buttonStackView.spacing = self.vSpacing; buttonStackView.spacing = self.vSpacing;
// Ensure all of the buttons have the same width.
buttonStackView.alignment = UIStackViewAlignmentFill;
self.stackView = [[UIStackView alloc] initWithArrangedSubviews:@[ self.stackView = [[UIStackView alloc] initWithArrangedSubviews:@[
self.titleLabel, self.titleLabel,

@ -224,7 +224,6 @@ NS_ASSUME_NONNULL_BEGIN
UIStackView *vStackView = [UIStackView new]; UIStackView *vStackView = [UIStackView new];
vStackView.axis = UILayoutConstraintAxisVertical; vStackView.axis = UILayoutConstraintAxisVertical;
vStackView.spacing = 0; vStackView.spacing = 0;
vStackView.alignment = UIStackViewAlignmentFill;
[self addSubview:vStackView]; [self addSubview:vStackView];
[vStackView autoPinToSuperviewEdges]; [vStackView autoPinToSuperviewEdges];
[vStackView addArrangedSubview:hStackView]; [vStackView addArrangedSubview:hStackView];

@ -87,7 +87,6 @@ NS_ASSUME_NONNULL_BEGIN
self.stackView = [UIStackView new]; self.stackView = [UIStackView new];
self.stackView.axis = UILayoutConstraintAxisVertical; self.stackView.axis = UILayoutConstraintAxisVertical;
self.stackView.alignment = UIStackViewAlignmentFill;
self.senderNameLabel = [UILabel new]; self.senderNameLabel = [UILabel new];
@ -485,9 +484,6 @@ NS_ASSUME_NONNULL_BEGIN
return (self.hasBodyMediaWithThumbnail || self.cellType == OWSMessageCellType_ContactShare); return (self.hasBodyMediaWithThumbnail || self.cellType == OWSMessageCellType_ContactShare);
} }
// Returns YES if there is a footer displayed _at the bottom_
// of the message bubble (as opposed to overlaid on a body media
// thumbnail).
- (BOOL)canFooterOverlayMedia - (BOOL)canFooterOverlayMedia
{ {
return self.hasBodyMediaWithThumbnail; return self.hasBodyMediaWithThumbnail;
@ -507,7 +503,6 @@ NS_ASSUME_NONNULL_BEGIN
UIStackView *textStackView = [[UIStackView alloc] initWithArrangedSubviews:textViews]; UIStackView *textStackView = [[UIStackView alloc] initWithArrangedSubviews:textViews];
textStackView.axis = UILayoutConstraintAxisVertical; textStackView.axis = UILayoutConstraintAxisVertical;
textStackView.alignment = UIStackViewAlignmentFill;
// TODO: Review // TODO: Review
textStackView.spacing = self.textViewVSpacing; textStackView.spacing = self.textViewVSpacing;
textStackView.layoutMarginsRelativeArrangement = YES; textStackView.layoutMarginsRelativeArrangement = YES;

@ -122,6 +122,8 @@ NS_ASSUME_NONNULL_BEGIN
[self.unreadLabel autoCenterInSuperview]; [self.unreadLabel autoCenterInSuperview];
[self.unreadLabel setContentHuggingHigh]; [self.unreadLabel setContentHuggingHigh];
[self.unreadLabel setCompressionResistanceHigh]; [self.unreadLabel setCompressionResistanceHigh];
self.payloadView.userInteractionEnabled = NO;
} }
- (void)dealloc - (void)dealloc

@ -78,7 +78,6 @@ const CGFloat kContactCellAvatarTextMargin = 12;
self.subtitleLabel, self.subtitleLabel,
]]; ]];
self.nameContainerView.axis = UILayoutConstraintAxisVertical; self.nameContainerView.axis = UILayoutConstraintAxisVertical;
self.nameContainerView.alignment = UIStackViewAlignmentFill;
[self.avatarView setContentHuggingHorizontalHigh]; [self.avatarView setContentHuggingHorizontalHigh];
[self.nameContainerView setContentHuggingHorizontalLow]; [self.nameContainerView setContentHuggingHorizontalLow];

@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
self.cellView = [ContactCellView new]; self.cellView = [ContactCellView new];
[self.contentView addSubview:self.cellView]; [self.contentView addSubview:self.cellView];
[self.cellView autoPinEdgesToSuperviewMargins]; [self.cellView autoPinEdgesToSuperviewMargins];
self.cellView.userInteractionEnabled = NO;
} }
- (void)configureWithSignalAccount:(SignalAccount *)signalAccount contactsManager:(OWSContactsManager *)contactsManager - (void)configureWithSignalAccount:(SignalAccount *)signalAccount contactsManager:(OWSContactsManager *)contactsManager

Loading…
Cancel
Save