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

Button locations in input toolbar should reflect RTL.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 2ec8522355
commit cec614706e
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

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

@ -21,8 +21,8 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
@property (nonatomic) UIButton *sendButton; @property (nonatomic) UIButton *sendButton;
@property (nonatomic) BOOL shouldShowVoiceMemoButton; @property (nonatomic) BOOL shouldShowVoiceMemoButton;
@property (nonatomic) UIButton *voiceMemoButton; @property (nonatomic) UIButton *voiceMemoButton;
@property (nonatomic) UIView *leadingButtonWrapper; @property (nonatomic) UIView *leftButtonWrapper;
@property (nonatomic) UIView *trailingButtonWrapper; @property (nonatomic) UIView *rightButtonWrapper;
@property (nonatomic) NSArray<NSLayoutConstraint *> *contentContraints; @property (nonatomic) NSArray<NSLayoutConstraint *> *contentContraints;
@ -77,16 +77,16 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
// than trying to manipulate the size of the buttons themselves, as you // 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) // can't coordinate the layout of the button content (e.g. image or text)
// using iOS auto layout. // using iOS auto layout.
_leadingButtonWrapper = [UIView containerView]; _leftButtonWrapper = [UIView containerView];
[self.leadingButtonWrapper [self.leftButtonWrapper
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self
action:@selector(leadingButtonTapped:)]]; action:@selector(leadingButtonTapped:)]];
[self addSubview:self.leadingButtonWrapper]; [self addSubview:self.leftButtonWrapper];
_trailingButtonWrapper = [UIView containerView]; _rightButtonWrapper = [UIView containerView];
[self.trailingButtonWrapper [self.rightButtonWrapper
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self
action:@selector(trailingButtonTapped:)]]; action:@selector(trailingButtonTapped:)]];
[self addSubview:self.trailingButtonWrapper]; [self addSubview:self.rightButtonWrapper];
_attachmentButton = [[UIButton alloc] init]; _attachmentButton = [[UIButton alloc] init];
self.attachmentButton.accessibilityLabel self.attachmentButton.accessibilityLabel
@ -97,7 +97,7 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
action:@selector(attachmentButtonPressed) action:@selector(attachmentButtonPressed)
forControlEvents:UIControlEventTouchUpInside]; forControlEvents:UIControlEventTouchUpInside];
[self.attachmentButton setImage:[UIImage imageNamed:@"btnAttachments--blue"] forState:UIControlStateNormal]; [self.attachmentButton setImage:[UIImage imageNamed:@"btnAttachments--blue"] forState:UIControlStateNormal];
[self.leadingButtonWrapper addSubview:self.attachmentButton]; [self.leftButtonWrapper addSubview:self.attachmentButton];
// TODO: Fix layout in this class. // TODO: Fix layout in this class.
_sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; _sendButton = [UIButton buttonWithType:UIButtonTypeCustom];
@ -109,7 +109,7 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter; self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter;
self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:16.f]; self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:16.f];
[self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside]; [self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside];
[self.trailingButtonWrapper addSubview:self.sendButton]; [self.rightButtonWrapper addSubview:self.sendButton];
UIImage *voiceMemoIcon = [UIImage imageNamed:@"voice-memo-button"]; UIImage *voiceMemoIcon = [UIImage imageNamed:@"voice-memo-button"];
OWSAssert(voiceMemoIcon); OWSAssert(voiceMemoIcon);
@ -117,7 +117,7 @@ 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_materialBlueColor]; self.voiceMemoButton.imageView.tintColor = [UIColor ows_materialBlueColor];
[self.trailingButtonWrapper addSubview:self.voiceMemoButton]; [self.rightButtonWrapper addSubview:self.voiceMemoButton];
// 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.
@ -125,7 +125,7 @@ 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.trailingButtonWrapper addGestureRecognizer:longPressGestureRecognizer]; [self.rightButtonWrapper addGestureRecognizer:longPressGestureRecognizer];
self.userInteractionEnabled = YES; self.userInteractionEnabled = YES;
@ -223,8 +223,8 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
[trailingButton setCompressionResistanceHigh]; [trailingButton setCompressionResistanceHigh];
[self.inputTextView setContentHuggingLow]; [self.inputTextView setContentHuggingLow];
OWSAssert(leadingButton.superview == self.leadingButtonWrapper); OWSAssert(leadingButton.superview == self.leftButtonWrapper);
OWSAssert(trailingButton.superview == self.trailingButtonWrapper); OWSAssert(trailingButton.superview == self.rightButtonWrapper);
// The leading and trailing buttons should be center-aligned with the // The leading and trailing buttons should be center-aligned with the
// inputTextView when the inputTextView is at its minimum size. // inputTextView when the inputTextView is at its minimum size.
@ -238,24 +238,24 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
// Additionally, we use "wrapper" views around the leading and trailing // Additionally, we use "wrapper" views around the leading and trailing
// buttons to expand their hot area. // buttons to expand their hot area.
self.contentContraints = @[ self.contentContraints = @[
[self.leadingButtonWrapper autoPinLeadingToSuperview], [self.leftButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeLeft],
[self.leadingButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeTop], [self.leftButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeTop],
[self.leadingButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeBottom], [self.leftButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeBottom],
[leadingButton autoSetDimension:ALDimensionHeight toSize:kMinContentHeight], [leadingButton autoSetDimension:ALDimensionHeight toSize:kMinContentHeight],
[leadingButton autoPinLeadingToSuperviewWithMargin:contentHInset], [leadingButton autoPinLeadingToSuperviewWithMargin:contentHInset],
[leadingButton autoPinTrailingToSuperviewWithMargin:contentHSpacing], [leadingButton autoPinTrailingToSuperviewWithMargin:contentHSpacing],
[leadingButton autoPinEdgeToSuperviewEdge:ALEdgeBottom], [leadingButton autoPinEdgeToSuperviewEdge:ALEdgeBottom],
[self.inputTextView autoPinLeadingToTrailingOfView:self.leadingButtonWrapper], [self.inputTextView autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:self.leftButtonWrapper],
[self.inputTextView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:textViewVInset], [self.inputTextView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:textViewVInset],
[self.inputTextView autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:textViewVInset], [self.inputTextView autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:textViewVInset],
[self.inputTextView autoSetDimension:ALDimensionHeight toSize:textViewHeight], [self.inputTextView autoSetDimension:ALDimensionHeight toSize:textViewHeight],
[self.trailingButtonWrapper autoPinLeadingToTrailingOfView:self.inputTextView], [self.rightButtonWrapper autoPinEdge:ALEdgeLeft toEdge:ALEdgeRight ofView:self.inputTextView],
[self.trailingButtonWrapper autoPinTrailingToSuperview], [self.rightButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeRight],
[self.trailingButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeTop], [self.rightButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeTop],
[self.trailingButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeBottom], [self.rightButtonWrapper autoPinEdgeToSuperviewEdge:ALEdgeBottom],
[trailingButton autoSetDimension:ALDimensionHeight toSize:kMinContentHeight], [trailingButton autoSetDimension:ALDimensionHeight toSize:kMinContentHeight],
[trailingButton autoPinLeadingToSuperviewWithMargin:contentHSpacing], [trailingButton autoPinLeadingToSuperviewWithMargin:contentHSpacing],

Write Preview
Loading…
Cancel
Save