Fix RSS feed UI bug

pull/49/head
Niels Andriesse 6 years ago
parent 3f6df9a6e5
commit a6aac19c32

@ -78,6 +78,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, nullable, readonly) OWSLinkPreviewDraft *linkPreviewDraft; @property (nonatomic, nullable, readonly) OWSLinkPreviewDraft *linkPreviewDraft;
- (void)hideInputMethod;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

@ -61,6 +61,7 @@ const CGFloat kMaxTextViewHeight = 98;
@property (nonatomic, readonly) UIButton *voiceMemoButton; @property (nonatomic, readonly) UIButton *voiceMemoButton;
@property (nonatomic, readonly) UIView *quotedReplyWrapper; @property (nonatomic, readonly) UIView *quotedReplyWrapper;
@property (nonatomic, readonly) UIView *linkPreviewWrapper; @property (nonatomic, readonly) UIView *linkPreviewWrapper;
@property (nonatomic, readonly) UIView *borderView;
@property (nonatomic) CGFloat textViewHeight; @property (nonatomic) CGFloat textViewHeight;
@property (nonatomic, readonly) NSLayoutConstraint *textViewHeightConstraint; @property (nonatomic, readonly) NSLayoutConstraint *textViewHeightConstraint;
@ -250,17 +251,17 @@ const CGFloat kMaxTextViewHeight = 98;
// The border must reside _outside_ of vStackWrapper so // The border must reside _outside_ of vStackWrapper so
// that it doesn't run afoul of its clipping, so we can't // that it doesn't run afoul of its clipping, so we can't
// use addBorderViewWithColor. // use addBorderViewWithColor.
UIView *borderView = [UIView new]; _borderView = [UIView new];
borderView.userInteractionEnabled = NO; self.borderView.userInteractionEnabled = NO;
borderView.backgroundColor = UIColor.clearColor; self.borderView.backgroundColor = UIColor.clearColor;
borderView.opaque = NO; self.borderView.opaque = NO;
borderView.layer.borderColor = Theme.secondaryColor.CGColor; self.borderView.layer.borderColor = Theme.secondaryColor.CGColor;
borderView.layer.borderWidth = CGHairlineWidth(); self.borderView.layer.borderWidth = CGHairlineWidth();
borderView.layer.cornerRadius = vStackRounding; self.borderView.layer.cornerRadius = vStackRounding;
[self addSubview:borderView]; [self addSubview:self.borderView];
[borderView autoPinToEdgesOfView:vStackWrapper]; [self.borderView autoPinToEdgesOfView:vStackWrapper];
[borderView setCompressionResistanceLow]; [self.borderView setCompressionResistanceLow];
[borderView setContentHuggingLow]; [self.borderView setContentHuggingLow];
[self ensureShouldShowVoiceMemoButtonAnimated:NO doLayout:NO]; [self ensureShouldShowVoiceMemoButtonAnimated:NO doLayout:NO];
} }
@ -1069,6 +1070,12 @@ const CGFloat kMaxTextViewHeight = 98;
[self clearLinkPreviewStateAndView]; [self clearLinkPreviewStateAndView];
} }
- (void)hideInputMethod
{
self.hStack.hidden = YES;
self.borderView.hidden = YES;
}
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

@ -579,12 +579,16 @@ typedef enum : NSUInteger {
return; return;
} }
if (self.userLeftGroup || self.isRSSFeed) { if (self.userLeftGroup) {
self.inputToolbar.hidden = YES; // user has requested they leave the group. further sends disallowed self.inputToolbar.hidden = YES; // user has requested they leave the group. further sends disallowed
[self dismissKeyBoard]; [self dismissKeyBoard];
} else { } else {
self.inputToolbar.hidden = NO; self.inputToolbar.hidden = NO;
} }
if (self.isRSSFeed) {
[self.inputToolbar hideInputMethod];
}
} }
- (void)viewDidLoad - (void)viewDidLoad

Loading…
Cancel
Save