Skip to content
This repository has been archived by the owner on Mar 24, 2022. It is now read-only.

Commit

Permalink
Merge branch 'gudatcomputers-WKInterfaceImage-setTintColor'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Stallard and Wiley Kestner committed Jan 14, 2015
2 parents 9afc14a + 2b22bf4 commit 06e290b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
6 changes: 6 additions & 0 deletions WatchKit/Specs/WatchKit/WKInterfaceImageSpec.mm
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@

subject should have_received(@selector(stopAnimating));
});

it(@"should record the invocation for setTintColor:", ^{
[subject setTintColor:[UIColor clearColor]];

subject should have_received(@selector(setTintColor:)).with([UIColor clearColor]);
});
});
});

Expand Down
2 changes: 2 additions & 0 deletions WatchKit/WatchKit/WKInterfaceImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
- (void)setImageData:(NSData *)imageData;
- (void)setImageNamed:(NSString *)imageName;

- (void)setTintColor:(UIColor *)tintColor;

- (void)startAnimating;

- (void)startAnimatingWithImagesInRange:(NSRange)imageRange
Expand Down
7 changes: 6 additions & 1 deletion WatchKit/WatchKit/WKInterfaceImage.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ - (void)setImage:(UIImage *)image NS_REQUIRES_SUPER;
- (void)setImageData:(NSData *)imageData NS_REQUIRES_SUPER;
- (void)setImageNamed:(NSString *)imageName NS_REQUIRES_SUPER;

- (void)setTintColor:(UIColor *)tintColor NS_REQUIRES_SUPER;

- (void)startAnimating NS_REQUIRES_SUPER;
- (void)startAnimatingWithImagesInRange:(NSRange)imageRange
duration:(NSTimeInterval)duration
Expand Down Expand Up @@ -56,6 +58,9 @@ - (void)stopAnimating
[super stopAnimating];
}


- (void)setTintColor:(UIColor *)tintColor
{
[super setTintColor:tintColor];
}

@end

0 comments on commit 06e290b

Please sign in to comment.