diff options
5 files changed, 12 insertions, 29 deletions
diff --git a/SmartDeviceLink/public/SDLShow.h b/SmartDeviceLink/public/SDLShow.h index c9a60b379..9b0706ee9 100644 --- a/SmartDeviceLink/public/SDLShow.h +++ b/SmartDeviceLink/public/SDLShow.h @@ -235,21 +235,13 @@ NS_ASSUME_NONNULL_BEGIN * </ul> */ @property (strong, nonatomic, nullable) NSString *statusBar; + /** - * This property is deprecated use SetMediaClockTimer instead. - * <p> The value for the MediaClock field using a format described in the - * MediaClockFormat enumeration + * Text value for MediaClock field. Has to be properly formatted by Mobile App according to the module's capabilities. If this text is set, any automatic media clock updates previously set with SetMediaClockTimer will be stopped. + * {"string_min_length": 0, "string_max_length": 500} * - * @discussion A String value for the MediaClock - * <p> - * <b>Notes: </b><br/> - * <ul> - * <li>Must be properly formatted as described in the - * MediaClockFormat enumeration</li> - * <li>If a value of five spaces is provided, this will clear - * that field on the display (i.e. the media clock timer field - * will not display anything)</li> - * </ul> + * @deprecated in SmartDeviceLink 7.1.0 + * @added in SmartDeviceLink 1.0.0 */ @property (strong, nonatomic, nullable) NSString *mediaClock __deprecated; /** diff --git a/SmartDeviceLink/public/SDLTextFieldName.h b/SmartDeviceLink/public/SDLTextFieldName.h index 23a352424..abd2d57fc 100644 --- a/SmartDeviceLink/public/SDLTextFieldName.h +++ b/SmartDeviceLink/public/SDLTextFieldName.h @@ -81,6 +81,9 @@ extern SDLTextFieldName const SDLTextFieldNameStatusBar; * Text value for MediaClock field. Must be properly formatted according to MediaClockFormat. Applies to SDLShow. * * @discussion This field is commonly used to show elapsed or remaining time in an audio track or audio capture. + * + * @deprecated in SmartDeviceLink 7.1.0 + * @added in SmartDeviceLink 1.0.0 */ extern SDLTextFieldName const SDLTextFieldNameMediaClock __deprecated; diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m index 6ea48cf30..8d2cf9dbc 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m @@ -74,10 +74,7 @@ QuickConfigurationBegin(SendingRPCsConfiguration) sharedExamples(@"unable to send an RPC", ^(QCKDSLSharedExampleContext exampleContext) { it(@"cannot publicly send RPCs", ^{ SDLLifecycleManager *testManager = exampleContext()[@"manager"]; -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLShow *testShow = [[SDLShow alloc] initWithMainField1:@"test" mainField2:nil alignment:nil]; -#pragma clang diagnostic pop + SDLShow *testShow = [[SDLShow alloc] initWithMainField1:@"test" mainField2:nil mainField3:nil mainField4:nil alignment:nil statusBar:nil mediaTrack:nil graphic:nil secondaryGraphic:nil softButtons:nil customPresets:nil metadataTags:nil templateTitle:nil windowID:nil templateConfiguration:nil]; [testManager sendRequest:testShow withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { expect(error).to(equal([NSError sdl_lifecycle_notReadyError])); @@ -533,10 +530,7 @@ describe(@"a lifecycle manager", ^{ }); it(@"can send an RPC of type Request", ^{ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLShow *testShow = [[SDLShow alloc] initWithMainField1:@"test" mainField2:nil alignment:nil]; -#pragma clang diagnostic pop + SDLShow *testShow = [[SDLShow alloc] initWithMainField1:@"test" mainField2:nil mainField3:nil mainField4:nil alignment:nil statusBar:nil mediaTrack:nil graphic:nil secondaryGraphic:nil softButtons:nil customPresets:nil metadataTags:nil templateTitle:nil windowID:nil templateConfiguration:nil]; OCMExpect([protocolMock sendRPC:testShow]); [testManager sendRPC:testShow]; diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m index 42c65e4bd..58e2495e3 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m @@ -202,10 +202,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ context(@"of a protocol message", ^{ beforeEach(^{ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLShow *showRPC = [[SDLShow alloc] initWithMainField1:@"Test1" mainField2:@"Test2" alignment:SDLTextAlignmentLeft]; -#pragma clang diagnostic pop + SDLShow *showRPC = [[SDLShow alloc] initWithMainField1:@"Test1" mainField2:@"Test2" mainField3:nil mainField4:nil alignment:SDLTextAlignmentLeft statusBar:nil mediaTrack:nil graphic:nil secondaryGraphic:nil softButtons:nil customPresets:nil metadataTags:nil templateTitle:nil windowID:nil templateConfiguration:nil]; SDLProtocolHeader *header = [SDLProtocolHeader headerForVersion:4]; header.serviceType = SDLServiceTypeRPC; diff --git a/SmartDeviceLinkTests/Notifications/SDLResponseDispatcherSpec.m b/SmartDeviceLinkTests/Notifications/SDLResponseDispatcherSpec.m index df919a67e..4ff829470 100644 --- a/SmartDeviceLinkTests/Notifications/SDLResponseDispatcherSpec.m +++ b/SmartDeviceLinkTests/Notifications/SDLResponseDispatcherSpec.m @@ -125,10 +125,7 @@ describe(@"a response dispatcher", ^{ __block NSUInteger numTimesHandlerCalled = 0; beforeEach(^{ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - testShow = [[SDLShow alloc] initWithMainField1:@"Test Show" mainField2:nil alignment:SDLTextAlignmentCenter]; -#pragma clang diagnostic pop + testShow = [[SDLShow alloc] initWithMainField1:@"Test Show" mainField2:nil mainField3:nil mainField4:nil alignment:SDLTextAlignmentCenter statusBar:nil mediaTrack:nil graphic:nil secondaryGraphic:nil softButtons:nil customPresets:nil metadataTags:nil templateTitle:nil windowID:nil templateConfiguration:nil]; testShow.correlationID = @1; }); |