mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Respond to CR.
This commit is contained in:
parent
18c890bb95
commit
b8e2cb6267
3 changed files with 4 additions and 9 deletions
|
@ -53,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
|
||||
- (void)updateFontSizes;
|
||||
|
||||
- (void)updateLayoutWithIsLandscape:(BOOL)isLandscape safeAreaInsets:(UIEdgeInsets)safeAreaInsets;
|
||||
- (void)updateLayoutWithSafeAreaInsets:(UIEdgeInsets)safeAreaInsets;
|
||||
|
||||
#pragma mark - Voice Memo
|
||||
|
||||
|
|
|
@ -54,7 +54,6 @@ const CGFloat kMaxTextViewHeight = 98;
|
|||
@property (nonatomic) BOOL isRecordingVoiceMemo;
|
||||
@property (nonatomic) CGPoint voiceMemoGestureStartLocation;
|
||||
@property (nonatomic, nullable) NSArray<NSLayoutConstraint *> *layoutContraints;
|
||||
@property (nonatomic) BOOL isLandscapeLayout;
|
||||
@property (nonatomic) UIEdgeInsets receivedSafeAreaInsets;
|
||||
|
||||
@end
|
||||
|
@ -71,7 +70,6 @@ const CGFloat kMaxTextViewHeight = 98;
|
|||
self = [super initWithFrame:CGRectZero];
|
||||
|
||||
_conversationStyle = conversationStyle;
|
||||
_isLandscapeLayout = NO;
|
||||
_receivedSafeAreaInsets = UIEdgeInsetsZero;
|
||||
|
||||
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
|
||||
|| !UIEdgeInsetsEqualToEdgeInsets(self.receivedSafeAreaInsets, safeAreaInsets));
|
||||
BOOL didChange = !UIEdgeInsetsEqualToEdgeInsets(self.receivedSafeAreaInsets, safeAreaInsets);
|
||||
BOOL hasLayout = self.layoutContraints != nil;
|
||||
|
||||
self.isLandscapeLayout = isLandscape;
|
||||
self.receivedSafeAreaInsets = safeAreaInsets;
|
||||
|
||||
if (didChange || !hasLayout) {
|
||||
|
|
|
@ -4893,12 +4893,11 @@ typedef enum : NSUInteger {
|
|||
|
||||
- (void)updateInputToolbarLayout
|
||||
{
|
||||
BOOL isLandscape = self.view.width > self.view.height;
|
||||
UIEdgeInsets safeAreaInsets = UIEdgeInsetsZero;
|
||||
if (@available(iOS 11, *)) {
|
||||
safeAreaInsets = self.view.safeAreaInsets;
|
||||
}
|
||||
[self.inputToolbar updateLayoutWithIsLandscape:isLandscape safeAreaInsets:safeAreaInsets];
|
||||
[self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
Loading…
Reference in a new issue