diff --git a/RNTester/js/SafeAreaViewExample.js b/RNTester/js/SafeAreaViewExample.js index 927a26651..0af1d1f1f 100644 --- a/RNTester/js/SafeAreaViewExample.js +++ b/RNTester/js/SafeAreaViewExample.js @@ -64,21 +64,6 @@ class SafeAreaViewExample extends React.Component< } } -class IsIPhoneXExample extends React.Component<{}> { - render() { - return ( - - - Is this an iPhone X:{' '} - {DeviceInfo.isIPhoneX_deprecated - ? 'Yeah!' - : 'Nope. (Or `isIPhoneX_deprecated` was already removed.)'} - - - ); - } -} - exports.examples = [ { title: ' Example', @@ -86,15 +71,6 @@ exports.examples = [ 'SafeAreaView automatically applies paddings reflect the portion of the view that is not covered by other (special) ancestor views.', render: () => , }, - { - title: 'isIPhoneX_deprecated Example', - description: - '`DeviceInfo.isIPhoneX_deprecated` returns true only on iPhone X. ' + - 'Note: This prop is deprecated and will be removed right after June 01, 2018. ' + - 'Please use this only for a quick and temporary solution. ' + - 'Use instead.', - render: () => , - }, ]; var styles = StyleSheet.create({ diff --git a/React/Modules/RCTDeviceInfo.m b/React/Modules/RCTDeviceInfo.m index 20e53d55a..7db187e30 100644 --- a/React/Modules/RCTDeviceInfo.m +++ b/React/Modules/RCTDeviceInfo.m @@ -51,22 +51,6 @@ RCT_EXPORT_MODULE() #endif } -static BOOL RCTIsIPhoneX() { - static BOOL isIPhoneX = NO; - static dispatch_once_t onceToken; - - dispatch_once(&onceToken, ^{ - RCTAssertMainQueue(); - - isIPhoneX = CGSizeEqualToSize( - [UIScreen mainScreen].nativeBounds.size, - CGSizeMake(1125, 2436) - ); - }); - - return isIPhoneX; -} - static NSDictionary *RCTExportedDimensions(RCTBridge *bridge) { RCTAssertMainQueue(); @@ -102,11 +86,6 @@ static NSDictionary *RCTExportedDimensions(RCTBridge *bridge) { return @{ @"Dimensions": RCTExportedDimensions(_bridge), - // Note: - // This prop is deprecated and will be removed right after June 01, 2018. - // Please use this only for a quick and temporary solution. - // Use instead. - @"isIPhoneX_deprecated": @(RCTIsIPhoneX()), }; }