diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2017-01-18 09:12:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-18 09:12:20 -0500 |
commit | 894c34a05235f49e527df72f7f95a4cc62ca0afd (patch) | |
tree | f28493b4390379318c0bc7a7d0a55099bdc35c08 /SmartDeviceLink/SDLPerformInteraction.h | |
parent | f44eba087b5f26897a6d126eedc691299f369782 (diff) | |
parent | bfac2fa01fd4fee31dbf8a69199a51d2ad57821d (diff) | |
download | sdl_ios-894c34a05235f49e527df72f7f95a4cc62ca0afd.tar.gz |
Merge pull request #490 from smartdevicelink/feature/sdl_0018_nullability_annotations
Adding of Nullability Annotations & Removing Dispose Methods
Diffstat (limited to 'SmartDeviceLink/SDLPerformInteraction.h')
-rw-r--r-- | SmartDeviceLink/SDLPerformInteraction.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/SmartDeviceLink/SDLPerformInteraction.h b/SmartDeviceLink/SDLPerformInteraction.h index 99d11886d..afbac1d9a 100644 --- a/SmartDeviceLink/SDLPerformInteraction.h +++ b/SmartDeviceLink/SDLPerformInteraction.h @@ -25,23 +25,26 @@ * Since SmartDeviceLink 1.0<br/> * See SDLCreateInteractionChoiceSet SDLDeleteInteractionChoiceSet */ + +NS_ASSUME_NONNULL_BEGIN + @interface SDLPerformInteraction : SDLRPCRequest - (instancetype)initWithInteractionChoiceSetId:(UInt16)interactionChoiceSetId; - (instancetype)initWithInteractionChoiceSetIdList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIdList; -- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(UInt16)interactionChoiceSetID; +- (instancetype)initWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(UInt16)interactionChoiceSetID; -- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(UInt16)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp; +- (instancetype)initWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(UInt16)interactionChoiceSetID vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp; -- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout; +- (instancetype)initWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(nullable NSString *)helpPrompt timeoutPrompt:(nullable NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout; -- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp; +- (instancetype)initWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(nullable NSString *)helpPrompt timeoutPrompt:(nullable NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp; -- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp; +- (instancetype)initWithInitialChunks:(nullable NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(nullable NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(nullable NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp; -- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp interactionLayout:(SDLLayoutMode)layout; +- (instancetype)initWithInitialChunks:(nullable NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(nullable NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(nullable NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp interactionLayout:(nullable SDLLayoutMode)layout; /** * @abstract The Text that Displayed when the interaction begins. This text may @@ -54,7 +57,7 @@ * @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 (strong) NSMutableArray<SDLTTSChunk *> *initialPrompt; +@property (nullable, strong) 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 @@ -70,23 +73,25 @@ * @abstract A Vector<TTSChunk> which taken together, specify the help phrase to * be spoken when the user says "help" during the VR session */ -@property (strong) NSMutableArray<SDLTTSChunk *> *helpPrompt; +@property (nullable, strong) 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 (strong) NSMutableArray<SDLTTSChunk *> *timeoutPrompt; +@property (nullable, strong) 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 (strong) NSNumber<SDLInt> *timeout; +@property (nullable, strong) 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 (strong) NSMutableArray<SDLVRHelpItem *> *vrHelp; -@property (strong) SDLLayoutMode interactionLayout; +@property (nullable, strong) NSMutableArray<SDLVRHelpItem *> *vrHelp; +@property (nullable, strong) SDLLayoutMode interactionLayout; @end + +NS_ASSUME_NONNULL_END |