diff --git a/PhotoData/DetailViewController.m b/PhotoData/DetailViewController.m
index ce00b81..e2f7c14 100644
--- a/PhotoData/DetailViewController.m
+++ b/PhotoData/DetailViewController.m
@@ -12,6 +12,7 @@ @implementation DetailViewController
- (void)viewDidLoad
{
[super viewDidLoad];
+ self.view.backgroundColor = [UIColor whiteColor];
self.navigationItem.title = self.key;
}
diff --git a/PhotoData/PhotoViewController.xib b/PhotoData/PhotoViewController.xib
index 01cc446..92c4cfe 100644
--- a/PhotoData/PhotoViewController.xib
+++ b/PhotoData/PhotoViewController.xib
@@ -2,13 +2,13 @@
1552
- 12D78
- 3084
- 1187.37
- 626.00
+ 13F1077
+ 6751
+ 1265.21
+ 698.00
IBProxyObject
@@ -38,9 +38,10 @@
{{0, 20}, {320, 548}}
-
+
3
MC45NwA
@@ -154,6 +160,8 @@
IBUIScreenMetrics
+ IBCocoaTouchFramework
+ iPhone 4-inch
YES
@@ -165,15 +173,13 @@
{568, 320}
- IBCocoaTouchFramework
- Retina 4 Full Screen
2
IBCocoaTouchFramework
-
+
view
@@ -211,10 +217,10 @@
1
-
+
@@ -258,6 +264,7 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
UIResponder
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -291,15 +298,77 @@
IBProjectSource
- ./Classes/PhotoViewController.h
+ ../PhotoData/PhotoViewController.h
+
+
+
+
+
+ UIGestureRecognizer
+ NSObject
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIGestureRecognizer.h
+
+
+
+ UILabel
+ UIView
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UILabel.h
+
+
+
+ UIResponder
+ NSObject
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIResponder.h
+
+
+
+ UISearchBar
+ UIView
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UISearchBar.h
+
+
+
+ UISearchDisplayController
+ NSObject
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UISearchDisplayController.h
+
+
+
+ UIView
+ UIResponder
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIView.h
+
+
+
+ UIViewController
+ UIResponder
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIViewController.h
0
IBCocoaTouchFramework
+ NO
+
+ com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3
+
+
YES
3
- 2083
diff --git a/PhotoData/RatingCell.m b/PhotoData/RatingCell.m
index 8eaa0df..a16c482 100644
--- a/PhotoData/RatingCell.m
+++ b/PhotoData/RatingCell.m
@@ -9,6 +9,7 @@
static const int MaximumNumberOfStars = 5;
static const float InactiveStarOpacity = .2;
+static const int StarViewTagOffset = 100;
@implementation RatingCell
@@ -30,7 +31,7 @@ - (void)updateForRating:(double)rating
{
NSUInteger numberOfStars = (NSUInteger) ceilf((float) (rating * MaximumNumberOfStars));
for (NSUInteger idx = 0; idx < MaximumNumberOfStars; idx++) {
- UIView *starView = self.contentView.subviews[idx];
+ UIView *starView = [self.contentView viewWithTag:StarViewTagOffset + idx];
starView.alpha = numberOfStars > idx ? 1 : InactiveStarOpacity;
}
}
diff --git a/PhotoData/RatingCell.xib b/PhotoData/RatingCell.xib
index c216ebd..8d4565a 100644
--- a/PhotoData/RatingCell.xib
+++ b/PhotoData/RatingCell.xib
@@ -2,13 +2,13 @@
1552
- 12D78
- 3084
- 1187.37
- 626.00
+ 13F1077
+ 6751
+ 1265.21
+ 698.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 2083
+ 6736
IBProxyObject
@@ -44,8 +44,10 @@
274
{{68, 6}, {32, 32}}
+
_NS:9
+ 100
NO
IBCocoaTouchFramework
@@ -58,8 +60,10 @@
274
{{106, 6}, {32, 32}}
+
_NS:9
+ 101
NO
IBCocoaTouchFramework
@@ -69,8 +73,10 @@
274
{{144, 6}, {32, 32}}
+
_NS:9
+ 102
NO
IBCocoaTouchFramework
@@ -80,8 +86,10 @@
274
{{182, 6}, {32, 32}}
+
_NS:9
+ 103
NO
IBCocoaTouchFramework
@@ -91,7 +99,10 @@
274
{{220, 6}, {32, 32}}
+
+
_NS:9
+ 104
NO
IBCocoaTouchFramework
@@ -99,6 +110,7 @@
{320, 43}
+
_NS:11
@@ -114,6 +126,7 @@
{320, 44}
+
_NS:9
IBCocoaTouchFramework
@@ -121,12 +134,12 @@
-
+
0
-
+
@@ -205,19 +218,65 @@
UITableViewCell
IBProjectSource
- ./Classes/RatingCell.h
+ ../PhotoData/RatingCell.h
+
+
+
+
+
+ UIGestureRecognizer
+ NSObject
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIGestureRecognizer.h
+
+
+
+ UIImageView
+ UIView
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIImageView.h
+
+
+
+ UIResponder
+ NSObject
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIResponder.h
+
+
+
+ UITableViewCell
+ UIView
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UITableViewCell.h
+
+
+
+ UIView
+ UIResponder
+
+ IBFrameworkSource
+ UIKit.framework/Headers/UIView.h
0
IBCocoaTouchFramework
+ NO
+
+ com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3
+
+
YES
3
star.png
{32, 32}
- 2083
diff --git a/PhotoDataTests/PhotosViewControllerTests.m b/PhotoDataTests/PhotosViewControllerTests.m
index 5720c4c..18ddfa4 100644
--- a/PhotoDataTests/PhotosViewControllerTests.m
+++ b/PhotoDataTests/PhotosViewControllerTests.m
@@ -17,7 +17,7 @@ @implementation PhotosViewControllerTests
- (void)testNibLoading
{
- id mockNavController = [self autoVerifiedMockForClass:[UINavigationController class]];
+ id mockNavController = [self autoVerifiedPartialMockForObject:[[UINavigationController alloc] init]];
// Create an instance that has the given navigation controller mock:
PhotosViewController *photosViewController = [[PhotosViewController alloc] init];
diff --git a/Submodules/ocmock b/Submodules/ocmock
index d7c45c4..fc3f81f 160000
--- a/Submodules/ocmock
+++ b/Submodules/ocmock
@@ -1 +1 @@
-Subproject commit d7c45c4b0d7b8b285a597502d3938640bd751299
+Subproject commit fc3f81ff9ce5ab877544067775a3e0779a725c32