diff options
Diffstat (limited to 'SmartDeviceLink/SDLChoice.h')
| -rw-r--r-- | SmartDeviceLink/SDLChoice.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/SmartDeviceLink/SDLChoice.h b/SmartDeviceLink/SDLChoice.h index b35deb299..1e88f097b 100644 --- a/SmartDeviceLink/SDLChoice.h +++ b/SmartDeviceLink/SDLChoice.h @@ -50,59 +50,63 @@ * * Since <b>SmartDeviceLink 1.0</b><br> */ +NS_ASSUME_NONNULL_BEGIN + @interface SDLChoice : SDLRPCStruct - (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands; -- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands image:(SDLImage *)image secondaryText:(NSString *)secondaryText secondaryImage:(SDLImage *)secondaryImage tertiaryText:(NSString *)tertiaryText; +- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands image:(nullable SDLImage *)image secondaryText:(nullable NSString *)secondaryText secondaryImage:(nullable SDLImage *)secondaryImage tertiaryText:(nullable NSString *)tertiaryText; /** * @abstract the application-scoped identifier that uniquely identifies this choice * * 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 (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 (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 (strong) NSString *tertiaryText; +@property (nullable, strong, nonatomic) NSString *tertiaryText; /** * @abstract Optional secondary image for choice * * Optional */ -@property (strong) SDLImage *secondaryImage; +@property (nullable, strong, nonatomic) SDLImage *secondaryImage; @end + +NS_ASSUME_NONNULL_END |