From 0138777343c50bfc3c461679ffb40633534cf9f2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 1 Dec 2017 14:38:41 -0800 Subject: [PATCH] New @available syntax avoids compiler warnings // FREEBIE --- SignalMessaging/categories/UIFont+OWS.m | 12 ++++++------ SignalMessaging/categories/UIView+OWS.m | 14 +++++++------- SignalServiceKit/src/Messages/OWSMessageSender.m | 2 +- .../AxolotlStore/TSStorageManager+SessionStore.m | 2 +- SignalServiceKit/src/Util/OWSQueues.h | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index 1e0d46c05..861552b96 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -8,7 +8,7 @@ + (UIFont *)ows_thinFontWithSize:(CGFloat)size { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { + if (@available(iOS 8.2, *)) { return [UIFont systemFontOfSize:size weight:UIFontWeightThin]; } else { return [UIFont fontWithName:@"HelveticaNeue-Thin" size:size]; @@ -17,7 +17,7 @@ + (UIFont *)ows_lightFontWithSize:(CGFloat)size { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { + if (@available(iOS 8.2, *)) { return [UIFont systemFontOfSize:size weight:UIFontWeightLight]; } else { return [UIFont fontWithName:@"HelveticaNeue-Light" size:size]; @@ -26,7 +26,7 @@ + (UIFont *)ows_regularFontWithSize:(CGFloat)size { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { + if (@available(iOS 8.2, *)) { return [UIFont systemFontOfSize:size weight:UIFontWeightRegular]; } else { return [UIFont fontWithName:@"HelveticaNeue" size:size]; @@ -35,7 +35,7 @@ + (UIFont *)ows_mediumFontWithSize:(CGFloat)size { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { + if (@available(iOS 8.2, *)) { return [UIFont systemFontOfSize:size weight:UIFontWeightMedium]; } else { return [UIFont fontWithName:@"HelveticaNeue-Medium" size:size]; @@ -83,7 +83,7 @@ + (UIFont *)ows_dynamicTypeTitle2Font { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { return [UIFont preferredFontForTextStyle:UIFontTextStyleTitle2]; } else { // Dynamic title font for ios8 defaults to bold 12.0 pt, whereas ios9+ it's 22.0pt regular weight. @@ -96,7 +96,7 @@ + (UIFont *)ows_dynamicTypeHeadlineFont { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { return [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]; } else { // See ows_dynamicTypeTitle2Font. diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index e762a4289..19f2e0dbc 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -252,7 +252,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (BOOL)isRTL { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { return ([UIView userInterfaceLayoutDirectionForSemanticContentAttribute:self.semanticContentAttribute] == UIUserInterfaceLayoutDirectionRightToLeft); } else { @@ -268,7 +268,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSLayoutConstraint *)autoPinLeadingToSuperviewWithMargin:(CGFloat)margin { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { NSLayoutConstraint *constraint = [self.leadingAnchor constraintEqualToAnchor:self.superview.layoutMarginsGuide.leadingAnchor constant:margin]; @@ -287,7 +287,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSLayoutConstraint *)autoPinTrailingToSuperviewWithMargin:(CGFloat)margin { - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { NSLayoutConstraint *constraint = [self.trailingAnchor constraintEqualToAnchor:self.superview.layoutMarginsGuide.trailingAnchor constant:-margin]; @@ -310,7 +310,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) { OWSAssert(view); - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { NSLayoutConstraint *constraint = [self.leadingAnchor constraintEqualToAnchor:view.trailingAnchor constant:margin]; constraint.active = YES; @@ -331,7 +331,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) { OWSAssert(view); - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { NSLayoutConstraint *constraint = [self.trailingAnchor constraintEqualToAnchor:view.leadingAnchor constant:-margin]; constraint.active = YES; @@ -352,7 +352,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) { OWSAssert(view); - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { NSLayoutConstraint *constraint = [self.leadingAnchor constraintEqualToAnchor:view.leadingAnchor constant:margin]; constraint.active = YES; @@ -373,7 +373,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) { OWSAssert(view); - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { + if (@available(iOS 9.0, *)) { NSLayoutConstraint *constraint = [self.trailingAnchor constraintEqualToAnchor:view.trailingAnchor constant:margin]; constraint.active = YES; diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 06c74c3a3..286dca484 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN void AssertIsOnSendingQueue() { #ifdef DEBUG - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(10, 0)) { + if (@available(iOS 10.0, *)) { dispatch_assert_queue([OWSDispatch sendingQueue]); } // else, skip assert as it's a development convenience. #endif diff --git a/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m b/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m index 2da207e97..cc236c9c1 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m +++ b/SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m @@ -11,7 +11,7 @@ NSString *const kSessionStoreDBConnectionKey = @"kSessionStoreDBConnectionKey"; void AssertIsOnSessionStoreQueue() { #ifdef DEBUG - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(10, 0)) { + if (@available(iOS 10.0, *)) { dispatch_assert_queue([OWSDispatch sessionStoreQueue]); } // else, skip assert as it's a development convenience. #endif diff --git a/SignalServiceKit/src/Util/OWSQueues.h b/SignalServiceKit/src/Util/OWSQueues.h index 50e6f813f..1325c2538 100644 --- a/SignalServiceKit/src/Util/OWSQueues.h +++ b/SignalServiceKit/src/Util/OWSQueues.h @@ -8,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN #define AssertOnDispatchQueue(queue) \ { \ - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(10, 0)) { \ + if (@available(iOS 10.0, *)) { \ dispatch_assert_queue(queue); \ } else { \ _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \