Skip to content

Commit

Permalink
Revert "Use @available checks for iOS 11 features (flutter#4596)" (fl…
Browse files Browse the repository at this point in the history
…utter#4597)

This reverts commit 89b6d43.

Apparently the clang toolchain is still hitting issues. Will give this
another go after the next clang toolchain update.
  • Loading branch information
cbracken authored Jan 27, 2018
1 parent 89b6d43 commit 521c73d
Showing 1 changed file with 17 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ @implementation FlutterViewController {
bool _platformSupportsTouchTypes;
bool _platformSupportsTouchPressure;
bool _platformSupportsTouchOrientationAndTilt;
bool _platformSupportsSafeAreaInsets;
BOOL _initialized;
BOOL _connected;
}
Expand Down Expand Up @@ -129,6 +130,7 @@ - (void)performCommonViewControllerInitialization {
_platformSupportsTouchTypes = fml::IsPlatformVersionAtLeast(9);
_platformSupportsTouchPressure = fml::IsPlatformVersionAtLeast(9);
_platformSupportsTouchOrientationAndTilt = fml::IsPlatformVersionAtLeast(9, 1);
_platformSupportsSafeAreaInsets = fml::IsPlatformVersionAtLeast(11, 0);

_orientationPreferences = UIInterfaceOrientationMaskAll;
_statusBarStyle = UIStatusBarStyleDefault;
Expand Down Expand Up @@ -619,21 +621,28 @@ - (void)viewDidLayoutSubviews {
}

- (void)viewSafeAreaInsetsDidChange {
[self updateViewportPadding];
[self updateViewportMetrics];
[super viewSafeAreaInsetsDidChange];
if (_platformSupportsSafeAreaInsets) {
[self updateViewportPadding];
[self updateViewportMetrics];
[super viewSafeAreaInsetsDidChange];
}
}

// Updates _viewportMetrics physical padding.
//
// Viewport padding represents the iOS safe area insets.
- (void)updateViewportPadding {
CGFloat scale = [UIScreen mainScreen].scale;
if (@available(iOS 11, *)) {
// TODO(cbracken) once clang toolchain compiler-rt has been updated, replace with
// if (@available(iOS 11, *)) {
if (_platformSupportsSafeAreaInsets) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
_viewportMetrics.physical_padding_top = self.view.safeAreaInsets.top * scale;
_viewportMetrics.physical_padding_left = self.view.safeAreaInsets.left * scale;
_viewportMetrics.physical_padding_right = self.view.safeAreaInsets.right * scale;
_viewportMetrics.physical_padding_bottom = self.view.safeAreaInsets.bottom * scale;
#pragma clang diagnostic pop
} else {
_viewportMetrics.physical_padding_top = [self statusBarPadding] * scale;
}
Expand Down Expand Up @@ -819,8 +828,11 @@ - (BOOL)isAlwaysUse24HourFormat {

- (void)handleStatusBarTouches:(UIEvent*)event {
CGFloat standardStatusBarHeight = kStandardStatusBarHeight;
if (@available(iOS 11, *)) {
if (_platformSupportsSafeAreaInsets) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
standardStatusBarHeight = self.view.safeAreaInsets.top;
#pragma clang diagnostic pop
}

// If the status bar is double-height, don't handle status bar taps. iOS
Expand Down

0 comments on commit 521c73d

Please sign in to comment.