diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-01-18 13:01:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 13:01:10 -0500 |
| commit | aef328f494aea84367af8d0d800253dfe38044b1 (patch) | |
| tree | 3fa13494f9dce02600f48271545d3ad7d45634cb | |
| parent | 894c34a05235f49e527df72f7f95a4cc62ca0afd (diff) | |
| parent | b308fba485164a8b63b199e02f02474694e0d3ce (diff) | |
| download | sdl_ios-aef328f494aea84367af8d0d800253dfe38044b1.tar.gz | |
Merge pull request #492 from smartdevicelink/feature/sdl_0009_prefer_nonatomic
[SDL 0009] Prefer nonatomic properties
135 files changed, 634 insertions, 635 deletions
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 5a8ab0a4b..278711aa4 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -241,14 +241,12 @@ 5D1654561D3E754F00554D93 /* SDLLifecycleManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D1654551D3E754F00554D93 /* SDLLifecycleManagerSpec.m */; }; 5D16545A1D3E7A1600554D93 /* SDLLifecycleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D1654581D3E7A1600554D93 /* SDLLifecycleManager.h */; }; 5D16545B1D3E7A1600554D93 /* SDLLifecycleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D1654591D3E7A1600554D93 /* SDLLifecycleManager.m */; }; - 5D1665AB1CF5F7D000CC4CA1 /* (null) in Sources */ = {isa = PBXBuildFile; }; 5D1665C41CF8CA2700CC4CA1 /* SDLListFilesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D1665C21CF8CA2700CC4CA1 /* SDLListFilesOperation.h */; }; 5D1665C51CF8CA2700CC4CA1 /* SDLListFilesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D1665C31CF8CA2700CC4CA1 /* SDLListFilesOperation.m */; }; 5D1665C81CF8CA3D00CC4CA1 /* SDLPermissionFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D1665C61CF8CA3D00CC4CA1 /* SDLPermissionFilter.h */; }; 5D1665C91CF8CA3D00CC4CA1 /* SDLPermissionFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D1665C71CF8CA3D00CC4CA1 /* SDLPermissionFilter.m */; }; 5D1665CB1CF8CA6700CC4CA1 /* NSNumber+NumberType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D1665CA1CF8CA6700CC4CA1 /* NSNumber+NumberType.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D1665CD1CF8CA8A00CC4CA1 /* SDLPermissionConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D1665CC1CF8CA8A00CC4CA1 /* SDLPermissionConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5D2996EA1BFCC0E3006106BF /* (null) in Sources */ = {isa = PBXBuildFile; }; 5D2F58081D0717D5001085CE /* SDLManagerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D2F58071D0717D5001085CE /* SDLManagerDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D3E48751D6F3B330000BFEF /* SDLAsynchronousOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D3E48731D6F3B330000BFEF /* SDLAsynchronousOperation.h */; }; 5D3E48761D6F3B330000BFEF /* SDLAsynchronousOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D3E48741D6F3B330000BFEF /* SDLAsynchronousOperation.m */; }; @@ -4207,6 +4205,7 @@ TargetAttributes = { 5D4019AE1A76EC350006B0C2 = { CreatedOnToolsVersion = 6.1.1; + DevelopmentTeam = ACNGAAM3M7; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 1; @@ -4515,7 +4514,6 @@ 5D61FCE91A84238C00846EE7 /* SDLLanguage.m in Sources */, 5D61FC3E1A84238C00846EE7 /* SDLAlertResponse.m in Sources */, 5D61FD8C1A84238C00846EE7 /* SDLSetMediaClockTimer.m in Sources */, - 5D2996EA1BFCC0E3006106BF /* (null) in Sources */, 5D61FE121A84238C00846EE7 /* SDLWarningLightStatus.m in Sources */, 5D61FCB81A84238C00846EE7 /* SDLGetVehicleDataResponse.m in Sources */, 5D61FC661A84238C00846EE7 /* SDLCompassDirection.m in Sources */, @@ -4539,7 +4537,6 @@ 5D61FCA41A84238C00846EE7 /* SDLEndAudioPassThru.m in Sources */, 5D8B17541AC9E11B006A6E1C /* SDLDialNumberResponse.m in Sources */, 5D61FC851A84238C00846EE7 /* SDLDeviceLevelStatus.m in Sources */, - 5D1665AB1CF5F7D000CC4CA1 /* (null) in Sources */, 5D61FD1E1A84238C00846EE7 /* SDLOnTBTClientState.m in Sources */, DA9F7E641DCBFAC800ACAE48 /* SDLDateTime.m in Sources */, 5D61FD581A84238C00846EE7 /* SDLPutFileResponse.m in Sources */, @@ -5073,6 +5070,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = ACNGAAM3M7; INFOPLIST_FILE = "$(SRCROOT)/SmartDeviceLink_Example/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -5086,6 +5084,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = ACNGAAM3M7; INFOPLIST_FILE = "$(SRCROOT)/SmartDeviceLink_Example/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/SmartDeviceLink/SDLAbstractProtocol.h b/SmartDeviceLink/SDLAbstractProtocol.h index d1772d447..45e00b434 100644 --- a/SmartDeviceLink/SDLAbstractProtocol.h +++ b/SmartDeviceLink/SDLAbstractProtocol.h @@ -13,9 +13,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLAbstractProtocol : NSObject <SDLTransportDelegate> -@property (strong) NSString *debugConsoleGroupName; -@property (nullable, weak) SDLAbstractTransport *transport; -@property (nullable, strong) NSHashTable<id<SDLProtocolListener>> *protocolDelegateTable; +@property (strong, nonatomic) NSString *debugConsoleGroupName; +@property (nullable, weak, nonatomic) SDLAbstractTransport *transport; +@property (nullable, strong, nonatomic) NSHashTable<id<SDLProtocolListener>> *protocolDelegateTable; @property (nullable, nonatomic, strong) id<SDLSecurityType> securityManager; @property (nonatomic, copy) NSString *appId; diff --git a/SmartDeviceLink/SDLAbstractTransport.h b/SmartDeviceLink/SDLAbstractTransport.h index cd25eb3be..0273b8425 100644 --- a/SmartDeviceLink/SDLAbstractTransport.h +++ b/SmartDeviceLink/SDLAbstractTransport.h @@ -8,8 +8,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLAbstractTransport : NSObject -@property (nullable, weak) id<SDLTransportDelegate> delegate; -@property (strong) NSString *debugConsoleGroupName; +@property (nullable, weak, nonatomic) id<SDLTransportDelegate> delegate; +@property (strong, nonatomic) NSString *debugConsoleGroupName; - (void)connect; - (void)disconnect; diff --git a/SmartDeviceLink/SDLAddCommand.h b/SmartDeviceLink/SDLAddCommand.h index feb6ff597..59ef5cb02 100644 --- a/SmartDeviceLink/SDLAddCommand.h +++ b/SmartDeviceLink/SDLAddCommand.h @@ -68,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Integer, 0 - 2,000,000,000 */ -@property (strong) NSNumber<SDLInt> *cmdID; +@property (strong, nonatomic) NSNumber<SDLInt> *cmdID; /** * @abstract a *SDLMenuParams* pointer which will defined the command and how it is added to the Command Menu @@ -80,7 +80,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional */ -@property (nullable, strong) SDLMenuParams *menuParams; +@property (nullable, strong, nonatomic) SDLMenuParams *menuParams; /** * @abstract An array of strings to be used as VR synonyms for this command. @@ -91,7 +91,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array of Strings, Max String length 99 chars, Array size 1 - 100 */ -@property (nullable, strong) NSMutableArray<NSString *> *vrCommands; +@property (nullable, strong, nonatomic) NSMutableArray<NSString *> *vrCommands; /** * @abstract Image struct containing a static or dynamic icon @@ -102,7 +102,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional */ -@property (nullable, strong) SDLImage *cmdIcon; +@property (nullable, strong, nonatomic) SDLImage *cmdIcon; @end diff --git a/SmartDeviceLink/SDLAddSubMenu.h b/SmartDeviceLink/SDLAddSubMenu.h index 71fe4ee5a..b411a43bd 100644 --- a/SmartDeviceLink/SDLAddSubMenu.h +++ b/SmartDeviceLink/SDLAddSubMenu.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN * <i>SDLAddCommand</i> to which SDLSubMenu is the parent of the command being added * <p> */ -@property (strong) NSNumber<SDLInt> *menuID; +@property (strong, nonatomic) NSNumber<SDLInt> *menuID; /** * @abstract a position of menu * @discussion An NSNumber pointer representing the position within the items @@ -50,12 +50,12 @@ NS_ASSUME_NONNULL_BEGIN * the end of the list</li> * </ul> */ -@property (nullable, strong) NSNumber<SDLInt> *position; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *position; /** * @abstract a menuName which is displayed representing this submenu item * @discussion NSString which will be displayed representing this submenu item */ -@property (strong) NSString *menuName; +@property (strong, nonatomic) NSString *menuName; @end diff --git a/SmartDeviceLink/SDLAirbagStatus.h b/SmartDeviceLink/SDLAirbagStatus.h index 392e60e98..ce10945c7 100644 --- a/SmartDeviceLink/SDLAirbagStatus.h +++ b/SmartDeviceLink/SDLAirbagStatus.h @@ -9,14 +9,14 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLAirbagStatus : SDLRPCStruct -@property (strong) SDLVehicleDataEventStatus driverAirbagDeployed; -@property (strong) SDLVehicleDataEventStatus driverSideAirbagDeployed; -@property (strong) SDLVehicleDataEventStatus driverCurtainAirbagDeployed; -@property (strong) SDLVehicleDataEventStatus passengerAirbagDeployed; -@property (strong) SDLVehicleDataEventStatus passengerCurtainAirbagDeployed; -@property (strong) SDLVehicleDataEventStatus driverKneeAirbagDeployed; -@property (strong) SDLVehicleDataEventStatus passengerSideAirbagDeployed; -@property (strong) SDLVehicleDataEventStatus passengerKneeAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus driverAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus driverSideAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus driverCurtainAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus passengerAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus passengerCurtainAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus driverKneeAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus passengerSideAirbagDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus passengerKneeAirbagDeployed; @end diff --git a/SmartDeviceLink/SDLAlert.h b/SmartDeviceLink/SDLAlert.h index 18837c122..22b4e9d50 100644 --- a/SmartDeviceLink/SDLAlert.h +++ b/SmartDeviceLink/SDLAlert.h @@ -73,7 +73,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max length 500 chars */ -@property (nullable, strong) NSString *alertText1; +@property (nullable, strong, nonatomic) NSString *alertText1; /** * @abstract The String to be displayed in the second field of the display during the Alert @@ -88,7 +88,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max length 500 chars */ -@property (nullable, strong) NSString *alertText2; +@property (nullable, strong, nonatomic) NSString *alertText2; /** * @abstract the String to be displayed in the third field of the display during the Alert @@ -102,7 +102,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max length 500 chars */ -@property (nullable, strong) NSString *alertText3; +@property (nullable, strong, nonatomic) NSString *alertText3; /** * @abstract An array which, taken together, specify what is to be spoken to the user @@ -111,7 +111,7 @@ NS_ASSUME_NONNULL_BEGIN * * @see SDLTTSChunk */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *ttsChunks; +@property (nullable, strong, nonatomic) NSMutableArray<SDLTTSChunk *> *ttsChunks; /** * @abstract The duration of the displayed portion of the alert, in milliseconds. @@ -124,7 +124,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Integer, 3000 - 10000 */ -@property (nullable, strong) NSNumber<SDLInt> *duration; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *duration; /** * @abstract Whether the alert tone should be played before the TTS (if any) is spoken. @@ -133,7 +133,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Boolean */ -@property (nullable, strong) NSNumber<SDLBool> *playTone; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *playTone; /** * @abstract If supported on the given platform, the alert GUI will include some sort of animation indicating that loading of a feature is progressing. e.g. a spinning wheel or hourglass, etc. @@ -142,7 +142,7 @@ NS_ASSUME_NONNULL_BEGIN * * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSNumber<SDLBool> *progressIndicator; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *progressIndicator; /** * @abstract App defined SoftButtons. @@ -153,7 +153,7 @@ NS_ASSUME_NONNULL_BEGIN * * @see SDLSoftButton */ -@property (nullable, strong) NSMutableArray<SDLSoftButton *> *softButtons; +@property (nullable, strong, nonatomic) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLAlertManeuver.h b/SmartDeviceLink/SDLAlertManeuver.h index 238a93cc1..66baa8585 100644 --- a/SmartDeviceLink/SDLAlertManeuver.h +++ b/SmartDeviceLink/SDLAlertManeuver.h @@ -19,8 +19,8 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithTTS:(nullable NSString *)ttsText softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons; - (instancetype)initWithTTSChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons; -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *ttsChunks; -@property (nullable, strong) NSMutableArray<SDLSoftButton *> *softButtons; +@property (nullable, strong, nonatomic) NSMutableArray<SDLTTSChunk *> *ttsChunks; +@property (nullable, strong, nonatomic) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLAlertResponse.h b/SmartDeviceLink/SDLAlertResponse.h index f3269c709..a2883778c 100644 --- a/SmartDeviceLink/SDLAlertResponse.h +++ b/SmartDeviceLink/SDLAlertResponse.h @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLAlertResponse : SDLRPCResponse -@property (nullable, strong) NSNumber<SDLInt> *tryAgainTime; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *tryAgainTime; @end diff --git a/SmartDeviceLink/SDLAppInfo.h b/SmartDeviceLink/SDLAppInfo.h index 965575085..98a573970 100644 --- a/SmartDeviceLink/SDLAppInfo.h +++ b/SmartDeviceLink/SDLAppInfo.h @@ -9,9 +9,9 @@ NS_ASSUME_NONNULL_BEGIN + (instancetype)currentAppInfo; -@property (strong) NSString *appDisplayName; -@property (strong) NSString *appBundleID; -@property (strong) NSString *appVersion; +@property (strong, nonatomic) NSString *appDisplayName; +@property (strong, nonatomic) NSString *appBundleID; +@property (strong, nonatomic) NSString *appVersion; @end diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.h b/SmartDeviceLink/SDLAudioPassThruCapabilities.h index 206658b34..f4f14b598 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.h +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.h @@ -51,17 +51,17 @@ NS_ASSUME_NONNULL_BEGIN * @abstract The sampling rate for AudioPassThru<br> * */ -@property (strong) SDLSamplingRate samplingRate; +@property (strong, nonatomic) SDLSamplingRate samplingRate; /** * @abstract The sample depth in bit for AudioPassThru<br> * */ -@property (strong) SDLBitsPerSample bitsPerSample; +@property (strong, nonatomic) SDLBitsPerSample bitsPerSample; /** * @abstract The audiotype for AudioPassThru<br> * */ -@property (strong) SDLAudioType audioType; +@property (strong, nonatomic) SDLAudioType audioType; @end diff --git a/SmartDeviceLink/SDLBeltStatus.h b/SmartDeviceLink/SDLBeltStatus.h index 5108c623c..9b60b9dc7 100644 --- a/SmartDeviceLink/SDLBeltStatus.h +++ b/SmartDeviceLink/SDLBeltStatus.h @@ -9,21 +9,21 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLBeltStatus : SDLRPCStruct -@property (strong) SDLVehicleDataEventStatus driverBeltDeployed; -@property (strong) SDLVehicleDataEventStatus passengerBeltDeployed; -@property (strong) SDLVehicleDataEventStatus passengerBuckleBelted; -@property (strong) SDLVehicleDataEventStatus driverBuckleBelted; -@property (strong) SDLVehicleDataEventStatus leftRow2BuckleBelted; -@property (strong) SDLVehicleDataEventStatus passengerChildDetected; -@property (strong) SDLVehicleDataEventStatus rightRow2BuckleBelted; -@property (strong) SDLVehicleDataEventStatus middleRow2BuckleBelted; -@property (strong) SDLVehicleDataEventStatus middleRow3BuckleBelted; -@property (strong) SDLVehicleDataEventStatus leftRow3BuckleBelted; -@property (strong) SDLVehicleDataEventStatus rightRow3BuckleBelted; -@property (strong) SDLVehicleDataEventStatus leftRearInflatableBelted; -@property (strong) SDLVehicleDataEventStatus rightRearInflatableBelted; -@property (strong) SDLVehicleDataEventStatus middleRow1BeltDeployed; -@property (strong) SDLVehicleDataEventStatus middleRow1BuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus driverBeltDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus passengerBeltDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus passengerBuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus driverBuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus leftRow2BuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus passengerChildDetected; +@property (strong, nonatomic) SDLVehicleDataEventStatus rightRow2BuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus middleRow2BuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus middleRow3BuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus leftRow3BuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus rightRow3BuckleBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus leftRearInflatableBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus rightRearInflatableBelted; +@property (strong, nonatomic) SDLVehicleDataEventStatus middleRow1BeltDeployed; +@property (strong, nonatomic) SDLVehicleDataEventStatus middleRow1BuckleBelted; @end diff --git a/SmartDeviceLink/SDLBodyInformation.h b/SmartDeviceLink/SDLBodyInformation.h index 03417b6ad..a0d626b57 100644 --- a/SmartDeviceLink/SDLBodyInformation.h +++ b/SmartDeviceLink/SDLBodyInformation.h @@ -18,37 +18,37 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract References signal "PrkBrkActv_B_Actl". */ -@property (strong) NSNumber<SDLBool> *parkBrakeActive; +@property (strong, nonatomic) NSNumber<SDLBool> *parkBrakeActive; /** * @abstract References signal "Ignition_Switch_Stable". See IgnitionStableStatus. */ -@property (strong) SDLIgnitionStableStatus ignitionStableStatus; +@property (strong, nonatomic) SDLIgnitionStableStatus ignitionStableStatus; /** * @abstract References signal "Ignition_status". See IgnitionStatus. */ -@property (strong) SDLIgnitionStatus ignitionStatus; +@property (strong, nonatomic) SDLIgnitionStatus ignitionStatus; /** * @abstract References signal "DrStatDrv_B_Actl". */ -@property (nullable, strong) NSNumber<SDLBool> *driverDoorAjar; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *driverDoorAjar; /** * @abstract References signal "DrStatPsngr_B_Actl". */ -@property (nullable, strong) NSNumber<SDLBool> *passengerDoorAjar; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *passengerDoorAjar; /** * @abstract References signal "DrStatRl_B_Actl". */ -@property (nullable, strong) NSNumber<SDLBool> *rearLeftDoorAjar; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *rearLeftDoorAjar; /** * @abstract References signal "DrStatRr_B_Actl". */ -@property (nullable, strong) NSNumber<SDLBool> *rearRightDoorAjar; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *rearRightDoorAjar; @end diff --git a/SmartDeviceLink/SDLButtonCapabilities.h b/SmartDeviceLink/SDLButtonCapabilities.h index 18b283c36..cc24f84fa 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.h +++ b/SmartDeviceLink/SDLButtonCapabilities.h @@ -19,28 +19,28 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The name of the SDL HMI button. */ -@property (strong) SDLButtonName name; +@property (strong, nonatomic) SDLButtonName name; /** * @abstract A NSNumber value indicates whether the button supports a SHORT press * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *shortPressAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *shortPressAvailable; /** * @abstract A NSNumber value indicates whether the button supports a LONG press * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *longPressAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *longPressAvailable; /** * @abstract A NSNumber value indicates whether the button supports "button down" and "button up" * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *upDownAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *upDownAvailable; @end diff --git a/SmartDeviceLink/SDLChoice.h b/SmartDeviceLink/SDLChoice.h index 465734617..1e88f097b 100644 --- a/SmartDeviceLink/SDLChoice.h +++ b/SmartDeviceLink/SDLChoice.h @@ -63,49 +63,49 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Integer 0 - 65535 */ -@property (strong) NSNumber<SDLInt> *choiceID; +@property (strong, nonatomic) NSNumber<SDLInt> *choiceID; /** * @abstract Text which appears in menu, representing this choice * * Required, Max string length 500 chars */ -@property (strong) NSString *menuName; +@property (strong, nonatomic) NSString *menuName; /** * @abstract VR synonyms for this choice * * Required, Array of Strings, Array length 1 - 100, Max String length 99 chars */ -@property (strong) NSMutableArray<NSString *> *vrCommands; +@property (strong, nonatomic) NSMutableArray<NSString *> *vrCommands; /** * @abstract The image of the choice * * Optional */ -@property (nullable, strong) SDLImage *image; +@property (nullable, strong, nonatomic) SDLImage *image; /** * @abstract Optional secondary text to display; e.g. address of POI in a search result entry * * Optional, Max String length 500 chars */ -@property (nullable, strong) NSString *secondaryText; +@property (nullable, strong, nonatomic) NSString *secondaryText; /** * @abstract Optional tertiary text to display; e.g. distance to POI for a search result entry * * Optional, Max String length 500 chars */ -@property (nullable, strong) NSString *tertiaryText; +@property (nullable, strong, nonatomic) NSString *tertiaryText; /** * @abstract Optional secondary image for choice * * Optional */ -@property (nullable, strong) SDLImage *secondaryImage; +@property (nullable, strong, nonatomic) SDLImage *secondaryImage; @end diff --git a/SmartDeviceLink/SDLClusterModeStatus.h b/SmartDeviceLink/SDLClusterModeStatus.h index 3a0590997..558a1fdcc 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.h +++ b/SmartDeviceLink/SDLClusterModeStatus.h @@ -11,10 +11,10 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLClusterModeStatus : SDLRPCStruct -@property (strong) NSNumber<SDLBool> *powerModeActive; -@property (strong) SDLPowerModeQualificationStatus powerModeQualificationStatus; -@property (strong) SDLCarModeStatus carModeStatus; -@property (strong) SDLPowerModeStatus powerModeStatus; +@property (strong, nonatomic) NSNumber<SDLBool> *powerModeActive; +@property (strong, nonatomic) SDLPowerModeQualificationStatus powerModeQualificationStatus; +@property (strong, nonatomic) SDLCarModeStatus carModeStatus; +@property (strong, nonatomic) SDLPowerModeStatus powerModeStatus; @end diff --git a/SmartDeviceLink/SDLConsoleController.h b/SmartDeviceLink/SDLConsoleController.h index 41807164c..26cbd39cb 100644 --- a/SmartDeviceLink/SDLConsoleController.h +++ b/SmartDeviceLink/SDLConsoleController.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN NSDateFormatter *dateFormatter; } -@property (strong, readonly) NSMutableArray<NSDictionary<NSString *, id>*> *messageList; +@property (strong, nonatomic, readonly) NSMutableArray<NSDictionary<NSString *, id>*> *messageList; - (instancetype)initWithTableView:(UITableView *)tableView; diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h index 5bfcfb7b3..2679f0266 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h @@ -30,14 +30,14 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Integer, 0 - 2,000,000,000 */ -@property (strong) NSNumber<SDLInt> *interactionChoiceSetID; +@property (strong, nonatomic) NSNumber<SDLInt> *interactionChoiceSetID; /** * @abstract Array of choices, which the user can select by menu or voice recognition * * Required, SDLChoice, Array size 1 - 100 */ -@property (strong) NSMutableArray<SDLChoice *> *choiceSet; +@property (strong, nonatomic) NSMutableArray<SDLChoice *> *choiceSet; @end diff --git a/SmartDeviceLink/SDLDIDResult.h b/SmartDeviceLink/SDLDIDResult.h index e58f6607a..2ee14af44 100644 --- a/SmartDeviceLink/SDLDIDResult.h +++ b/SmartDeviceLink/SDLDIDResult.h @@ -9,9 +9,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLDIDResult : SDLRPCStruct -@property (strong) SDLVehicleDataResultCode resultCode; -@property (strong) NSNumber<SDLInt> *didLocation; -@property (nullable, strong) NSString *data; +@property (strong, nonatomic) SDLVehicleDataResultCode resultCode; +@property (strong, nonatomic) NSNumber<SDLInt> *didLocation; +@property (nullable, strong, nonatomic) NSString *data; @end diff --git a/SmartDeviceLink/SDLDeleteCommand.h b/SmartDeviceLink/SDLDeleteCommand.h index 7d5c1cbe3..2bc9e7769 100644 --- a/SmartDeviceLink/SDLDeleteCommand.h +++ b/SmartDeviceLink/SDLDeleteCommand.h @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Min Value: 0; Max Value: 2000000000 */ -@property (strong) NSNumber<SDLInt> *cmdID; +@property (strong, nonatomic) NSNumber<SDLInt> *cmdID; @end diff --git a/SmartDeviceLink/SDLDeleteFile.h b/SmartDeviceLink/SDLDeleteFile.h index 961e8b01a..4372e4333 100644 --- a/SmartDeviceLink/SDLDeleteFile.h +++ b/SmartDeviceLink/SDLDeleteFile.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN * @abstract a file reference name * @discussion a String value representing a file reference name */ -@property (strong) NSString *syncFileName; +@property (strong, nonatomic) NSString *syncFileName; @end diff --git a/SmartDeviceLink/SDLDeleteFileResponse.h b/SmartDeviceLink/SDLDeleteFileResponse.h index 8e7cb2107..aaf8e8f9e 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.h +++ b/SmartDeviceLink/SDLDeleteFileResponse.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLDeleteFileResponse : SDLRPCResponse -@property (strong) NSNumber<SDLInt> *spaceAvailable; +@property (strong, nonatomic) NSNumber<SDLInt> *spaceAvailable; @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h index 9beb61ffb..8c03f2eca 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Min Value: 0; Max Value: 2000000000 */ -@property (strong) NSNumber<SDLInt> *interactionChoiceSetID; +@property (strong, nonatomic) NSNumber<SDLInt> *interactionChoiceSetID; @end diff --git a/SmartDeviceLink/SDLDeleteSubMenu.h b/SmartDeviceLink/SDLDeleteSubMenu.h index daf04970d..74a6363a9 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.h +++ b/SmartDeviceLink/SDLDeleteSubMenu.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN * @abstract the MenuID that identifies the SDLSubMenu to be delete * @discussion <b>Notes: </b>Min Value: 0; Max Value: 2000000000 */ -@property (strong) NSNumber<SDLInt> *menuID; +@property (strong, nonatomic) NSNumber<SDLInt> *menuID; @end diff --git a/SmartDeviceLink/SDLDeviceInfo.h b/SmartDeviceLink/SDLDeviceInfo.h index a1e62dc24..0af061abc 100644 --- a/SmartDeviceLink/SDLDeviceInfo.h +++ b/SmartDeviceLink/SDLDeviceInfo.h @@ -9,12 +9,12 @@ NS_ASSUME_NONNULL_BEGIN + (instancetype)currentDevice; -@property (nullable, strong) NSString *hardware; -@property (nullable, strong) NSString *firmwareRev; -@property (nullable, strong) NSString *os; -@property (nullable, strong) NSString *osVersion; -@property (nullable, strong) NSString *carrier; -@property (nullable, strong) NSNumber<SDLInt> *maxNumberRFCOMMPorts; +@property (nullable, strong, nonatomic) NSString *hardware; +@property (nullable, strong, nonatomic) NSString *firmwareRev; +@property (nullable, strong, nonatomic) NSString *os; +@property (nullable, strong, nonatomic) NSString *osVersion; +@property (nullable, strong, nonatomic) NSString *carrier; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *maxNumberRFCOMMPorts; @end diff --git a/SmartDeviceLink/SDLDeviceStatus.h b/SmartDeviceLink/SDLDeviceStatus.h index 2642162a8..d1f36d215 100644 --- a/SmartDeviceLink/SDLDeviceStatus.h +++ b/SmartDeviceLink/SDLDeviceStatus.h @@ -108,35 +108,35 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *voiceRecOn; +@property (strong, nonatomic) NSNumber<SDLBool> *voiceRecOn; /** * @abstract Indicates whether the bluetooth connection established * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *btIconOn; +@property (strong, nonatomic) NSNumber<SDLBool> *btIconOn; /** * @abstract Indicates whether a call is being active * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *callActive; +@property (strong, nonatomic) NSNumber<SDLBool> *callActive; /** * @abstract Indicates whether the phone is in roaming mode * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *phoneRoaming; +@property (strong, nonatomic) NSNumber<SDLBool> *phoneRoaming; /** * @abstract Indicates whether a textmessage is available * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *textMsgAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *textMsgAvailable; /** * @abstract Battery level status @@ -145,21 +145,21 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLDeviceLevelStatus battLevelStatus; +@property (strong, nonatomic) SDLDeviceLevelStatus battLevelStatus; /** * @abstract The status of the stereo audio output channel * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *stereoAudioOutputMuted; +@property (strong, nonatomic) NSNumber<SDLBool> *stereoAudioOutputMuted; /** * @abstract The status of the mono audio output channel * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *monoAudioOutputMuted; +@property (strong, nonatomic) NSNumber<SDLBool> *monoAudioOutputMuted; /** * @abstract Signal level status @@ -168,7 +168,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLDeviceLevelStatus signalLevelStatus; +@property (strong, nonatomic) SDLDeviceLevelStatus signalLevelStatus; /** * @abstract The current primary audio source of SDL (if selected). @@ -177,14 +177,14 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLPrimaryAudioSource primaryAudioSource; +@property (strong, nonatomic) SDLPrimaryAudioSource primaryAudioSource; /** * @abstract Indicates if an emergency call is active * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *eCallEventActive; +@property (strong, nonatomic) NSNumber<SDLBool> *eCallEventActive; @end diff --git a/SmartDeviceLink/SDLDiagnosticMessage.h b/SmartDeviceLink/SDLDiagnosticMessage.h index 3c6467f09..e5bff4a58 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.h +++ b/SmartDeviceLink/SDLDiagnosticMessage.h @@ -21,21 +21,21 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Integer, 0 - 65535 */ -@property (strong) NSNumber<SDLInt> *targetID; +@property (strong, nonatomic) NSNumber<SDLInt> *targetID; /** * Length of message (in bytes) * * Required, Integer, 65535 */ -@property (strong) NSNumber<SDLInt> *messageLength; +@property (strong, nonatomic) NSNumber<SDLInt> *messageLength; /** * Array of bytes comprising CAN message. * * Required, Array of NSNumber (Integers), Array size 1 - 65535, Integer Size 0 - 255 */ -@property (strong) NSMutableArray<NSNumber<SDLInt> *> *messageData; +@property (strong, nonatomic) NSMutableArray<NSNumber<SDLInt> *> *messageData; @end diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.h b/SmartDeviceLink/SDLDiagnosticMessageResponse.h index 3396dceb1..5c4c8745f 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.h +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLDiagnosticMessageResponse : SDLRPCResponse -@property (strong) NSMutableArray<NSNumber<SDLInt> *> *messageDataResult; +@property (strong, nonatomic) NSMutableArray<NSNumber<SDLInt> *> *messageDataResult; @end diff --git a/SmartDeviceLink/SDLDisplayCapabilities.h b/SmartDeviceLink/SDLDisplayCapabilities.h index 991a16dd5..437f686fc 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.h +++ b/SmartDeviceLink/SDLDisplayCapabilities.h @@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLDisplayType displayType; +@property (strong, nonatomic) SDLDisplayType displayType; /** * @abstract An array of SDLTextField structures, each of which describes a field in the HMI which the application can write to using operations such as *SDLShow*, *SDLSetMediaClockTimer*, etc. @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Array of SDLTextField, 1 - 100 objects */ -@property (strong) NSMutableArray<SDLTextField *> *textFields; +@property (strong, nonatomic) NSMutableArray<SDLTextField *> *textFields; /** * @abstract An array of SDLImageField elements @@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array of SDLImageField, 1 - 100 objects */ -@property (nullable, strong) NSMutableArray<SDLImageField *> *imageFields; +@property (nullable, strong, nonatomic) NSMutableArray<SDLImageField *> *imageFields; /** * @abstract An array of SDLMediaClockFormat elements, defining the valid string formats used in specifying the contents of the media clock field @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Array of SDLMediaClockFormats, 0 - 100 objects */ -@property (strong) NSMutableArray<SDLMediaClockFormat> *mediaClockFormats; +@property (strong, nonatomic) NSMutableArray<SDLMediaClockFormat> *mediaClockFormats; /** * @abstract The display's persistent screen supports. @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *graphicSupported; +@property (strong, nonatomic) NSNumber<SDLBool> *graphicSupported; /** * @abstract Number of presets the screen supports @@ -74,21 +74,21 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array of String, max string size 100, 0 - 100 objects */ -@property (nullable, strong) NSMutableArray<NSString *> *templatesAvailable; +@property (nullable, strong, nonatomic) NSMutableArray<NSString *> *templatesAvailable; /** * @abstract A set of all parameters related to a prescribed screen area (e.g. for video / touch input) * * Optional */ -@property (nullable, strong) SDLScreenParams *screenParams; +@property (nullable, strong, nonatomic) SDLScreenParams *screenParams; /** * @abstract The number of on-screen custom presets available (if any); otherwise omitted * * Optional, Integer 1 - 100 */ -@property (nullable, strong) NSNumber<SDLInt> *numCustomPresetsAvailable; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *numCustomPresetsAvailable; @end diff --git a/SmartDeviceLink/SDLECallInfo.h b/SmartDeviceLink/SDLECallInfo.h index 5528b5ec1..75d88f309 100644 --- a/SmartDeviceLink/SDLECallInfo.h +++ b/SmartDeviceLink/SDLECallInfo.h @@ -10,9 +10,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLECallInfo : SDLRPCStruct -@property (strong) SDLVehicleDataNotificationStatus eCallNotificationStatus; -@property (strong) SDLVehicleDataNotificationStatus auxECallNotificationStatus; -@property (strong) SDLECallConfirmationStatus eCallConfirmationStatus; +@property (strong, nonatomic) SDLVehicleDataNotificationStatus eCallNotificationStatus; +@property (strong, nonatomic) SDLVehicleDataNotificationStatus auxECallNotificationStatus; +@property (strong, nonatomic) SDLECallConfirmationStatus eCallConfirmationStatus; @end diff --git a/SmartDeviceLink/SDLEmergencyEvent.h b/SmartDeviceLink/SDLEmergencyEvent.h index 7162a5abd..759c64659 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.h +++ b/SmartDeviceLink/SDLEmergencyEvent.h @@ -11,11 +11,11 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLEmergencyEvent : SDLRPCStruct -@property (strong) SDLEmergencyEventType emergencyEventType; -@property (strong) SDLFuelCutoffStatus fuelCutoffStatus; -@property (strong) SDLVehicleDataEventStatus rolloverEvent; -@property (strong) NSNumber<SDLInt> *maximumChangeVelocity; -@property (strong) SDLVehicleDataEventStatus multipleEvents; +@property (strong, nonatomic) SDLEmergencyEventType emergencyEventType; +@property (strong, nonatomic) SDLFuelCutoffStatus fuelCutoffStatus; +@property (strong, nonatomic) SDLVehicleDataEventStatus rolloverEvent; +@property (strong, nonatomic) NSNumber<SDLInt> *maximumChangeVelocity; +@property (strong, nonatomic) SDLVehicleDataEventStatus multipleEvents; @end diff --git a/SmartDeviceLink/SDLEncodedSyncPData.h b/SmartDeviceLink/SDLEncodedSyncPData.h index 99e543f7c..5d32ced74 100644 --- a/SmartDeviceLink/SDLEncodedSyncPData.h +++ b/SmartDeviceLink/SDLEncodedSyncPData.h @@ -8,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLEncodedSyncPData : SDLRPCRequest -@property (strong) NSMutableArray<NSString *> *data; +@property (strong, nonatomic) NSMutableArray<NSString *> *data; @end diff --git a/SmartDeviceLink/SDLGPSData.h b/SmartDeviceLink/SDLGPSData.h index c720356b1..892bd7e46 100644 --- a/SmartDeviceLink/SDLGPSData.h +++ b/SmartDeviceLink/SDLGPSData.h @@ -22,61 +22,61 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Float, -180 - 180 */ -@property (strong) NSNumber<SDLFloat> *longitudeDegrees; +@property (strong, nonatomic) NSNumber<SDLFloat> *longitudeDegrees; /** * @abstract latitude degrees * * Required, Float, -90 - 90 */ -@property (strong) NSNumber<SDLFloat> *latitudeDegrees; +@property (strong, nonatomic) NSNumber<SDLFloat> *latitudeDegrees; /** * @abstract utc year * * Required, Integer, 2010 - 2100 */ -@property (strong) NSNumber<SDLInt> *utcYear; +@property (strong, nonatomic) NSNumber<SDLInt> *utcYear; /** * @abstract utc month * * Required, Integer, 1 - 12 */ -@property (strong) NSNumber<SDLInt> *utcMonth; +@property (strong, nonatomic) NSNumber<SDLInt> *utcMonth; /** * @abstract utc day * * Required, Integer, 1 - 31 */ -@property (strong) NSNumber<SDLInt> *utcDay; +@property (strong, nonatomic) NSNumber<SDLInt> *utcDay; /** * @abstract utc hours * * Required, Integer, 0 - 23 */ -@property (strong) NSNumber<SDLInt> *utcHours; +@property (strong, nonatomic) NSNumber<SDLInt> *utcHours; /** * @abstract utc minutes * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber<SDLInt> *utcMinutes; +@property (strong, nonatomic) NSNumber<SDLInt> *utcMinutes; /** * @abstract utc seconds * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber<SDLInt> *utcSeconds; +@property (strong, nonatomic) NSNumber<SDLInt> *utcSeconds; /** * Potential Compass Directions */ -@property (strong) SDLCompassDirection compassDirection; +@property (strong, nonatomic) SDLCompassDirection compassDirection; /** * @abstract The 3D positional dilution of precision. @@ -85,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Float, 0.0 - 10.0 */ -@property (strong) NSNumber<SDLFloat> *pdop; +@property (strong, nonatomic) NSNumber<SDLFloat> *pdop; /** * @abstract The horizontal dilution of precision @@ -94,7 +94,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Float, 0.0 - 10.0 */ -@property (strong) NSNumber<SDLFloat> *hdop; +@property (strong, nonatomic) NSNumber<SDLFloat> *hdop; /** * @abstract the vertical dilution of precision @@ -103,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Float, 0.0 - 10.0 */ -@property (strong) NSNumber<SDLFloat> *vdop; +@property (strong, nonatomic) NSNumber<SDLFloat> *vdop; /** * @abstract What the coordinates are based on @@ -112,28 +112,28 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *actual; +@property (strong, nonatomic) NSNumber<SDLBool> *actual; /** * @abstract The number of satellites in view * * Required, Integer, 0 - 31 */ -@property (strong) NSNumber<SDLInt> *satellites; +@property (strong, nonatomic) NSNumber<SDLInt> *satellites; /** * The supported dimensions of the GPS * * Required */ -@property (strong) SDLDimension dimension; +@property (strong, nonatomic) SDLDimension dimension; /** * @abstract altitude in meters * * Required, Float, -10000.0 - 10000.0 */ -@property (strong) NSNumber<SDLFloat> *altitude; +@property (strong, nonatomic) NSNumber<SDLFloat> *altitude; /** * @abstract Heading based on the GPS data. @@ -142,14 +142,14 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Float, 0.0 - 359.99 */ -@property (strong) NSNumber<SDLFloat> *heading; +@property (strong, nonatomic) NSNumber<SDLFloat> *heading; /** * @abstract speed in KPH * * Required, Float, 0.0 - 500.0 */ -@property (strong) NSNumber<SDLFloat> *speed; +@property (strong, nonatomic) NSNumber<SDLFloat> *speed; @end diff --git a/SmartDeviceLink/SDLGetDTCs.h b/SmartDeviceLink/SDLGetDTCs.h index 290ab3a2b..c212e7f95 100644 --- a/SmartDeviceLink/SDLGetDTCs.h +++ b/SmartDeviceLink/SDLGetDTCs.h @@ -29,11 +29,11 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Minvalue:0; Maxvalue:65535 */ -@property (strong) NSNumber<SDLInt> *ecuName; +@property (strong, nonatomic) NSNumber<SDLInt> *ecuName; /** * @abstract DTC Mask Byte to be sent in diagnostic request to module. NSNumber* dtcMask Minvalue:0; Maxvalue:255 */ -@property (nullable, strong) NSNumber<SDLInt> *dtcMask; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *dtcMask; @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetDTCsResponse.h b/SmartDeviceLink/SDLGetDTCsResponse.h index f9511ea4e..7368b42f2 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.h +++ b/SmartDeviceLink/SDLGetDTCsResponse.h @@ -14,8 +14,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLGetDTCsResponse : SDLRPCResponse -@property (strong) NSNumber<SDLInt> *ecuHeader; -@property (strong) NSMutableArray<NSString *> *dtc; +@property (strong, nonatomic) NSNumber<SDLInt> *ecuHeader; +@property (strong, nonatomic) NSMutableArray<NSString *> *dtc; @end diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index a64383c56..cee465c23 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -24,109 +24,109 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A boolean value. If true, requests Gps data */ -@property (nullable, strong) NSNumber<SDLBool> *gps; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *gps; /** * @abstract A boolean value. If true, requests speed data */ -@property (nullable, strong) NSNumber<SDLBool> *speed; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *speed; /** * @abstract A boolean value. If true, requests rpm data */ -@property (nullable, strong) NSNumber<SDLBool> *rpm; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *rpm; /** * @abstract A boolean value. If true, requests FuelLevel data */ -@property (nullable, strong) NSNumber<SDLBool> *fuelLevel; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *fuelLevel; /** * @abstract A boolean value. If true, requests fuelLevel_State data */ -@property (nullable, strong) NSNumber<SDLBool> *fuelLevel_State; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *fuelLevel_State; /** * @abstract A boolean value. If true, requests instantFuelConsumption data */ -@property (nullable, strong) NSNumber<SDLBool> *instantFuelConsumption; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *instantFuelConsumption; /** * @abstract A boolean value. If true, requests externalTemperature data */ -@property (nullable, strong) NSNumber<SDLBool> *externalTemperature; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *externalTemperature; /** * @abstract A boolean value. If true, requests Vehicle Identification Number */ -@property (nullable, strong) NSNumber<SDLBool> *vin; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *vin; /** * @abstract A boolean value. If true, requests Currently selected gear data */ -@property (nullable, strong) NSNumber<SDLBool> *prndl; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *prndl; /** * @abstract A boolean value. If true, requests tire pressure status data */ -@property (nullable, strong) NSNumber<SDLBool> *tirePressure; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *tirePressure; /** * @abstract A boolean value. If true, requests odometer data */ -@property (nullable, strong) NSNumber<SDLBool> *odometer; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *odometer; /** * @abstract A boolean value. If true, requests belt Status data */ -@property (nullable, strong) NSNumber<SDLBool> *beltStatus; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *beltStatus; /** * @abstract A boolean value. If true, requests body Information data */ -@property (nullable, strong) NSNumber<SDLBool> *bodyInformation; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *bodyInformation; /** * @abstract A boolean value. If true, requests device Status data */ -@property (nullable, strong) NSNumber<SDLBool> *deviceStatus; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *deviceStatus; /** * @abstract A boolean value. If true, requests driver Braking data */ -@property (nullable, strong) NSNumber<SDLBool> *driverBraking; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *driverBraking; /** * @abstract A boolean value. If true, requests wiper Status data */ -@property (nullable, strong) NSNumber<SDLBool> *wiperStatus; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *wiperStatus; /** * @abstract A boolean value. If true, requests Head Lamp Status data */ -@property (nullable, strong) NSNumber<SDLBool> *headLampStatus; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *headLampStatus; /** * @abstract A boolean value. If true, requests Engine Torque data */ -@property (nullable, strong) NSNumber<SDLBool> *engineTorque; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *engineTorque; /** * @abstract A boolean value. If true, means the accPedalPosition data has been * subscribed. */ -@property (nullable, strong) NSNumber<SDLBool> *accPedalPosition; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *accPedalPosition; /** * @abstract A boolean value. If true, means the steeringWheelAngle data has been * subscribed. */ -@property (nullable, strong) NSNumber<SDLBool> *steeringWheelAngle; -@property (nullable, strong) NSNumber<SDLBool> *eCallInfo; -@property (nullable, strong) NSNumber<SDLBool> *airbagStatus; -@property (nullable, strong) NSNumber<SDLBool> *emergencyEvent; -@property (nullable, strong) NSNumber<SDLBool> *clusterModeStatus; -@property (nullable, strong) NSNumber<SDLBool> *myKey; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *steeringWheelAngle; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *eCallInfo; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *airbagStatus; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *emergencyEvent; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *clusterModeStatus; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *myKey; @end diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index c851e96f2..240f9907b 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -35,107 +35,107 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A SDLGPSData* value. See GPSData. */ -@property (nullable, strong) SDLGPSData *gps; +@property (nullable, strong, nonatomic) SDLGPSData *gps; /** * @abstract The vehicle speed in kilometers per hour. */ -@property (nullable, strong) NSNumber<SDLFloat> *speed; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *speed; /** * @abstract The number of revolutions per minute of the engine. */ -@property (nullable, strong) NSNumber<SDLInt> *rpm; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *rpm; /** * @abstract The fuel level in the tank (percentage) */ -@property (nullable, strong) NSNumber<SDLFloat> *fuelLevel; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *fuelLevel; /** * @abstract A SDLComponentVolumeStatus* value. The fuel level state. */ -@property (nullable, strong) SDLComponentVolumeStatus fuelLevel_State; +@property (nullable, strong, nonatomic) SDLComponentVolumeStatus fuelLevel_State; /** * @abstract The instantaneous fuel consumption in microlitres. */ -@property (nullable, strong) NSNumber<SDLFloat> *instantFuelConsumption; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *instantFuelConsumption; /** * @abstract The external temperature in degrees celsius. */ -@property (nullable, strong) NSNumber<SDLFloat> *externalTemperature; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *externalTemperature; /** * @abstract The Vehicle Identification Number */ -@property (nullable, strong) NSString *vin; +@property (nullable, strong, nonatomic) NSString *vin; /** * @abstract See PRNDL. */ -@property (nullable, strong) SDLPRNDL prndl; +@property (nullable, strong, nonatomic) SDLPRNDL prndl; /** * @abstract A SDLTireStatus* value. See TireStatus. */ -@property (nullable, strong) SDLTireStatus *tirePressure; +@property (nullable, strong, nonatomic) SDLTireStatus *tirePressure; /** * @abstract Odometer reading in km. */ -@property (nullable, strong) NSNumber<SDLInt> *odometer; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *odometer; /** * @abstract A SDLBeltStatus* value. The status of the seat belts. */ -@property (nullable, strong) SDLBeltStatus *beltStatus; +@property (nullable, strong, nonatomic) SDLBeltStatus *beltStatus; /** * @abstract A SDLBodyInformation* value. The body information including power modes. */ -@property (nullable, strong) SDLBodyInformation *bodyInformation; +@property (nullable, strong, nonatomic) SDLBodyInformation *bodyInformation; /** * @abstract A SDLDeviceStatus* value. The device status including signal and battery strength. */ -@property (nullable, strong) SDLDeviceStatus *deviceStatus; +@property (nullable, strong, nonatomic) SDLDeviceStatus *deviceStatus; /** * @abstract A SDLVehicleDataResult* value. The status of the brake pedal. */ -@property (nullable, strong) SDLVehicleDataEventStatus driverBraking; +@property (nullable, strong, nonatomic) SDLVehicleDataEventStatus driverBraking; /** * @abstract A SDLWiperStatus* value. The status of the wipers. */ -@property (nullable, strong) SDLWiperStatus wiperStatus; +@property (nullable, strong, nonatomic) SDLWiperStatus wiperStatus; /** * @abstract A SDLHeadLampStatus* value. Status of the head lamps. */ -@property (nullable, strong) SDLHeadLampStatus *headLampStatus; +@property (nullable, strong, nonatomic) SDLHeadLampStatus *headLampStatus; /** * @abstract Torque value for engine (in Nm) on non-diesel variants. */ -@property (nullable, strong) NSNumber<SDLFloat> *engineTorque; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *engineTorque; /** * @abstract Accelerator pedal position (percentage depressed) */ -@property (nullable, strong) NSNumber<SDLFloat> *accPedalPosition; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *accPedalPosition; /** * @abstract Current angle of the steering wheel (in deg) */ -@property (nullable, strong) NSNumber<SDLFloat> *steeringWheelAngle; -@property (nullable, strong) SDLECallInfo *eCallInfo; -@property (nullable, strong) SDLAirbagStatus *airbagStatus; -@property (nullable, strong) SDLEmergencyEvent *emergencyEvent; -@property (nullable, strong) SDLClusterModeStatus *clusterModeStatus; -@property (nullable, strong) SDLMyKey *myKey; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *steeringWheelAngle; +@property (nullable, strong, nonatomic) SDLECallInfo *eCallInfo; +@property (nullable, strong, nonatomic) SDLAirbagStatus *airbagStatus; +@property (nullable, strong, nonatomic) SDLEmergencyEvent *emergencyEvent; +@property (nullable, strong, nonatomic) SDLClusterModeStatus *clusterModeStatus; +@property (nullable, strong, nonatomic) SDLMyKey *myKey; @end diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.h b/SmartDeviceLink/SDLGetWaypointsResponse.h index 46f726a68..3da0b1a0d 100644 --- a/SmartDeviceLink/SDLGetWaypointsResponse.h +++ b/SmartDeviceLink/SDLGetWaypointsResponse.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array size 1 - 10 */ -@property (nullable, strong) NSArray<SDLLocationDetails *> *waypoints; +@property (nullable, strong, nonatomic) NSArray<SDLLocationDetails *> *waypoints; @end diff --git a/SmartDeviceLink/SDLHMIPermissions.h b/SmartDeviceLink/SDLHMIPermissions.h index ea370dcc4..a37f867e6 100644 --- a/SmartDeviceLink/SDLHMIPermissions.h +++ b/SmartDeviceLink/SDLHMIPermissions.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Array of SDLHMILevel, Array size 0 - 100 */ -@property (strong) NSMutableArray<SDLHMILevel> *allowed; +@property (strong, nonatomic) NSMutableArray<SDLHMILevel> *allowed; /** * @abstract a set of all HMI levels that are prohibited for this given RPC @@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Array of SDLHMILevel, Array size 0 - 100 */ -@property (strong) NSMutableArray<SDLHMILevel> *userDisallowed; +@property (strong, nonatomic) NSMutableArray<SDLHMILevel> *userDisallowed; @end diff --git a/SmartDeviceLink/SDLHeadLampStatus.h b/SmartDeviceLink/SDLHeadLampStatus.h index 5e8e45465..f695fdb2d 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.h +++ b/SmartDeviceLink/SDLHeadLampStatus.h @@ -17,13 +17,13 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A boolean value. Status of the low beam lamps. */ -@property (strong) NSNumber<SDLBool> *lowBeamsOn; +@property (strong, nonatomic) NSNumber<SDLBool> *lowBeamsOn; /** * @abstract A boolean value. Status of the high beam lamps. */ -@property (strong) NSNumber<SDLBool> *highBeamsOn; +@property (strong, nonatomic) NSNumber<SDLBool> *highBeamsOn; -@property (nullable, strong) SDLAmbientLightStatus ambientLightSensorStatus; +@property (nullable, strong, nonatomic) SDLAmbientLightStatus ambientLightSensorStatus; @end diff --git a/SmartDeviceLink/SDLIAPSession.h b/SmartDeviceLink/SDLIAPSession.h index 8f28c64da..6442540c4 100644 --- a/SmartDeviceLink/SDLIAPSession.h +++ b/SmartDeviceLink/SDLIAPSession.h @@ -14,11 +14,11 @@ typedef void (^SessionCompletionHandler)(BOOL success); @interface SDLIAPSession : NSObject -@property (nullable, strong, atomic) EAAccessory *accessory; -@property (nullable, strong, atomic) NSString *protocol; -@property (nullable, strong, atomic) EASession *easession; -@property (nullable, weak) id<SDLIAPSessionDelegate> delegate; -@property (nullable, strong, atomic) SDLStreamDelegate *streamDelegate; +@property (nullable, strong, nonatomic) EAAccessory *accessory; +@property (nullable, strong, nonatomic) NSString *protocol; +@property (nullable, strong, nonatomic) EASession *easession; +@property (nullable, weak, nonatomic) id<SDLIAPSessionDelegate> delegate; +@property (nullable, strong, nonatomic) SDLStreamDelegate *streamDelegate; - (instancetype)initWithAccessory:(EAAccessory *)accessory forProtocol:(NSString *)protocol; diff --git a/SmartDeviceLink/SDLIAPSession.m b/SmartDeviceLink/SDLIAPSession.m index cc8035911..7bbc96fa1 100644 --- a/SmartDeviceLink/SDLIAPSession.m +++ b/SmartDeviceLink/SDLIAPSession.m @@ -11,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLIAPSession () -@property (assign) BOOL isInputStreamOpen; -@property (assign) BOOL isOutputStreamOpen; +@property (assign, nonatomic) BOOL isInputStreamOpen; +@property (assign, nonatomic) BOOL isOutputStreamOpen; @end diff --git a/SmartDeviceLink/SDLIAPTransport.h b/SmartDeviceLink/SDLIAPTransport.h index 894869e49..94fd01bda 100644 --- a/SmartDeviceLink/SDLIAPTransport.h +++ b/SmartDeviceLink/SDLIAPTransport.h @@ -10,8 +10,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLIAPTransport : SDLAbstractTransport <SDLIAPSessionDelegate> -@property (nullable, strong, atomic) SDLIAPSession *controlSession; -@property (nullable, strong, atomic) SDLIAPSession *session; +@property (nullable, strong, nonatomic) SDLIAPSession *controlSession; +@property (nullable, strong, nonatomic) SDLIAPSession *session; @end diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m index c2c0102eb..e2a85bc78 100644 --- a/SmartDeviceLink/SDLIAPTransport.m +++ b/SmartDeviceLink/SDLIAPTransport.m @@ -30,9 +30,9 @@ int const streamOpenTimeoutSeconds = 2; dispatch_queue_t _transmit_queue; } -@property (assign) int retryCounter; -@property (assign) BOOL sessionSetupInProgress; -@property (nullable, strong) SDLTimer *protocolIndexTimer; +@property (assign, nonatomic) int retryCounter; +@property (assign, nonatomic) BOOL sessionSetupInProgress; +@property (nullable, strong, nonatomic) SDLTimer *protocolIndexTimer; @end diff --git a/SmartDeviceLink/SDLImage.h b/SmartDeviceLink/SDLImage.h index 7f669afab..cb21b9545 100644 --- a/SmartDeviceLink/SDLImage.h +++ b/SmartDeviceLink/SDLImage.h @@ -22,14 +22,14 @@ NS_ASSUME_NONNULL_BEGIN * * Required, max length = 65535 */ -@property (strong) NSString *value; +@property (strong, nonatomic) NSString *value; /** * @abstract Describes, whether it is a static or dynamic image * * Required */ -@property (strong) SDLImageType imageType; +@property (strong, nonatomic) SDLImageType imageType; @end diff --git a/SmartDeviceLink/SDLImageField.h b/SmartDeviceLink/SDLImageField.h index 9d14c8bd3..429e77343 100644 --- a/SmartDeviceLink/SDLImageField.h +++ b/SmartDeviceLink/SDLImageField.h @@ -12,9 +12,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLImageField : SDLRPCStruct -@property (strong) SDLImageFieldName name; -@property (strong) NSMutableArray<SDLFileType> *imageTypeSupported; -@property (nullable, strong) SDLImageResolution *imageResolution; +@property (strong, nonatomic) SDLImageFieldName name; +@property (strong, nonatomic) NSMutableArray<SDLFileType> *imageTypeSupported; +@property (nullable, strong, nonatomic) SDLImageResolution *imageResolution; @end diff --git a/SmartDeviceLink/SDLImageResolution.h b/SmartDeviceLink/SDLImageResolution.h index 94f103d07..d9b25eec7 100644 --- a/SmartDeviceLink/SDLImageResolution.h +++ b/SmartDeviceLink/SDLImageResolution.h @@ -8,8 +8,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLImageResolution : SDLRPCStruct -@property (strong) NSNumber<SDLInt> *resolutionWidth; -@property (strong) NSNumber<SDLInt> *resolutionHeight; +@property (strong, nonatomic) NSNumber<SDLInt> *resolutionWidth; +@property (strong, nonatomic) NSNumber<SDLInt> *resolutionHeight; @end diff --git a/SmartDeviceLink/SDLKeyboardProperties.h b/SmartDeviceLink/SDLKeyboardProperties.h index 105b13f61..576053bd9 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.h +++ b/SmartDeviceLink/SDLKeyboardProperties.h @@ -13,11 +13,11 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithLanguage:(nullable SDLLanguage)language layout:(nullable SDLKeyboardLayout)layout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteText:(nullable NSString *)autoCompleteText; -@property (nullable, strong) SDLLanguage language; -@property (nullable, strong) SDLKeyboardLayout keyboardLayout; -@property (nullable, strong) SDLKeypressMode keypressMode; -@property (nullable, strong) NSMutableArray<NSString *> *limitedCharacterList; -@property (nullable, strong) NSString *autoCompleteText; +@property (nullable, strong, nonatomic) SDLLanguage language; +@property (nullable, strong, nonatomic) SDLKeyboardLayout keyboardLayout; +@property (nullable, strong, nonatomic) SDLKeypressMode keypressMode; +@property (nullable, strong, nonatomic) NSMutableArray<NSString *> *limitedCharacterList; +@property (nullable, strong, nonatomic) NSString *autoCompleteText; @end diff --git a/SmartDeviceLink/SDLListFilesResponse.h b/SmartDeviceLink/SDLListFilesResponse.h index cd8fb1a63..c07d617fe 100644 --- a/SmartDeviceLink/SDLListFilesResponse.h +++ b/SmartDeviceLink/SDLListFilesResponse.h @@ -14,8 +14,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLListFilesResponse : SDLRPCResponse -@property (nullable, strong) NSMutableArray<NSString *> *filenames; -@property (strong) NSNumber<SDLInt> *spaceAvailable; +@property (nullable, strong, nonatomic) NSMutableArray<NSString *> *filenames; +@property (strong, nonatomic) NSNumber<SDLInt> *spaceAvailable; @end diff --git a/SmartDeviceLink/SDLLocationDetails.h b/SmartDeviceLink/SDLLocationDetails.h index d4809e700..3bce4d58c 100644 --- a/SmartDeviceLink/SDLLocationDetails.h +++ b/SmartDeviceLink/SDLLocationDetails.h @@ -64,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional */ -@property (nullable, strong) SDLOasisAddress *searchAddress; +@property (nullable, strong, nonatomic) SDLOasisAddress *searchAddress; @end diff --git a/SmartDeviceLink/SDLMenuParams.h b/SmartDeviceLink/SDLMenuParams.h index 70a691cfa..c5b0c81ff 100644 --- a/SmartDeviceLink/SDLMenuParams.h +++ b/SmartDeviceLink/SDLMenuParams.h @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Integer, 0 - 2,000,000,000 */ -@property (nullable, strong) NSNumber<SDLInt> *parentID; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *parentID; /** * @abstract The position within the items of the parent Command Menu @@ -38,14 +38,14 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Integer, 0 - 1000 */ -@property (nullable, strong) NSNumber<SDLInt> *position; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *position; /** * @abstract the menu name which appears in menu, representing this command * * Required, max length 500 characters */ -@property (strong) NSString *menuName; +@property (strong, nonatomic) NSString *menuName; @end diff --git a/SmartDeviceLink/SDLMyKey.h b/SmartDeviceLink/SDLMyKey.h index 7bfc41335..1100d4990 100644 --- a/SmartDeviceLink/SDLMyKey.h +++ b/SmartDeviceLink/SDLMyKey.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLMyKey : SDLRPCStruct -@property (strong) SDLVehicleDataStatus e911Override; +@property (strong, nonatomic) SDLVehicleDataStatus e911Override; @end diff --git a/SmartDeviceLink/SDLObjectWithPriority.h b/SmartDeviceLink/SDLObjectWithPriority.h index b02041a57..848773f05 100644 --- a/SmartDeviceLink/SDLObjectWithPriority.h +++ b/SmartDeviceLink/SDLObjectWithPriority.h @@ -9,8 +9,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLObjectWithPriority : NSObject -@property (nullable, strong) id object; -@property (assign) NSInteger priority; +@property (nullable, strong, nonatomic) id object; +@property (assign, nonatomic) NSInteger priority; - (instancetype)initWithObject:(nullable id)object priority:(NSInteger)priority NS_DESIGNATED_INITIALIZER; diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h index d612a545c..7e18b858a 100644 --- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h +++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h @@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The reason application's interface was terminated */ -@property (strong) SDLAppInterfaceUnregisteredReason reason; +@property (strong, nonatomic) SDLAppInterfaceUnregisteredReason reason; @end diff --git a/SmartDeviceLink/SDLOnButtonEvent.h b/SmartDeviceLink/SDLOnButtonEvent.h index c333f828a..f4b65d95d 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.h +++ b/SmartDeviceLink/SDLOnButtonEvent.h @@ -51,12 +51,12 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The name of the button */ -@property (strong) SDLButtonName buttonName; +@property (strong, nonatomic) SDLButtonName buttonName; /** * @abstract Indicates whether this is an UP or DOWN event */ -@property (strong) SDLButtonEventMode buttonEventMode; +@property (strong, nonatomic) SDLButtonEventMode buttonEventMode; /** * @abstract If ButtonName is "CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID) @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Integer, 0 - 65536 */ -@property (nullable, strong) NSNumber<SDLInt> *customButtonID; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *customButtonID; @end diff --git a/SmartDeviceLink/SDLOnButtonPress.h b/SmartDeviceLink/SDLOnButtonPress.h index 942ad4038..1c8381114 100644 --- a/SmartDeviceLink/SDLOnButtonPress.h +++ b/SmartDeviceLink/SDLOnButtonPress.h @@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLButtonName buttonName; +@property (strong, nonatomic) SDLButtonName buttonName; /** * @abstract Indicates whether this is a LONG or SHORT button press event @@ -69,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLButtonPressMode buttonPressMode; +@property (strong, nonatomic) SDLButtonPressMode buttonPressMode; /** * @abstract If ButtonName is "CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID) @@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Integer 0 - 65536 */ -@property (nullable, strong) NSNumber<SDLInt> *customButtonID; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *customButtonID; @end diff --git a/SmartDeviceLink/SDLOnCommand.h b/SmartDeviceLink/SDLOnCommand.h index 6a5c3fd3d..0b685a486 100644 --- a/SmartDeviceLink/SDLOnCommand.h +++ b/SmartDeviceLink/SDLOnCommand.h @@ -22,12 +22,12 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The command ID of the command the user selected. This is the command ID value provided by the application in the <i>SDLAddCommand</i> operation that created the command. */ -@property (strong) NSNumber<SDLInt> *cmdID; +@property (strong, nonatomic) NSNumber<SDLInt> *cmdID; /** * @abstract Indicates whether command was selected via voice or via a menu selection (using the OK button). */ -@property (strong) SDLTriggerSource triggerSource; +@property (strong, nonatomic) SDLTriggerSource triggerSource; @end diff --git a/SmartDeviceLink/SDLOnDriverDistraction.h b/SmartDeviceLink/SDLOnDriverDistraction.h index e75a32aa1..7a0b4e163 100644 --- a/SmartDeviceLink/SDLOnDriverDistraction.h +++ b/SmartDeviceLink/SDLOnDriverDistraction.h @@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The driver distraction state (i.e. whether driver distraction rules are in effect, or not) */ -@property (strong) SDLDriverDistractionState state; +@property (strong, nonatomic) SDLDriverDistractionState state; @end diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.h b/SmartDeviceLink/SDLOnEncodedSyncPData.h index 090a9920d..9bcbdae45 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.h +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.h @@ -7,9 +7,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnEncodedSyncPData : SDLRPCNotification -@property (strong) NSMutableArray<NSString *> *data; -@property (nullable, strong) NSString *URL; -@property (nullable, strong) NSNumber<SDLInt> *Timeout; +@property (strong, nonatomic) NSMutableArray<NSString *> *data; +@property (nullable, strong, nonatomic) NSString *URL; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *Timeout; @end diff --git a/SmartDeviceLink/SDLOnHMIStatus.h b/SmartDeviceLink/SDLOnHMIStatus.h index d9c52c6c5..10ae21948 100644 --- a/SmartDeviceLink/SDLOnHMIStatus.h +++ b/SmartDeviceLink/SDLOnHMIStatus.h @@ -30,20 +30,20 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract SDLHMILevel in effect for the application */ -@property (strong) SDLHMILevel hmiLevel; +@property (strong, nonatomic) SDLHMILevel hmiLevel; /** * @abstract Current state of audio streaming for the application. When this parameter has a value of NOT_AUDIBLE, the application must stop streaming audio to SDL. * * Informs app whether any currently streaming audio is audible to user (AUDIBLE) or not (NOT_AUDIBLE). A value of NOT_AUDIBLE means that either the application's audio will not be audible to the user, or that the application's audio should not be audible to the user (i.e. some other application on the mobile device may be streaming audio and the application's audio would be blended with that other audio). */ -@property (strong) SDLAudioStreamingState audioStreamingState; +@property (strong, nonatomic) SDLAudioStreamingState audioStreamingState; /** * @abstract the System Context * @discussion whether a user-initiated interaction is in-progress (VRSESSION or MENU), or not (MAIN) */ -@property (strong) SDLSystemContext systemContext; +@property (strong, nonatomic) SDLSystemContext systemContext; @end diff --git a/SmartDeviceLink/SDLOnHashChange.h b/SmartDeviceLink/SDLOnHashChange.h index 09b7ac663..59dd0f0d0 100644 --- a/SmartDeviceLink/SDLOnHashChange.h +++ b/SmartDeviceLink/SDLOnHashChange.h @@ -8,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnHashChange : SDLRPCNotification -@property (strong) NSString *hashID; +@property (strong, nonatomic) NSString *hashID; @end diff --git a/SmartDeviceLink/SDLOnKeyboardInput.h b/SmartDeviceLink/SDLOnKeyboardInput.h index 0db289a70..38c4989ef 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.h +++ b/SmartDeviceLink/SDLOnKeyboardInput.h @@ -9,8 +9,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnKeyboardInput : SDLRPCNotification -@property (strong) SDLKeyboardEvent event; -@property (nullable, strong) NSString *data; +@property (strong, nonatomic) SDLKeyboardEvent event; +@property (nullable, strong, nonatomic) NSString *data; @end diff --git a/SmartDeviceLink/SDLOnLanguageChange.h b/SmartDeviceLink/SDLOnLanguageChange.h index dd3cb891f..4937c70fd 100644 --- a/SmartDeviceLink/SDLOnLanguageChange.h +++ b/SmartDeviceLink/SDLOnLanguageChange.h @@ -19,12 +19,12 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract Current SDL voice engine (VR+TTS) language */ -@property (strong) SDLLanguage language; +@property (strong, nonatomic) SDLLanguage language; /** * @abstract Current display language */ -@property (strong) SDLLanguage hmiDisplayLanguage; +@property (strong, nonatomic) SDLLanguage hmiDisplayLanguage; @end diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.h b/SmartDeviceLink/SDLOnLockScreenStatus.h index e139d1387..830cd223f 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.h +++ b/SmartDeviceLink/SDLOnLockScreenStatus.h @@ -26,23 +26,23 @@ NS_ASSUME_NONNULL_BEGIN * <p>Get the current driver distraction status(i.e. whether driver distraction rules are in effect, or not)</p> * @return String */ -@property (strong) NSNumber<SDLBool> *driverDistractionStatus; +@property (strong, nonatomic) NSNumber<SDLBool> *driverDistractionStatus; /** * <p>Get user selection status for the application (has the app been selected via hmi or voice command)</p> * @return Boolean the current user selection status */ -@property (strong) NSNumber<SDLBool> *userSelected; +@property (strong, nonatomic) NSNumber<SDLBool> *userSelected; /** * <p>Get the {@linkplain LockScreenStatus} enumeration, indicating if the lockscreen should be required, optional or off </p> * @return {@linkplain LockScreenStatus} */ -@property (strong) SDLLockScreenStatus lockScreenStatus; +@property (strong, nonatomic) SDLLockScreenStatus lockScreenStatus; /** * <p>Get HMILevel in effect for the application</p> * @return {@linkplain HMILevel} the current HMI Level in effect for the application */ -@property (strong) SDLHMILevel hmiLevel; +@property (strong, nonatomic) SDLHMILevel hmiLevel; @end diff --git a/SmartDeviceLink/SDLOnPermissionsChange.h b/SmartDeviceLink/SDLOnPermissionsChange.h index 0d1b719d7..daec5ec66 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.h +++ b/SmartDeviceLink/SDLOnPermissionsChange.h @@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN * * @see SDLPermissionItem */ -@property (strong) NSMutableArray<SDLPermissionItem *> *permissionItem; +@property (strong, nonatomic) NSMutableArray<SDLPermissionItem *> *permissionItem; @end diff --git a/SmartDeviceLink/SDLOnSyncPData.h b/SmartDeviceLink/SDLOnSyncPData.h index f28112c11..cf2e1af13 100644 --- a/SmartDeviceLink/SDLOnSyncPData.h +++ b/SmartDeviceLink/SDLOnSyncPData.h @@ -8,8 +8,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnSyncPData : SDLRPCNotification -@property (nullable, strong) NSString *URL; -@property (nullable, strong) NSNumber<SDLInt> *Timeout; +@property (nullable, strong, nonatomic) NSString *URL; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *Timeout; @end diff --git a/SmartDeviceLink/SDLOnSystemRequest.h b/SmartDeviceLink/SDLOnSystemRequest.h index 2bfe7b462..236cde278 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.h +++ b/SmartDeviceLink/SDLOnSystemRequest.h @@ -10,12 +10,12 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnSystemRequest : SDLRPCNotification -@property (strong) SDLRequestType requestType; -@property (nullable, strong) NSString *url; -@property (nullable, strong) NSNumber<SDLInt> *timeout; -@property (nullable, strong) SDLFileType fileType; -@property (nullable, strong) NSNumber<SDLUInt> *offset; -@property (nullable, strong) NSNumber<SDLUInt> *length; +@property (strong, nonatomic) SDLRequestType requestType; +@property (nullable, strong, nonatomic) NSString *url; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *timeout; +@property (nullable, strong, nonatomic) SDLFileType fileType; +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *offset; +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *length; @end diff --git a/SmartDeviceLink/SDLOnTBTClientState.h b/SmartDeviceLink/SDLOnTBTClientState.h index 43dac9254..33e9c37be 100644 --- a/SmartDeviceLink/SDLOnTBTClientState.h +++ b/SmartDeviceLink/SDLOnTBTClientState.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnTBTClientState : SDLRPCNotification -@property (strong) SDLTBTState state; +@property (strong, nonatomic) SDLTBTState state; @end diff --git a/SmartDeviceLink/SDLOnTouchEvent.h b/SmartDeviceLink/SDLOnTouchEvent.h index df9f24c66..21b3e1c5b 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.h +++ b/SmartDeviceLink/SDLOnTouchEvent.h @@ -11,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnTouchEvent : SDLRPCNotification -@property (strong) SDLTouchType type; -@property (strong) NSMutableArray<SDLTouchEvent *> *event; +@property (strong, nonatomic) SDLTouchType type; +@property (strong, nonatomic) NSMutableArray<SDLTouchEvent *> *event; @end diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 31dc0ab66..6a8c4af78 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -34,107 +34,107 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A SDLGPSData* value. See GPSData. */ -@property (nullable, strong) SDLGPSData *gps; +@property (nullable, strong, nonatomic) SDLGPSData *gps; /** * @abstract The vehicle speed in kilometers per hour. */ -@property (nullable, strong) NSNumber<SDLFloat> *speed; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *speed; /** * @abstract The number of revolutions per minute of the engine. */ -@property (nullable, strong) NSNumber<SDLInt> *rpm; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *rpm; /** * @abstract The fuel level in the tank (percentage) */ -@property (nullable, strong) NSNumber<SDLFloat> *fuelLevel; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *fuelLevel; /** * @abstract A SDLComponentVolumeStatus* value. The fuel level state. */ -@property (nullable, strong) SDLComponentVolumeStatus fuelLevel_State; +@property (nullable, strong, nonatomic) SDLComponentVolumeStatus fuelLevel_State; /** * @abstract The instantaneous fuel consumption in microlitres. */ -@property (nullable, strong) NSNumber<SDLFloat> *instantFuelConsumption; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *instantFuelConsumption; /** * @abstract The external temperature in degrees celsius. */ -@property (nullable, strong) NSNumber<SDLFloat> *externalTemperature; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *externalTemperature; /** * @abstract The Vehicle Identification Number */ -@property (nullable, strong) NSString *vin; +@property (nullable, strong, nonatomic) NSString *vin; /** * @abstract See PRNDL. */ -@property (nullable, strong) SDLPRNDL prndl; +@property (nullable, strong, nonatomic) SDLPRNDL prndl; /** * @abstract A SDLTireStatus* value. See TireStatus. */ -@property (nullable, strong) SDLTireStatus *tirePressure; +@property (nullable, strong, nonatomic) SDLTireStatus *tirePressure; /** * @abstract Odometer reading in km. */ -@property (nullable, strong) NSNumber<SDLInt> *odometer; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *odometer; /** * @abstract A SDLBeltStatus* value. The status of the seat belts. */ -@property (nullable, strong) SDLBeltStatus *beltStatus; +@property (nullable, strong, nonatomic) SDLBeltStatus *beltStatus; /** * @abstract A SDLBodyInformation* value. The body information including power modes. */ -@property (nullable, strong) SDLBodyInformation *bodyInformation; +@property (nullable, strong, nonatomic) SDLBodyInformation *bodyInformation; /** * @abstract A SDLDeviceStatus* value. The device status including signal and battery strength. */ -@property (nullable, strong) SDLDeviceStatus *deviceStatus; +@property (nullable, strong, nonatomic) SDLDeviceStatus *deviceStatus; /** * @abstract A SDLVehicleDataResult* value. The status of the brake pedal. */ -@property (nullable, strong) SDLVehicleDataEventStatus driverBraking; +@property (nullable, strong, nonatomic) SDLVehicleDataEventStatus driverBraking; /** * @abstract A SDLWiperStatus* value. The status of the wipers. */ -@property (nullable, strong) SDLWiperStatus wiperStatus; +@property (nullable, strong, nonatomic) SDLWiperStatus wiperStatus; /** * @abstract A SDLHeadLampStatus* value. Status of the head lamps. */ -@property (nullable, strong) SDLHeadLampStatus *headLampStatus; +@property (nullable, strong, nonatomic) SDLHeadLampStatus *headLampStatus; /** * @abstract Torque value for engine (in Nm) on non-diesel variants. */ -@property (nullable, strong) NSNumber<SDLFloat> *engineTorque; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *engineTorque; /** * @abstract Accelerator pedal position (percentage depressed) */ -@property (nullable, strong) NSNumber<SDLFloat> *accPedalPosition; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *accPedalPosition; /** * @abstract Current angle of the steering wheel (in deg) */ -@property (nullable, strong) NSNumber<SDLFloat> *steeringWheelAngle; -@property (nullable, strong) SDLECallInfo *eCallInfo; -@property (nullable, strong) SDLAirbagStatus *airbagStatus; -@property (nullable, strong) SDLEmergencyEvent *emergencyEvent; -@property (nullable, strong) SDLClusterModeStatus *clusterModeStatus; -@property (nullable, strong) SDLMyKey *myKey; +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *steeringWheelAngle; +@property (nullable, strong, nonatomic) SDLECallInfo *eCallInfo; +@property (nullable, strong, nonatomic) SDLAirbagStatus *airbagStatus; +@property (nullable, strong, nonatomic) SDLEmergencyEvent *emergencyEvent; +@property (nullable, strong, nonatomic) SDLClusterModeStatus *clusterModeStatus; +@property (nullable, strong, nonatomic) SDLMyKey *myKey; @end diff --git a/SmartDeviceLink/SDLParameterPermissions.h b/SmartDeviceLink/SDLParameterPermissions.h index 4744463d3..c2356665a 100644 --- a/SmartDeviceLink/SDLParameterPermissions.h +++ b/SmartDeviceLink/SDLParameterPermissions.h @@ -19,13 +19,13 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Array of String, max String length = 100, Array size 0 - 100 */ -@property (strong) NSMutableArray<NSString *> *allowed; +@property (strong, nonatomic) NSMutableArray<NSString *> *allowed; /** * @abstract A set of all parameters that are prohibited for this given RPC. * * Required, Array of String, max String length = 100, Array size 0 - 100 */ -@property (strong) NSMutableArray<NSString *> *userDisallowed; +@property (strong, nonatomic) NSMutableArray<NSString *> *userDisallowed; @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.h b/SmartDeviceLink/SDLPerformAudioPassThru.h index de67ae34e..a48a44cbb 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.h +++ b/SmartDeviceLink/SDLPerformAudioPassThru.h @@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN * <li>Array Maxsize: 100</li> * </ul> */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *initialPrompt; +@property (nullable, strong, nonatomic) NSMutableArray<SDLTTSChunk *> *initialPrompt; /** * @abstract a line of text displayed during audio capture * @discussion audioPassThruDisplayText1 @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Maxlength=500 */ -@property (nullable, strong) NSString *audioPassThruDisplayText1; +@property (nullable, strong, nonatomic) NSString *audioPassThruDisplayText1; /** * @abstract A line of text displayed during audio capture * @discussion audioPassThruDisplayText2 @@ -65,13 +65,13 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Maxlength=500 */ -@property (nullable, strong) NSString *audioPassThruDisplayText2; +@property (nullable, strong, nonatomic) NSString *audioPassThruDisplayText2; /** * @abstract A samplingRate * * @discussion a SamplingRate value representing a 8 or 16 or 22 or 24 khz */ -@property (strong) SDLSamplingRate samplingRate; +@property (strong, nonatomic) SDLSamplingRate samplingRate; /** * @abstract the maximum duration of audio recording in milliseconds * @@ -81,22 +81,22 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Minvalue:1; Maxvalue:1000000 */ -@property (strong) NSNumber<SDLInt> *maxDuration; +@property (strong, nonatomic) NSNumber<SDLInt> *maxDuration; /** * @abstract the quality the audio is recorded - 8 bit or 16 bit * * @discussion a BitsPerSample value representing 8 bit or 16 bit */ -@property (strong) SDLBitsPerSample bitsPerSample; +@property (strong, nonatomic) SDLBitsPerSample bitsPerSample; /** * @abstract an audioType */ -@property (strong) SDLAudioType audioType; +@property (strong, nonatomic) SDLAudioType audioType; /** * @abstract a Boolean value representing if the current audio source should be * muted during the APT session<br/> */ -@property (nullable, strong) NSNumber<SDLBool> *muteAudio; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *muteAudio; @end diff --git a/SmartDeviceLink/SDLPerformInteraction.h b/SmartDeviceLink/SDLPerformInteraction.h index afbac1d9a..4c61a9fd4 100644 --- a/SmartDeviceLink/SDLPerformInteraction.h +++ b/SmartDeviceLink/SDLPerformInteraction.h @@ -52,45 +52,45 @@ NS_ASSUME_NONNULL_BEGIN * displayed on first line of multiline display, and is centered. If text * does not fit on line, it will be truncated */ -@property (strong) NSString *initialText; +@property (strong, nonatomic) NSString *initialText; /** * @abstract An array of one or more TTSChunks that, taken together, specify * what is to be spoken to the user at the start of an interaction */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *initialPrompt; +@property (nullable, strong, nonatomic) NSMutableArray<SDLTTSChunk *> *initialPrompt; /** * @abstract The Indicates mode that indicate how user selects interaction * choice. User can choose either by voice (VR_ONLY), by visual selection * from the menu (MANUAL_ONLY), or by either mode (BOTH) */ -@property (strong) SDLInteractionMode interactionMode; +@property (strong, nonatomic) SDLInteractionMode interactionMode; /** * @abstract A Vector<Integer> value representing an Array of one or more Choice * Set IDs */ -@property (strong) NSMutableArray<NSNumber<SDLInt> *> *interactionChoiceSetIDList; +@property (strong, nonatomic) NSMutableArray<NSNumber<SDLInt> *> *interactionChoiceSetIDList; /** * @abstract A Vector<TTSChunk> which taken together, specify the help phrase to * be spoken when the user says "help" during the VR session */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *helpPrompt; +@property (nullable, strong, nonatomic) NSMutableArray<SDLTTSChunk *> *helpPrompt; /** * @abstract An array of TTSChunks which, taken together, specify the phrase to * be spoken when the listen times out during the VR session */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *timeoutPrompt; +@property (nullable, strong, nonatomic) NSMutableArray<SDLTTSChunk *> *timeoutPrompt; /** * @abstract An Integer value representing the amount of time, in milliseconds, * SDL will wait for the user to make a choice (VR or Menu) */ -@property (nullable, strong) NSNumber<SDLInt> *timeout; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *timeout; /** * @abstract A Voice recognition Help, which is a suggested VR Help Items to * display on-screen during Perform Interaction * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSMutableArray<SDLVRHelpItem *> *vrHelp; -@property (nullable, strong) SDLLayoutMode interactionLayout; +@property (nullable, strong, nonatomic) NSMutableArray<SDLVRHelpItem *> *vrHelp; +@property (nullable, strong, nonatomic) SDLLayoutMode interactionLayout; @end diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.h b/SmartDeviceLink/SDLPerformInteractionResponse.h index 0d308a6cf..587b0e955 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.h +++ b/SmartDeviceLink/SDLPerformInteractionResponse.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Integer, 0 - 2,000,000,000 */ -@property (nullable, strong) NSNumber<SDLInt> *choiceID; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *choiceID; /** * @abstract Manually entered text selection, e.g. through keyboard @@ -32,14 +32,14 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max length 500 chars */ -@property (nullable, strong) NSString *manualTextEntry; +@property (nullable, strong, nonatomic) NSString *manualTextEntry; /** * @abstract A *SDLTriggerSource* object which will be shown in the HMI * * @discussion Only is valid if resultCode is SUCCESS. */ -@property (nullable, strong) SDLTriggerSource triggerSource; +@property (nullable, strong, nonatomic) SDLTriggerSource triggerSource; @end diff --git a/SmartDeviceLink/SDLPermissionItem.h b/SmartDeviceLink/SDLPermissionItem.h index a3d7d5d81..ea7eb7154 100644 --- a/SmartDeviceLink/SDLPermissionItem.h +++ b/SmartDeviceLink/SDLPermissionItem.h @@ -10,9 +10,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLPermissionItem : SDLRPCStruct -@property (strong) NSString *rpcName; -@property (strong) SDLHMIPermissions *hmiPermissions; -@property (strong) SDLParameterPermissions *parameterPermissions; +@property (strong, nonatomic) NSString *rpcName; +@property (strong, nonatomic) SDLHMIPermissions *hmiPermissions; +@property (strong, nonatomic) SDLParameterPermissions *parameterPermissions; @end diff --git a/SmartDeviceLink/SDLPolicyDataParser.h b/SmartDeviceLink/SDLPolicyDataParser.h index 0b4142788..cdc763b1e 100644 --- a/SmartDeviceLink/SDLPolicyDataParser.h +++ b/SmartDeviceLink/SDLPolicyDataParser.h @@ -8,24 +8,24 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLPolicyDataParser : NSObject -@property (assign) Byte protocolVersion; -@property (assign) BOOL isResponseRequired; -@property (assign) BOOL isHighBandwidth; -@property (assign) BOOL isSigned; -@property (assign) BOOL isEncrypted; -@property (assign) BOOL hasESN; -@property (assign) Byte serviceType; -@property (assign) Byte commandType; -@property (assign) BOOL CPUDestination; -@property (assign) Byte encryptionKeyIndex; -@property (assign) UInt32 payloadSize; -@property (strong) NSData *ESN; -@property (assign) UInt32 moduleMessageId; -@property (assign) UInt32 serverMessageId; -@property (assign) Byte messageStatus; -@property (strong) NSData *initializationVector; -@property (strong) NSData *payload; -@property (strong) NSData *signatureTag; +@property (assign, nonatomic) Byte protocolVersion; +@property (assign, nonatomic) BOOL isResponseRequired; +@property (assign, nonatomic) BOOL isHighBandwidth; +@property (assign, nonatomic) BOOL isSigned; +@property (assign, nonatomic) BOOL isEncrypted; +@property (assign, nonatomic) BOOL hasESN; +@property (assign, nonatomic) Byte serviceType; +@property (assign, nonatomic) Byte commandType; +@property (assign, nonatomic) BOOL CPUDestination; +@property (assign, nonatomic) Byte encryptionKeyIndex; +@property (assign, nonatomic) UInt32 payloadSize; +@property (strong, nonatomic) NSData *ESN; +@property (assign, nonatomic) UInt32 moduleMessageId; +@property (assign, nonatomic) UInt32 serverMessageId; +@property (assign, nonatomic) Byte messageStatus; +@property (strong, nonatomic) NSData *initializationVector; +@property (strong, nonatomic) NSData *payload; +@property (strong, nonatomic) NSData *signatureTag; - (nullable NSData *)unwrap:(NSData *)wrappedData; - (void)parsePolicyData:(NSData *)data; diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.h b/SmartDeviceLink/SDLPresetBankCapabilities.h index 91cccccb0..9242bddbd 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.h +++ b/SmartDeviceLink/SDLPresetBankCapabilities.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *onScreenPresetsAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *onScreenPresetsAvailable; @end diff --git a/SmartDeviceLink/SDLProtocol.m b/SmartDeviceLink/SDLProtocol.m index 24e655fff..53d2ee036 100644 --- a/SmartDeviceLink/SDLProtocol.m +++ b/SmartDeviceLink/SDLProtocol.m @@ -37,9 +37,9 @@ NS_ASSUME_NONNULL_BEGIN SDLPrioritizedObjectCollection *_prioritizedCollection; } -@property (strong) NSMutableData *receiveBuffer; -@property (nullable, strong) SDLProtocolReceivedMessageRouter *messageRouter; -@property (nonatomic, strong) NSMutableDictionary<SDLServiceTypeBox *, SDLProtocolHeader *> *serviceHeaders; +@property (strong, nonatomic) NSMutableData *receiveBuffer; +@property (nullable, strong, nonatomic) SDLProtocolReceivedMessageRouter *messageRouter; +@property (strong, nonatomic) NSMutableDictionary<SDLServiceTypeBox *, SDLProtocolHeader *> *serviceHeaders; @end diff --git a/SmartDeviceLink/SDLProtocolHeader.h b/SmartDeviceLink/SDLProtocolHeader.h index f38a1dbc7..97c405db2 100644 --- a/SmartDeviceLink/SDLProtocolHeader.h +++ b/SmartDeviceLink/SDLProtocolHeader.h @@ -44,15 +44,15 @@ NS_ASSUME_NONNULL_BEGIN NSUInteger _size; } -@property (assign, readonly) UInt8 version; -@property (assign, readonly) NSUInteger size; -@property (assign) BOOL compressed __deprecated_msg("This is a mirror for encrypted"); -@property (assign) BOOL encrypted; -@property (assign) SDLFrameType frameType; -@property (assign) SDLServiceType serviceType; -@property (assign) SDLFrameData frameData; -@property (assign) UInt8 sessionID; -@property (assign) UInt32 bytesInPayload; +@property (assign, nonatomic, readonly) UInt8 version; +@property (assign, nonatomic, readonly) NSUInteger size; +@property (assign, nonatomic) BOOL compressed __deprecated_msg("This is a mirror for encrypted"); +@property (assign, nonatomic) BOOL encrypted; +@property (assign, nonatomic) SDLFrameType frameType; +@property (assign, nonatomic) SDLServiceType serviceType; +@property (assign, nonatomic) SDLFrameData frameData; +@property (assign, nonatomic) UInt8 sessionID; +@property (assign, nonatomic) UInt32 bytesInPayload; - (instancetype)init; - (nullable NSData *)data; diff --git a/SmartDeviceLink/SDLProtocolMessage.h b/SmartDeviceLink/SDLProtocolMessage.h index c0b67e414..c4400a8c7 100644 --- a/SmartDeviceLink/SDLProtocolMessage.h +++ b/SmartDeviceLink/SDLProtocolMessage.h @@ -9,9 +9,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLProtocolMessage : NSObject -@property (strong) SDLProtocolHeader *header; -@property (nullable, strong) NSData *payload; -@property (strong, readonly) NSData *data; +@property (strong, nonatomic) SDLProtocolHeader *header; +@property (nullable, strong, nonatomic) NSData *payload; +@property (strong, nonatomic, readonly) NSData *data; + (id)messageWithHeader:(SDLProtocolHeader *)header andPayload:(nullable NSData *)payload; // Returns a V1 or V2 object diff --git a/SmartDeviceLink/SDLProtocolMessageAssembler.h b/SmartDeviceLink/SDLProtocolMessageAssembler.h index e83737fb9..589d8032a 100644 --- a/SmartDeviceLink/SDLProtocolMessageAssembler.h +++ b/SmartDeviceLink/SDLProtocolMessageAssembler.h @@ -12,9 +12,9 @@ typedef void (^SDLMessageAssemblyCompletionHandler)(BOOL done, SDLProtocolMessa @interface SDLProtocolMessageAssembler : NSObject -@property (assign, readonly) UInt8 sessionID; -@property (assign) UInt32 frameCount; // number of consecutive frames required for reassembly -@property (assign) UInt32 expectedBytes; +@property (assign, nonatomic, readonly) UInt8 sessionID; +@property (assign, nonatomic) UInt32 frameCount; // number of consecutive frames required for reassembly +@property (assign, nonatomic) UInt32 expectedBytes; - (instancetype)initWithSessionID:(UInt8)sessionID; - (void)handleMessage:(SDLProtocolMessage *)message withCompletionHandler:(SDLMessageAssemblyCompletionHandler)completionHandler; diff --git a/SmartDeviceLink/SDLProtocolReceivedMessageRouter.h b/SmartDeviceLink/SDLProtocolReceivedMessageRouter.h index 75f1b9e00..c153c0c41 100644 --- a/SmartDeviceLink/SDLProtocolReceivedMessageRouter.h +++ b/SmartDeviceLink/SDLProtocolReceivedMessageRouter.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLProtocolReceivedMessageRouter : NSObject -@property (weak, nullable) id<SDLProtocolListener> delegate; +@property (weak, nonatomic, nullable) id<SDLProtocolListener> delegate; - (void)handleReceivedMessage:(SDLProtocolMessage *)message; diff --git a/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m b/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m index 6b0f8fe26..a3bc929a5 100644 --- a/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m +++ b/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLProtocolReceivedMessageRouter () -@property (strong) NSMutableDictionary<NSNumber *, SDLProtocolMessageAssembler *> *messageAssemblers; +@property (strong, nonatomic) NSMutableDictionary<NSNumber *, SDLProtocolMessageAssembler *> *messageAssemblers; @end diff --git a/SmartDeviceLink/SDLProxy.h b/SmartDeviceLink/SDLProxy.h index 8863b6095..81d1743f0 100644 --- a/SmartDeviceLink/SDLProxy.h +++ b/SmartDeviceLink/SDLProxy.h @@ -22,12 +22,12 @@ __deprecated_msg("Use SDLManager instead") BOOL _isConnected; } -@property (nullable, strong) SDLAbstractProtocol *protocol; -@property (nullable, strong) SDLAbstractTransport *transport; -@property (readonly, copy) NSSet<NSObject<SDLProxyListener> *> *proxyListeners; -@property (strong) SDLTimer *startSessionTimer; -@property (copy) NSString *debugConsoleGroupName; -@property (readonly, copy) NSString *proxyVersion; +@property (nullable, strong, nonatomic) SDLAbstractProtocol *protocol; +@property (nullable, strong, nonatomic) SDLAbstractTransport *transport; +@property (readonly, copy, nonatomic) NSSet<NSObject<SDLProxyListener> *> *proxyListeners; +@property (strong, nonatomic) SDLTimer *startSessionTimer; +@property (copy, nonatomic) NSString *debugConsoleGroupName; +@property (readonly, copy, nonatomic) NSString *proxyVersion; @property (nullable, nonatomic, strong, readonly) SDLStreamingMediaManager *streamingMediaManager; - (id)initWithTransport:(SDLAbstractTransport *)transport diff --git a/SmartDeviceLink/SDLPutFile.h b/SmartDeviceLink/SDLPutFile.h index a1c07dd15..247228fbd 100644 --- a/SmartDeviceLink/SDLPutFile.h +++ b/SmartDeviceLink/SDLPutFile.h @@ -29,14 +29,14 @@ NS_ASSUME_NONNULL_BEGIN * * Required, maxlength 255 characters */ -@property (strong) NSString *syncFileName; +@property (strong, nonatomic) NSString *syncFileName; /** * A FileType value representing a selected file type * * Required */ -@property (strong) SDLFileType fileType; +@property (strong, nonatomic) SDLFileType fileType; /** * A value to indicates if the file is meant to persist between @@ -49,28 +49,28 @@ NS_ASSUME_NONNULL_BEGIN * * Boolean, Optional, default = NO */ -@property (nullable, strong) NSNumber<SDLBool> *persistentFile; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *persistentFile; /** * Indicates if the file is meant to be passed through core to elsewhere on the system. If set to TRUE, then the system will instead pass the data thru as it arrives to a predetermined area outside of core. * * Boolean, Optional, default = NO */ -@property (nullable, strong) NSNumber<SDLBool> *systemFile; +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *systemFile; /** * Offset in bytes for resuming partial data chunks. * * Integer, Optional, 0 - 100,000,000,000 */ -@property (nullable, strong) NSNumber<SDLUInt> *offset; +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *offset; /** * Length in bytes for resuming partial data chunks. If offset is set to 0, then length is the total length of the file to be downloaded * * Integer, Optional, 0 - 100,000,000,000 */ -@property (nullable, strong) NSNumber<SDLUInt> *length; +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *length; @end diff --git a/SmartDeviceLink/SDLPutFileResponse.h b/SmartDeviceLink/SDLPutFileResponse.h index 3b85e2f66..dfa7a74a7 100644 --- a/SmartDeviceLink/SDLPutFileResponse.h +++ b/SmartDeviceLink/SDLPutFileResponse.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLPutFileResponse : SDLRPCResponse -@property (strong) NSNumber<SDLInt> *spaceAvailable; +@property (strong, nonatomic) NSNumber<SDLInt> *spaceAvailable; @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLRPCMessage.h b/SmartDeviceLink/SDLRPCMessage.h index a9ea45064..3612d15c0 100644 --- a/SmartDeviceLink/SDLRPCMessage.h +++ b/SmartDeviceLink/SDLRPCMessage.h @@ -20,9 +20,9 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSObject *)getParameters:(NSString *)functionName; - (void)setParameters:(NSString *)functionName value:(nullable NSObject *)value; -@property (nullable, strong) NSData *bulkData; -@property (strong, readonly) NSString *name; -@property (strong, readonly) NSString *messageType; +@property (nullable, strong, nonatomic) NSData *bulkData; +@property (strong, nonatomic, readonly) NSString *name; +@property (strong, nonatomic, readonly) NSString *messageType; @end diff --git a/SmartDeviceLink/SDLRPCPayload.h b/SmartDeviceLink/SDLRPCPayload.h index d71492a21..5794cb5ea 100644 --- a/SmartDeviceLink/SDLRPCPayload.h +++ b/SmartDeviceLink/SDLRPCPayload.h @@ -10,11 +10,11 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLRPCPayload : NSObject -@property (assign) SDLRPCMessageType rpcType; -@property (assign) UInt32 functionID; -@property (assign) UInt32 correlationID; -@property (nullable, strong) NSData *jsonData; -@property (nullable, strong) NSData *binaryData; +@property (assign, nonatomic) SDLRPCMessageType rpcType; +@property (assign, nonatomic) UInt32 functionID; +@property (assign, nonatomic) UInt32 correlationID; +@property (nullable, strong, nonatomic) NSData *jsonData; +@property (nullable, strong, nonatomic) NSData *binaryData; - (NSData *)data; + (nullable id)rpcPayloadWithData:(NSData *)data; diff --git a/SmartDeviceLink/SDLRPCRequest.h b/SmartDeviceLink/SDLRPCRequest.h index d2cf650b0..b99449aef 100644 --- a/SmartDeviceLink/SDLRPCRequest.h +++ b/SmartDeviceLink/SDLRPCRequest.h @@ -8,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLRPCRequest : SDLRPCMessage -@property (strong) NSNumber<SDLInt> *correlationID; +@property (strong, nonatomic) NSNumber<SDLInt> *correlationID; @end diff --git a/SmartDeviceLink/SDLRPCResponse.h b/SmartDeviceLink/SDLRPCResponse.h index 635790f2a..270217e4a 100644 --- a/SmartDeviceLink/SDLRPCResponse.h +++ b/SmartDeviceLink/SDLRPCResponse.h @@ -10,10 +10,10 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLRPCResponse : SDLRPCMessage -@property (strong) NSNumber<SDLInt> *correlationID; -@property (strong) NSNumber<SDLBool> *success; -@property (strong) SDLResult resultCode; -@property (nullable, strong) NSString *info; +@property (strong, nonatomic) NSNumber<SDLInt> *correlationID; +@property (strong, nonatomic) NSNumber<SDLBool> *success; +@property (strong, nonatomic) SDLResult resultCode; +@property (nullable, strong, nonatomic) NSString *info; @end diff --git a/SmartDeviceLink/SDLReadDID.h b/SmartDeviceLink/SDLReadDID.h index 6b3eafe99..d275f694e 100644 --- a/SmartDeviceLink/SDLReadDID.h +++ b/SmartDeviceLink/SDLReadDID.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN * @abstract An ID of the vehicle module * <br/><b>Notes: </b>Minvalue:0; Maxvalue:65535 */ -@property (strong) NSNumber<SDLInt> *ecuName; +@property (strong, nonatomic) NSNumber<SDLInt> *ecuName; /** * @abstract Raw data from vehicle data DID location(s) @@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN * <li>ArrayMin:0; ArrayMax:1000</li> * </ul> */ -@property (strong) NSMutableArray<NSNumber<SDLInt> *> *didLocation; +@property (strong, nonatomic) NSMutableArray<NSNumber<SDLInt> *> *didLocation; @end diff --git a/SmartDeviceLink/SDLReadDIDResponse.h b/SmartDeviceLink/SDLReadDIDResponse.h index 8b8710656..7fcd0ed9c 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.h +++ b/SmartDeviceLink/SDLReadDIDResponse.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLReadDIDResponse : SDLRPCResponse -@property (nullable, strong) NSMutableArray<SDLDIDResult *> *didResult; +@property (nullable, strong, nonatomic) NSMutableArray<SDLDIDResult *> *didResult; @end diff --git a/SmartDeviceLink/SDLRegisterAppInterface.h b/SmartDeviceLink/SDLRegisterAppInterface.h index 8781cd820..a8b6fdc37 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.h +++ b/SmartDeviceLink/SDLRegisterAppInterface.h @@ -101,7 +101,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLSyncMsgVersion *syncMsgVersion; +@property (strong, nonatomic) SDLSyncMsgVersion *syncMsgVersion; /** * @abstract The Mobile Application's Name, This name is displayed in the SDL Mobile Applications menu. It also serves as the unique identifier of the application for SmartDeviceLink @@ -115,7 +115,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Max length 100 chars */ -@property (strong) NSString *appName; +@property (strong, nonatomic) NSString *appName; /** * @abstract TTS string for VR recognition of the mobile application name. @@ -130,7 +130,7 @@ NS_ASSUME_NONNULL_BEGIN * @since SDL 2.0 * @see SDLTTSChunk */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *ttsName; +@property (nullable, strong, nonatomic) NSMutableArray<SDLTTSChunk *> *ttsName; /** * @abstract A String representing an abbreviated version of the mobile application's name (if necessary) that will be displayed on the media screen @@ -139,7 +139,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max length 100 chars */ -@property (nullable, strong) NSString *ngnMediaScreenAppName; +@property (nullable, strong, nonatomic) NSString *ngnMediaScreenAppName; /** * @abstract Defines a additional voice recognition commands @@ -148,7 +148,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array of Strings, Array length 1 - 100, Max String length 40 */ -@property (nullable, strong) NSMutableArray<NSString *> *vrSynonyms; +@property (nullable, strong, nonatomic) NSMutableArray<NSString *> *vrSynonyms; /** * @abstract Indicates if the application is a media or a non-media application. @@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *isMediaApplication; +@property (strong, nonatomic) NSNumber<SDLBool> *isMediaApplication; /** * @abstract A Language enumeration indicating what language the application intends to use for user interaction (TTS and VR). @@ -166,7 +166,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLLanguage languageDesired; +@property (strong, nonatomic) SDLLanguage languageDesired; /** * @abstract An enumeration indicating what language the application intends to use for user interaction (Display). @@ -177,7 +177,7 @@ NS_ASSUME_NONNULL_BEGIN * * @since SDL 2.0 */ -@property (strong) SDLLanguage hmiDisplayLanguageDesired; +@property (strong, nonatomic) SDLLanguage hmiDisplayLanguageDesired; /** * @abstract A list of all applicable app types stating which classifications to be given to the app. @@ -187,7 +187,7 @@ NS_ASSUME_NONNULL_BEGIN * @since SDL 2.0 * @see SDLAppHMIType */ -@property (nullable, strong) NSMutableArray<SDLAppHMIType> *appHMIType; +@property (nullable, strong, nonatomic) NSMutableArray<SDLAppHMIType> *appHMIType; /** * @abstract ID used to uniquely identify current state of all app data that can persist through connection cycles (e.g. ignition cycles). @@ -198,14 +198,14 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, max length 100 chars */ -@property (nullable, strong) NSString *hashID; +@property (nullable, strong, nonatomic) NSString *hashID; /** * @abstract Information about the connecting device * * Optional */ -@property (nullable, strong) SDLDeviceInfo *deviceInfo; +@property (nullable, strong, nonatomic) SDLDeviceInfo *deviceInfo; /** * @abstract ID used to validate app with policy table entries @@ -214,14 +214,14 @@ NS_ASSUME_NONNULL_BEGIN * * @since SDL 2.0 */ -@property (strong) NSString *appID; +@property (strong, nonatomic) NSString *appID; /** * @abstract Information about the application running * * Optional */ -@property (nullable, strong) SDLAppInfo *appInfo; +@property (nullable, strong, nonatomic) SDLAppInfo *appInfo; @end diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h index 782a68908..32dc5e40c 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h @@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional */ -@property (nullable, strong) SDLSyncMsgVersion *syncMsgVersion; +@property (nullable, strong, nonatomic) SDLSyncMsgVersion *syncMsgVersion; /** * The currently active VR+TTS language on Sync. @@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional */ -@property (nullable, strong) SDLLanguage language; +@property (nullable, strong, nonatomic) SDLLanguage language; /** * The currently active display language on Sync @@ -54,21 +54,21 @@ NS_ASSUME_NONNULL_BEGIN * * Optional */ -@property (nullable, strong) SDLLanguage hmiDisplayLanguage; +@property (nullable, strong, nonatomic) SDLLanguage hmiDisplayLanguage; /** * @see SDLDisplayCapabilities * * Optional */ -@property (nullable, strong) SDLDisplayCapabilities *displayCapabilities; +@property (nullable, strong, nonatomic) SDLDisplayCapabilities *displayCapabilities; /** * @see SDLButtonCapabilities * * Optional, Array of length 1 - 100, of SDLButtonCapabilities */ -@property (nullable, strong) NSMutableArray<SDLButtonCapabilities *> *buttonCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLButtonCapabilities *> *buttonCapabilities; /** * If returned, the platform supports on-screen SoftButtons @@ -77,7 +77,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array of length 1 - 100, of SDLSoftButtonCapabilities */ -@property (nullable, strong) NSMutableArray<SDLSoftButtonCapabilities *> *softButtonCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLSoftButtonCapabilities *> *softButtonCapabilities; /** * If returned, the platform supports custom on-screen Presets @@ -86,42 +86,42 @@ NS_ASSUME_NONNULL_BEGIN * * Optional */ -@property (nullable, strong) SDLPresetBankCapabilities *presetBankCapabilities; +@property (nullable, strong, nonatomic) SDLPresetBankCapabilities *presetBankCapabilities; /** * @see SDLHMIZoneCapabilities * * Optional, Array of length 1 - 100, of SDLHMIZoneCapabilities */ -@property (nullable, strong) NSMutableArray<SDLHMIZoneCapabilities> *hmiZoneCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLHMIZoneCapabilities> *hmiZoneCapabilities; /** * @see SDLSpeechCapabilities * * Optional, Array of length 1 - 100, of SDLSpeechCapabilities */ -@property (nullable, strong) NSMutableArray<SDLSpeechCapabilities> *speechCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLSpeechCapabilities> *speechCapabilities; /** * @see SDLPrerecordedSpeech * * Optional, Array of length 1 - 100, of SDLPrerecordedSpeech */ -@property (nullable, strong) NSMutableArray<SDLPrerecordedSpeech> *prerecordedSpeech; +@property (nullable, strong, nonatomic) NSMutableArray<SDLPrerecordedSpeech> *prerecordedSpeech; /** * @see SDLVRCapabilities * * Optional, Array of length 1 - 100, of SDLVRCapabilities */ -@property (nullable, strong) NSMutableArray<SDLVRCapabilities> *vrCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLVRCapabilities> *vrCapabilities; /** * @see SDLAudioPassThruCapabilities * * Optional, Array of length 1 - 100, of SDLAudioPassThruCapabilities */ -@property (nullable, strong) NSMutableArray<SDLAudioPassThruCapabilities *> *audioPassThruCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLAudioPassThruCapabilities *> *audioPassThruCapabilities; /** * Specifies the vehicle's type @@ -130,35 +130,35 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array of length 1 - 100, of SDLVehicleType */ -@property (nullable, strong) SDLVehicleType *vehicleType; +@property (nullable, strong, nonatomic) SDLVehicleType *vehicleType; /** * Specifies the white-list of supported diagnostic modes (0x00-0xFF) capable for DiagnosticMessage requests. If a mode outside this list is requested, it will be rejected. * * Optional, Array of length 1 - 100, Integer 0 - 255 */ -@property (nullable, strong) NSMutableArray<NSNumber<SDLInt> *> *supportedDiagModes; +@property (nullable, strong, nonatomic) NSMutableArray<NSNumber<SDLInt> *> *supportedDiagModes; /** * @see SDLHMICapabilities * * Optional */ -@property (nullable, strong) SDLHMICapabilities *hmiCapabilities; +@property (nullable, strong, nonatomic) SDLHMICapabilities *hmiCapabilities; /** * The SmartDeviceLink version * * Optional, String max length 100 */ -@property (nullable, strong) NSString *sdlVersion; +@property (nullable, strong, nonatomic) NSString *sdlVersion; /** * The software version of the system that implements the SmartDeviceLink core * * Optional, String max length 100 */ -@property (nullable, strong) NSString *systemSoftwareVersion; +@property (nullable, strong, nonatomic) NSString *systemSoftwareVersion; @end diff --git a/SmartDeviceLink/SDLResetGlobalProperties.h b/SmartDeviceLink/SDLResetGlobalProperties.h index e45e45804..7c842e5c1 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.h +++ b/SmartDeviceLink/SDLResetGlobalProperties.h @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN * @abstract An array of one or more GlobalProperty enumeration elements * indicating which global properties to reset to their default value */ -@property (strong) NSMutableArray<SDLGlobalProperty> *properties; +@property (strong, nonatomic) NSMutableArray<SDLGlobalProperty> *properties; @end diff --git a/SmartDeviceLink/SDLScreenParams.h b/SmartDeviceLink/SDLScreenParams.h index 4918306fe..23c7a16a6 100644 --- a/SmartDeviceLink/SDLScreenParams.h +++ b/SmartDeviceLink/SDLScreenParams.h @@ -10,8 +10,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLScreenParams : SDLRPCStruct -@property (strong) SDLImageResolution *resolution; -@property (nullable, strong) SDLTouchEventCapabilities *touchEventAvailable; +@property (strong, nonatomic) SDLImageResolution *resolution; +@property (nullable, strong, nonatomic) SDLTouchEventCapabilities *touchEventAvailable; @end diff --git a/SmartDeviceLink/SDLScrollableMessage.h b/SmartDeviceLink/SDLScrollableMessage.h index 30e1f85f7..87ed0be98 100644 --- a/SmartDeviceLink/SDLScrollableMessage.h +++ b/SmartDeviceLink/SDLScrollableMessage.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Maxlength=500 */ -@property (strong) NSString *scrollableMessageBody; +@property (strong, nonatomic) NSString *scrollableMessageBody; /** * @abstract Gets/Sets an App defined timeout. Indicates how long of a timeout in milliseconds from the * last action @@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes</b>:Minval=0; Maxval=65535;Default=30000 */ -@property (nullable, strong) NSNumber<SDLInt> *timeout; +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *timeout; /** * @abstract Gets/Sets App defined SoftButtons.If omitted on supported displays, only the * system defined "Close" SoftButton will be displayed @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Minsize=0, Maxsize=8 */ -@property (nullable, strong) NSMutableArray<SDLSoftButton *> *softButtons; +@property (nullable, strong, nonatomic) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLSetAppIcon.h b/SmartDeviceLink/SDLSetAppIcon.h index 655614d17..2b99843c6 100644 --- a/SmartDeviceLink/SDLSetAppIcon.h +++ b/SmartDeviceLink/SDLSetAppIcon.h @@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN * <p> * <b>Notes: </b>Maxlength=500 */ -@property (strong) NSString *syncFileName; +@property (strong, nonatomic) NSString *syncFileName; @end diff --git a/SmartDeviceLink/SDLSetDisplayLayout.h b/SmartDeviceLink/SDLSetDisplayLayout.h index 4ac2170b2..c2097d804 100644 --- a/SmartDeviceLink/SDLSetDisplayLayout.h +++ b/SmartDeviceLink/SDLSetDisplayLayout.h @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN * include: "ONSCREEN_PRESETS" Custom screen containing app-defined onscreen * presets. Currently defined for GEN2 */ -@property (strong) NSString *displayLayout; +@property (strong, nonatomic) NSString *displayLayout; @end diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.h b/SmartDeviceLink/SDLSetDisplayLayoutResponse.h index c98d1bf3b..edacb17ed 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.h +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.h @@ -18,10 +18,10 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLSetDisplayLayoutResponse : SDLRPCResponse -@property (nullable, strong) SDLDisplayCapabilities *displayCapabilities; -@property (nullable, strong) NSMutableArray<SDLButtonCapabilities *> *buttonCapabilities; -@property (nullable, strong) NSMutableArray<SDLSoftButtonCapabilities *> *softButtonCapabilities; -@property (nullable, strong) SDLPresetBankCapabilities *presetBankCapabilities; +@property (nullable, strong, nonatomic) SDLDisplayCapabilities *displayCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLButtonCapabilities *> *buttonCapabilities; +@property (nullable, strong, nonatomic) NSMutableArray<SDLSoftButtonCapabilities *> *softButtonCapabilities; +@property (nullable, strong, nonatomic) SDLPresetBankCapabilities *presetBankCapabilities; @end diff --git a/SmartDeviceLink/SDLSetGlobalProperties.h b/SmartDeviceLink/SDLSetGlobalProperties.h index b4413ce71..95c803bae 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.h +++ b/SmartDeviceLink/SDLSetGlobalProperties.h @@ -42,14 +42,14 @@ NS_ASSUME_NONNULL_BEGIN * <li>Only optional it timeoutPrompt has been specified</li> * </ul> */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *helpPrompt; +@property (strong, nonatomic, nullable) NSMutableArray<SDLTTSChunk *> *helpPrompt; /** * @abstract A Vector<TTSChunk> for Timeout Prompt representing Array of one or * more TTSChunk elements specifying the help prompt used in an interaction * started by PTT * */ -@property (nullable, strong) NSMutableArray<SDLTTSChunk *> *timeoutPrompt; +@property (strong, nonatomic, nullable) NSMutableArray<SDLTTSChunk *> *timeoutPrompt; /** * @abstract Sets a voice recognition Help Title * @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN * </ul> * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSString *vrHelpTitle; +@property (strong, nonatomic, nullable) NSString *vrHelpTitle; /** * @abstract Sets the items listed in the VR help screen used in an interaction * started by PTT @@ -86,10 +86,10 @@ NS_ASSUME_NONNULL_BEGIN * </ul> * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSMutableArray<SDLVRHelpItem *> *vrHelp; -@property (nullable, strong) NSString *menuTitle; -@property (nullable, strong) SDLImage *menuIcon; -@property (nullable, strong) SDLKeyboardProperties *keyboardProperties; +@property (strong, nonatomic, nullable) NSMutableArray<SDLVRHelpItem *> *vrHelp; +@property (strong, nonatomic, nullable) NSString *menuTitle; +@property (strong, nonatomic, nullable) SDLImage *menuIcon; +@property (strong, nonatomic, nullable) SDLKeyboardProperties *keyboardProperties; @end diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.h b/SmartDeviceLink/SDLSetMediaClockTimer.h index 27fb5e8b7..f561299f5 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimer.h +++ b/SmartDeviceLink/SDLSetMediaClockTimer.h @@ -38,13 +38,13 @@ NS_ASSUME_NONNULL_BEGIN * <li>Will be ignored for PAUSE/RESUME and CLEAR</li> * </ul> */ -@property (nullable, strong) SDLStartTime *startTime; +@property (strong, nonatomic, nullable) SDLStartTime *startTime; /** * @abstract An END time of type SDLStartTime, specifying hour, minute, second values * * @discussion An SDLStartTime object with specifying hour, minute, second values */ -@property (nullable, strong) SDLStartTime *endTime; +@property (strong, nonatomic, nullable) SDLStartTime *endTime; /** * @abstract The media clock/timer update mode (COUNTUP/COUNTDOWN/PAUSE/RESUME) * @@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN * the timer's value when it was paused</li> * </ul> */ -@property (strong) SDLUpdateMode updateMode; +@property (strong, nonatomic) SDLUpdateMode updateMode; @end diff --git a/SmartDeviceLink/SDLShow.h b/SmartDeviceLink/SDLShow.h index b07ebf8f9..fb6c16411 100644 --- a/SmartDeviceLink/SDLShow.h +++ b/SmartDeviceLink/SDLShow.h @@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN * cleared</li> * </ul> */ -@property (nullable, strong) NSString *mainField1; +@property (strong, nonatomic, nullable) NSString *mainField1; /** * @abstract The text displayed on the second display line of a two-line display * @@ -76,7 +76,7 @@ NS_ASSUME_NONNULL_BEGIN * <li>Maxlength = 500</li> * </ul> */ -@property (nullable, strong) NSString *mainField2; +@property (strong, nonatomic, nullable) NSString *mainField2; /** * @abstract The text displayed on the first display line of the second page * @@ -95,7 +95,7 @@ NS_ASSUME_NONNULL_BEGIN * </ul> * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSString *mainField3; +@property (strong, nonatomic, nullable) NSString *mainField3; /** * @abstract The text displayed on the second display line of the second page * @@ -114,7 +114,7 @@ NS_ASSUME_NONNULL_BEGIN * </ul> * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSString *mainField4; +@property (strong, nonatomic, nullable) NSString *mainField4; /** * @abstract The alignment that Specifies how mainField1 and mainField2 text * should be aligned on display @@ -130,7 +130,7 @@ NS_ASSUME_NONNULL_BEGIN * <li>Has no effect with navigation display</li> * </ul> */ -@property (nullable, strong) SDLTextAlignment alignment; +@property (strong, nonatomic, nullable) SDLTextAlignment alignment; /** * @abstract Text in the Status Bar * @@ -148,7 +148,7 @@ NS_ASSUME_NONNULL_BEGIN * parameter is ignored</li> * </ul> */ -@property (nullable, strong) NSString *statusBar; +@property (strong, nonatomic, nullable) NSString *statusBar; /** * @abstract This property is deprecated use SetMediaClockTimer instead. * <p> The value for the MediaClock field using a format described in the @@ -165,7 +165,7 @@ NS_ASSUME_NONNULL_BEGIN * will not display anything)</li> * </ul> */ -@property (nullable, strong) NSString *mediaClock; +@property (strong, nonatomic, nullable) NSString *mediaClock; /** * @abstract The text in the track field * @@ -178,7 +178,7 @@ NS_ASSUME_NONNULL_BEGIN * <li>This field is only valid for media applications on navigation displays</li> * </ul> */ -@property (nullable, strong) NSString *mediaTrack; +@property (strong, nonatomic, nullable) NSString *mediaTrack; /** * @abstract An image to be shown on supported displays * @@ -188,7 +188,7 @@ NS_ASSUME_NONNULL_BEGIN * graphic shall not change<br/> * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) SDLImage *graphic; +@property (strong, nonatomic, nullable) SDLImage *graphic; /** * @abstract An image to be shown on supported displays * @@ -198,7 +198,7 @@ NS_ASSUME_NONNULL_BEGIN * graphic shall not change<br/> * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) SDLImage *secondaryGraphic; +@property (strong, nonatomic, nullable) SDLImage *secondaryGraphic; /** * @abstract The the Soft buttons defined by the App * @@ -215,7 +215,7 @@ NS_ASSUME_NONNULL_BEGIN * * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSMutableArray<SDLSoftButton *> *softButtons; +@property (strong, nonatomic, nullable) NSMutableArray<SDLSoftButton *> *softButtons; /** * @abstract The Custom Presets defined by the App * @@ -229,7 +229,7 @@ NS_ASSUME_NONNULL_BEGIN * </ul> * @since SmartDeviceLink 2.0 */ -@property (nullable, strong) NSMutableArray<NSString *> *customPresets; +@property (strong, nonatomic, nullable) NSMutableArray<NSString *> *customPresets; @end diff --git a/SmartDeviceLink/SDLShowConstantTBT.h b/SmartDeviceLink/SDLShowConstantTBT.h index 9fcf6992f..90604befa 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.h +++ b/SmartDeviceLink/SDLShowConstantTBT.h @@ -19,17 +19,17 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithNavigationText1:(nullable NSString *)navigationText1 navigationText2:(nullable NSString *)navigationText2 eta:(nullable NSString *)eta timeToDestination:(nullable NSString *)timeToDestination totalDistance:(nullable NSString *)totalDistance turnIcon:(nullable SDLImage *)turnIcon nextTurnIcon:(nullable SDLImage *)nextTurnIcon distanceToManeuver:(double)distanceToManeuver distanceToManeuverScale:(double)distanceToManeuverScale maneuverComplete:(BOOL)maneuverComplete softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons; -@property (nullable, strong) NSString *navigationText1; -@property (nullable, strong) NSString *navigationText2; -@property (nullable, strong) NSString *eta; -@property (nullable, strong) NSString *timeToDestination; -@property (nullable, strong) NSString *totalDistance; -@property (nullable, strong) SDLImage *turnIcon; -@property (nullable, strong) SDLImage *nextTurnIcon; -@property (nullable, strong) NSNumber<SDLFloat> *distanceToManeuver; -@property (nullable, strong) NSNumber<SDLFloat> *distanceToManeuverScale; -@property (nullable, strong) NSNumber<SDLBool> *maneuverComplete; -@property (nullable, strong) NSMutableArray<SDLSoftButton *> *softButtons; +@property (strong, nonatomic, nullable) NSString *navigationText1; +@property (strong, nonatomic, nullable) NSString *navigationText2; +@property (strong, nonatomic, nullable) NSString *eta; +@property (strong, nonatomic, nullable) NSString *timeToDestination; +@property (strong, nonatomic, nullable) NSString *totalDistance; +@property (strong, nonatomic, nullable) SDLImage *turnIcon; +@property (strong, nonatomic, nullable) SDLImage *nextTurnIcon; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *distanceToManeuver; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *distanceToManeuverScale; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *maneuverComplete; +@property (strong, nonatomic, nullable) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLSingleTireStatus.h b/SmartDeviceLink/SDLSingleTireStatus.h index c685137c4..da8e71077 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.h +++ b/SmartDeviceLink/SDLSingleTireStatus.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The volume status of a single tire */ -@property (strong) SDLComponentVolumeStatus status; +@property (strong, nonatomic) SDLComponentVolumeStatus status; @end diff --git a/SmartDeviceLink/SDLSlider.h b/SmartDeviceLink/SDLSlider.h index 517a17cb0..31a312bd7 100644 --- a/SmartDeviceLink/SDLSlider.h +++ b/SmartDeviceLink/SDLSlider.h @@ -27,21 +27,21 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Integer, 2 - 26 */ -@property (strong) NSNumber<SDLInt> *numTicks; +@property (strong, nonatomic) NSNumber<SDLInt> *numTicks; /** * @abstract An Initial position of slider control * * Required, Integer, 1 - 26 */ -@property (strong) NSNumber<SDLInt> *position; +@property (strong, nonatomic) NSNumber<SDLInt> *position; /** * @abstract A text header to display * * Rquired, Max length 500 chars */ -@property (strong) NSString *sliderHeader; +@property (strong, nonatomic) NSString *sliderHeader; /** * @abstract A text footer to display @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Array of Strings, Array length 1 - 26, Max string length 500 chars */ -@property (nullable, strong) NSMutableArray<NSString *> *sliderFooter; +@property (strong, nonatomic, nullable) NSMutableArray<NSString *> *sliderFooter; /** * @abstract An App defined timeout @@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Integer, 1000 - 65535 */ -@property (nullable, strong) NSNumber<SDLInt> *timeout; +@property (strong, nonatomic, nullable) NSNumber<SDLInt> *timeout; @end diff --git a/SmartDeviceLink/SDLSliderResponse.h b/SmartDeviceLink/SDLSliderResponse.h index f6dc234ac..1dd4232b4 100644 --- a/SmartDeviceLink/SDLSliderResponse.h +++ b/SmartDeviceLink/SDLSliderResponse.h @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract The selected position of the slider. */ -@property (nullable, strong) NSNumber<SDLInt> *sliderPosition; +@property (strong, nonatomic, nullable) NSNumber<SDLInt> *sliderPosition; @end diff --git a/SmartDeviceLink/SDLSoftButton.h b/SmartDeviceLink/SDLSoftButton.h index 25a2c2ff5..a5cc9d7a4 100644 --- a/SmartDeviceLink/SDLSoftButton.h +++ b/SmartDeviceLink/SDLSoftButton.h @@ -20,12 +20,12 @@ NS_ASSUME_NONNULL_BEGIN @property (copy, nonatomic) SDLRPCNotificationHandler handler; -@property (strong) SDLSoftButtonType type; -@property (nullable, strong) NSString *text; -@property (nullable, strong) SDLImage *image; -@property (nullable, strong) NSNumber<SDLBool> *isHighlighted; -@property (strong) NSNumber<SDLInt> *softButtonID; -@property (nullable, strong) SDLSystemAction systemAction; +@property (strong, nonatomic) SDLSoftButtonType type; +@property (strong, nonatomic, nullable) NSString *text; +@property (strong, nonatomic, nullable) SDLImage *image; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *isHighlighted; +@property (strong, nonatomic) NSNumber<SDLInt> *softButtonID; +@property (strong, nonatomic, nullable) SDLSystemAction systemAction; @end diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.h b/SmartDeviceLink/SDLSoftButtonCapabilities.h index 2dd02c302..c06cd026f 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.h +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.h @@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *shortPressAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *shortPressAvailable; /** * @abstract The button supports a LONG press. @@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *longPressAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *longPressAvailable; /** * @abstract The button supports "button down" and "button up". @@ -39,14 +39,14 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *upDownAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *upDownAvailable; /** * @abstract The button supports referencing a static or dynamic image. * * Required, Boolean */ -@property (strong) NSNumber<SDLBool> *imageSupported; +@property (strong, nonatomic) NSNumber<SDLBool> *imageSupported; @end diff --git a/SmartDeviceLink/SDLSpeak.h b/SmartDeviceLink/SDLSpeak.h index 65f3b406e..528c3f133 100644 --- a/SmartDeviceLink/SDLSpeak.h +++ b/SmartDeviceLink/SDLSpeak.h @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN * * @see SDLTTSChunk */ -@property (strong) NSMutableArray<SDLTTSChunk *> *ttsChunks; +@property (strong, nonatomic) NSMutableArray<SDLTTSChunk *> *ttsChunks; @end diff --git a/SmartDeviceLink/SDLStartTime.h b/SmartDeviceLink/SDLStartTime.h index 79fa5ddf8..5fbc0e987 100644 --- a/SmartDeviceLink/SDLStartTime.h +++ b/SmartDeviceLink/SDLStartTime.h @@ -23,21 +23,21 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber<SDLInt> *hours; +@property (strong, nonatomic) NSNumber<SDLInt> *hours; /** * @abstract The minute of the media clock * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber<SDLInt> *minutes; +@property (strong, nonatomic) NSNumber<SDLInt> *minutes; /** * @abstract The second of the media clock * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber<SDLInt> *seconds; +@property (strong, nonatomic) NSNumber<SDLInt> *seconds; @end diff --git a/SmartDeviceLink/SDLSubscribeButton.h b/SmartDeviceLink/SDLSubscribeButton.h index 5576141b9..6b3465636 100644 --- a/SmartDeviceLink/SDLSubscribeButton.h +++ b/SmartDeviceLink/SDLSubscribeButton.h @@ -85,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN * @abstract The name of the button to subscribe to * @discussion An enum value, see <i>SDLButtonName</i> */ -@property (strong) SDLButtonName buttonName; +@property (strong, nonatomic) SDLButtonName buttonName; @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 56fe1895d..4e0411d43 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -29,104 +29,104 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A boolean value. If true, subscribes Gps data */ -@property (nullable, strong) NSNumber<SDLBool> *gps; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps; /** * @abstract A boolean value. If true, subscribes speed data */ -@property (nullable, strong) NSNumber<SDLBool> *speed; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed; /** * @abstract A boolean value. If true, subscribes rpm data */ -@property (nullable, strong) NSNumber<SDLBool> *rpm; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm; /** * @abstract A boolean value. If true, subscribes FuelLevel data */ -@property (nullable, strong) NSNumber<SDLBool> *fuelLevel; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel; /** * @abstract A boolean value. If true, subscribes fuelLevel_State data */ -@property (nullable, strong) NSNumber<SDLBool> *fuelLevel_State; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State; /** * @abstract A boolean value. If true, subscribes instantFuelConsumption data */ -@property (nullable, strong) NSNumber<SDLBool> *instantFuelConsumption; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption; /** * @abstract A boolean value. If true, subscribes externalTemperature data */ -@property (nullable, strong) NSNumber<SDLBool> *externalTemperature; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature; /** * @abstract A boolean value. If true, subscribes Currently selected gear data */ -@property (nullable, strong) NSNumber<SDLBool> *prndl; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl; /** * @abstract A boolean value. If true, subscribes tire pressure status data */ -@property (nullable, strong) NSNumber<SDLBool> *tirePressure; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure; /** * @abstract A boolean value. If true, subscribes odometer data */ -@property (nullable, strong) NSNumber<SDLBool> *odometer; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer; /** * @abstract A boolean value. If true, subscribes belt Status data */ -@property (nullable, strong) NSNumber<SDLBool> *beltStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus; /** * @abstract A boolean value. If true, subscribes body Information data */ -@property (nullable, strong) NSNumber<SDLBool> *bodyInformation; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation; /** * @abstract A boolean value. If true, subscribes device Status data */ -@property (nullable, strong) NSNumber<SDLBool> *deviceStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus; /** * @abstract A boolean value. If true, subscribes driver Braking data */ -@property (nullable, strong) NSNumber<SDLBool> *driverBraking; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking; /** * @abstract A boolean value. If true, subscribes wiper Status data */ -@property (nullable, strong) NSNumber<SDLBool> *wiperStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus; /** * @abstract A boolean value. If true, subscribes Head Lamp Status data */ -@property (nullable, strong) NSNumber<SDLBool> *headLampStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus; /** * @abstract A boolean value. If true, subscribes Engine Torque data */ -@property (nullable, strong) NSNumber<SDLBool> *engineTorque; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque; /** * @abstract A boolean value. If true, means the accPedalPosition data has been * subscribed. */ -@property (nullable, strong) NSNumber<SDLBool> *accPedalPosition; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition; /** * @abstract A boolean value. If true, means the steeringWheelAngle data has been * subscribed. */ -@property (nullable, strong) NSNumber<SDLBool> *steeringWheelAngle; -@property (nullable, strong) NSNumber<SDLBool> *eCallInfo; -@property (nullable, strong) NSNumber<SDLBool> *airbagStatus; -@property (nullable, strong) NSNumber<SDLBool> *emergencyEvent; -@property (nullable, strong) NSNumber<SDLBool> *clusterModeStatus; -@property (nullable, strong) NSNumber<SDLBool> *myKey; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey; @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 04da0a87c..b32c0ca7a 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -19,102 +19,102 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A SDLVehicleDataResult* value. See GPSData. */ -@property (nullable, strong) SDLVehicleDataResult *gps; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *gps; /** * @abstract A SDLVehicleDataResult* value. The vehicle speed in kilometers per hour. */ -@property (nullable, strong) SDLVehicleDataResult *speed; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *speed; /** * @abstract A SDLVehicleDataResult* value. The number of revolutions per minute of the engine. */ -@property (nullable, strong) SDLVehicleDataResult *rpm; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *rpm; /** * @abstract A SDLVehicleDataResult* value. The fuel level in the tank (percentage) */ -@property (nullable, strong) SDLVehicleDataResult *fuelLevel; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; /** * @abstract A SDLVehicleDataResult* value. The fuel level state. */ -@property (nullable, strong) SDLVehicleDataResult *fuelLevel_State; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; /** * @abstract A SDLVehicleDataResult* value. The instantaneous fuel consumption in microlitres. */ -@property (nullable, strong) SDLVehicleDataResult *instantFuelConsumption; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *instantFuelConsumption; /** * @abstract A SDLVehicleDataResult* value. The external temperature in degrees celsius. */ -@property (nullable, strong) SDLVehicleDataResult *externalTemperature; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *externalTemperature; /** * @abstract A SDLVehicleDataResult* value. See PRNDL. */ -@property (nullable, strong) SDLVehicleDataResult *prndl; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *prndl; /** * @abstract A SDLVehicleDataResult* value. See TireStatus. */ -@property (nullable, strong) SDLVehicleDataResult *tirePressure; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *tirePressure; /** * @abstract A SDLVehicleDataResult* value. Odometer in km. */ -@property (nullable, strong) SDLVehicleDataResult *odometer; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *odometer; /** * @abstract A SDLVehicleDataResult* value. The status of the seat belts. */ -@property (nullable, strong) SDLVehicleDataResult *beltStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *beltStatus; /** * @abstract A SDLVehicleDataResult* value. The body information including power modes. */ -@property (nullable, strong) SDLVehicleDataResult *bodyInformation; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *bodyInformation; /** * @abstract A SDLVehicleDataResult* value. The device status including signal and battery strength. */ -@property (nullable, strong) SDLVehicleDataResult *deviceStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *deviceStatus; /** * @abstract A SDLVehicleDataResult* value. The status of the brake pedal. */ -@property (nullable, strong) SDLVehicleDataResult *driverBraking; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *driverBraking; /** * @abstract A SDLVehicleDataResult* value. The status of the wipers. */ -@property (nullable, strong) SDLVehicleDataResult *wiperStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *wiperStatus; /** * @abstract A SDLVehicleDataResult* value. Status of the head lamps. */ -@property (nullable, strong) SDLVehicleDataResult *headLampStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *headLampStatus; /** * @abstract A SDLVehicleDataResult* value. Torque value for engine (in Nm) on non-diesel variants. */ -@property (nullable, strong) SDLVehicleDataResult *engineTorque; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineTorque; /** * @abstract A SDLVehicleDataResult* value. Accelerator pedal position (percentage depressed) */ -@property (nullable, strong) SDLVehicleDataResult *accPedalPosition; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *accPedalPosition; /** * @abstract A SDLVehicleDataResult* value. Current angle of the steering wheel (in deg) */ -@property (nullable, strong) SDLVehicleDataResult *steeringWheelAngle; -@property (nullable, strong) SDLVehicleDataResult *eCallInfo; -@property (nullable, strong) SDLVehicleDataResult *airbagStatus; -@property (nullable, strong) SDLVehicleDataResult *emergencyEvent; -@property (nullable, strong) SDLVehicleDataResult *clusterModes; -@property (nullable, strong) SDLVehicleDataResult *myKey; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *steeringWheelAngle; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *eCallInfo; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *airbagStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *emergencyEvent; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *clusterModes; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *myKey; @end diff --git a/SmartDeviceLink/SDLSyncMsgVersion.h b/SmartDeviceLink/SDLSyncMsgVersion.h index 961a5aaab..7f94afdbf 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.h +++ b/SmartDeviceLink/SDLSyncMsgVersion.h @@ -22,13 +22,13 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Integer, 1 - 10 */ -@property (strong) NSNumber<SDLInt> *majorVersion; +@property (strong, nonatomic) NSNumber<SDLInt> *majorVersion; /** * @abstract The minor version indicates a change to a previous version that should still allow to be run on an older version (with limited functionality) * * Required, Integer, 0 - 1000 */ -@property (strong) NSNumber<SDLInt> *minorVersion; +@property (strong, nonatomic) NSNumber<SDLInt> *minorVersion; @end diff --git a/SmartDeviceLink/SDLSystemRequest.h b/SmartDeviceLink/SDLSystemRequest.h index d5e702ba2..a39b1f712 100644 --- a/SmartDeviceLink/SDLSystemRequest.h +++ b/SmartDeviceLink/SDLSystemRequest.h @@ -17,8 +17,8 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithType:(SDLRequestType)requestType fileName:(nullable NSString *)fileName; -@property (strong) SDLRequestType requestType; -@property (nullable, strong) NSString *fileName; +@property (strong, nonatomic) SDLRequestType requestType; +@property (strong, nonatomic, nullable) NSString *fileName; @end diff --git a/SmartDeviceLink/SDLTCPTransport.h b/SmartDeviceLink/SDLTCPTransport.h index 926246991..ed8da7e41 100644 --- a/SmartDeviceLink/SDLTCPTransport.h +++ b/SmartDeviceLink/SDLTCPTransport.h @@ -9,8 +9,8 @@ NS_ASSUME_NONNULL_BEGIN _Nullable CFSocketRef socket; } -@property (strong, atomic) NSString *hostName; -@property (strong, atomic) NSString *portNumber; +@property (strong, nonatomic) NSString *hostName; +@property (strong, nonatomic) NSString *portNumber; @end diff --git a/SmartDeviceLink/SDLTTSChunk.h b/SmartDeviceLink/SDLTTSChunk.h index dc10c0fa4..ad7690ef0 100644 --- a/SmartDeviceLink/SDLTTSChunk.h +++ b/SmartDeviceLink/SDLTTSChunk.h @@ -59,14 +59,14 @@ NS_ASSUME_NONNULL_BEGIN * * Required, Max length 500 */ -@property (strong) NSString *text; +@property (strong, nonatomic) NSString *text; /** * @abstract The type of information in the "text" field (e.g. phrase to be spoken, phoneme specification, name of pre-recorded sound). * * Required */ -@property (strong) SDLSpeechCapabilities type; +@property (strong, nonatomic) SDLSpeechCapabilities type; @end diff --git a/SmartDeviceLink/SDLTextField.h b/SmartDeviceLink/SDLTextField.h index c1ded2138..2546b2cf1 100644 --- a/SmartDeviceLink/SDLTextField.h +++ b/SmartDeviceLink/SDLTextField.h @@ -68,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLTextFieldName name; +@property (strong, nonatomic) SDLTextFieldName name; /** * @abstract The character set that is supported in this field. @@ -77,21 +77,21 @@ NS_ASSUME_NONNULL_BEGIN * * Required */ -@property (strong) SDLCharacterSet characterSet; +@property (strong, nonatomic) SDLCharacterSet characterSet; /** * @abstract The number of characters in one row of this field. * * Required, Integer 1 - 500 */ -@property (strong) NSNumber<SDLInt> *width; +@property (strong, nonatomic) NSNumber<SDLInt> *width; /** * @abstract The number of rows for this text field. * * Required, Integer 1 - 8 */ -@property (strong) NSNumber<SDLInt> *rows; +@property (strong, nonatomic) NSNumber<SDLInt> *rows; @end diff --git a/SmartDeviceLink/SDLTimer.h b/SmartDeviceLink/SDLTimer.h index 2bfde8325..0382b7f67 100644 --- a/SmartDeviceLink/SDLTimer.h +++ b/SmartDeviceLink/SDLTimer.h @@ -8,9 +8,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLTimer : NSObject -@property (nullable, nonatomic, copy) void (^elapsedBlock)(void); -@property (nullable, nonatomic, copy) void (^canceledBlock)(void); -@property (assign) float duration; +@property (copy, nonatomic, nullable) void (^elapsedBlock)(void); +@property (copy, nonatomic, nullable) void (^canceledBlock)(void); +@property (assign, nonatomic) float duration; - (instancetype)init; - (instancetype)initWithDuration:(float)duration __deprecated; diff --git a/SmartDeviceLink/SDLTimer.m b/SmartDeviceLink/SDLTimer.m index 3de032ac7..f689ce0c7 100644 --- a/SmartDeviceLink/SDLTimer.m +++ b/SmartDeviceLink/SDLTimer.m @@ -8,9 +8,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLTimer () -@property (nullable, strong) NSTimer *timer; -@property (assign) BOOL timerRunning; -@property (nonatomic) BOOL repeat; +@property (strong, nonatomic, nullable) NSTimer *timer; +@property (assign, nonatomic) BOOL timerRunning; +@property (assign, nonatomic) BOOL repeat; @end diff --git a/SmartDeviceLink/SDLTireStatus.h b/SmartDeviceLink/SDLTireStatus.h index 9912bb364..51e3a9db0 100644 --- a/SmartDeviceLink/SDLTireStatus.h +++ b/SmartDeviceLink/SDLTireStatus.h @@ -11,13 +11,13 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLTireStatus : SDLRPCStruct -@property (strong) SDLWarningLightStatus pressureTelltale; -@property (strong) SDLSingleTireStatus *leftFront; -@property (strong) SDLSingleTireStatus *rightFront; -@property (strong) SDLSingleTireStatus *leftRear; -@property (strong) SDLSingleTireStatus *rightRear; -@property (strong) SDLSingleTireStatus *innerLeftRear; -@property (strong) SDLSingleTireStatus *innerRightRear; +@property (strong, nonatomic) SDLWarningLightStatus pressureTelltale; +@property (strong, nonatomic) SDLSingleTireStatus *leftFront; +@property (strong, nonatomic) SDLSingleTireStatus *rightFront; +@property (strong, nonatomic) SDLSingleTireStatus *leftRear; +@property (strong, nonatomic) SDLSingleTireStatus *rightRear; +@property (strong, nonatomic) SDLSingleTireStatus *innerLeftRear; +@property (strong, nonatomic) SDLSingleTireStatus *innerRightRear; @end diff --git a/SmartDeviceLink/SDLTouchCoord.h b/SmartDeviceLink/SDLTouchCoord.h index dbd8b871f..156511585 100644 --- a/SmartDeviceLink/SDLTouchCoord.h +++ b/SmartDeviceLink/SDLTouchCoord.h @@ -8,8 +8,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLTouchCoord : SDLRPCStruct -@property (strong) NSNumber<SDLFloat> *x; -@property (strong) NSNumber<SDLFloat> *y; +@property (strong, nonatomic) NSNumber<SDLFloat> *x; +@property (strong, nonatomic) NSNumber<SDLFloat> *y; @end diff --git a/SmartDeviceLink/SDLTouchEvent.h b/SmartDeviceLink/SDLTouchEvent.h index 57bf410dd..353b0a625 100644 --- a/SmartDeviceLink/SDLTouchEvent.h +++ b/SmartDeviceLink/SDLTouchEvent.h @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN Mandatory, 0-9 */ -@property (strong) NSNumber<SDLInt> *touchEventId; +@property (strong, nonatomic) NSNumber<SDLInt> *touchEventId; /** The time that the touch was recorded. This number can the time since the beginning of the session or something else as long as the units are in milliseconds. @@ -30,12 +30,12 @@ NS_ASSUME_NONNULL_BEGIN Mandatory, array size 1-1000, contains <NSNumber> size 0-5000000000 */ -@property (strong) NSMutableArray<NSNumber<SDLInt> *> *timeStamp; +@property (strong, nonatomic) NSMutableArray<NSNumber<SDLInt> *> *timeStamp; /** * Mandatory, array size 1-1000, contains SDLTouchCoord */ -@property (strong) NSMutableArray<SDLTouchCoord *> *coord; +@property (strong, nonatomic) NSMutableArray<SDLTouchCoord *> *coord; @end diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.h b/SmartDeviceLink/SDLTouchEventCapabilities.h index 1d02f40b0..87bb68bf4 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.h +++ b/SmartDeviceLink/SDLTouchEventCapabilities.h @@ -8,9 +8,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLTouchEventCapabilities : SDLRPCStruct -@property (strong) NSNumber<SDLBool> *pressAvailable; -@property (strong) NSNumber<SDLBool> *multiTouchAvailable; -@property (strong) NSNumber<SDLBool> *doublePressAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *pressAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *multiTouchAvailable; +@property (strong, nonatomic) NSNumber<SDLBool> *doublePressAvailable; @end diff --git a/SmartDeviceLink/SDLTurn.h b/SmartDeviceLink/SDLTurn.h index 5b187adc9..f895d07eb 100644 --- a/SmartDeviceLink/SDLTurn.h +++ b/SmartDeviceLink/SDLTurn.h @@ -11,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithNavigationText:(nullable NSString *)navigationText turnIcon:(nullable SDLImage *)icon; -@property (nullable, strong) NSString *navigationText; -@property (nullable, strong) SDLImage *turnIcon; +@property (strong, nonatomic, nullable) NSString *navigationText; +@property (strong, nonatomic, nullable) SDLImage *turnIcon; @end diff --git a/SmartDeviceLink/SDLUnsubscribeButton.h b/SmartDeviceLink/SDLUnsubscribeButton.h index e000dc70e..edfa5ae20 100644 --- a/SmartDeviceLink/SDLUnsubscribeButton.h +++ b/SmartDeviceLink/SDLUnsubscribeButton.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN * @discussion An Enumeration value, see <i> * SDLButtonName</i> */ -@property (strong) SDLButtonName buttonName; +@property (strong, nonatomic) SDLButtonName buttonName; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 0ce128722..fc7938075 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -26,98 +26,98 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A boolean value. If true, unsubscribes Gps data */ -@property (nullable, strong) NSNumber<SDLBool> *gps; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps; /** * @abstract A boolean value. If true, unsubscribes speed data */ -@property (nullable, strong) NSNumber<SDLBool> *speed; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed; /** * @abstract A boolean value. If true, unsubscribe data */ -@property (nullable, strong) NSNumber<SDLBool> *rpm; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm; /** * @abstract A boolean value. If true, unsubscribes FuelLevel data */ -@property (nullable, strong) NSNumber<SDLBool> *fuelLevel; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel; /** * @abstract A boolean value. If true, unsubscribes fuelLevel_State data */ -@property (nullable, strong) NSNumber<SDLBool> *fuelLevel_State; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State; /** * @abstract A boolean value. If true, unsubscribes instantFuelConsumption data */ -@property (nullable, strong) NSNumber<SDLBool> *instantFuelConsumption; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption; /** * @abstract A boolean value. If true, unsubscribes externalTemperature data */ -@property (nullable, strong) NSNumber<SDLBool> *externalTemperature; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature; /** * @abstract A boolean value. If true, unsubscribes Currently selected gear data */ -@property (nullable, strong) NSNumber<SDLBool> *prndl; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl; /** * @abstract A boolean value. If true, unsubscribes tire pressure status data */ -@property (nullable, strong) NSNumber<SDLBool> *tirePressure; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure; /** * @abstract A boolean value. If true, unsubscribes odometer data */ -@property (nullable, strong) NSNumber<SDLBool> *odometer; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer; /** * @abstract A boolean value. If true, unsubscribes belt Status data */ -@property (nullable, strong) NSNumber<SDLBool> *beltStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus; /** * @abstract A boolean value. If true, unsubscribes body Information data */ -@property (nullable, strong) NSNumber<SDLBool> *bodyInformation; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation; /** * @abstract A boolean value. If true, unsubscribes device Status data */ -@property (nullable, strong) NSNumber<SDLBool> *deviceStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus; /** * @abstract A boolean value. If true, unsubscribes driver Braking data */ -@property (nullable, strong) NSNumber<SDLBool> *driverBraking; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking; /** * @abstract A boolean value. If true, unsubscribes wiper Status data */ -@property (nullable, strong) NSNumber<SDLBool> *wiperStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus; /** * @abstract A boolean value. If true, unsubscribes Head Lamp Status data */ -@property (nullable, strong) NSNumber<SDLBool> *headLampStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus; /** * @abstract A boolean value. If true, unsubscribes Engine Torque data */ -@property (nullable, strong) NSNumber<SDLBool> *engineTorque; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque; /** * @abstract A boolean value. If true, unsubscribes accPedalPosition data */ -@property (nullable, strong) NSNumber<SDLBool> *accPedalPosition; -@property (nullable, strong) NSNumber<SDLBool> *steeringWheelAngle; -@property (nullable, strong) NSNumber<SDLBool> *eCallInfo; -@property (nullable, strong) NSNumber<SDLBool> *airbagStatus; -@property (nullable, strong) NSNumber<SDLBool> *emergencyEvent; -@property (nullable, strong) NSNumber<SDLBool> *clusterModeStatus; -@property (nullable, strong) NSNumber<SDLBool> *myKey; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 90e6ec480..bced5894e 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -19,102 +19,102 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A SDLVehicleDataResult* value. See GPSData. */ -@property (nullable, strong) SDLVehicleDataResult *gps; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *gps; /** * @abstract A SDLVehicleDataResult* value. The vehicle speed in kilometers per hour. */ -@property (nullable, strong) SDLVehicleDataResult *speed; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *speed; /** * @abstract A SDLVehicleDataResult* value. The number of revolutions per minute of the engine. */ -@property (nullable, strong) SDLVehicleDataResult *rpm; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *rpm; /** * @abstract A SDLVehicleDataResult* value. The fuel level in the tank (percentage) */ -@property (nullable, strong) SDLVehicleDataResult *fuelLevel; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; /** * @abstract A SDLVehicleDataResult* value. The fuel level state. */ -@property (nullable, strong) SDLVehicleDataResult *fuelLevel_State; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; /** * @abstract A SDLVehicleDataResult* value. The instantaneous fuel consumption in microlitres. */ -@property (nullable, strong) SDLVehicleDataResult *instantFuelConsumption; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *instantFuelConsumption; /** * @abstract A SDLVehicleDataResult* value. The external temperature in degrees celsius. */ -@property (nullable, strong) SDLVehicleDataResult *externalTemperature; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *externalTemperature; /** * @abstract A SDLVehicleDataResult* value. See PRNDL. */ -@property (nullable, strong) SDLVehicleDataResult *prndl; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *prndl; /** * @abstract A SDLVehicleDataResult* value. See TireStatus. */ -@property (nullable, strong) SDLVehicleDataResult *tirePressure; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *tirePressure; /** * @abstract A SDLVehicleDataResult* value. Odometer in km. */ -@property (nullable, strong) SDLVehicleDataResult *odometer; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *odometer; /** * @abstract A SDLVehicleDataResult* value. The status of the seat belts. */ -@property (nullable, strong) SDLVehicleDataResult *beltStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *beltStatus; /** * @abstract A SDLVehicleDataResult* value. The body information including power modes. */ -@property (nullable, strong) SDLVehicleDataResult *bodyInformation; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *bodyInformation; /** * @abstract A SDLVehicleDataResult* value. The device status including signal and battery strength. */ -@property (nullable, strong) SDLVehicleDataResult *deviceStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *deviceStatus; /** * @abstract A SDLVehicleDataResult* value. The status of the brake pedal. */ -@property (nullable, strong) SDLVehicleDataResult *driverBraking; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *driverBraking; /** * @abstract A SDLVehicleDataResult* value. The status of the wipers. */ -@property (nullable, strong) SDLVehicleDataResult *wiperStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *wiperStatus; /** * @abstract A SDLVehicleDataResult* value. Status of the head lamps. */ -@property (nullable, strong) SDLVehicleDataResult *headLampStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *headLampStatus; /** * @abstract A SDLVehicleDataResult* value. Torque value for engine (in Nm) on non-diesel variants. */ -@property (nullable, strong) SDLVehicleDataResult *engineTorque; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineTorque; /** * @abstract A SDLVehicleDataResult* value. Accelerator pedal position (percentage depressed) */ -@property (nullable, strong) SDLVehicleDataResult *accPedalPosition; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *accPedalPosition; /** * @abstract A SDLVehicleDataResult* value. Current angle of the steering wheel (in deg) */ -@property (nullable, strong) SDLVehicleDataResult *steeringWheelAngle; -@property (nullable, strong) SDLVehicleDataResult *eCallInfo; -@property (nullable, strong) SDLVehicleDataResult *airbagStatus; -@property (nullable, strong) SDLVehicleDataResult *emergencyEvent; -@property (nullable, strong) SDLVehicleDataResult *clusterModes; -@property (nullable, strong) SDLVehicleDataResult *myKey; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *steeringWheelAngle; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *eCallInfo; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *airbagStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *emergencyEvent; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *clusterModes; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *myKey; @end diff --git a/SmartDeviceLink/SDLUpdateTurnList.h b/SmartDeviceLink/SDLUpdateTurnList.h index 9071f7bc9..63a3473aa 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.h +++ b/SmartDeviceLink/SDLUpdateTurnList.h @@ -22,12 +22,12 @@ NS_ASSUME_NONNULL_BEGIN /** * Optional, SDLTurn, 1 - 100 entries */ -@property (nullable, strong) NSMutableArray<SDLTurn *> *turnList; +@property (strong, nonatomic, nullable) NSMutableArray<SDLTurn *> *turnList; /** * Required, SDLSoftButton, 0 - 1 Entries */ -@property (nullable, strong) NSMutableArray<SDLSoftButton *> *softButtons; +@property (strong, nonatomic, nullable) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLV2ProtocolHeader.h b/SmartDeviceLink/SDLV2ProtocolHeader.h index 350e73369..bb93768bb 100644 --- a/SmartDeviceLink/SDLV2ProtocolHeader.h +++ b/SmartDeviceLink/SDLV2ProtocolHeader.h @@ -8,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLV2ProtocolHeader : SDLProtocolHeader -@property (assign) UInt32 messageID; +@property (assign, nonatomic) UInt32 messageID; - (instancetype)init; - (instancetype)initWithVersion:(UInt8)version; diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index ea475f1ea..d0bbf59cb 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -10,8 +10,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLVehicleDataResult : SDLRPCStruct -@property (strong) SDLVehicleDataType dataType; -@property (strong) SDLVehicleDataResultCode resultCode; +@property (strong, nonatomic) SDLVehicleDataType dataType; +@property (strong, nonatomic) SDLVehicleDataResultCode resultCode; @end diff --git a/SmartDeviceLink/SDLVehicleType.h b/SmartDeviceLink/SDLVehicleType.h index d46af829c..4d7164bb4 100644 --- a/SmartDeviceLink/SDLVehicleType.h +++ b/SmartDeviceLink/SDLVehicleType.h @@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max String length 500 chars */ -@property (nullable, strong) NSString *make; +@property (strong, nonatomic, nullable) NSString *make; /** * @abstract The model of the vehicle @@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max String length 500 chars */ -@property (nullable, strong) NSString *model; +@property (strong, nonatomic, nullable) NSString *model; /** * @abstract The model year of the vehicle @@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max String length 500 chars */ -@property (nullable, strong) NSString *modelYear; +@property (strong, nonatomic, nullable) NSString *modelYear; /** * @abstract The trim of the vehicle @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional, Max String length 500 chars */ -@property (nullable, strong) NSString *trim; +@property (strong, nonatomic, nullable) NSString *trim; @end diff --git a/SmartDeviceLink/SDLVrHelpItem.h b/SmartDeviceLink/SDLVrHelpItem.h index 8d5a27cf5..e460538ac 100644 --- a/SmartDeviceLink/SDLVrHelpItem.h +++ b/SmartDeviceLink/SDLVrHelpItem.h @@ -13,9 +13,9 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithText:(NSString *)text image:(nullable SDLImage *)image position:(UInt8)position; -@property (strong) NSString *text; -@property (nullable, strong) SDLImage *image; -@property (strong) NSNumber<SDLInt> *position; +@property (strong, nonatomic) NSString *text; +@property (strong, nonatomic, nullable) SDLImage *image; +@property (strong, nonatomic) NSNumber<SDLInt> *position; @end diff --git a/SmartDeviceLink_Example/Classes/ProxyManager.m b/SmartDeviceLink_Example/Classes/ProxyManager.m index 4a4833808..17fcc1687 100644 --- a/SmartDeviceLink_Example/Classes/ProxyManager.m +++ b/SmartDeviceLink_Example/Classes/ProxyManager.m @@ -111,7 +111,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)showInitialData { - if ((self.initialShowState != SDLHMIInitialShowStateDataAvailable) || [self.sdlManager.hmiLevel isEqualToString:SDLHMILevelFull]) { + if ((self.initialShowState != SDLHMIInitialShowStateDataAvailable) || ![self.sdlManager.hmiLevel isEqualToString:SDLHMILevelFull]) { return; } |