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

Compose to stack view

Browse Source 
TODO:

resize after sending
restore actions
add padding
vcenter icons
add new assets
pull/1/head
Michael Kirk 8 years ago
parent 7ef693f1b5
commit 1a00690b17
3 changed files with 108 additions and 242 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // Copyright (c) 2018 Open Whisper Systems. All rights reserved.
// //
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
@protocol ConversationTextViewToolbarDelegate <NSObject> @protocol ConversationTextViewToolbarDelegate <NSObject>
- (void)textViewDidChange; - (void)textViewDidChange:(UITextView *)textView;
@end @end

16
Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
Unescape Escape View File

@ -27,13 +27,9 @@ NS_ASSUME_NONNULL_BEGIN
self.delegate = self; self.delegate = self;
// round edge with dynamic type.
CGFloat cornerRadius = 16.0f;
self.backgroundColor = [UIColor ows_light02Color]; self.backgroundColor = [UIColor ows_light02Color];
self.layer.borderColor = [UIColor.ows_blackColor colorWithAlphaComponent:0.12f].CGColor; self.layer.borderColor = [UIColor.ows_blackColor colorWithAlphaComponent:0.12f].CGColor;
self.layer.borderWidth = 0.5f; self.layer.borderWidth = 0.5f;
self.layer.cornerRadius = cornerRadius;
self.scrollIndicatorInsets = UIEdgeInsetsMake(4, 4, 4, 4); self.scrollIndicatorInsets = UIEdgeInsetsMake(4, 4, 4, 4);
@ -52,14 +48,13 @@ NS_ASSUME_NONNULL_BEGIN
self.placeholderView = [UILabel new]; self.placeholderView = [UILabel new];
self.placeholderView.text = NSLocalizedString(@"new_message", @""); self.placeholderView.text = NSLocalizedString(@"new_message", @"");
self.placeholderView.textColor = [UIColor lightGrayColor]; self.placeholderView.textColor = UIColor.ows_light35Color;
self.placeholderView.userInteractionEnabled = NO; self.placeholderView.userInteractionEnabled = NO;
[self addSubview:self.placeholderView]; [self addSubview:self.placeholderView];
// We need to do these steps _after_ placeholderView is configured. // We need to do these steps _after_ placeholderView is configured.
self.font = [UIFont ows_dynamicTypeBodyFont]; self.font = [UIFont ows_dynamicTypeBodyFont];
self.textContainerInset = UIEdgeInsetsMake(4.0f, 8.0, 4.0f, 2.0f); self.textContainerInset = UIEdgeInsetsMake(7.0f, 12.0f, 7.0f, 12.0f);
self.contentInset = UIEdgeInsetsMake(1.0f, 0.0f, 1.0f, 0.0f);
[self ensurePlaceholderConstraints]; [self ensurePlaceholderConstraints];
[self updatePlaceholderVisibility]; [self updatePlaceholderVisibility];
@ -75,6 +70,11 @@ NS_ASSUME_NONNULL_BEGIN
self.placeholderView.font = font; self.placeholderView.font = font;
} }
- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)isAnimated
{
[super setContentOffset:contentOffset animated:false];
}
- (void)setContentInset:(UIEdgeInsets)contentInset - (void)setContentInset:(UIEdgeInsets)contentInset
{ {
[super setContentInset:contentInset]; [super setContentInset:contentInset];
@ -181,7 +181,7 @@ NS_ASSUME_NONNULL_BEGIN
[self updatePlaceholderVisibility]; [self updatePlaceholderVisibility];
[self.textViewToolbarDelegate textViewDidChange]; [self.textViewToolbarDelegate textViewDidChange:self];
} }
- (void)textViewDidEndEditing:(UITextView *)textView - (void)textViewDidEndEditing:(UITextView *)textView

330
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
Unescape Escape View File

@ -20,6 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
static void *kConversationInputTextViewObservingContext = &kConversationInputTextViewObservingContext; static void *kConversationInputTextViewObservingContext = &kConversationInputTextViewObservingContext;
const CGFloat kMinTextViewHeight = 36;
const CGFloat kMaxTextViewHeight = 98;
#pragma mark - #pragma mark -
@interface ConversationInputToolbar () <UIGestureRecognizerDelegate, @interface ConversationInputToolbar () <UIGestureRecognizerDelegate,
@ -28,21 +31,17 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
@property (nonatomic, readonly) ConversationStyle *conversationStyle; @property (nonatomic, readonly) ConversationStyle *conversationStyle;
@property (nonatomic, readonly) UIView *composeContainer;
@property (nonatomic, readonly) ConversationInputTextView *inputTextView; @property (nonatomic, readonly) ConversationInputTextView *inputTextView;
@property (nonatomic, readonly) UIStackView *contentStackView; @property (nonatomic, readonly) UIStackView *contentRows;
@property (nonatomic, readonly) UIStackView *composeRow;
@property (nonatomic, readonly) UIButton *attachmentButton; @property (nonatomic, readonly) UIButton *attachmentButton;
@property (nonatomic, readonly) UIButton *sendButton; @property (nonatomic, readonly) UIButton *sendButton;
@property (nonatomic, readonly) UIButton *voiceMemoButton; @property (nonatomic, readonly) UIButton *voiceMemoButton;
@property (nonatomic, readonly) UIView *leftButtonWrapper;
@property (nonatomic, readonly) UIView *rightButtonWrapper;
@property (nonatomic) BOOL shouldShowVoiceMemoButton;
@property (nonatomic) NSArray<NSLayoutConstraint *> *contentContraints;
@property (nonatomic) NSValue *lastTextContentSize; @property (nonatomic) NSValue *lastTextContentSize;
@property (nonatomic) CGFloat toolbarHeight; @property (nonatomic) CGFloat toolbarHeight;
@property (nonatomic) CGFloat textViewHeight; @property (nonatomic) CGFloat textViewHeight;
@property (nonatomic, readonly) NSLayoutConstraint *textViewHeightConstraint;
#pragma mark - #pragma mark -
@ -80,23 +79,11 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
return self; return self;
} }
- (void)dealloc
{
[self removeKVOObservers];
}
- (CGSize)intrinsicContentSize - (CGSize)intrinsicContentSize
{ {
// Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, the intrinsicContentSize is used // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify
// to determine the height of the rendered inputAccessoryView. // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout.
CGFloat height = self.toolbarHeight; return CGSizeZero;
if (self.quotedMessagePreview) {
height += self.quotedMessageTopMargin;
height += self.quotedMessagePreview.intrinsicContentSize.height;
}
CGSize newSize = CGSizeMake(self.bounds.size.width, height);
return newSize;
} }
- (void)createContents - (void)createContents
@ -111,7 +98,7 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight];
// We can make our blur effect more muted by increasing this background alpha. // We can make our blur effect more muted by increasing this background alpha.
self.backgroundColor = [[UIColor ows_toolbarBackgroundColor] colorWithAlphaComponent:0.4]; self.backgroundColor = [[UIColor ows_toolbarBackgroundColor] colorWithAlphaComponent:0.4f];
UIVisualEffectView *blurEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; UIVisualEffectView *blurEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect];
[self addSubview:blurEffectView]; [self addSubview:blurEffectView];
@ -120,31 +107,13 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
self.autoresizingMask = UIViewAutoresizingFlexibleHeight; self.autoresizingMask = UIViewAutoresizingFlexibleHeight;
_composeContainer = [UIView containerView];
_contentStackView = [[UIStackView alloc] initWithArrangedSubviews:@[ _composeContainer ]];
_contentStackView.axis = UILayoutConstraintAxisVertical;
[self addSubview:_contentStackView];
[_contentStackView autoPinEdgesToSuperviewEdges];
_inputTextView = [ConversationInputTextView new]; _inputTextView = [ConversationInputTextView new];
self.inputTextView.layer.cornerRadius = kMinTextViewHeight / 2.0f;
self.inputTextView.textViewToolbarDelegate = self; self.inputTextView.textViewToolbarDelegate = self;
self.inputTextView.font = [UIFont ows_dynamicTypeBodyFont]; self.inputTextView.font = [UIFont ows_dynamicTypeBodyFont];
[self.composeContainer addSubview:self.inputTextView]; [self.inputTextView setContentHuggingLow];
// We want to be permissive about taps on the send and attachment buttons, _textViewHeightConstraint = [self.inputTextView autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight];
// so we use wrapper views that capture nearby taps. This is a lot easier
// than trying to manipulate the size of the buttons themselves, as you
// can't coordinate the layout of the button content (e.g. image or text)
// using iOS auto layout.
_leftButtonWrapper = [UIView containerView];
[self.leftButtonWrapper
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(leftButtonTapped:)]];
[self.composeContainer addSubview:self.leftButtonWrapper];
_rightButtonWrapper = [UIView containerView];
[self.rightButtonWrapper
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(rightButtonTapped:)]];
[self.composeContainer addSubview:self.rightButtonWrapper];
_attachmentButton = [[UIButton alloc] init]; _attachmentButton = [[UIButton alloc] init];
self.attachmentButton.accessibilityLabel self.attachmentButton.accessibilityLabel
@ -159,9 +128,9 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
forState:UIControlStateNormal]; forState:UIControlStateNormal];
self.attachmentButton.contentEdgeInsets = UIEdgeInsetsMake(0, 3, 0, 3); self.attachmentButton.contentEdgeInsets = UIEdgeInsetsMake(0, 3, 0, 3);
self.attachmentButton.tintColor = UIColor.ows_navbarIconColor; self.attachmentButton.tintColor = UIColor.ows_navbarIconColor;
[self.leftButtonWrapper addSubview:self.attachmentButton]; [self.attachmentButton setCompressionResistanceHigh];
[self.attachmentButton setContentHuggingHigh];
// TODO: Fix layout in this class.
_sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; _sendButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.sendButton [self.sendButton
setTitle:NSLocalizedString(@"SEND_BUTTON_TITLE", @"Label for the send button in the conversation view.") setTitle:NSLocalizedString(@"SEND_BUTTON_TITLE", @"Label for the send button in the conversation view.")
@ -169,8 +138,9 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
[self.sendButton setTitleColor:UIColor.ows_signalBlueColor forState:UIControlStateNormal]; [self.sendButton setTitleColor:UIColor.ows_signalBlueColor forState:UIControlStateNormal];
self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter; self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter;
self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:17.f]; self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:17.f];
[self.sendButton setCompressionResistanceHigh];
[self.sendButton setContentHuggingHigh];
[self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside]; [self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside];
[self.rightButtonWrapper addSubview:self.sendButton];
UIImage *voiceMemoIcon = [UIImage imageNamed:@"voice-memo-button"]; UIImage *voiceMemoIcon = [UIImage imageNamed:@"voice-memo-button"];
OWSAssert(voiceMemoIcon); OWSAssert(voiceMemoIcon);
@ -178,7 +148,8 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
[self.voiceMemoButton setImage:[voiceMemoIcon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] [self.voiceMemoButton setImage:[voiceMemoIcon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]
forState:UIControlStateNormal]; forState:UIControlStateNormal];
self.voiceMemoButton.imageView.tintColor = UIColor.ows_navbarIconColor; self.voiceMemoButton.imageView.tintColor = UIColor.ows_navbarIconColor;
[self.rightButtonWrapper addSubview:self.voiceMemoButton]; [self.voiceMemoButton setCompressionResistanceHigh];
[self.voiceMemoButton setContentHuggingHigh];
// We want to be permissive about the voice message gesture, so we hang // We want to be permissive about the voice message gesture, so we hang
// the long press GR on the button's wrapper, not the button itself. // the long press GR on the button's wrapper, not the button itself.
@ -186,22 +157,29 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)]; [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)];
longPressGestureRecognizer.minimumPressDuration = 0; longPressGestureRecognizer.minimumPressDuration = 0;
longPressGestureRecognizer.delegate = self; longPressGestureRecognizer.delegate = self;
[self.rightButtonWrapper addGestureRecognizer:longPressGestureRecognizer];
self.userInteractionEnabled = YES; self.userInteractionEnabled = YES;
[self addKVOObservers]; _composeRow = [[UIStackView alloc]
initWithArrangedSubviews:@[ self.attachmentButton, self.inputTextView, self.voiceMemoButton, self.sendButton ]];
_composeRow.axis = UILayoutConstraintAxisHorizontal;
_composeRow.layoutMarginsRelativeArrangement = YES;
_composeRow.layoutMargins = UIEdgeInsetsMake(6, 8, 6, 8);
_composeRow.alignment = UIStackViewAlignmentBottom;
_composeRow.spacing = 8;
_contentRows = [[UIStackView alloc] initWithArrangedSubviews:@[ _composeRow ]];
_contentRows.axis = UILayoutConstraintAxisVertical;
[self ensureShouldShowVoiceMemoButton]; [self addSubview:_contentRows];
[_contentRows autoPinEdgesToSuperviewEdges];
[self ensureContentConstraints]; [self ensureShouldShowVoiceMemoButtonAnimated:NO];
} }
- (void)updateFontSizes - (void)updateFontSizes
{ {
self.inputTextView.font = [UIFont ows_dynamicTypeBodyFont]; self.inputTextView.font = [UIFont ows_dynamicTypeBodyFont];
[self ensureContentConstraints];
} }
- (void)setInputTextViewDelegate:(id<ConversationInputTextViewDelegate>)value - (void)setInputTextViewDelegate:(id<ConversationInputTextViewDelegate>)value
@ -225,7 +203,7 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
self.inputTextView.text = value; self.inputTextView.text = value;
[self ensureShouldShowVoiceMemoButton]; [self ensureShouldShowVoiceMemoButtonAnimated:NO];
} }
- (void)clearTextMessage - (void)clearTextMessage
@ -254,17 +232,6 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
[self.inputTextView reloadInputViews]; [self.inputTextView reloadInputViews];
} }
- (void)setShouldShowVoiceMemoButton:(BOOL)shouldShowVoiceMemoButton
{
if (_shouldShowVoiceMemoButton == shouldShowVoiceMemoButton) {
return;
}
_shouldShowVoiceMemoButton = shouldShowVoiceMemoButton;
[self ensureContentConstraints];
}
- (void)setQuotedReply:(nullable OWSQuotedReplyModel *)quotedReply - (void)setQuotedReply:(nullable OWSQuotedReplyModel *)quotedReply
{ {
if (quotedReply == _quotedReply) { if (quotedReply == _quotedReply) {
@ -292,8 +259,8 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
[wrapper addSubview:quotedMessagePreview]; [wrapper addSubview:quotedMessagePreview];
[quotedMessagePreview autoPinToSuperviewMargins]; [quotedMessagePreview autoPinToSuperviewMargins];
// TODO animate [self.contentRows insertArrangedSubview:wrapper atIndex:0];
[self.contentStackView insertArrangedSubview:wrapper atIndex:0];
self.quotedMessagePreview = wrapper; self.quotedMessagePreview = wrapper;
} }
@ -304,9 +271,8 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
- (void)clearQuotedMessagePreview - (void)clearQuotedMessagePreview
{ {
// TODO animate
if (self.quotedMessagePreview) { if (self.quotedMessagePreview) {
[self.contentStackView removeArrangedSubview:self.quotedMessagePreview]; [self.contentRows removeArrangedSubview:self.quotedMessagePreview];
[self.quotedMessagePreview removeFromSuperview]; [self.quotedMessagePreview removeFromSuperview];
self.quotedMessagePreview = nil; self.quotedMessagePreview = nil;
} }
@ -327,113 +293,38 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
return self.inputTextView.isFirstResponder; return self.inputTextView.isFirstResponder;
} }
- (void)ensureContentConstraints - (void)ensureShouldShowVoiceMemoButtonAnimated:(BOOL)isAnimated
{ {
[NSLayoutConstraint deactivateConstraints:self.contentContraints]; void (^updateBlock)(void) = ^{
if (self.inputTextView.trimmedText.length > 0) {
const int textViewVInset = 5; if (!self.voiceMemoButton.isHidden) {
const int contentHInset = 6; self.voiceMemoButton.hidden = YES;
const int contentHSpacing = 6; }
// I'm not sure why this addional offset is necessary, but without it our minTextViewHeight is too short.
const CGFloat kAdditionalUnaccountedForHeight = 1;
// We want to grow the text input area to fit its content within reason.
const CGFloat minTextViewHeight
= ceil(self.inputTextView.font.lineHeight + self.inputTextView.textContainerInset.top
+ self.inputTextView.textContainerInset.bottom + self.inputTextView.contentInset.top
+ self.inputTextView.contentInset.bottom)
+ kAdditionalUnaccountedForHeight;
// Exactly 4 lines of text with default sizing.
const CGFloat kMaxTextViewHeight = 98.f;
const CGFloat textViewDesiredHeight = (self.inputTextView.contentSize.height + self.inputTextView.contentInset.top
+ self.inputTextView.contentInset.bottom);
const CGFloat textViewHeight = ceil(CGFloatClamp(textViewDesiredHeight, minTextViewHeight, kMaxTextViewHeight));
const CGFloat kMinContentHeight = minTextViewHeight + textViewVInset * 2;
self.textViewHeight = textViewHeight;
self.toolbarHeight = textViewHeight + textViewVInset * 2;
self.leftButtonWrapper.hidden = NO;
self.inputTextView.hidden = NO;
self.voiceMemoButton.hidden = NO;
UIButton *leftButton = self.attachmentButton;
UIButton *rightButton = (self.shouldShowVoiceMemoButton ? self.voiceMemoButton : self.sendButton);
UIButton *inactiveRightButton = (self.shouldShowVoiceMemoButton ? self.sendButton : self.voiceMemoButton);
leftButton.enabled = YES;
rightButton.enabled = YES;
inactiveRightButton.enabled = NO;
leftButton.hidden = NO;
rightButton.hidden = NO;
inactiveRightButton.hidden = YES;
[leftButton setContentHuggingHigh];
[rightButton setContentHuggingHigh];
[leftButton setCompressionResistanceHigh];
[rightButton setCompressionResistanceHigh];
[self.inputTextView setCompressionResistanceLow];
[self.inputTextView setContentHuggingLow];
OWSAssert(leftButton.superview == self.leftButtonWrapper); if (self.sendButton.isHidden) {
OWSAssert(rightButton.superview == self.rightButtonWrapper); self.sendButton.hidden = NO;
}
// The leading and trailing buttons should be center-aligned with the } else {
// inputTextView when the inputTextView is at its minimum size. if (self.voiceMemoButton.isHidden) {
// self.voiceMemoButton.hidden = NO;
// We want the leading and trailing buttons to hug the bottom of the input }
// toolbar as the inputTextView expands.
// if (!self.sendButton.isHidden) {
// Therefore we fix the button heights to the size of the toolbar when self.sendButton.hidden = YES;
// inputTextView is at its minimum size. }
// }
// Additionally, we use "wrapper" views around the leading and trailing
// buttons to expand their hot area.
self.contentContraints = @[
[self.leftButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeLeft],
[self.leftButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeTop],
[self.leftButtonWrapper autoPinBottomToSuperviewMarginWithInset:0],
[leftButton autoSetDimension:ALDimensionHeight toSize:kMinContentHeight],
[leftButton autoPinLeadingToSuperviewMarginWithInset:contentHInset],
[leftButton autoPinTrailingToSuperviewMarginWithInset:contentHSpacing],
[leftButton autoPinEdgeToSuperviewEdge:ALEdgeBottom],
[self.inputTextView autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:self.leftButtonWrapper],
[self.inputTextView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:textViewVInset],
[self.inputTextView autoPinBottomToSuperviewMarginWithInset:textViewVInset],
[self.inputTextView autoSetDimension:ALDimensionHeight toSize:textViewHeight],
[self.rightButtonWrapper autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:self.inputTextView],
[self.rightButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeRight],
[self.rightButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeTop],
[self.rightButtonWrapper autoPinBottomToSuperviewMarginWithInset:0],
[rightButton autoSetDimension:ALDimensionHeight toSize:kMinContentHeight],
[rightButton autoPinLeadingToSuperviewMarginWithInset:contentHSpacing],
[rightButton autoPinTrailingToSuperviewMarginWithInset:contentHInset],
[rightButton autoPinEdgeToSuperviewEdge:ALEdgeBottom]
];
// Layout immediately, unless the input toolbar hasn't even been laid out yet.
if (self.bounds.size.width > 0 && self.bounds.size.height > 0) {
[self layoutIfNeeded]; [self layoutIfNeeded];
} };
}
- (void)ensureShouldShowVoiceMemoButton if (isAnimated) {
{ [UIView animateWithDuration:0.1 animations:updateBlock];
self.shouldShowVoiceMemoButton = self.inputTextView.trimmedText.length < 1; } else {
updateBlock();
}
} }
- (void)handleLongPress:(UIGestureRecognizer *)sender - (void)handleLongPress:(UIGestureRecognizer *)sender
{ {
if (!self.shouldShowVoiceMemoButton) {
return;
}
switch (sender.state) { switch (sender.state) {
case UIGestureRecognizerStatePossible: case UIGestureRecognizerStatePossible:
case UIGestureRecognizerStateCancelled: case UIGestureRecognizerStateCancelled:
@ -490,11 +381,11 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
{ {
if ([gestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]]) { // if ([gestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]]) {
return self.shouldShowVoiceMemoButton; // return self.shouldShowVoiceMemoButton;
} else { // } else {
return YES; return YES;
} // }
} }
#pragma mark - Voice Memo #pragma mark - Voice Memo
@ -703,21 +594,21 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
#pragma mark - Event Handlers #pragma mark - Event Handlers
- (void)leftButtonTapped:(UIGestureRecognizer *)sender //- (void)leftButtonTapped:(UIGestureRecognizer *)sender
{ //{
if (sender.state == UIGestureRecognizerStateRecognized) { // if (sender.state == UIGestureRecognizerStateRecognized) {
[self attachmentButtonPressed]; // [self attachmentButtonPressed];
} // }
} //}
- (void)rightButtonTapped:(UIGestureRecognizer *)sender //- (void)rightButtonTapped:(UIGestureRecognizer *)sender
{ //{
if (sender.state == UIGestureRecognizerStateRecognized) { // if (sender.state == UIGestureRecognizerStateRecognized) {
if (!self.shouldShowVoiceMemoButton) { // if (!self.shouldShowVoiceMemoButton) {
[self sendButtonPressed]; // [self sendButtonPressed];
} // }
} // }
} //}
- (void)sendButtonPressed - (void)sendButtonPressed
{ {
@ -735,58 +626,33 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
#pragma mark - ConversationTextViewToolbarDelegate #pragma mark - ConversationTextViewToolbarDelegate
- (void)textViewDidChange - (void)textViewDidChange:(UITextView *)textView
{ {
OWSAssert(self.inputToolbarDelegate); OWSAssert(self.inputToolbarDelegate);
[self ensureShouldShowVoiceMemoButtonAnimated:YES];
[self ensureShouldShowVoiceMemoButton]; [self updateHeightWithTextView:textView];
} }
#pragma mark - Text Input Sizing - (void)updateHeightWithTextView:(UITextView *)textView
- (void)addKVOObservers
{ {
[self.inputTextView addObserver:self // compute new height assuming width is unchanged
forKeyPath:NSStringFromSelector(@selector(contentSize)) CGSize currentSize = textView.frame.size;
options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew CGFloat newHeight = [self clampedHeightWithTextView:textView fixedWidth:currentSize.width];
context:kConversationInputTextViewObservingContext];
}
- (void)removeKVOObservers if (newHeight != self.textViewHeight) {
{ self.textViewHeight = newHeight;
@try { OWSAssert(self.textViewHeightConstraint);
[self.inputTextView removeObserver:self self.textViewHeightConstraint.constant = newHeight;
forKeyPath:NSStringFromSelector(@selector(contentSize)) [self invalidateIntrinsicContentSize];
context:kConversationInputTextViewObservingContext];
} @catch (NSException *__unused exception) {
// TODO: This try/catch can probably be safely removed.
OWSFail(@"%@ removeKVOObservers failed.", self.logTag);
} }
} }
- (void)observeValueForKeyPath:(nullable NSString *)keyPath - (CGFloat)clampedHeightWithTextView:(UITextView *)textView fixedWidth:(CGFloat)fixedWidth
ofObject:(nullable id)object
change:(nullable NSDictionary<NSKeyValueChangeKey, id> *)change
context:(nullable void *)context
{ {
if (context == kConversationInputTextViewObservingContext) { CGSize fixedWidthSize = CGSizeMake(fixedWidth, CGFLOAT_MAX);
CGSize contentSize = [textView sizeThatFits:fixedWidthSize];
if (object == self.inputTextView && [keyPath isEqualToString:NSStringFromSelector(@selector(contentSize))]) {
CGSize textContentSize = self.inputTextView.contentSize; return CGFloatClamp(contentSize.height, kMinTextViewHeight, kMaxTextViewHeight);
NSValue *_Nullable lastTextContentSize = self.lastTextContentSize;
self.lastTextContentSize = [NSValue valueWithCGSize:textContentSize];
// Update view constraints, but only when text content size changes.
//
// NOTE: We use a "fuzzy equals" comparison to avoid infinite recursion,
// since ensureContentConstraints can affect the text content size.
if (!lastTextContentSize || fabs(lastTextContentSize.CGSizeValue.width - textContentSize.width) > 0.1f
|| fabs(lastTextContentSize.CGSizeValue.height - textContentSize.height) > 0.1f) {
[self ensureContentConstraints];
[self invalidateIntrinsicContentSize];
}
}
}
} }
#pragma mark QuotedReplyPreviewViewDelegate #pragma mark QuotedReplyPreviewViewDelegate

Write Preview
Loading…
Cancel
Save