More consistent HUBComponentWrapper usage and fixing target device family issue

Author: marmelroy

HubFramework.xcodeproj/project.pbxproj

@@ -2851,13 +2851,13 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.HubFramework-tvOS";
 				PRODUCT_NAME = HubFramework;
-				SDKROOT = appletvos10.1;
+				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0.1;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2909,12 +2909,12 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.HubFramework-tvOS";
 				PRODUCT_NAME = HubFramework;
-				SDKROOT = appletvos10.1;
+				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0.1;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

sources/HUBViewController.m

@@ -786,7 +786,7 @@ - (BOOL)collectionViewShouldBeginScrolling:(HUBCollectionView *)collectionView
 - (BOOL)collectionView:(UICollectionView *)collectionView canFocusItemAtIndexPath:(NSIndexPath *)indexPath
 {
     HUBComponentCollectionViewCell *cell = (HUBComponentCollectionViewCell *)[collectionView cellForItemAtIndexPath:indexPath];
-    HUBComponentWrapper * wrapper = [self componentWrapperFromCell:cell];
+    HUBComponentWrapper * const wrapper = [self componentWrapperFromCell:cell];
     return wrapper.visibleChildren.count == 0;
 }
 #endif
@@ -1566,10 +1566,10 @@ - (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated
 
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator {
     HUBComponentCollectionViewCell *previousItem = (HUBComponentCollectionViewCell *)context.previouslyFocusedView;
-    HUBComponentWrapper *previousWrapper = [self componentWrapperFromCell:previousItem];
+    HUBComponentWrapper * const previousWrapper = [self componentWrapperFromCell:previousItem];
     [previousWrapper updateViewForFocusState:HUBComponentFocusStateNone];
     HUBComponentCollectionViewCell *nextItem = (HUBComponentCollectionViewCell *)context.nextFocusedView;
-    HUBComponentWrapper *nextWrapper = [self componentWrapperFromCell:nextItem];
+    HUBComponentWrapper * const nextWrapper = [self componentWrapperFromCell:nextItem];
     [nextWrapper updateViewForFocusState:HUBComponentFocusStateInFocus];
 }