willowtreeapps · ifobos · Mar 23, 2018 · Mar 23, 2018 · Mar 23, 2018 · Apr 3, 2018
diff --git a/Ouroboros/InfiniteCarousel.swift b/Ouroboros/InfiniteCarousel.swift
diff --git a/OuroborosExample/OuroborosExample.xcodeproj/project.pbxproj b/OuroborosExample/OuroborosExample.xcodeproj/project.pbxproj
@@ -179,7 +179,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "WillowTree Apps";
 				TargetAttributes = {
 					D95AA24F1BDA88E90080C25B = {
@@ -243,13 +243,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-OuroborosExample-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		205A67691261B208A6BE610C /* [CP] Embed Pods Frameworks */ = {
@@ -258,9 +261,12 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-OuroborosExample/Pods-OuroborosExample-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/WillowTreeOuroboros/WillowTreeOuroboros.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WillowTreeOuroboros.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -324,14 +330,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -370,14 +382,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -412,7 +430,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.willowtreeapps.OuroborosExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -426,7 +444,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.willowtreeapps.OuroborosExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/OuroborosExample/OuroborosExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OuroborosExample/OuroborosExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...andassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/...andassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...ndassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/...ndassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...andassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/...andassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...ndassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/...ndassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...ple/OuroborosExample/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json b/...ple/OuroborosExample/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
@@ -12,6 +12,12 @@
       "filename" : "App Icon - Small.imagestack",
       "role" : "primary-app-icon"
     },
+    {
+      "size" : "2320x720",
+      "idiom" : "tv",
+      "filename" : "Top Shelf Image Wide.imageset",
+      "role" : "top-shelf-image-wide"
+    },
     {
       "size" : "1920x720",
       "idiom" : "tv",
@@ -23,4 +29,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...assets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json b/...assets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json b/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/OuroborosExample/OuroborosExample/Assets.xcassets/LaunchImage.launchimage/Contents.json b/OuroborosExample/OuroborosExample/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,5 +1,12 @@
 {
   "images" : [
+    {
+      "orientation" : "landscape",
+      "idiom" : "tv",
+      "extent" : "full-screen",
+      "minimum-system-version" : "11.0",
+      "scale" : "2x"
+    },
     {
       "orientation" : "landscape",
       "idiom" : "tv",

diff --git a/OuroborosExample/OuroborosExample/Base.lproj/Main.storyboard b/OuroborosExample/OuroborosExample/Base.lproj/Main.storyboard
@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="14109" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="appleTV" orientation="landscape">
+        <adaptation id="light"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
+        <deployment identifier="tvOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -17,7 +22,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceHorizontal="YES" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="ibD-Ne-gnG" customClass="InfiniteCarousel" customModule="WillowTreeOuroboros">
-                                <rect key="frame" x="0.0" y="0.0" width="1920" height="260"/>
+                                <rect key="frame" x="0.0" y="60" width="1920" height="260"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="260" id="auj-LI-b1O"/>
                                 </constraints>
@@ -37,7 +42,7 @@
                                 </connections>
                             </collectionView>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="lQK-ta-p19" customClass="InfiniteCarousel" customModule="WillowTreeOuroboros">
-                                <rect key="frame" x="0.0" y="270" width="1920" height="200"/>
+                                <rect key="frame" x="0.0" y="330" width="1920" height="200"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="200" id="pki-f3-ci9"/>
                                 </constraints>
@@ -63,7 +68,7 @@
                                 </connections>
                             </collectionView>
                             <collectionView multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="5Lm-K5-YMg" customClass="InfiniteCarousel" customModule="WillowTreeOuroboros">
-                                <rect key="frame" x="0.0" y="500" width="1920" height="540"/>
+                                <rect key="frame" x="0.0" y="560" width="1920" height="540"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="540" id="dqU-4b-70b"/>
                                 </constraints>
@@ -85,9 +90,8 @@
                                                     <rect key="frame" x="0.0" y="0.0" width="864" height="540"/>
                                                 </imageView>
                                             </subviews>
-                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
-                                        <color key="backgroundColor" red="0.42187408609999999" green="1" blue="0.89891723749999997" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" red="0.42187408609999999" green="1" blue="0.89891723749999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="trailing" secondItem="TyL-HX-Cpv" secondAttribute="trailing" id="5t6-aR-dvD"/>
                                             <constraint firstItem="TyL-HX-Cpv" firstAttribute="top" secondItem="mvq-lc-kzX" secondAttribute="top" id="JKz-39-XFq"/>
@@ -101,7 +105,7 @@
                                 </cells>
                             </collectionView>
                         </subviews>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="5Lm-K5-YMg" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="8AF-uj-b7b"/>
                             <constraint firstAttribute="trailing" secondItem="5Lm-K5-YMg" secondAttribute="trailing" id="W6u-YV-wiK"/>

diff --git a/OuroborosExample/OuroborosExample/ViewController.swift b/OuroborosExample/OuroborosExample/ViewController.swift
@@ -14,7 +14,7 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
     @IBOutlet weak var carousel: InfiniteCarousel!
     @IBOutlet weak var carousel2: InfiniteCarousel!
     @IBOutlet weak var natGeo: InfiniteCarousel!
-    
+
     let natGeoDataSource = NatGeoDataSource()
 
     let colors: [UIColor] = [
@@ -31,7 +31,7 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 
         carousel.register(UINib(nibName: "SampleCell", bundle: nil), forCellWithReuseIdentifier: SampleCell.ID)
         carousel2.register(UINib(nibName: "SampleCell", bundle: nil), forCellWithReuseIdentifier: SampleCell.ID)
-        
+
         natGeo.dataSource = natGeoDataSource
     }
 
@@ -45,6 +45,12 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
         cell.label.text = "\(indexPath.item)"
         return cell
     }
+
+    func collectionView(_ collectionView: UICollectionView, didUpdateFocusIn context: UICollectionViewFocusUpdateContext, with coordinator: UIFocusAnimationCoordinator) {
+        if let targetCarousel = collectionView as? InfiniteCarousel, let indexPath = context.nextFocusedIndexPath {
+            print("IndexPath: \(targetCarousel.adjustedIndexPathForIndexPath(indexPath))")
+        }
+    }
 }
 
 class SampleCell: UICollectionViewCell {

diff --git a/OuroborosExample/Podfile.lock b/OuroborosExample/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - WillowTreeOuroboros (0.2.0)
+  - WillowTreeOuroboros (0.2.1)
 
 DEPENDENCIES:
   - WillowTreeOuroboros (from `..`)
 
 EXTERNAL SOURCES:
   WillowTreeOuroboros:
-    :path: ".."
+    :path: ..
 
 SPEC CHECKSUMS:
-  WillowTreeOuroboros: d89095dfedf8da86188d602a205af640e52a066a
+  WillowTreeOuroboros: 9189ef419596530a1d458fc0d87085a3b50d2fc1
 
 PODFILE CHECKSUM: a42dc192f7a63ea6062b354e19a1f341d58f29e5
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.3.1