Respond to CR.

pull/1/head
Matthew Chen 6 years ago
parent 18c890bb95
commit b8e2cb6267

@ -53,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)updateFontSizes; - (void)updateFontSizes;
- (void)updateLayoutWithIsLandscape:(BOOL)isLandscape safeAreaInsets:(UIEdgeInsets)safeAreaInsets; - (void)updateLayoutWithSafeAreaInsets:(UIEdgeInsets)safeAreaInsets;
#pragma mark - Voice Memo #pragma mark - Voice Memo

@ -54,7 +54,6 @@ const CGFloat kMaxTextViewHeight = 98;
@property (nonatomic) BOOL isRecordingVoiceMemo; @property (nonatomic) BOOL isRecordingVoiceMemo;
@property (nonatomic) CGPoint voiceMemoGestureStartLocation; @property (nonatomic) CGPoint voiceMemoGestureStartLocation;
@property (nonatomic, nullable) NSArray<NSLayoutConstraint *> *layoutContraints; @property (nonatomic, nullable) NSArray<NSLayoutConstraint *> *layoutContraints;
@property (nonatomic) BOOL isLandscapeLayout;
@property (nonatomic) UIEdgeInsets receivedSafeAreaInsets; @property (nonatomic) UIEdgeInsets receivedSafeAreaInsets;
@end @end
@ -71,7 +70,6 @@ const CGFloat kMaxTextViewHeight = 98;
self = [super initWithFrame:CGRectZero]; self = [super initWithFrame:CGRectZero];
_conversationStyle = conversationStyle; _conversationStyle = conversationStyle;
_isLandscapeLayout = NO;
_receivedSafeAreaInsets = UIEdgeInsetsZero; _receivedSafeAreaInsets = UIEdgeInsetsZero;
if (self) { if (self) {
@ -355,13 +353,11 @@ const CGFloat kMaxTextViewHeight = 98;
]; ];
} }
- (void)updateLayoutWithIsLandscape:(BOOL)isLandscape safeAreaInsets:(UIEdgeInsets)safeAreaInsets - (void)updateLayoutWithSafeAreaInsets:(UIEdgeInsets)safeAreaInsets
{ {
BOOL didChange = (self.isLandscapeLayout != isLandscape BOOL didChange = !UIEdgeInsetsEqualToEdgeInsets(self.receivedSafeAreaInsets, safeAreaInsets);
|| !UIEdgeInsetsEqualToEdgeInsets(self.receivedSafeAreaInsets, safeAreaInsets));
BOOL hasLayout = self.layoutContraints != nil; BOOL hasLayout = self.layoutContraints != nil;
self.isLandscapeLayout = isLandscape;
self.receivedSafeAreaInsets = safeAreaInsets; self.receivedSafeAreaInsets = safeAreaInsets;
if (didChange || !hasLayout) { if (didChange || !hasLayout) {

@ -4893,12 +4893,11 @@ typedef enum : NSUInteger {
- (void)updateInputToolbarLayout - (void)updateInputToolbarLayout
{ {
BOOL isLandscape = self.view.width > self.view.height;
UIEdgeInsets safeAreaInsets = UIEdgeInsetsZero; UIEdgeInsets safeAreaInsets = UIEdgeInsetsZero;
if (@available(iOS 11, *)) { if (@available(iOS 11, *)) {
safeAreaInsets = self.view.safeAreaInsets; safeAreaInsets = self.view.safeAreaInsets;
} }
[self.inputToolbar updateLayoutWithIsLandscape:isLandscape safeAreaInsets:safeAreaInsets]; [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets];
} }
@end @end

Loading…
Cancel
Save