DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use @available checks for iOS 11 features (#4596)" (#4597)

Browse Source 
This reverts commit 89b6d435205d9bcdf8dde965dd1b0432482407c5.

Apparently the clang toolchain is still hitting issues. Will give this
another go after the next clang toolchain update.
This commit is contained in:
Chris Bracken 2018-01-26 16:08:18 -08:00 committed by GitHub
parent 89b6d43520
commit 521c73ded8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
View File

@ -81,6 +81,7 @@ class PlatformMessageResponseDarwin : public blink::PlatformMessageResponse {
bool _platformSupportsTouchTypes;
bool _platformSupportsTouchPressure;
bool _platformSupportsTouchOrientationAndTilt;
bool _platformSupportsSafeAreaInsets;
BOOL _initialized;
BOOL _connected;
}
@ -129,6 +130,7 @@ class PlatformMessageResponseDarwin : public blink::PlatformMessageResponse {
_platformSupportsTouchTypes = fml::IsPlatformVersionAtLeast(9);
_platformSupportsTouchPressure = fml::IsPlatformVersionAtLeast(9);
_platformSupportsTouchOrientationAndTilt = fml::IsPlatformVersionAtLeast(9, 1);
_platformSupportsSafeAreaInsets = fml::IsPlatformVersionAtLeast(11, 0);
_orientationPreferences = UIInterfaceOrientationMaskAll;
_statusBarStyle = UIStatusBarStyleDefault;
@ -619,9 +621,11 @@ static inline blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* to
}
- (void)viewSafeAreaInsetsDidChange {
[self updateViewportPadding];
[self updateViewportMetrics];
[super viewSafeAreaInsetsDidChange];
if (_platformSupportsSafeAreaInsets) {
[self updateViewportPadding];
[self updateViewportMetrics];
[super viewSafeAreaInsetsDidChange];
}
}
// Updates _viewportMetrics physical padding.
@ -629,11 +633,16 @@ static inline blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* to
// 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;
}
@ -819,8 +828,11 @@ constexpr CGFloat kStandardStatusBarHeight = 20.0;
- (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