moved itunes branch to master

RxSugar · Dec 2, 2015 · 1a2b8be · 1a2b8be
2 parents c2f5710 + e154e12
commit 1a2b8be
Show file tree

Hide file tree

Showing 24 changed files with 789 additions and 140 deletions.
diff --git a/Searchy.xcodeproj/project.pbxproj b/Searchy.xcodeproj/project.pbxproj
@@ -25,6 +25,18 @@
 		5A3A5FB21BF39D8800A99B68 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A1839561BEA762100622B04 /* Result.framework */; };
 		5A3A5FB41BF3DF0700A99B68 /* ReactiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A3A5FB31BF3DF0700A99B68 /* ReactiveExtensions.swift */; };
 		5A3A5FB61BF3F23700A99B68 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A3A5FB51BF3F23700A99B68 /* main.swift */; };
+		5A6326AD1BFA6FBD000B07CC /* SearchyDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A6326AC1BFA6FBD000B07CC /* SearchyDetailController.swift */; };
+		5A6326AF1BFA7189000B07CC /* ImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A6326AE1BFA7189000B07CC /* ImageProvider.swift */; };
+		5A6326B11BFA7355000B07CC /* ImageProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A6326B01BFA7355000B07CC /* ImageProviderTests.swift */; };
+		5A6326B61BFA7B75000B07CC /* clone-1.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A6326B21BFA7B75000B07CC /* clone-1.png */; };
+		5A6326B71BFA7B75000B07CC /* clone-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A6326B31BFA7B75000B07CC /* clone-2.png */; };
+		5A6326B81BFA7B75000B07CC /* clone-3.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A6326B41BFA7B75000B07CC /* clone-3.png */; };
+		5A6326B91BFA7B75000B07CC /* clone-4.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A6326B51BFA7B75000B07CC /* clone-4.png */; };
+		5A6326BF1BFA8ACE000B07CC /* ApplicationContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A6326BE1BFA8ACE000B07CC /* ApplicationContext.swift */; };
+		5A6326C11BFA8C53000B07CC /* SearchyCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A6326C01BFA8C53000B07CC /* SearchyCell.swift */; };
+		5A6326C31BFB8630000B07CC /* SearchyDisplayItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A6326C21BFB8630000B07CC /* SearchyDisplayItem.swift */; };
+		5A6326C51BFB868E000B07CC /* SearchyDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A6326C41BFB868E000B07CC /* SearchyDetailView.swift */; };
+		5A8E37201BFA262700D6E6BC /* Transition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A8E371F1BFA262700D6E6BC /* Transition.swift */; };
 		5AEB20631BEB9D7700418692 /* SearchyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AEB20621BEB9D7700418692 /* SearchyView.swift */; };
 /* End PBXBuildFile section */
 
@@ -72,6 +84,18 @@
 		5A3A5FAB1BF3936800A99B68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		5A3A5FB31BF3DF0700A99B68 /* ReactiveExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReactiveExtensions.swift; sourceTree = "<group>"; };
 		5A3A5FB51BF3F23700A99B68 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+		5A6326AC1BFA6FBD000B07CC /* SearchyDetailController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchyDetailController.swift; sourceTree = "<group>"; };
+		5A6326AE1BFA7189000B07CC /* ImageProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageProvider.swift; sourceTree = "<group>"; };
+		5A6326B01BFA7355000B07CC /* ImageProviderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageProviderTests.swift; sourceTree = "<group>"; };
+		5A6326B21BFA7B75000B07CC /* clone-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "clone-1.png"; sourceTree = "<group>"; };
+		5A6326B31BFA7B75000B07CC /* clone-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "clone-2.png"; sourceTree = "<group>"; };
+		5A6326B41BFA7B75000B07CC /* clone-3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "clone-3.png"; sourceTree = "<group>"; };
+		5A6326B51BFA7B75000B07CC /* clone-4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "clone-4.png"; sourceTree = "<group>"; };
+		5A6326BE1BFA8ACE000B07CC /* ApplicationContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationContext.swift; sourceTree = "<group>"; };
+		5A6326C01BFA8C53000B07CC /* SearchyCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchyCell.swift; sourceTree = "<group>"; };
+		5A6326C21BFB8630000B07CC /* SearchyDisplayItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchyDisplayItem.swift; sourceTree = "<group>"; };
+		5A6326C41BFB868E000B07CC /* SearchyDetailView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchyDetailView.swift; sourceTree = "<group>"; };
+		5A8E371F1BFA262700D6E6BC /* Transition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Transition.swift; sourceTree = "<group>"; };
 		5AEB20621BEB9D7700418692 /* SearchyView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchyView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -106,6 +130,68 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		4D1128091BFF7148004370E0 /* Search Results UI */ = {
+			isa = PBXGroup;
+			children = (
+				5A1839361BEA6BC900622B04 /* SearchyController.swift */,
+				5AEB20621BEB9D7700418692 /* SearchyView.swift */,
+				5A18395D1BEA7B4B00622B04 /* SearchyBinding.swift */,
+				5A8E371F1BFA262700D6E6BC /* Transition.swift */,
+				5A6326C01BFA8C53000B07CC /* SearchyCell.swift */,
+			);
+			name = "Search Results UI";
+			sourceTree = "<group>";
+		};
+		4D11280A1BFF717E004370E0 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				5A18395F1BEA7B8500622B04 /* SearchyModel.swift */,
+				5A1839631BEA846900622B04 /* SearchResult.swift */,
+			);
+			name = Model;
+			sourceTree = "<group>";
+		};
+		4D11280B1BFF7194004370E0 /* Service */ = {
+			isa = PBXGroup;
+			children = (
+				5A1839651BEA866300622B04 /* NetworkLayer.swift */,
+				5A1839611BEA7D8400622B04 /* SearchService.swift */,
+				5A6326AE1BFA7189000B07CC /* ImageProvider.swift */,
+			);
+			name = Service;
+			sourceTree = "<group>";
+		};
+		4D11280C1BFF71B9004370E0 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				5A3A5FB31BF3DF0700A99B68 /* ReactiveExtensions.swift */,
+				5A6326BE1BFA8ACE000B07CC /* ApplicationContext.swift */,
+			);
+			name = Common;
+			sourceTree = "<group>";
+		};
+		4D11280D1BFF7203004370E0 /* Result Detail UI */ = {
+			isa = PBXGroup;
+			children = (
+				5A6326AC1BFA6FBD000B07CC /* SearchyDetailController.swift */,
+				5A6326C21BFB8630000B07CC /* SearchyDisplayItem.swift */,
+				5A6326C41BFB868E000B07CC /* SearchyDetailView.swift */,
+			);
+			name = "Result Detail UI";
+			sourceTree = "<group>";
+		};
+		4D11280E1BFF721D004370E0 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				5A1839341BEA6BC900622B04 /* AppDelegate.swift */,
+				5A18393D1BEA6BC900622B04 /* Assets.xcassets */,
+				5A18393F1BEA6BC900622B04 /* LaunchScreen.storyboard */,
+				5A1839421BEA6BC900622B04 /* Info.plist */,
+				5A3A5FB51BF3F23700A99B68 /* main.swift */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
 		5A1839281BEA6BC900622B04 = {
 			isa = PBXGroup;
 			children = (
@@ -128,19 +214,12 @@
 		5A1839331BEA6BC900622B04 /* Searchy */ = {
 			isa = PBXGroup;
 			children = (
-				5A1839341BEA6BC900622B04 /* AppDelegate.swift */,
-				5A1839361BEA6BC900622B04 /* SearchyController.swift */,
-				5AEB20621BEB9D7700418692 /* SearchyView.swift */,
-				5A18395D1BEA7B4B00622B04 /* SearchyBinding.swift */,
-				5A18395F1BEA7B8500622B04 /* SearchyModel.swift */,
-				5A1839611BEA7D8400622B04 /* SearchService.swift */,
-				5A1839651BEA866300622B04 /* NetworkLayer.swift */,
-				5A1839631BEA846900622B04 /* SearchResult.swift */,
-				5A18393D1BEA6BC900622B04 /* Assets.xcassets */,
-				5A18393F1BEA6BC900622B04 /* LaunchScreen.storyboard */,
-				5A1839421BEA6BC900622B04 /* Info.plist */,
-				5A3A5FB31BF3DF0700A99B68 /* ReactiveExtensions.swift */,
-				5A3A5FB51BF3F23700A99B68 /* main.swift */,
+				4D11280D1BFF7203004370E0 /* Result Detail UI */,
+				4D1128091BFF7148004370E0 /* Search Results UI */,
+				4D11280A1BFF717E004370E0 /* Model */,
+				4D11280B1BFF7194004370E0 /* Service */,
+				4D11280C1BFF71B9004370E0 /* Common */,
+				4D11280E1BFF721D004370E0 /* Supporting Files */,
 			);
 			path = Searchy;
 			sourceTree = "<group>";
@@ -149,7 +228,12 @@
 			isa = PBXGroup;
 			children = (
 				5A3A5FA91BF3936800A99B68 /* SearchyModelTests.swift */,
+				5A6326B21BFA7B75000B07CC /* clone-1.png */,
+				5A6326B31BFA7B75000B07CC /* clone-2.png */,
+				5A6326B41BFA7B75000B07CC /* clone-3.png */,
+				5A6326B51BFA7B75000B07CC /* clone-4.png */,
 				5A3A5FAB1BF3936800A99B68 /* Info.plist */,
+				5A6326B01BFA7355000B07CC /* ImageProviderTests.swift */,
 			);
 			path = SearchyTests;
 			sourceTree = "<group>";
@@ -205,6 +289,7 @@
 				TargetAttributes = {
 					5A1839301BEA6BC900622B04 = {
 						CreatedOnToolsVersion = 7.1;
+						DevelopmentTeam = 4GE5RZ8NEV;
 					};
 					5A3A5FA61BF3936800A99B68 = {
 						CreatedOnToolsVersion = 7.2;
@@ -245,6 +330,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5A6326B91BFA7B75000B07CC /* clone-4.png in Resources */,
+				5A6326B81BFA7B75000B07CC /* clone-3.png in Resources */,
+				5A6326B71BFA7B75000B07CC /* clone-2.png in Resources */,
+				5A6326B61BFA7B75000B07CC /* clone-1.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -257,21 +346,29 @@
 			files = (
 				5A1839661BEA866400622B04 /* NetworkLayer.swift in Sources */,
 				5A1839371BEA6BC900622B04 /* SearchyController.swift in Sources */,
+				5A6326BF1BFA8ACE000B07CC /* ApplicationContext.swift in Sources */,
 				5A1839601BEA7B8500622B04 /* SearchyModel.swift in Sources */,
 				5A1839621BEA7D8400622B04 /* SearchService.swift in Sources */,
 				5A18395E1BEA7B4B00622B04 /* SearchyBinding.swift in Sources */,
 				5AEB20631BEB9D7700418692 /* SearchyView.swift in Sources */,
+				5A6326C31BFB8630000B07CC /* SearchyDisplayItem.swift in Sources */,
+				5A6326C11BFA8C53000B07CC /* SearchyCell.swift in Sources */,
 				5A3A5FB61BF3F23700A99B68 /* main.swift in Sources */,
 				5A1839641BEA846900622B04 /* SearchResult.swift in Sources */,
 				5A3A5FB41BF3DF0700A99B68 /* ReactiveExtensions.swift in Sources */,
 				5A1839351BEA6BC900622B04 /* AppDelegate.swift in Sources */,
+				5A6326C51BFB868E000B07CC /* SearchyDetailView.swift in Sources */,
+				5A6326AD1BFA6FBD000B07CC /* SearchyDetailController.swift in Sources */,
+				5A6326AF1BFA7189000B07CC /* ImageProvider.swift in Sources */,
+				5A8E37201BFA262700D6E6BC /* Transition.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		5A3A5FA31BF3936800A99B68 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5A6326B11BFA7355000B07CC /* ImageProviderTests.swift in Sources */,
 				5A3A5FAA1BF3936800A99B68 /* SearchyModelTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -383,15 +480,17 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/build/Debug-iphoneos",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				INFOPLIST_FILE = Searchy/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.Searchy;
+				PRODUCT_BUNDLE_IDENTIFIER = com.escappe.Searchy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -400,15 +499,17 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/build/Debug-iphoneos",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				INFOPLIST_FILE = Searchy/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.Searchy;
+				PRODUCT_BUNDLE_IDENTIFIER = com.escappe.Searchy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -422,7 +523,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				INFOPLIST_FILE = SearchyTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.SearchyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -439,7 +540,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				INFOPLIST_FILE = SearchyTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.SearchyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -475,6 +576,7 @@
 				5A3A5FAF1BF3936800A99B68 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

diff --git a/Searchy.xcodeproj/xcuserdata/dev1.xcuserdatad/xcschemes/Searchy.xcscheme b/Searchy.xcodeproj/xcuserdata/dev1.xcuserdatad/xcschemes/Searchy.xcscheme
@@ -26,8 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/Searchy.xcworkspace/xcuserdata/dev1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Searchy.xcworkspace/xcuserdata/dev1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,22 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Searchy/SearchyDetailController.swift"
+            timestampString = "469577293.629465"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "49"
+            endingLineNumber = "49"
+            landmarkName = "handlePopGesture(_:)"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/Searchy/AppDelegate.swift b/Searchy/AppDelegate.swift
@@ -4,7 +4,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	private let appWindow = UIWindow(frame: UIScreen.mainScreen().bounds)
 
 	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-		let navigationController = UINavigationController(rootViewController: SearchyController())
+		let navigationController = UINavigationController(rootViewController: SearchyController(context: ApplicationContext()))
         navigationController.navigationBar.translucent = false
         navigationController.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName : UIColor(hue:0.56, saturation:1, brightness:1, alpha:1)]
 

diff --git a/Searchy/ApplicationContext.swift b/Searchy/ApplicationContext.swift
@@ -0,0 +1,10 @@
+import Foundation
+
+struct ApplicationContext {
+    let networkLayer = URLSessionNetworkLayer()
+    let imageProvider:ImageProvider
+
+    init() {
+        imageProvider = ImageProvider(networkLayer: networkLayer)
+    }
+}
diff --git a/Searchy/Base.lproj/LaunchScreen.storyboard b/Searchy/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9527.1" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9525.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -19,11 +19,13 @@
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="searchy" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nqm-uo-otP">
                                 <rect key="frame" x="244" y="281" width="112" height="39"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="32"/>
                                 <color key="textColor" red="0.0" green="0.61201751336662236" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="Nqm-uo-otP" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="7Vt-uK-S5F"/>

diff --git a/Searchy/ImageProvider.swift b/Searchy/ImageProvider.swift
@@ -0,0 +1,27 @@
+import UIKit
+import ReactiveCocoa
+
+class ImageProvider {
+    private let networkLayer:NetworkLayer
+    var imageCache = NSCache()
+
+    init(networkLayer: NetworkLayer) {
+        self.networkLayer = networkLayer
+    }
+
+    func imageFromURL(url: NSURL) -> SignalProducer<UIImage, NoError> {
+        return SignalProducer { observer, _ in
+            if let image = self.imageCache.objectForKey(url.absoluteString) as? UIImage {
+                observer.sendNext(image)
+            } else {
+                self.networkLayer.fetchDataFromUrl(url.absoluteString, completion: { result in
+                    if case .Success(let data) = result, let image = UIImage(data: data) {
+                        self.imageCache.setObject(image, forKey: url.absoluteString)
+                        observer.sendNext(image)
+                    }
+                })
+            }
+
+        }
+    }
+}
diff --git a/Searchy/Info.plist b/Searchy/Info.plist
@@ -22,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -44,10 +49,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 </dict>
 </plist>