diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-01-18 09:44:40 -0500 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-01-18 09:44:45 -0500 |
| commit | 85476cb28257bf5d2a4b89f1dfb73baa47a8bd67 (patch) | |
| tree | e3fcfcf8844fcce9626349d8340405a31a49bdea /SmartDeviceLink/SDLChoice.h | |
| parent | 55850b04dca4b6d11e3a7fcac42d1e1708a36bdf (diff) | |
| parent | 894c34a05235f49e527df72f7f95a4cc62ca0afd (diff) | |
| download | sdl_ios-85476cb28257bf5d2a4b89f1dfb73baa47a8bd67.tar.gz | |
Merge branch 'develop' into feature/sdl_0009_prefer_nonatomic
# Conflicts:
# SmartDeviceLink/SDLAbstractProtocol.h
# SmartDeviceLink/SDLAbstractTransport.h
# SmartDeviceLink/SDLAddCommand.h
# SmartDeviceLink/SDLAddSubMenu.h
# SmartDeviceLink/SDLAlert.h
# SmartDeviceLink/SDLAlertManeuver.h
# SmartDeviceLink/SDLAlertResponse.h
# SmartDeviceLink/SDLBodyInformation.h
# SmartDeviceLink/SDLChoice.h
# SmartDeviceLink/SDLDIDResult.h
# SmartDeviceLink/SDLDeviceInfo.h
# SmartDeviceLink/SDLDisplayCapabilities.h
# SmartDeviceLink/SDLGetDTCs.h
# SmartDeviceLink/SDLGetVehicleData.h
# SmartDeviceLink/SDLGetVehicleDataResponse.h
# SmartDeviceLink/SDLGetWaypointsResponse.h
# SmartDeviceLink/SDLHeadLampStatus.h
# SmartDeviceLink/SDLIAPSession.h
# SmartDeviceLink/SDLIAPTransport.h
# SmartDeviceLink/SDLIAPTransport.m
# SmartDeviceLink/SDLImageField.h
# SmartDeviceLink/SDLKeyboardProperties.h
# SmartDeviceLink/SDLListFilesResponse.h
# SmartDeviceLink/SDLLocationDetails.h
# SmartDeviceLink/SDLMenuParams.h
# SmartDeviceLink/SDLObjectWithPriority.h
# SmartDeviceLink/SDLOnButtonEvent.h
# SmartDeviceLink/SDLOnButtonPress.h
# SmartDeviceLink/SDLOnEncodedSyncPData.h
# SmartDeviceLink/SDLOnKeyboardInput.h
# SmartDeviceLink/SDLOnSyncPData.h
# SmartDeviceLink/SDLOnSystemRequest.h
# SmartDeviceLink/SDLOnVehicleData.h
# SmartDeviceLink/SDLPerformAudioPassThru.h
# SmartDeviceLink/SDLPerformInteraction.h
# SmartDeviceLink/SDLPerformInteractionResponse.h
# SmartDeviceLink/SDLProtocol.m
# SmartDeviceLink/SDLProtocolMessage.h
# SmartDeviceLink/SDLProtocolMessage.m
# SmartDeviceLink/SDLProtocolMessageAssembler.h
# SmartDeviceLink/SDLProtocolReceivedMessageRouter.h
# SmartDeviceLink/SDLProtocolReceivedMessageRouter.m
# SmartDeviceLink/SDLProxy.h
# SmartDeviceLink/SDLProxy.m
# SmartDeviceLink/SDLPutFile.h
# SmartDeviceLink/SDLRPCMessage.h
# SmartDeviceLink/SDLRPCPayload.h
# SmartDeviceLink/SDLRPCResponse.h
# SmartDeviceLink/SDLReadDIDResponse.h
# SmartDeviceLink/SDLRegisterAppInterface.h
# SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
# SmartDeviceLink/SDLScreenParams.h
# SmartDeviceLink/SDLScrollableMessage.h
# SmartDeviceLink/SDLSetDisplayLayoutResponse.h
# SmartDeviceLink/SDLSetGlobalProperties.h
# SmartDeviceLink/SDLSetMediaClockTimer.h
# SmartDeviceLink/SDLShow.h
# SmartDeviceLink/SDLShowConstantTBT.h
# SmartDeviceLink/SDLSlider.h
# SmartDeviceLink/SDLSliderResponse.h
# SmartDeviceLink/SDLSoftButton.h
# SmartDeviceLink/SDLSubscribeVehicleData.h
# SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
# SmartDeviceLink/SDLSystemRequest.h
# SmartDeviceLink/SDLTimer.h
# SmartDeviceLink/SDLTimer.m
# SmartDeviceLink/SDLTurn.h
# SmartDeviceLink/SDLUnsubscribeVehicleData.h
# SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
# SmartDeviceLink/SDLUpdateTurnList.h
# SmartDeviceLink/SDLVehicleType.h
# SmartDeviceLink/SDLVrHelpItem.h
Diffstat (limited to 'SmartDeviceLink/SDLChoice.h')
| -rw-r--r-- | SmartDeviceLink/SDLChoice.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/SmartDeviceLink/SDLChoice.h b/SmartDeviceLink/SDLChoice.h index 50bdf8d80..1e88f097b 100644 --- a/SmartDeviceLink/SDLChoice.h +++ b/SmartDeviceLink/SDLChoice.h @@ -50,11 +50,13 @@ * * 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 @@ -82,27 +84,29 @@ * * Optional */ -@property (strong, nonatomic) 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, nonatomic) 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, nonatomic) NSString *tertiaryText; +@property (nullable, strong, nonatomic) NSString *tertiaryText; /** * @abstract Optional secondary image for choice * * Optional */ -@property (strong, nonatomic) SDLImage *secondaryImage; +@property (nullable, strong, nonatomic) SDLImage *secondaryImage; @end + +NS_ASSUME_NONNULL_END |