signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Revert "Fix quoted reply margin."

Browse Source 
This reverts commit c76c571d87.
This commit is contained in:
Matthew Chen 2018-07-02 16:11:49 -04:00
parent c76c571d87
commit 9dd18c46ea
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
View File

@ -92,7 +92,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
// to determine the height of the rendered inputAccessoryView.
CGFloat height = self.toolbarHeight + ConversationInputToolbarBorderViewHeight;
if (self.quotedMessagePreview) {
height += self.quotedMessageTopMargin;
height += self.quotedMessagePreview.intrinsicContentSize.height;
}
CGSize newSize = CGSizeMake(self.bounds.size.width, height);
@ -128,8 +127,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
_composeContainer = [UIView containerView];
_contentStackView = [[UIStackView alloc] initWithArrangedSubviews:@[ _composeContainer ]];
_contentStackView.axis = UILayoutConstraintAxisVertical;
_contentStackView.layoutMargins = UIEdgeInsetsZero;
_contentStackView.layoutMarginsRelativeArrangement = YES;
[self addSubview:_contentStackView];
[_contentStackView autoPinEdgesToSuperviewEdges];
@ -292,12 +289,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
// TODO animate
[self.contentStackView insertArrangedSubview:self.quotedMessagePreview atIndex:0];
self.contentStackView.layoutMargins = UIEdgeInsetsMake(self.quotedMessageTopMargin, 0, 0, 0);
}
- (CGFloat)quotedMessageTopMargin
{
return 5.f;
}
- (void)clearQuotedMessagePreview
@ -308,7 +299,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
[self.quotedMessagePreview removeFromSuperview];
self.quotedMessagePreview = nil;
}
self.contentStackView.layoutMargins = UIEdgeInsetsZero;
}
- (void)beginEditingTextMessage