diff options
5 files changed, 20 insertions, 2 deletions
diff --git a/SmartDeviceLink/private/SDLTextField+ScreenManagerExtensions.m b/SmartDeviceLink/private/SDLTextField+ScreenManagerExtensions.m index cbc062d93..3086e67e9 100644 --- a/SmartDeviceLink/private/SDLTextField+ScreenManagerExtensions.m +++ b/SmartDeviceLink/private/SDLTextField+ScreenManagerExtensions.m @@ -13,7 +13,7 @@ + (NSArray<SDLTextFieldName> *)sdl_allTextFieldNames { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - return @[SDLTextFieldNameETA, SDLTextFieldNameMenuName, SDLTextFieldNameMenuTitle, SDLTextFieldNameStatusBar, SDLTextFieldNameAlertText1, SDLTextFieldNameAlertText2, SDLTextFieldNameAlertText3, SDLTextFieldNameMainField1, SDLTextFieldNameMainField2, SDLTextFieldNameMainField3, SDLTextFieldNameMainField4, SDLTextFieldNameMediaClock, SDLTextFieldNameMediaTrack, SDLTextFieldNamePhoneNumber, SDLTextFieldNameAddressLines, SDLTextFieldNameLocationName, SDLTextFieldNameSliderFooter, SDLTextFieldNameSliderHeader, SDLTextFieldNameTertiaryText, SDLTextFieldNameSecondaryText, SDLTextFieldNameTemplateTitle, SDLTextFieldNameTotalDistance, SDLTextFieldNameNavigationText1, SDLTextFieldNameNavigationText2, SDLTextFieldNameLocationDescription, SDLTextFieldNameScrollableMessageBody, SDLTextFieldNameInitialInteractionText, SDLTextFieldNameAudioPassThruDisplayText1, SDLTextFieldNameAudioPassThruDisplayText2]; + return @[SDLTextFieldNameETA, SDLTextFieldNameMenuName, SDLTextFieldNameMenuTitle, SDLTextFieldNameStatusBar, SDLTextFieldNameAlertText1, SDLTextFieldNameAlertText2, SDLTextFieldNameAlertText3, SDLTextFieldNameMainField1, SDLTextFieldNameMainField2, SDLTextFieldNameMainField3, SDLTextFieldNameMainField4, SDLTextFieldNameMediaClock, SDLTextFieldNameMediaTrack, SDLTextFieldNamePhoneNumber, SDLTextFieldNameAddressLines, SDLTextFieldNameLocationName, SDLTextFieldNameSliderFooter, SDLTextFieldNameSliderHeader, SDLTextFieldNameTertiaryText, SDLTextFieldNameSecondaryText, SDLTextFieldNameTemplateTitle, SDLTextFieldNameTotalDistance, SDLTextFieldNameNavigationText1, SDLTextFieldNameNavigationText2, SDLTextFieldNameLocationDescription, SDLTextFieldNameScrollableMessageBody, SDLTextFieldNameInitialInteractionText, SDLTextFieldNameAudioPassThruDisplayText1, SDLTextFieldNameAudioPassThruDisplayText2, SDLTextFieldNameTimeToDestination, SDLTextFieldNameTurnText]; } #pragma clang diagnostic pop diff --git a/SmartDeviceLink/public/SDLTextFieldName.h b/SmartDeviceLink/public/SDLTextFieldName.h index abd2d57fc..b0193021d 100644 --- a/SmartDeviceLink/public/SDLTextFieldName.h +++ b/SmartDeviceLink/public/SDLTextFieldName.h @@ -232,6 +232,20 @@ extern SDLTextFieldName const SDLTextFieldNameAddressLines; extern SDLTextFieldName const SDLTextFieldNamePhoneNumber; /** + * Optional time to destination field for navigationTexts parameter in ShowConstantTB + * + * @added in SmartDeviceLink 7.1.0 + */ +extern SDLTextFieldName const SDLTextFieldNameTimeToDestination; + +/** + * Turn text for turnList parameter of UpdateTurnList + * + * @added in SmartDeviceLink 7.1.0 + */ +extern SDLTextFieldName const SDLTextFieldNameTurnText; + +/** * The first line of the subtle alert text field; applies to `SubtleAlert` `alertText1` * * @since SDL 7.0.0 diff --git a/SmartDeviceLink/public/SDLTextFieldName.m b/SmartDeviceLink/public/SDLTextFieldName.m index 54f8c781e..94ad94266 100644 --- a/SmartDeviceLink/public/SDLTextFieldName.m +++ b/SmartDeviceLink/public/SDLTextFieldName.m @@ -61,6 +61,8 @@ SDLTextFieldName const SDLTextFieldNameLocationName = @"locationName"; SDLTextFieldName const SDLTextFieldNameLocationDescription = @"locationDescription"; SDLTextFieldName const SDLTextFieldNameAddressLines = @"addressLines"; SDLTextFieldName const SDLTextFieldNamePhoneNumber = @"phoneNumber"; +SDLTextFieldName const SDLTextFieldNameTimeToDestination = @"timeToDestination"; +SDLTextFieldName const SDLTextFieldNameTurnText = @"turnText"; SDLTextFieldName const SDLTextFieldNameSubtleAlertText1 = @"subtleAlertText1"; SDLTextFieldName const SDLTextFieldNameSubtleAlertText2 = @"subtleAlertText2"; SDLTextFieldName const SDLTextFieldNameSubtleAlertSoftButtonText = @"subtleAlertSoftButtonText"; diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m index 423c68b77..53f1e93d6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m @@ -49,6 +49,8 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLTextFieldNameSubtleAlertText1).to(equal(@"subtleAlertText1")); expect(SDLTextFieldNameSubtleAlertText2).to(equal(@"subtleAlertText2")); expect(SDLTextFieldNameSubtleAlertSoftButtonText).to(equal("subtleAlertSoftButtonText")); + expect(SDLTextFieldNameTimeToDestination).to(equal(@"timeToDestination")); + expect(SDLTextFieldNameTurnText).to(equal(@"turnText")); }); }); diff --git a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m index 4afa389d2..30c6dc23d 100644 --- a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m +++ b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m @@ -536,7 +536,7 @@ describe(@"System capability manager", ^{ it(@"should should save the capabilities", ^{ // All the text fields and image fields should be available - expect(testSystemCapabilityManager.defaultMainWindowCapability.textFields).to(haveCount(29)); + expect(testSystemCapabilityManager.defaultMainWindowCapability.textFields).to(haveCount(31)); expect(testSystemCapabilityManager.defaultMainWindowCapability.imageFields).to(haveCount(14)); }); }); |