diff options
Diffstat (limited to 'SmartDeviceLink')
89 files changed, 553 insertions, 207 deletions
diff --git a/SmartDeviceLink/SDLAirbagStatus.h b/SmartDeviceLink/SDLAirbagStatus.h index a8d127f17..392e60e98 100644 --- a/SmartDeviceLink/SDLAirbagStatus.h +++ b/SmartDeviceLink/SDLAirbagStatus.h @@ -5,6 +5,8 @@ #import "SDLVehicleDataEventStatus.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLAirbagStatus : SDLRPCStruct @property (strong) SDLVehicleDataEventStatus driverAirbagDeployed; @@ -17,3 +19,5 @@ @property (strong) SDLVehicleDataEventStatus passengerKneeAirbagDeployed; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m index 099bfe4f5..a320d40fc 100644 --- a/SmartDeviceLink/SDLAirbagStatus.m +++ b/SmartDeviceLink/SDLAirbagStatus.m @@ -4,6 +4,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLAirbagStatus - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus)driverAirbagDeployed { @@ -111,3 +113,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppInfo.h b/SmartDeviceLink/SDLAppInfo.h index c08fba9fd..965575085 100644 --- a/SmartDeviceLink/SDLAppInfo.h +++ b/SmartDeviceLink/SDLAppInfo.h @@ -3,6 +3,8 @@ #import "SDLRPCStruct.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLAppInfo : SDLRPCStruct + (instancetype)currentAppInfo; @@ -12,3 +14,5 @@ @property (strong) NSString *appVersion; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m index 0bc1b073c..530e90632 100644 --- a/SmartDeviceLink/SDLAppInfo.m +++ b/SmartDeviceLink/SDLAppInfo.m @@ -8,6 +8,8 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionString"; static NSString *const SDLBundleAppNameKey = @"CFBundleName"; +NS_ASSUME_NONNULL_BEGIN + @implementation SDLAppInfo + (instancetype)currentAppInfo { @@ -60,3 +62,5 @@ static NSString *const SDLBundleAppNameKey = @"CFBundleName"; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.h b/SmartDeviceLink/SDLAudioPassThruCapabilities.h index 08501ff30..206658b34 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.h +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.h @@ -42,6 +42,9 @@ * </table> * Since <b>SmartDeviceLink 2.0</b> */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLAudioPassThruCapabilities : SDLRPCStruct /** @@ -61,3 +64,5 @@ @property (strong) SDLAudioType audioType; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m index 875179a97..5981de92d 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m @@ -6,6 +6,7 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN @implementation SDLAudioPassThruCapabilities @@ -49,3 +50,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLBeltStatus.h b/SmartDeviceLink/SDLBeltStatus.h index 6fd565877..5108c623c 100644 --- a/SmartDeviceLink/SDLBeltStatus.h +++ b/SmartDeviceLink/SDLBeltStatus.h @@ -5,6 +5,8 @@ #import "SDLVehicleDataEventStatus.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLBeltStatus : SDLRPCStruct @property (strong) SDLVehicleDataEventStatus driverBeltDeployed; @@ -24,3 +26,5 @@ @property (strong) SDLVehicleDataEventStatus middleRow1BuckleBelted; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m index b4777519e..7f376761a 100644 --- a/SmartDeviceLink/SDLBeltStatus.m +++ b/SmartDeviceLink/SDLBeltStatus.m @@ -6,6 +6,8 @@ #import "SDLNames.h" #import "SDLVehicleDataEventStatus.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLBeltStatus - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus)driverBeltDeployed { @@ -204,3 +206,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLBodyInformation.h b/SmartDeviceLink/SDLBodyInformation.h index 4729ffc6c..03417b6ad 100644 --- a/SmartDeviceLink/SDLBodyInformation.h +++ b/SmartDeviceLink/SDLBodyInformation.h @@ -10,6 +10,9 @@ /** * The body information including power modes. */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLBodyInformation : SDLRPCStruct /** @@ -30,21 +33,23 @@ /** * @abstract References signal "DrStatDrv_B_Actl". */ -@property (strong) NSNumber<SDLBool> *driverDoorAjar; +@property (nullable, strong) NSNumber<SDLBool> *driverDoorAjar; /** * @abstract References signal "DrStatPsngr_B_Actl". */ -@property (strong) NSNumber<SDLBool> *passengerDoorAjar; +@property (nullable, strong) NSNumber<SDLBool> *passengerDoorAjar; /** * @abstract References signal "DrStatRl_B_Actl". */ -@property (strong) NSNumber<SDLBool> *rearLeftDoorAjar; +@property (nullable, strong) NSNumber<SDLBool> *rearLeftDoorAjar; /** * @abstract References signal "DrStatRr_B_Actl". */ -@property (strong) NSNumber<SDLBool> *rearRightDoorAjar; +@property (nullable, strong) NSNumber<SDLBool> *rearRightDoorAjar; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m index db54f6264..71f20254b 100644 --- a/SmartDeviceLink/SDLBodyInformation.m +++ b/SmartDeviceLink/SDLBodyInformation.m @@ -48,7 +48,7 @@ return (SDLIgnitionStatus)obj; } -- (void)setDriverDoorAjar:(NSNumber<SDLBool> *)driverDoorAjar { +- (void)setDriverDoorAjar:(nullable NSNumber<SDLBool> *)driverDoorAjar { if (driverDoorAjar != nil) { [store setObject:driverDoorAjar forKey:SDLNameDriverDoorAjar]; } else { @@ -56,11 +56,11 @@ } } -- (NSNumber<SDLBool> *)driverDoorAjar { +- (nullable NSNumber<SDLBool> *)driverDoorAjar { return [store objectForKey:SDLNameDriverDoorAjar]; } -- (void)setPassengerDoorAjar:(NSNumber<SDLBool> *)passengerDoorAjar { +- (void)setPassengerDoorAjar:(nullable NSNumber<SDLBool> *)passengerDoorAjar { if (passengerDoorAjar != nil) { [store setObject:passengerDoorAjar forKey:SDLNamePassengerDoorAjar]; } else { @@ -68,11 +68,11 @@ } } -- (NSNumber<SDLBool> *)passengerDoorAjar { +- (nullable NSNumber<SDLBool> *)passengerDoorAjar { return [store objectForKey:SDLNamePassengerDoorAjar]; } -- (void)setRearLeftDoorAjar:(NSNumber<SDLBool> *)rearLeftDoorAjar { +- (void)setRearLeftDoorAjar:(nullable NSNumber<SDLBool> *)rearLeftDoorAjar { if (rearLeftDoorAjar != nil) { [store setObject:rearLeftDoorAjar forKey:SDLNameRearLeftDoorAjar]; } else { @@ -80,11 +80,11 @@ } } -- (NSNumber<SDLBool> *)rearLeftDoorAjar { +- (nullable NSNumber<SDLBool> *)rearLeftDoorAjar { return [store objectForKey:SDLNameRearLeftDoorAjar]; } -- (void)setRearRightDoorAjar:(NSNumber<SDLBool> *)rearRightDoorAjar { +- (void)setRearRightDoorAjar:(nullable NSNumber<SDLBool> *)rearRightDoorAjar { if (rearRightDoorAjar != nil) { [store setObject:rearRightDoorAjar forKey:SDLNameRearRightDoorAjar]; } else { @@ -92,7 +92,7 @@ } } -- (NSNumber<SDLBool> *)rearRightDoorAjar { +- (nullable NSNumber<SDLBool> *)rearRightDoorAjar { return [store objectForKey:SDLNameRearRightDoorAjar]; } diff --git a/SmartDeviceLink/SDLButtonCapabilities.h b/SmartDeviceLink/SDLButtonCapabilities.h index f73416239..18b283c36 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.h +++ b/SmartDeviceLink/SDLButtonCapabilities.h @@ -11,6 +11,9 @@ * * @since SDL 1.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLButtonCapabilities : SDLRPCStruct /** @@ -40,3 +43,5 @@ @property (strong) NSNumber<SDLBool> *upDownAvailable; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m index 3786a6534..43ed46bb5 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.m +++ b/SmartDeviceLink/SDLButtonCapabilities.m @@ -5,6 +5,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLButtonCapabilities - (void)setName:(SDLButtonName)name { @@ -57,3 +59,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLClusterModeStatus.h b/SmartDeviceLink/SDLClusterModeStatus.h index 5970fc69f..3a0590997 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.h +++ b/SmartDeviceLink/SDLClusterModeStatus.h @@ -7,6 +7,7 @@ #import "SDLPowerModeQualificationStatus.h" #import "SDLPowerModeStatus.h" +NS_ASSUME_NONNULL_BEGIN @interface SDLClusterModeStatus : SDLRPCStruct @@ -16,3 +17,5 @@ @property (strong) SDLPowerModeStatus powerModeStatus; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m index 194cc9aff..131f1a752 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.m +++ b/SmartDeviceLink/SDLClusterModeStatus.m @@ -5,6 +5,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLClusterModeStatus - (void)setPowerModeActive:(NSNumber<SDLBool> *)powerModeActive { @@ -59,3 +61,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDIDResult.h b/SmartDeviceLink/SDLDIDResult.h index 60eec5184..e58f6607a 100644 --- a/SmartDeviceLink/SDLDIDResult.h +++ b/SmartDeviceLink/SDLDIDResult.h @@ -5,11 +5,14 @@ #import "SDLVehicleDataResultCode.h" +NS_ASSUME_NONNULL_BEGIN @interface SDLDIDResult : SDLRPCStruct @property (strong) SDLVehicleDataResultCode resultCode; @property (strong) NSNumber<SDLInt> *didLocation; -@property (strong) NSString *data; +@property (nullable, strong) NSString *data; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m index 3e441fbbe..b016da96b 100644 --- a/SmartDeviceLink/SDLDIDResult.m +++ b/SmartDeviceLink/SDLDIDResult.m @@ -5,6 +5,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLDIDResult - (void)setResultCode:(SDLVehicleDataResultCode)resultCode { @@ -32,7 +34,7 @@ return [store objectForKey:SDLNameDIDLocation]; } -- (void)setData:(NSString *)data { +- (void)setData:(nullable NSString *)data { if (data != nil) { [store setObject:data forKey:SDLNameData]; } else { @@ -40,8 +42,10 @@ } } -- (NSString *)data { +- (nullable NSString *)data { return [store objectForKey:SDLNameData]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDateTime.h b/SmartDeviceLink/SDLDateTime.h index 7dffbd5d2..840183553 100644 --- a/SmartDeviceLink/SDLDateTime.h +++ b/SmartDeviceLink/SDLDateTime.h @@ -3,6 +3,8 @@ #import "SDLRPCStruct.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLDateTime : SDLRPCStruct - (instancetype)initWithHour:(UInt8)hour minute:(UInt8)minute; @@ -18,62 +20,64 @@ * * Optional, Integer 0 - 999 */ -@property (copy, nonatomic) NSNumber<SDLInt> *millisecond; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *millisecond; /** * @abstract Seconds part of time * * Optional, Integer 0 - 59 */ -@property (copy, nonatomic) NSNumber<SDLInt> *second; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *second; /** * @abstract Minutes part of time * * Optional, Integer 0 - 59 */ -@property (copy, nonatomic) NSNumber<SDLInt> *minute; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *minute; /** * @abstract Hour part of time * * Optional, Integer 0 - 23 */ -@property (copy, nonatomic) NSNumber<SDLInt> *hour; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *hour; /** * @abstract Day of the month * * Optional, Integer 1 - 31 */ -@property (copy, nonatomic) NSNumber<SDLInt> *day; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *day; /** * @abstract Month of the year * * Optional, Integer 1 - 12 */ -@property (copy, nonatomic) NSNumber<SDLInt> *month; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *month; /** * @abstract The year in YYYY format * * Optional, Max Value 4095 */ -@property (copy, nonatomic) NSNumber<SDLInt> *year; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *year; /** * @abstract Time zone offset in Min with regard to UTC * * Optional, Integer 0 - 59 */ -@property (copy, nonatomic) NSNumber<SDLInt> *timezoneMinuteOffset; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *timezoneMinuteOffset; /** * @abstract Time zone offset in Hours with regard to UTC * * Optional, Integer -12 - 14 */ -@property (copy, nonatomic) NSNumber<SDLInt> *timezoneHourOffset; +@property (nullable, copy, nonatomic) NSNumber<SDLInt> *timezoneHourOffset; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDateTime.m b/SmartDeviceLink/SDLDateTime.m index f10cf1020..8fe98255a 100644 --- a/SmartDeviceLink/SDLDateTime.m +++ b/SmartDeviceLink/SDLDateTime.m @@ -56,7 +56,7 @@ return self; } -- (void)setMillisecond:(NSNumber<SDLInt> *)millisecond { +- (void)setMillisecond:(nullable NSNumber<SDLInt> *)millisecond { if (millisecond != nil) { store[SDLNameMillisecond] = millisecond; } else { @@ -64,11 +64,11 @@ } } -- (NSNumber<SDLInt> *)millisecond { +- (nullable NSNumber<SDLInt> *)millisecond { return store[SDLNameMillisecond]; } -- (void)setSecond:(NSNumber<SDLInt> *)second { +- (void)setSecond:(nullable NSNumber<SDLInt> *)second { if (second != nil) { store[SDLNameSecond] = second; } else { @@ -76,11 +76,11 @@ } } -- (NSNumber<SDLInt> *)second { +- (nullable NSNumber<SDLInt> *)second { return store[SDLNameSecond]; } -- (void)setMinute:(NSNumber<SDLInt> *)minute { +- (void)setMinute:(nullable NSNumber<SDLInt> *)minute { if (minute != nil) { store[SDLNameMinute] = minute; } else { @@ -88,11 +88,11 @@ } } -- (NSNumber<SDLInt> *)minute { +- (nullable NSNumber<SDLInt> *)minute { return store[SDLNameMinute]; } -- (void)setHour:(NSNumber<SDLInt> *)hour { +- (void)setHour:(nullable NSNumber<SDLInt> *)hour { if (hour != nil) { store[SDLNameHour] = hour; } else { @@ -100,11 +100,11 @@ } } -- (NSNumber<SDLInt> *)hour { +- (nullable NSNumber<SDLInt> *)hour { return store[SDLNameHour]; } -- (void)setDay:(NSNumber<SDLInt> *)day { +- (void)setDay:(nullable NSNumber<SDLInt> *)day { if (day != nil) { store[SDLNameDay] = day; } else { @@ -112,11 +112,11 @@ } } -- (NSNumber<SDLInt> *)day { +- (nullable NSNumber<SDLInt> *)day { return store[SDLNameDay]; } -- (void)setMonth:(NSNumber<SDLInt> *)month { +- (void)setMonth:(nullable NSNumber<SDLInt> *)month { if (month != nil) { store[SDLNameMonth] = month; } else { @@ -124,11 +124,11 @@ } } -- (NSNumber<SDLInt> *)month { +- (nullable NSNumber<SDLInt> *)month { return store[SDLNameMonth]; } -- (void)setYear:(NSNumber<SDLInt> *)year { +- (void)setYear:(nullable NSNumber<SDLInt> *)year { if (year != nil) { store[SDLNameYear] = year; } else { @@ -136,11 +136,11 @@ } } -- (NSNumber<SDLInt> *)year { +- (nullable NSNumber<SDLInt> *)year { return store[SDLNameYear]; } -- (void)setTimezoneMinuteOffset:(NSNumber<SDLInt> *)timezoneMinuteOffset { +- (void)setTimezoneMinuteOffset:(nullable NSNumber<SDLInt> *)timezoneMinuteOffset { if (timezoneMinuteOffset != nil) { store[SDLNameTimezoneMinuteOffset] = timezoneMinuteOffset; } else { @@ -148,11 +148,11 @@ } } -- (NSNumber<SDLInt> *)timezoneMinuteOffset { +- (nullable NSNumber<SDLInt> *)timezoneMinuteOffset { return store[SDLNameTimezoneMinuteOffset]; } -- (void)setTimezoneHourOffset:(NSNumber<SDLInt> *)timezoneHourOffset { +- (void)setTimezoneHourOffset:(nullable NSNumber<SDLInt> *)timezoneHourOffset { if (timezoneHourOffset != nil) { store[SDLNameTimezoneHourOffset] = timezoneHourOffset; } else { @@ -160,7 +160,7 @@ } } -- (NSNumber<SDLInt> *)timezoneHourOffset { +- (nullable NSNumber<SDLInt> *)timezoneHourOffset { return store[SDLNameTimezoneHourOffset]; } diff --git a/SmartDeviceLink/SDLDeviceInfo.h b/SmartDeviceLink/SDLDeviceInfo.h index 1e34434a0..a1e62dc24 100644 --- a/SmartDeviceLink/SDLDeviceInfo.h +++ b/SmartDeviceLink/SDLDeviceInfo.h @@ -3,16 +3,19 @@ #import "SDLRPCMessage.h" +NS_ASSUME_NONNULL_BEGIN @interface SDLDeviceInfo : SDLRPCStruct + (instancetype)currentDevice; -@property (strong) NSString *hardware; -@property (strong) NSString *firmwareRev; -@property (strong) NSString *os; -@property (strong) NSString *osVersion; -@property (strong) NSString *carrier; -@property (strong) NSNumber<SDLInt> *maxNumberRFCOMMPorts; +@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; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m index 86b5b711a..0791bfe8a 100644 --- a/SmartDeviceLink/SDLDeviceInfo.m +++ b/SmartDeviceLink/SDLDeviceInfo.m @@ -9,6 +9,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLDeviceInfo + (instancetype)currentDevice { @@ -26,7 +28,7 @@ return deviceInfo; } -- (void)setHardware:(NSString *)hardware { +- (void)setHardware:(nullable NSString *)hardware { if (hardware != nil) { [store setObject:hardware forKey:SDLNameHardware]; } else { @@ -34,11 +36,11 @@ } } -- (NSString *)hardware { +- (nullable NSString *)hardware { return [store objectForKey:SDLNameHardware]; } -- (void)setFirmwareRev:(NSString *)firmwareRev { +- (void)setFirmwareRev:(nullable NSString *)firmwareRev { if (firmwareRev != nil) { [store setObject:firmwareRev forKey:SDLNameFirmwareRevision]; } else { @@ -46,11 +48,11 @@ } } -- (NSString *)firmwareRev { +- (nullable NSString *)firmwareRev { return [store objectForKey:SDLNameFirmwareRevision]; } -- (void)setOs:(NSString *)os { +- (void)setOs:(nullable NSString *)os { if (os != nil) { [store setObject:os forKey:SDLNameOS]; } else { @@ -58,11 +60,11 @@ } } -- (NSString *)os { +- (nullable NSString *)os { return [store objectForKey:SDLNameOS]; } -- (void)setOsVersion:(NSString *)osVersion { +- (void)setOsVersion:(nullable NSString *)osVersion { if (osVersion != nil) { [store setObject:osVersion forKey:SDLNameOSVersion]; } else { @@ -70,11 +72,11 @@ } } -- (NSString *)osVersion { +- (nullable NSString *)osVersion { return [store objectForKey:SDLNameOSVersion]; } -- (void)setCarrier:(NSString *)carrier { +- (void)setCarrier:(nullable NSString *)carrier { if (carrier != nil) { [store setObject:carrier forKey:SDLNameCarrier]; } else { @@ -82,11 +84,11 @@ } } -- (NSString *)carrier { +- (nullable NSString *)carrier { return [store objectForKey:SDLNameCarrier]; } -- (void)setMaxNumberRFCOMMPorts:(NSNumber<SDLInt> *)maxNumberRFCOMMPorts { +- (void)setMaxNumberRFCOMMPorts:(nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts { if (maxNumberRFCOMMPorts != nil) { [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRFCOMMPorts]; } else { @@ -94,8 +96,10 @@ } } -- (NSNumber<SDLInt> *)maxNumberRFCOMMPorts { +- (nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts { return [store objectForKey:SDLNameMaxNumberRFCOMMPorts]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDeviceStatus.h b/SmartDeviceLink/SDLDeviceStatus.h index 0a81176e3..2642162a8 100644 --- a/SmartDeviceLink/SDLDeviceStatus.h +++ b/SmartDeviceLink/SDLDeviceStatus.h @@ -98,6 +98,9 @@ * </table> * @since SDL 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLDeviceStatus : SDLRPCStruct /** @@ -184,3 +187,5 @@ @property (strong) NSNumber<SDLBool> *eCallEventActive; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m index fb5f1e853..6a5b7c8e1 100644 --- a/SmartDeviceLink/SDLDeviceStatus.m +++ b/SmartDeviceLink/SDLDeviceStatus.m @@ -7,6 +7,8 @@ #import "SDLNames.h" #import "SDLPrimaryAudioSource.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLDeviceStatus - (void)setVoiceRecOn:(NSNumber<SDLBool> *)voiceRecOn { @@ -145,3 +147,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDisplayCapabilities.h b/SmartDeviceLink/SDLDisplayCapabilities.h index 0e12ff682..991a16dd5 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.h +++ b/SmartDeviceLink/SDLDisplayCapabilities.h @@ -15,6 +15,9 @@ * * @since SDL 1.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLDisplayCapabilities : SDLRPCStruct /** @@ -44,7 +47,7 @@ * * Optional, Array of SDLImageField, 1 - 100 objects */ -@property (strong) NSMutableArray<SDLImageField *> *imageFields; +@property (nullable, strong) NSMutableArray<SDLImageField *> *imageFields; /** * @abstract An array of SDLMediaClockFormat elements, defining the valid string formats used in specifying the contents of the media clock field @@ -71,20 +74,22 @@ * * Optional, Array of String, max string size 100, 0 - 100 objects */ -@property (strong) NSMutableArray<NSString *> *templatesAvailable; +@property (nullable, strong) NSMutableArray<NSString *> *templatesAvailable; /** * @abstract A set of all parameters related to a prescribed screen area (e.g. for video / touch input) * * Optional */ -@property (strong) SDLScreenParams *screenParams; +@property (nullable, strong) SDLScreenParams *screenParams; /** * @abstract The number of on-screen custom presets available (if any); otherwise omitted * * Optional, Integer 1 - 100 */ -@property (strong) NSNumber<SDLInt> *numCustomPresetsAvailable; +@property (nullable, strong) NSNumber<SDLInt> *numCustomPresetsAvailable; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m index f3e3f5cfb..a92552a32 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.m +++ b/SmartDeviceLink/SDLDisplayCapabilities.m @@ -8,6 +8,8 @@ #import "SDLScreenParams.h" #import "SDLTextField.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLDisplayCapabilities - (void)setDisplayType:(SDLDisplayType)displayType { @@ -44,7 +46,7 @@ } } -- (void)setImageFields:(NSMutableArray<SDLImageField *> *)imageFields { +- (void)setImageFields:(nullable NSMutableArray<SDLImageField *> *)imageFields { if (imageFields != nil) { [store setObject:imageFields forKey:SDLNameImageFields]; } else { @@ -52,7 +54,7 @@ } } -- (NSMutableArray<SDLImageField *> *)imageFields { +- (nullable NSMutableArray<SDLImageField *> *)imageFields { NSMutableArray<SDLImageField *> *array = [store objectForKey:SDLNameImageFields]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLImageField.class]) { return array; @@ -98,7 +100,7 @@ return [store objectForKey:SDLNameGraphicSupported]; } -- (void)setTemplatesAvailable:(NSMutableArray<NSString *> *)templatesAvailable { +- (void)setTemplatesAvailable:(nullable NSMutableArray<NSString *> *)templatesAvailable { if (templatesAvailable != nil) { [store setObject:templatesAvailable forKey:SDLNameTemplatesAvailable]; } else { @@ -106,11 +108,11 @@ } } -- (NSMutableArray<NSString *> *)templatesAvailable { +- (nullable NSMutableArray<NSString *> *)templatesAvailable { return [store objectForKey:SDLNameTemplatesAvailable]; } -- (void)setScreenParams:(SDLScreenParams *)screenParams { +- (void)setScreenParams:(nullable SDLScreenParams *)screenParams { if (screenParams != nil) { [store setObject:screenParams forKey:SDLNameScreenParams]; } else { @@ -118,7 +120,7 @@ } } -- (SDLScreenParams *)screenParams { +- (nullable SDLScreenParams *)screenParams { NSObject *obj = [store objectForKey:SDLNameScreenParams]; if (obj == nil || [obj isKindOfClass:SDLScreenParams.class]) { return (SDLScreenParams *)obj; @@ -127,7 +129,7 @@ } } -- (void)setNumCustomPresetsAvailable:(NSNumber<SDLInt> *)numCustomPresetsAvailable { +- (void)setNumCustomPresetsAvailable:(nullable NSNumber<SDLInt> *)numCustomPresetsAvailable { if (numCustomPresetsAvailable != nil) { [store setObject:numCustomPresetsAvailable forKey:SDLNameNumberCustomPresetsAvailable]; } else { @@ -135,8 +137,10 @@ } } -- (NSNumber<SDLInt> *)numCustomPresetsAvailable { +- (nullable NSNumber<SDLInt> *)numCustomPresetsAvailable { return [store objectForKey:SDLNameNumberCustomPresetsAvailable]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLECallInfo.h b/SmartDeviceLink/SDLECallInfo.h index d0443d3dd..5528b5ec1 100644 --- a/SmartDeviceLink/SDLECallInfo.h +++ b/SmartDeviceLink/SDLECallInfo.h @@ -6,6 +6,7 @@ #import "SDLECallConfirmationStatus.h" #import "SDLVehicleDataNotificationStatus.h" +NS_ASSUME_NONNULL_BEGIN @interface SDLECallInfo : SDLRPCStruct @@ -14,3 +15,5 @@ @property (strong) SDLECallConfirmationStatus eCallConfirmationStatus; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m index 62e7cb939..81753457c 100644 --- a/SmartDeviceLink/SDLECallInfo.m +++ b/SmartDeviceLink/SDLECallInfo.m @@ -5,6 +5,7 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN @implementation SDLECallInfo @@ -48,3 +49,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLEmergencyEvent.h b/SmartDeviceLink/SDLEmergencyEvent.h index 4fbf15a44..7162a5abd 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.h +++ b/SmartDeviceLink/SDLEmergencyEvent.h @@ -7,6 +7,7 @@ #import "SDLFuelCutoffStatus.h" #import "SDLVehicleDataEventStatus.h" +NS_ASSUME_NONNULL_BEGIN @interface SDLEmergencyEvent : SDLRPCStruct @@ -17,3 +18,5 @@ @property (strong) SDLVehicleDataEventStatus multipleEvents; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m index 0207cf3f9..e226265d8 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.m +++ b/SmartDeviceLink/SDLEmergencyEvent.m @@ -5,6 +5,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLEmergencyEvent - (void)setEmergencyEventType:(SDLEmergencyEventType)emergencyEventType { @@ -72,3 +74,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGPSData.h b/SmartDeviceLink/SDLGPSData.h index 8a1a9a5d1..c720356b1 100644 --- a/SmartDeviceLink/SDLGPSData.h +++ b/SmartDeviceLink/SDLGPSData.h @@ -12,6 +12,9 @@ * * @since SDL 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLGPSData : SDLRPCStruct /** @@ -149,3 +152,5 @@ @property (strong) NSNumber<SDLFloat> *speed; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m index 63cdeb550..dc7be5e1c 100644 --- a/SmartDeviceLink/SDLGPSData.m +++ b/SmartDeviceLink/SDLGPSData.m @@ -5,6 +5,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLGPSData - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees { @@ -226,3 +228,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLHMICapabilities.h b/SmartDeviceLink/SDLHMICapabilities.h index b20e5b27d..6c7fe43d5 100644 --- a/SmartDeviceLink/SDLHMICapabilities.h +++ b/SmartDeviceLink/SDLHMICapabilities.h @@ -4,6 +4,8 @@ #import "SDLRPCStruct.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLHMICapabilities : SDLRPCStruct /** @@ -11,13 +13,15 @@ Boolean value. Optional. */ -@property (copy, nonatomic) NSNumber<SDLBool> *navigation; +@property (nullable, copy, nonatomic) NSNumber<SDLBool> *navigation; /** Availability of build in phone. True: Available, False: Not Available Boolean value. Optional. */ -@property (copy, nonatomic) NSNumber<SDLBool> *phoneCall; +@property (nullable, copy, nonatomic) NSNumber<SDLBool> *phoneCall; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m index 677ff8e84..52fe4d8cb 100644 --- a/SmartDeviceLink/SDLHMICapabilities.m +++ b/SmartDeviceLink/SDLHMICapabilities.m @@ -6,9 +6,11 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLHMICapabilities -- (void)setNavigation:(NSNumber<SDLBool> *)navigation { +- (void)setNavigation:(nullable NSNumber<SDLBool> *)navigation { if (navigation != nil) { store[SDLNameNavigation] = navigation; } else { @@ -16,11 +18,11 @@ } } -- (NSNumber<SDLBool> *)navigation { +- (nullable NSNumber<SDLBool> *)navigation { return store[SDLNameNavigation]; } -- (void)setPhoneCall:(NSNumber<SDLBool> *)phoneCall { +- (void)setPhoneCall:(nullable NSNumber<SDLBool> *)phoneCall { if (phoneCall != nil) { store[SDLNamePhoneCall] = phoneCall; } else { @@ -28,8 +30,10 @@ } } -- (NSNumber<SDLBool> *)phoneCall { +- (nullable NSNumber<SDLBool> *)phoneCall { return store[SDLNamePhoneCall]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLHMIPermissions.h b/SmartDeviceLink/SDLHMIPermissions.h index bd5475751..ea370dcc4 100644 --- a/SmartDeviceLink/SDLHMIPermissions.h +++ b/SmartDeviceLink/SDLHMIPermissions.h @@ -11,6 +11,9 @@ * * @since SDL 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLHMIPermissions : SDLRPCStruct /** @@ -32,3 +35,5 @@ @property (strong) NSMutableArray<SDLHMILevel> *userDisallowed; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m index 7e3a9c16f..cd301151e 100644 --- a/SmartDeviceLink/SDLHMIPermissions.m +++ b/SmartDeviceLink/SDLHMIPermissions.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLHMIPermissions - (void)setAllowed:(NSMutableArray<SDLHMILevel> *)allowed { @@ -52,3 +54,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLHeadLampStatus.h b/SmartDeviceLink/SDLHeadLampStatus.h index 7ec8c14e3..5e8e45465 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.h +++ b/SmartDeviceLink/SDLHeadLampStatus.h @@ -9,6 +9,9 @@ /** * Status of the head lamps */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLHeadLampStatus : SDLRPCStruct /** @@ -20,6 +23,8 @@ */ @property (strong) NSNumber<SDLBool> *highBeamsOn; -@property (strong) SDLAmbientLightStatus ambientLightSensorStatus; +@property (nullable, strong) SDLAmbientLightStatus ambientLightSensorStatus; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m index 68936b8b0..fb79c8175 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.m +++ b/SmartDeviceLink/SDLHeadLampStatus.m @@ -6,6 +6,8 @@ #import "SDLAmbientLightStatus.h" #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLHeadLampStatus - (void)setLowBeamsOn:(NSNumber<SDLBool> *)lowBeamsOn { @@ -32,7 +34,7 @@ return [store objectForKey:SDLNameHighBeamsOn]; } -- (void)setAmbientLightSensorStatus:(SDLAmbientLightStatus)ambientLightSensorStatus { +- (void)setAmbientLightSensorStatus:(nullable SDLAmbientLightStatus)ambientLightSensorStatus { if (ambientLightSensorStatus != nil) { [store setObject:ambientLightSensorStatus forKey:SDLNameAmbientLightSensorStatus]; } else { @@ -40,9 +42,11 @@ } } -- (SDLAmbientLightStatus)ambientLightSensorStatus { +- (nullable SDLAmbientLightStatus)ambientLightSensorStatus { NSObject *obj = [store objectForKey:SDLNameAmbientLightSensorStatus]; return (SDLAmbientLightStatus)obj; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLImageField.h b/SmartDeviceLink/SDLImageField.h index 69932c5c4..9d14c8bd3 100644 --- a/SmartDeviceLink/SDLImageField.h +++ b/SmartDeviceLink/SDLImageField.h @@ -8,10 +8,14 @@ @class SDLImageResolution; +NS_ASSUME_NONNULL_BEGIN + @interface SDLImageField : SDLRPCStruct @property (strong) SDLImageFieldName name; @property (strong) NSMutableArray<SDLFileType> *imageTypeSupported; -@property (strong) SDLImageResolution *imageResolution; +@property (nullable, strong) SDLImageResolution *imageResolution; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m index fe6b089b6..ef9c1e109 100644 --- a/SmartDeviceLink/SDLImageField.m +++ b/SmartDeviceLink/SDLImageField.m @@ -7,6 +7,8 @@ #import "SDLImageResolution.h" #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLImageField - (void)setName:(SDLImageFieldName)name { @@ -43,7 +45,7 @@ } } -- (void)setImageResolution:(SDLImageResolution *)imageResolution { +- (void)setImageResolution:(nullable SDLImageResolution *)imageResolution { if (imageResolution != nil) { [store setObject:imageResolution forKey:SDLNameImageResolution]; } else { @@ -51,7 +53,7 @@ } } -- (SDLImageResolution *)imageResolution { +- (nullable SDLImageResolution *)imageResolution { NSObject *obj = [store objectForKey:SDLNameImageResolution]; if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) { return (SDLImageResolution *)obj; @@ -61,3 +63,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLImageResolution.h b/SmartDeviceLink/SDLImageResolution.h index ca086ea61..94f103d07 100644 --- a/SmartDeviceLink/SDLImageResolution.h +++ b/SmartDeviceLink/SDLImageResolution.h @@ -4,9 +4,13 @@ #import "SDLRPCMessage.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLImageResolution : SDLRPCStruct @property (strong) NSNumber<SDLInt> *resolutionWidth; @property (strong) NSNumber<SDLInt> *resolutionHeight; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m index 61b7f1eaf..ad62502ee 100644 --- a/SmartDeviceLink/SDLImageResolution.m +++ b/SmartDeviceLink/SDLImageResolution.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLImageResolution - (void)setResolutionWidth:(NSNumber<SDLInt> *)resolutionWidth { @@ -33,3 +35,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLKeyboardProperties.h b/SmartDeviceLink/SDLKeyboardProperties.h index 8874436a3..105b13f61 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.h +++ b/SmartDeviceLink/SDLKeyboardProperties.h @@ -7,14 +7,18 @@ #import "SDLKeypressMode.h" #import "SDLLanguage.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLKeyboardProperties : SDLRPCStruct -- (instancetype)initWithLanguage:(SDLLanguage)language layout:(SDLKeyboardLayout)layout keypressMode:(SDLKeypressMode)keypressMode limitedCharacterList:(NSArray<NSString *> *)limitedCharacterList autoCompleteText:(NSString *)autoCompleteText; +- (instancetype)initWithLanguage:(nullable SDLLanguage)language layout:(nullable SDLKeyboardLayout)layout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteText:(nullable NSString *)autoCompleteText; -@property (strong) SDLLanguage language; -@property (strong) SDLKeyboardLayout keyboardLayout; -@property (strong) SDLKeypressMode keypressMode; -@property (strong) NSMutableArray<NSString *> *limitedCharacterList; -@property (strong) 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; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m index 8219d5365..20f6c2e8b 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.m +++ b/SmartDeviceLink/SDLKeyboardProperties.m @@ -5,9 +5,11 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLKeyboardProperties -- (instancetype)initWithLanguage:(SDLLanguage)language layout:(SDLKeyboardLayout)layout keypressMode:(SDLKeypressMode)keypressMode limitedCharacterList:(NSArray<NSString *> *)limitedCharacterList autoCompleteText:(NSString *)autoCompleteText { +- (instancetype)initWithLanguage:(nullable SDLLanguage)language layout:(nullable SDLKeyboardLayout)layout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteText:(nullable NSString *)autoCompleteText { self = [self init]; if (!self) { return nil; @@ -22,7 +24,7 @@ return self; } -- (void)setLanguage:(SDLLanguage)language { +- (void)setLanguage:(nullable SDLLanguage)language { if (language != nil) { [store setObject:language forKey:SDLNameLanguage]; } else { @@ -30,12 +32,12 @@ } } -- (SDLLanguage)language { +- (nullable SDLLanguage)language { NSObject *obj = [store objectForKey:SDLNameLanguage]; return (SDLLanguage )obj; } -- (void)setKeyboardLayout:(SDLKeyboardLayout)keyboardLayout { +- (void)setKeyboardLayout:(nullable SDLKeyboardLayout)keyboardLayout { if (keyboardLayout != nil) { [store setObject:keyboardLayout forKey:SDLNameKeyboardLayout]; } else { @@ -43,12 +45,12 @@ } } -- (SDLKeyboardLayout)keyboardLayout { +- (nullable SDLKeyboardLayout)keyboardLayout { NSObject *obj = [store objectForKey:SDLNameKeyboardLayout]; return (SDLKeyboardLayout)obj; } -- (void)setKeypressMode:(SDLKeypressMode)keypressMode { +- (void)setKeypressMode:(nullable SDLKeypressMode)keypressMode { if (keypressMode != nil) { [store setObject:keypressMode forKey:SDLNameKeypressMode]; } else { @@ -56,12 +58,12 @@ } } -- (SDLKeypressMode)keypressMode { +- (nullable SDLKeypressMode)keypressMode { NSObject *obj = [store objectForKey:SDLNameKeypressMode]; return (SDLKeypressMode)obj; } -- (void)setLimitedCharacterList:(NSMutableArray<NSString *> *)limitedCharacterList { +- (void)setLimitedCharacterList:(nullable NSMutableArray<NSString *> *)limitedCharacterList { if (limitedCharacterList != nil) { [store setObject:limitedCharacterList forKey:SDLNameLimitedCharacterList]; } else { @@ -69,11 +71,11 @@ } } -- (NSMutableArray<NSString *> *)limitedCharacterList { +- (nullable NSMutableArray<NSString *> *)limitedCharacterList { return [store objectForKey:SDLNameLimitedCharacterList]; } -- (void)setAutoCompleteText:(NSString *)autoCompleteText { +- (void)setAutoCompleteText:(nullable NSString *)autoCompleteText { if (autoCompleteText != nil) { [store setObject:autoCompleteText forKey:SDLNameAutoCompleteText]; } else { @@ -81,8 +83,10 @@ } } -- (NSString *)autoCompleteText { +- (nullable NSString *)autoCompleteText { return [store objectForKey:SDLNameAutoCompleteText]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLLocationCoordinate.h b/SmartDeviceLink/SDLLocationCoordinate.h index dd2850f97..0fef535c2 100644 --- a/SmartDeviceLink/SDLLocationCoordinate.h +++ b/SmartDeviceLink/SDLLocationCoordinate.h @@ -3,6 +3,8 @@ #import "SDLRPCStruct.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLLocationCoordinate : SDLRPCStruct /** @@ -20,3 +22,5 @@ @property (copy, nonatomic) NSNumber<SDLFloat> *longitudeDegrees; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLLocationCoordinate.m b/SmartDeviceLink/SDLLocationCoordinate.m index c3f69279a..d7aec2d41 100644 --- a/SmartDeviceLink/SDLLocationCoordinate.m +++ b/SmartDeviceLink/SDLLocationCoordinate.m @@ -4,6 +4,8 @@ #import "SDLLocationCoordinate.h" #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLLocationCoordinate - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees { @@ -31,3 +33,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLLocationDetails.h b/SmartDeviceLink/SDLLocationDetails.h index 349a58265..d4809e700 100644 --- a/SmartDeviceLink/SDLLocationDetails.h +++ b/SmartDeviceLink/SDLLocationDetails.h @@ -7,6 +7,8 @@ @class SDLImage; @class SDLOasisAddress; +NS_ASSUME_NONNULL_BEGIN + @interface SDLLocationDetails : SDLRPCStruct /** @@ -16,35 +18,35 @@ * * Optional */ -@property (strong, nonatomic) SDLLocationCoordinate *coordinate; +@property (nullable, strong, nonatomic) SDLLocationCoordinate *coordinate; /** * @abstract Name of location. * * Optional, Max length 500 chars */ -@property (copy, nonatomic) NSString *locationName; +@property (nullable, copy, nonatomic) NSString *locationName; /** * @abstract Location address for display purposes only. * * Optional, Array of Strings, Array length 0 - 4, Max String length 500 */ -@property (copy, nonatomic) NSArray<NSString *> *addressLines; +@property (nullable, copy, nonatomic) NSArray<NSString *> *addressLines; /** * @abstract Description intended location / establishment. * * Optional, Max length 500 chars */ -@property (copy, nonatomic) NSString *locationDescription; +@property (nullable, copy, nonatomic) NSString *locationDescription; /** * @abstract Phone number of location / establishment. * * Optional, Max length 500 chars */ -@property (copy, nonatomic) NSString *phoneNumber; +@property (nullable, copy, nonatomic) NSString *phoneNumber; /** * @abstract Image / icon of intended location. @@ -53,7 +55,7 @@ * * Optional */ -@property (strong, nonatomic) SDLImage *locationImage; +@property (nullable, strong, nonatomic) SDLImage *locationImage; /** * @abstract Address to be used by navigation engines for search. @@ -62,7 +64,9 @@ * * Optional */ -@property (strong) SDLOasisAddress *searchAddress; +@property (nullable, strong) SDLOasisAddress *searchAddress; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLLocationDetails.m b/SmartDeviceLink/SDLLocationDetails.m index 2d35664b5..e42ce110e 100644 --- a/SmartDeviceLink/SDLLocationDetails.m +++ b/SmartDeviceLink/SDLLocationDetails.m @@ -10,7 +10,7 @@ @implementation SDLLocationDetails -- (void)setCoordinate:(SDLLocationCoordinate *)coordinate { +- (void)setCoordinate:(nullable SDLLocationCoordinate *)coordinate { if (coordinate != nil) { store[SDLNameLocationCoordinate] = coordinate; } else { @@ -18,11 +18,11 @@ } } -- (SDLLocationCoordinate *)coordinate { +- (nullable SDLLocationCoordinate *)coordinate { return store[SDLNameLocationCoordinate]; } -- (void)setLocationName:(NSString *)locationName { +- (void)setLocationName:(nullable NSString *)locationName { if (locationName != nil) { store[SDLNameLocationName] = locationName; } else { @@ -30,11 +30,11 @@ } } -- (NSString *)locationName { +- (nullable NSString *)locationName { return store[SDLNameLocationName]; } -- (void)setAddressLines:(NSArray<NSString *> *)addressLines { +- (void)setAddressLines:(nullable NSArray<NSString *> *)addressLines { if (addressLines != nil) { store[SDLNameAddressLines] = addressLines; } else { @@ -42,11 +42,11 @@ } } -- (NSArray<NSString *> *)addressLines { +- (nullable NSArray<NSString *> *)addressLines { return store[SDLNameAddressLines]; } -- (void)setLocationDescription:(NSString *)locationDescription { +- (void)setLocationDescription:(nullable NSString *)locationDescription { if (locationDescription != nil) { store[SDLNameLocationDescription] = locationDescription; } else { @@ -54,11 +54,11 @@ } } -- (NSString *)locationDescription { +- (nullable NSString *)locationDescription { return store[SDLNameLocationDescription]; } -- (void)setPhoneNumber:(NSString *)phoneNumber { +- (void)setPhoneNumber:(nullable NSString *)phoneNumber { if (phoneNumber != nil) { store[SDLNamePhoneNumber] = phoneNumber; } else { @@ -66,11 +66,11 @@ } } -- (NSString *)phoneNumber { +- (nullable NSString *)phoneNumber { return store[SDLNamePhoneNumber]; } -- (void)setLocationImage:(SDLImage *)locationImage { +- (void)setLocationImage:(nullable SDLImage *)locationImage { if (locationImage != nil) { store[SDLNameLocationImage] = locationImage; } else { @@ -78,11 +78,11 @@ } } -- (SDLImage *)locationImage { +- (nullable SDLImage *)locationImage { return store[SDLNameLocationImage]; } -- (void)setSearchAddress:(SDLOasisAddress *)searchAddress { +- (void)setSearchAddress:(nullable SDLOasisAddress *)searchAddress { if (searchAddress != nil) { store[SDLNameAddress] = searchAddress; } else { @@ -90,7 +90,7 @@ } } -- (SDLOasisAddress *)searchAddress { +- (nullable SDLOasisAddress *)searchAddress { return store[SDLNameAddress]; } diff --git a/SmartDeviceLink/SDLMenuParams.h b/SmartDeviceLink/SDLMenuParams.h index 0c76a7e16..70a691cfa 100644 --- a/SmartDeviceLink/SDLMenuParams.h +++ b/SmartDeviceLink/SDLMenuParams.h @@ -9,6 +9,9 @@ * * @since SDL 1.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLMenuParams : SDLRPCStruct - (instancetype)initWithMenuName:(NSString *)menuName; @@ -21,7 +24,7 @@ * * Optional, Integer, 0 - 2,000,000,000 */ -@property (strong) NSNumber<SDLInt> *parentID; +@property (nullable, strong) NSNumber<SDLInt> *parentID; /** * @abstract The position within the items of the parent Command Menu @@ -35,7 +38,7 @@ * * Optional, Integer, 0 - 1000 */ -@property (strong) NSNumber<SDLInt> *position; +@property (nullable, strong) NSNumber<SDLInt> *position; /** * @abstract the menu name which appears in menu, representing this command @@ -45,3 +48,5 @@ @property (strong) NSString *menuName; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m index 558f7014a..d20c2ca44 100644 --- a/SmartDeviceLink/SDLMenuParams.m +++ b/SmartDeviceLink/SDLMenuParams.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLMenuParams - (instancetype)initWithMenuName:(NSString *)menuName parentId:(UInt32)parentId position:(UInt16)position { @@ -31,7 +33,7 @@ return self; } -- (void)setParentID:(NSNumber<SDLInt> *)parentID { +- (void)setParentID:(nullable NSNumber<SDLInt> *)parentID { if (parentID != nil) { [store setObject:parentID forKey:SDLNameParentId]; } else { @@ -39,11 +41,11 @@ } } -- (NSNumber<SDLInt> *)parentID { +- (nullable NSNumber<SDLInt> *)parentID { return [store objectForKey:SDLNameParentId]; } -- (void)setPosition:(NSNumber<SDLInt> *)position { +- (void)setPosition:(nullable NSNumber<SDLInt> *)position { if (position != nil) { [store setObject:position forKey:SDLNamePosition]; } else { @@ -51,7 +53,7 @@ } } -- (NSNumber<SDLInt> *)position { +- (nullable NSNumber<SDLInt> *)position { return [store objectForKey:SDLNamePosition]; } @@ -68,3 +70,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMyKey.h b/SmartDeviceLink/SDLMyKey.h index 30c1d490a..7bfc41335 100644 --- a/SmartDeviceLink/SDLMyKey.h +++ b/SmartDeviceLink/SDLMyKey.h @@ -5,9 +5,12 @@ #import "SDLVehicleDataStatus.h" +NS_ASSUME_NONNULL_BEGIN @interface SDLMyKey : SDLRPCStruct @property (strong) SDLVehicleDataStatus e911Override; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m index a271a063e..158ddc4c4 100644 --- a/SmartDeviceLink/SDLMyKey.m +++ b/SmartDeviceLink/SDLMyKey.m @@ -6,6 +6,8 @@ #import "SDLNames.h" #import "SDLVehicleDataStatus.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLMyKey - (void)setE911Override:(SDLVehicleDataStatus)e911Override { @@ -22,3 +24,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOasisAddress.h b/SmartDeviceLink/SDLOasisAddress.h index 17bb00af6..d2a463264 100644 --- a/SmartDeviceLink/SDLOasisAddress.h +++ b/SmartDeviceLink/SDLOasisAddress.h @@ -3,73 +3,77 @@ #import "SDLRPCStruct.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLOasisAddress : SDLRPCStruct -- (instancetype)initWithSubThoroughfare:(NSString *)subThoroughfare thoroughfare:(NSString *)thoroughfare locality:(NSString *)locality administrativeArea:(NSString *)administrativeArea postalCode:(NSString *)postalCode countryCode:(NSString *)countryCode; +- (instancetype)initWithSubThoroughfare:(nullable NSString *)subThoroughfare thoroughfare:(nullable NSString *)thoroughfare locality:(nullable NSString *)locality administrativeArea:(nullable NSString *)administrativeArea postalCode:(nullable NSString *)postalCode countryCode:(nullable NSString *)countryCode; -- (instancetype)initWithSubThoroughfare:(NSString *)subThoroughfare thoroughfare:(NSString *)thoroughfare locality:(NSString *)locality administrativeArea:(NSString *)administrativeArea postalCode:(NSString *)postalCode countryCode:(NSString *)countryCode countryName:(NSString *)countryName subAdministrativeArea:(NSString *)subAdministrativeArea subLocality:(NSString *)subLocality; +- (instancetype)initWithSubThoroughfare:(nullable NSString *)subThoroughfare thoroughfare:(nullable NSString *)thoroughfare locality:(nullable NSString *)locality administrativeArea:(nullable NSString *)administrativeArea postalCode:(nullable NSString *)postalCode countryCode:(nullable NSString *)countryCode countryName:(nullable NSString *)countryName subAdministrativeArea:(nullable NSString *)subAdministrativeArea subLocality:(nullable NSString *)subLocality; /** * @abstract Name of the country (localized) * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *countryName; +@property (nullable, copy, nonatomic) NSString *countryName; /** * @abstract countryCode of the country(ISO 3166-2) * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *countryCode; +@property (nullable, copy, nonatomic) NSString *countryCode; /** * @abstract postalCode of location (PLZ, ZIP, PIN, CAP etc.) * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *postalCode; +@property (nullable, copy, nonatomic) NSString *postalCode; /** * @abstract Portion of country (e.g. state) * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *administrativeArea; +@property (nullable, copy, nonatomic) NSString *administrativeArea; /** * @abstract Portion of administrativeArea (e.g. county) * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *subAdministrativeArea; +@property (nullable, copy, nonatomic) NSString *subAdministrativeArea; /** * @abstract Hypernym for city/village * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *locality; +@property (nullable, copy, nonatomic) NSString *locality; /** * @abstract Hypernym for district * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *subLocality; +@property (nullable, copy, nonatomic) NSString *subLocality; /** * @abstract Hypernym for street, road etc. * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *thoroughfare; +@property (nullable, copy, nonatomic) NSString *thoroughfare; /** * @abstract Portion of thoroughfare (e.g. house number) * * Optional, max length = 200 */ -@property (copy, nonatomic) NSString *subThoroughfare; +@property (nullable, copy, nonatomic) NSString *subThoroughfare; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOasisAddress.m b/SmartDeviceLink/SDLOasisAddress.m index 27782fa49..079863394 100644 --- a/SmartDeviceLink/SDLOasisAddress.m +++ b/SmartDeviceLink/SDLOasisAddress.m @@ -4,13 +4,15 @@ #import "SDLOasisAddress.h" #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLOasisAddress -- (instancetype)initWithSubThoroughfare:(NSString *)subThoroughfare thoroughfare:(NSString *)thoroughfare locality:(NSString *)locality administrativeArea:(NSString *)administrativeArea postalCode:(NSString *)postalCode countryCode:(NSString *)countryCode { +- (instancetype)initWithSubThoroughfare:(nullable NSString *)subThoroughfare thoroughfare:(nullable NSString *)thoroughfare locality:(nullable NSString *)locality administrativeArea:(nullable NSString *)administrativeArea postalCode:(nullable NSString *)postalCode countryCode:(nullable NSString *)countryCode { return [self initWithSubThoroughfare:subThoroughfare thoroughfare:thoroughfare locality:locality administrativeArea:administrativeArea postalCode:postalCode countryCode:countryCode countryName:nil subAdministrativeArea:nil subLocality:nil]; } -- (instancetype)initWithSubThoroughfare:(NSString *)subThoroughfare thoroughfare:(NSString *)thoroughfare locality:(NSString *)locality administrativeArea:(NSString *)administrativeArea postalCode:(NSString *)postalCode countryCode:(NSString *)countryCode countryName:(NSString *)countryName subAdministrativeArea:(NSString *)subAdministrativeArea subLocality:(NSString *)subLocality { +- (instancetype)initWithSubThoroughfare:(nullable NSString *)subThoroughfare thoroughfare:(nullable NSString *)thoroughfare locality:(nullable NSString *)locality administrativeArea:(nullable NSString *)administrativeArea postalCode:(nullable NSString *)postalCode countryCode:(nullable NSString *)countryCode countryName:(nullable NSString *)countryName subAdministrativeArea:(nullable NSString *)subAdministrativeArea subLocality:(nullable NSString *)subLocality { self = [self init]; if (!self) { return nil; @@ -30,7 +32,7 @@ } -- (void)setCountryName:(NSString *)countryName { +- (void)setCountryName:(nullable NSString *)countryName { if (countryName != nil) { store[SDLNameCountryName] = countryName; } else { @@ -38,11 +40,11 @@ } } -- (NSString *)countryName { +- (nullable NSString *)countryName { return store[SDLNameCountryName]; } -- (void)setCountryCode:(NSString *)countryCode { +- (void)setCountryCode:(nullable NSString *)countryCode { if (countryCode != nil) { store[SDLNameCountryCode] = countryCode; } else { @@ -50,11 +52,11 @@ } } -- (NSString *)countryCode { +- (nullable NSString *)countryCode { return store[SDLNameCountryCode]; } -- (void)setPostalCode:(NSString *)postalCode { +- (void)setPostalCode:(nullable NSString *)postalCode { if (postalCode != nil) { store[SDLNamePostalCode] = postalCode; } else { @@ -62,11 +64,11 @@ } } -- (NSString *)postalCode { +- (nullable NSString *)postalCode { return store[SDLNamePostalCode]; } -- (void)setAdministrativeArea:(NSString *)administrativeArea { +- (void)setAdministrativeArea:(nullable NSString *)administrativeArea { if (administrativeArea != nil) { store[SDLNameAdministrativeArea] = administrativeArea; } else { @@ -74,11 +76,11 @@ } } -- (NSString *)administrativeArea { +- (nullable NSString *)administrativeArea { return store[SDLNameAdministrativeArea]; } -- (void)setSubAdministrativeArea:(NSString *)subAdministrativeArea { +- (void)setSubAdministrativeArea:(nullable NSString *)subAdministrativeArea { if (subAdministrativeArea != nil) { store[SDLNameSubAdministrativeArea] = subAdministrativeArea; } else { @@ -86,11 +88,11 @@ } } -- (NSString *)subAdministrativeArea { +- (nullable NSString *)subAdministrativeArea { return store[SDLNameSubAdministrativeArea]; } -- (void)setLocality:(NSString *)locality { +- (void)setLocality:(nullable NSString *)locality { if (locality != nil) { store[SDLNameLocality] = locality; } else { @@ -98,11 +100,11 @@ } } -- (NSString *)locality { +- (nullable NSString *)locality { return store[SDLNameLocality]; } -- (void)setSubLocality:(NSString *)subLocality { +- (void)setSubLocality:(nullable NSString *)subLocality { if (subLocality != nil) { store[SDLNameSubLocality] = subLocality; } else { @@ -110,11 +112,11 @@ } } -- (NSString *)subLocality { +- (nullable NSString *)subLocality { return store[SDLNameSubLocality]; } -- (void)setThoroughfare:(NSString *)thoroughfare { +- (void)setThoroughfare:(nullable NSString *)thoroughfare { if (thoroughfare != nil) { store[SDLNameThoroughfare] = thoroughfare; } else { @@ -122,11 +124,11 @@ } } -- (NSString *)thoroughfare { +- (nullable NSString *)thoroughfare { return store[SDLNameThoroughfare]; } -- (void)setSubThoroughfare:(NSString *)subThoroughfare { +- (void)setSubThoroughfare:(nullable NSString *)subThoroughfare { if (subThoroughfare != nil) { store[SDLNameSubThoroughfare] = subThoroughfare; } else { @@ -134,8 +136,10 @@ } } -- (NSString *)subThoroughfare { +- (nullable NSString *)subThoroughfare { return store[SDLNameSubThoroughfare]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLParameterPermissions.h b/SmartDeviceLink/SDLParameterPermissions.h index 225028518..4744463d3 100644 --- a/SmartDeviceLink/SDLParameterPermissions.h +++ b/SmartDeviceLink/SDLParameterPermissions.h @@ -9,6 +9,9 @@ * * @since SDL 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLParameterPermissions : SDLRPCStruct /** @@ -25,3 +28,5 @@ @property (strong) NSMutableArray<NSString *> *userDisallowed; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m index d9b5043f1..fc4655d67 100644 --- a/SmartDeviceLink/SDLParameterPermissions.m +++ b/SmartDeviceLink/SDLParameterPermissions.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLParameterPermissions - (void)setAllowed:(NSMutableArray<NSString *> *)allowed { @@ -33,3 +35,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPermissionItem.h b/SmartDeviceLink/SDLPermissionItem.h index a64c11aa2..a3d7d5d81 100644 --- a/SmartDeviceLink/SDLPermissionItem.h +++ b/SmartDeviceLink/SDLPermissionItem.h @@ -6,6 +6,7 @@ @class SDLHMIPermissions; @class SDLParameterPermissions; +NS_ASSUME_NONNULL_BEGIN @interface SDLPermissionItem : SDLRPCStruct @@ -14,3 +15,5 @@ @property (strong) SDLParameterPermissions *parameterPermissions; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m index ccd7bca6a..f2a116fe1 100644 --- a/SmartDeviceLink/SDLPermissionItem.m +++ b/SmartDeviceLink/SDLPermissionItem.m @@ -7,6 +7,8 @@ #import "SDLNames.h" #import "SDLParameterPermissions.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLPermissionItem - (void)setRpcName:(NSString *)rpcName { @@ -56,3 +58,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.h b/SmartDeviceLink/SDLPresetBankCapabilities.h index 8c0cdda32..91cccccb0 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.h +++ b/SmartDeviceLink/SDLPresetBankCapabilities.h @@ -9,6 +9,9 @@ * * @since SDL 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLPresetBankCapabilities : SDLRPCStruct /** @@ -19,3 +22,5 @@ @property (strong) NSNumber<SDLBool> *onScreenPresetsAvailable; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m index 8ad3a63ee..1b0f56f31 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.m +++ b/SmartDeviceLink/SDLPresetBankCapabilities.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLPresetBankCapabilities - (void)setOnScreenPresetsAvailable:(NSNumber<SDLBool> *)onScreenPresetsAvailable { @@ -21,3 +23,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLScreenParams.h b/SmartDeviceLink/SDLScreenParams.h index 6236181cf..4918306fe 100644 --- a/SmartDeviceLink/SDLScreenParams.h +++ b/SmartDeviceLink/SDLScreenParams.h @@ -6,10 +6,13 @@ @class SDLImageResolution; @class SDLTouchEventCapabilities; +NS_ASSUME_NONNULL_BEGIN @interface SDLScreenParams : SDLRPCStruct @property (strong) SDLImageResolution *resolution; -@property (strong) SDLTouchEventCapabilities *touchEventAvailable; +@property (nullable, strong) SDLTouchEventCapabilities *touchEventAvailable; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m index 01e966435..937fcf4c4 100644 --- a/SmartDeviceLink/SDLScreenParams.m +++ b/SmartDeviceLink/SDLScreenParams.m @@ -7,6 +7,8 @@ #import "SDLNames.h" #import "SDLTouchEventCapabilities.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLScreenParams - (void)setResolution:(SDLImageResolution *)resolution { @@ -26,7 +28,7 @@ } } -- (void)setTouchEventAvailable:(SDLTouchEventCapabilities *)touchEventAvailable { +- (void)setTouchEventAvailable:(nullable SDLTouchEventCapabilities *)touchEventAvailable { if (touchEventAvailable != nil) { [store setObject:touchEventAvailable forKey:SDLNameTouchEventAvailable]; } else { @@ -34,7 +36,7 @@ } } -- (SDLTouchEventCapabilities *)touchEventAvailable { +- (nullable SDLTouchEventCapabilities *)touchEventAvailable { NSObject *obj = [store objectForKey:SDLNameTouchEventAvailable]; if (obj == nil || [obj isKindOfClass:SDLTouchEventCapabilities.class]) { return (SDLTouchEventCapabilities *)obj; @@ -44,3 +46,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSingleTireStatus.h b/SmartDeviceLink/SDLSingleTireStatus.h index e57e04230..c685137c4 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.h +++ b/SmartDeviceLink/SDLSingleTireStatus.h @@ -10,6 +10,9 @@ * * @since SmartDeviceLink 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLSingleTireStatus : SDLRPCStruct /** @@ -18,3 +21,5 @@ @property (strong) SDLComponentVolumeStatus status; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSoftButton.h b/SmartDeviceLink/SDLSoftButton.h index ccf98c612..be30eb402 100644 --- a/SmartDeviceLink/SDLSoftButton.h +++ b/SmartDeviceLink/SDLSoftButton.h @@ -10,20 +10,23 @@ @class SDLImage; +NS_ASSUME_NONNULL_BEGIN @interface SDLSoftButton : SDLRPCStruct <SDLRequestHandler> -- (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler; +- (instancetype)initWithHandler:(nullable SDLRPCNotificationHandler)handler; -- (instancetype)initWithType:(SDLSoftButtonType)tyle text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonId:(UInt16)buttonId systemAction:(SDLSystemAction)systemAction handler:(SDLRPCNotificationHandler)handler; +- (instancetype)initWithType:(SDLSoftButtonType)tyle text:(nullable NSString *)text image:(nullable SDLImage *)image highlighted:(BOOL)highlighted buttonId:(UInt16)buttonId systemAction:(nullable SDLSystemAction)systemAction handler:(nullable SDLRPCNotificationHandler)handler; @property (copy, nonatomic) SDLRPCNotificationHandler handler; @property (strong) SDLSoftButtonType type; -@property (strong) NSString *text; -@property (strong) SDLImage *image; -@property (strong) NSNumber<SDLBool> *isHighlighted; +@property (nullable, strong) NSString *text; +@property (nullable, strong) SDLImage *image; +@property (nullable, strong) NSNumber<SDLBool> *isHighlighted; @property (strong) NSNumber<SDLInt> *softButtonID; -@property (strong) SDLSystemAction systemAction; +@property (nullable, strong) SDLSystemAction systemAction; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m index 248b07d8e..448531659 100644 --- a/SmartDeviceLink/SDLSoftButton.m +++ b/SmartDeviceLink/SDLSoftButton.m @@ -6,10 +6,11 @@ #import "SDLImage.h" #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN @implementation SDLSoftButton -- (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler { +- (instancetype)initWithHandler:(nullable SDLRPCNotificationHandler)handler { self = [self init]; if (!self) { return nil; @@ -20,7 +21,7 @@ return self; } -- (instancetype)initWithType:(SDLSoftButtonType)type text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonId:(UInt16)buttonId systemAction:(SDLSystemAction)systemAction handler:(SDLRPCNotificationHandler)handler { +- (instancetype)initWithType:(SDLSoftButtonType)type text:(nullable NSString *)text image:(nullable SDLImage *)image highlighted:(BOOL)highlighted buttonId:(UInt16)buttonId systemAction:(nullable SDLSystemAction)systemAction handler:(nullable SDLRPCNotificationHandler)handler { self = [self initWithHandler:handler]; if (!self) { return nil; @@ -50,7 +51,7 @@ return (SDLSoftButtonType)obj; } -- (void)setText:(NSString *)text { +- (void)setText:(nullable NSString *)text { if (text != nil) { [store setObject:text forKey:SDLNameText]; } else { @@ -58,11 +59,11 @@ } } -- (NSString *)text { +- (nullable NSString *)text { return [store objectForKey:SDLNameText]; } -- (void)setImage:(SDLImage *)image { +- (void)setImage:(nullable SDLImage *)image { if (image != nil) { [store setObject:image forKey:SDLNameImage]; } else { @@ -70,7 +71,7 @@ } } -- (SDLImage *)image { +- (nullable SDLImage *)image { NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; @@ -79,7 +80,7 @@ } } -- (void)setIsHighlighted:(NSNumber<SDLBool> *)isHighlighted { +- (void)setIsHighlighted:(nullable NSNumber<SDLBool> *)isHighlighted { if (isHighlighted != nil) { [store setObject:isHighlighted forKey:SDLNameIsHighlighted]; } else { @@ -87,7 +88,7 @@ } } -- (NSNumber<SDLBool> *)isHighlighted { +- (nullable NSNumber<SDLBool> *)isHighlighted { return [store objectForKey:SDLNameIsHighlighted]; } @@ -103,7 +104,7 @@ return [store objectForKey:SDLNameSoftButtonId]; } -- (void)setSystemAction:(SDLSystemAction)systemAction { +- (void)setSystemAction:(nullable SDLSystemAction)systemAction { if (systemAction != nil) { [store setObject:systemAction forKey:SDLNameSystemAction]; } else { @@ -111,9 +112,11 @@ } } -- (SDLSystemAction)systemAction { +- (nullable SDLSystemAction)systemAction { NSObject *obj = [store objectForKey:SDLNameSystemAction]; return (SDLSystemAction)obj; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.h b/SmartDeviceLink/SDLSoftButtonCapabilities.h index 0fb85c301..2dd02c302 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.h +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.h @@ -9,6 +9,9 @@ * * @since SDL 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLSoftButtonCapabilities : SDLRPCStruct /** @@ -46,3 +49,5 @@ @property (strong) NSNumber<SDLBool> *imageSupported; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m index ed2171b1f..4dbc7ca2e 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.m +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLSoftButtonCapabilities - (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable { @@ -57,3 +59,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLStartTime.h b/SmartDeviceLink/SDLStartTime.h index 36f8cdf02..79fa5ddf8 100644 --- a/SmartDeviceLink/SDLStartTime.h +++ b/SmartDeviceLink/SDLStartTime.h @@ -9,6 +9,9 @@ * * @since SDL 1.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLStartTime : SDLRPCStruct - (instancetype)initWithHours:(UInt8)hours minutes:(UInt8)minutes seconds:(UInt8)seconds; @@ -37,3 +40,5 @@ @property (strong) NSNumber<SDLInt> *seconds; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m index a8d9b304b..8071ad7ff 100644 --- a/SmartDeviceLink/SDLStartTime.m +++ b/SmartDeviceLink/SDLStartTime.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLStartTime - (instancetype)initWithHours:(UInt8)hours minutes:(UInt8)minutes seconds:(UInt8)seconds { @@ -58,3 +60,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSyncMsgVersion.h b/SmartDeviceLink/SDLSyncMsgVersion.h index 6fe4ec009..4c1f1874c 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.h +++ b/SmartDeviceLink/SDLSyncMsgVersion.h @@ -9,6 +9,9 @@ * * @since SDL 1.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLSyncMsgVersion : SDLRPCStruct - (instancetype)initWithMajorVersion:(NSInteger)majorVersion minorVersion:(NSInteger)minorVersion; @@ -27,3 +30,5 @@ @property (strong) NSNumber<SDLInt> *minorVersion; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m index 2ea09ecb1..5bf3fd2a8 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.m +++ b/SmartDeviceLink/SDLSyncMsgVersion.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLSyncMsgVersion - (instancetype)initWithMajorVersion:(NSInteger)majorVersion minorVersion:(NSInteger)minorVersion { @@ -48,3 +50,5 @@ return [NSString stringWithFormat:@"%@.%@", self.majorVersion, self.minorVersion]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTTSChunk.h b/SmartDeviceLink/SDLTTSChunk.h index 1adf5e083..dc10c0fa4 100644 --- a/SmartDeviceLink/SDLTTSChunk.h +++ b/SmartDeviceLink/SDLTTSChunk.h @@ -36,6 +36,9 @@ * * @since SmartDeviceLink 1.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLTTSChunk : SDLRPCStruct - (instancetype)initWithText:(NSString *)text type:(SDLSpeechCapabilities)type; @@ -66,3 +69,5 @@ @property (strong) SDLSpeechCapabilities type; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m index f9324d807..4d178b034 100644 --- a/SmartDeviceLink/SDLTTSChunk.m +++ b/SmartDeviceLink/SDLTTSChunk.m @@ -5,6 +5,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLTTSChunk - (instancetype)initWithText:(NSString *)text type:(SDLSpeechCapabilities)type { @@ -73,3 +75,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTextField.h b/SmartDeviceLink/SDLTextField.h index b4ba0ea4f..c1ded2138 100644 --- a/SmartDeviceLink/SDLTextField.h +++ b/SmartDeviceLink/SDLTextField.h @@ -56,6 +56,9 @@ * * @since SDL 1.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLTextField : SDLRPCStruct /** @@ -91,3 +94,5 @@ @property (strong) NSNumber<SDLInt> *rows; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m index 21d2bca7c..a54a32828 100644 --- a/SmartDeviceLink/SDLTextField.m +++ b/SmartDeviceLink/SDLTextField.m @@ -7,6 +7,7 @@ #import "SDLNames.h" #import "SDLTextFieldName.h" +NS_ASSUME_NONNULL_BEGIN @implementation SDLTextField @@ -61,3 +62,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTireStatus.h b/SmartDeviceLink/SDLTireStatus.h index c65850303..9912bb364 100644 --- a/SmartDeviceLink/SDLTireStatus.h +++ b/SmartDeviceLink/SDLTireStatus.h @@ -3,9 +3,12 @@ #import "SDLRPCMessage.h" -@class SDLSingleTireStatus; #import "SDLWarningLightStatus.h" +@class SDLSingleTireStatus; + +NS_ASSUME_NONNULL_BEGIN + @interface SDLTireStatus : SDLRPCStruct @property (strong) SDLWarningLightStatus pressureTelltale; @@ -17,3 +20,5 @@ @property (strong) SDLSingleTireStatus *innerRightRear; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m index 495c0d3d3..b40b51074 100644 --- a/SmartDeviceLink/SDLTireStatus.m +++ b/SmartDeviceLink/SDLTireStatus.m @@ -5,7 +5,8 @@ #import "SDLNames.h" #import "SDLSingleTireStatus.h" -#import "SDLWarningLightStatus.h" + +NS_ASSUME_NONNULL_BEGIN @implementation SDLTireStatus @@ -125,3 +126,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchCoord.h b/SmartDeviceLink/SDLTouchCoord.h index 8e719e3a8..dbd8b871f 100644 --- a/SmartDeviceLink/SDLTouchCoord.h +++ b/SmartDeviceLink/SDLTouchCoord.h @@ -4,9 +4,13 @@ #import "SDLRPCMessage.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLTouchCoord : SDLRPCStruct @property (strong) NSNumber<SDLFloat> *x; @property (strong) NSNumber<SDLFloat> *y; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m index 40a842140..247794737 100644 --- a/SmartDeviceLink/SDLTouchCoord.m +++ b/SmartDeviceLink/SDLTouchCoord.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLTouchCoord - (void)setX:(NSNumber<SDLFloat> *)x { @@ -33,3 +35,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchEvent.h b/SmartDeviceLink/SDLTouchEvent.h index 83a090b50..57bf410dd 100644 --- a/SmartDeviceLink/SDLTouchEvent.h +++ b/SmartDeviceLink/SDLTouchEvent.h @@ -6,6 +6,8 @@ @class SDLTouchCoord; +NS_ASSUME_NONNULL_BEGIN + @interface SDLTouchEvent : SDLRPCStruct /** @@ -36,3 +38,5 @@ @property (strong) NSMutableArray<SDLTouchCoord *> *coord; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m index 632bc6994..db8062311 100644 --- a/SmartDeviceLink/SDLTouchEvent.m +++ b/SmartDeviceLink/SDLTouchEvent.m @@ -7,6 +7,8 @@ #import "SDLNames.h" #import "SDLTouchCoord.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLTouchEvent - (void)setTouchEventId:(NSNumber<SDLInt> *)touchEventId { @@ -55,3 +57,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.h b/SmartDeviceLink/SDLTouchEventCapabilities.h index 40f37801a..1d02f40b0 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.h +++ b/SmartDeviceLink/SDLTouchEventCapabilities.h @@ -4,6 +4,8 @@ #import "SDLRPCMessage.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLTouchEventCapabilities : SDLRPCStruct @property (strong) NSNumber<SDLBool> *pressAvailable; @@ -11,3 +13,5 @@ @property (strong) NSNumber<SDLBool> *doublePressAvailable; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m index 1f307ede6..894e78c79 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.m +++ b/SmartDeviceLink/SDLTouchEventCapabilities.m @@ -6,6 +6,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLTouchEventCapabilities - (void)setPressAvailable:(NSNumber<SDLBool> *)pressAvailable { @@ -45,3 +47,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTurn.h b/SmartDeviceLink/SDLTurn.h index 3b3a5b50a..5b187adc9 100644 --- a/SmartDeviceLink/SDLTurn.h +++ b/SmartDeviceLink/SDLTurn.h @@ -5,12 +5,15 @@ @class SDLImage; +NS_ASSUME_NONNULL_BEGIN @interface SDLTurn : SDLRPCStruct -- (instancetype)initWithNavigationText:(NSString *)navigationText turnIcon:(SDLImage *)icon; +- (instancetype)initWithNavigationText:(nullable NSString *)navigationText turnIcon:(nullable SDLImage *)icon; -@property (strong) NSString *navigationText; -@property (strong) SDLImage *turnIcon; +@property (nullable, strong) NSString *navigationText; +@property (nullable, strong) SDLImage *turnIcon; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m index c02a71a04..775a426d3 100644 --- a/SmartDeviceLink/SDLTurn.m +++ b/SmartDeviceLink/SDLTurn.m @@ -6,10 +6,11 @@ #import "SDLImage.h" #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN @implementation SDLTurn -- (instancetype)initWithNavigationText:(NSString *)navigationText turnIcon:(SDLImage *)icon { +- (instancetype)initWithNavigationText:(nullable NSString *)navigationText turnIcon:(nullable SDLImage *)icon { self = [self init]; if (!self) { return nil; @@ -21,7 +22,7 @@ return self; } -- (void)setNavigationText:(NSString *)navigationText { +- (void)setNavigationText:(nullable NSString *)navigationText { if (navigationText != nil) { [store setObject:navigationText forKey:SDLNameNavigationText]; } else { @@ -29,11 +30,11 @@ } } -- (NSString *)navigationText { +- (nullable NSString *)navigationText { return [store objectForKey:SDLNameNavigationText]; } -- (void)setTurnIcon:(SDLImage *)turnIcon { +- (void)setTurnIcon:(nullable SDLImage *)turnIcon { if (turnIcon != nil) { [store setObject:turnIcon forKey:SDLNameTurnIcon]; } else { @@ -41,7 +42,7 @@ } } -- (SDLImage *)turnIcon { +- (nullable SDLImage *)turnIcon { NSObject *obj = [store objectForKey:SDLNameTurnIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; @@ -51,3 +52,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index b586542d6..ea475f1ea 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -6,9 +6,13 @@ #import "SDLVehicleDataType.h" #import "SDLVehicleDataResultCode.h" +NS_ASSUME_NONNULL_BEGIN + @interface SDLVehicleDataResult : SDLRPCStruct @property (strong) SDLVehicleDataType dataType; @property (strong) SDLVehicleDataResultCode resultCode; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index 80d81fc32..4fc333b97 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -5,6 +5,8 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLVehicleDataResult - (void)setDataType:(SDLVehicleDataType)dataType { @@ -34,3 +36,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLVehicleType.h b/SmartDeviceLink/SDLVehicleType.h index aceb40b72..d46af829c 100644 --- a/SmartDeviceLink/SDLVehicleType.h +++ b/SmartDeviceLink/SDLVehicleType.h @@ -9,6 +9,9 @@ * * @since SDL 2.0 */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLVehicleType : SDLRPCStruct /** @@ -18,7 +21,7 @@ * * Optional, Max String length 500 chars */ -@property (strong) NSString *make; +@property (nullable, strong) NSString *make; /** * @abstract The model of the vehicle @@ -27,7 +30,7 @@ * * Optional, Max String length 500 chars */ -@property (strong) NSString *model; +@property (nullable, strong) NSString *model; /** * @abstract The model year of the vehicle @@ -36,7 +39,7 @@ * * Optional, Max String length 500 chars */ -@property (strong) NSString *modelYear; +@property (nullable, strong) NSString *modelYear; /** * @abstract The trim of the vehicle @@ -45,6 +48,8 @@ * * Optional, Max String length 500 chars */ -@property (strong) NSString *trim; +@property (nullable, strong) NSString *trim; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m index aec889c34..c02a7e8f4 100644 --- a/SmartDeviceLink/SDLVehicleType.m +++ b/SmartDeviceLink/SDLVehicleType.m @@ -6,9 +6,11 @@ #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLVehicleType -- (void)setMake:(NSString *)make { +- (void)setMake:(nullable NSString *)make { if (make != nil) { [store setObject:make forKey:SDLNameMake]; } else { @@ -16,11 +18,11 @@ } } -- (NSString *)make { +- (nullable NSString *)make { return [store objectForKey:SDLNameMake]; } -- (void)setModel:(NSString *)model { +- (void)setModel:(nullable NSString *)model { if (model != nil) { [store setObject:model forKey:SDLNameModel]; } else { @@ -28,11 +30,11 @@ } } -- (NSString *)model { +- (nullable NSString *)model { return [store objectForKey:SDLNameModel]; } -- (void)setModelYear:(NSString *)modelYear { +- (void)setModelYear:(nullable NSString *)modelYear { if (modelYear != nil) { [store setObject:modelYear forKey:SDLNameModelYear]; } else { @@ -40,11 +42,11 @@ } } -- (NSString *)modelYear { +- (nullable NSString *)modelYear { return [store objectForKey:SDLNameModelYear]; } -- (void)setTrim:(NSString *)trim { +- (void)setTrim:(nullable NSString *)trim { if (trim != nil) { [store setObject:trim forKey:SDLNameTrim]; } else { @@ -52,8 +54,10 @@ } } -- (NSString *)trim { +- (nullable NSString *)trim { return [store objectForKey:SDLNameTrim]; } @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLVrHelpItem.h b/SmartDeviceLink/SDLVrHelpItem.h index ba81745ad..8d5a27cf5 100644 --- a/SmartDeviceLink/SDLVrHelpItem.h +++ b/SmartDeviceLink/SDLVrHelpItem.h @@ -5,15 +5,18 @@ @class SDLImage; +NS_ASSUME_NONNULL_BEGIN @interface SDLVRHelpItem : SDLRPCStruct -- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image; +- (instancetype)initWithText:(NSString *)text image:(nullable SDLImage *)image; -- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image position:(UInt8)position; +- (instancetype)initWithText:(NSString *)text image:(nullable SDLImage *)image position:(UInt8)position; @property (strong) NSString *text; -@property (strong) SDLImage *image; +@property (nullable, strong) SDLImage *image; @property (strong) NSNumber<SDLInt> *position; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m index c11cc119b..711fa4d72 100644 --- a/SmartDeviceLink/SDLVrHelpItem.m +++ b/SmartDeviceLink/SDLVrHelpItem.m @@ -7,9 +7,11 @@ #import "SDLImage.h" #import "SDLNames.h" +NS_ASSUME_NONNULL_BEGIN + @implementation SDLVRHelpItem -- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image position:(UInt8)position { +- (instancetype)initWithText:(NSString *)text image:(nullable SDLImage *)image position:(UInt8)position { self = [self initWithText:text image:image]; if (!self) { return nil; @@ -20,7 +22,7 @@ return self; } -- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image { +- (instancetype)initWithText:(NSString *)text image:(nullable SDLImage *)image { self = [self init]; if (!self) { return nil; @@ -44,7 +46,7 @@ return [store objectForKey:SDLNameText]; } -- (void)setImage:(SDLImage *)image { +- (void)setImage:(nullable SDLImage *)image { if (image != nil) { [store setObject:image forKey:SDLNameImage]; } else { @@ -52,7 +54,7 @@ } } -- (SDLImage *)image { +- (nullable SDLImage *)image { NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; @@ -74,3 +76,5 @@ } @end + +NS_ASSUME_NONNULL_END |