From 0b165d9acf9b81ad44f565fce0946def7df7187d Mon Sep 17 00:00:00 2001
From: Justin Heo <jstnheo@gmail.com>
Date: Wed, 27 Jan 2016 00:50:47 -0800
Subject: [PATCH] Convenience init for RippleView

---
 Minamo.xcodeproj/project.pbxproj                 | 8 +-------
 Minamo/RippleView.swift                          | 8 +++++++-
 MinamoExample/Base.lproj/LaunchScreen.storyboard | 5 ++---
 MinamoExample/Base.lproj/Main.storyboard         | 6 ++----
 MinamoExample/ViewController.swift               | 4 +---
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Minamo.xcodeproj/project.pbxproj b/Minamo.xcodeproj/project.pbxproj
index 5c81b03..c44993d 100644
--- a/Minamo.xcodeproj/project.pbxproj
+++ b/Minamo.xcodeproj/project.pbxproj
@@ -8,16 +8,13 @@
 
 /* Begin PBXBuildFile section */
 		4622B5301C5111BF00DBE9E5 /* Minamo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4622B5251C5111BF00DBE9E5 /* Minamo.framework */; };
-		46C6CDCF1C55BD4600FB146D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 46C6CDCC1C55BD4600FB146D /* Info.plist */; };
 		46C6CDD01C55BD4600FB146D /* RippleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46C6CDCD1C55BD4600FB146D /* RippleView.swift */; };
 		46C6CDDA1C55BD5100FB146D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46C6CDD21C55BD5100FB146D /* AppDelegate.swift */; };
 		46C6CDDB1C55BD5100FB146D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 46C6CDD31C55BD5100FB146D /* Assets.xcassets */; };
 		46C6CDDC1C55BD5100FB146D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 46C6CDD41C55BD5100FB146D /* LaunchScreen.storyboard */; };
 		46C6CDDD1C55BD5100FB146D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 46C6CDD61C55BD5100FB146D /* Main.storyboard */; };
-		46C6CDDE1C55BD5100FB146D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 46C6CDD81C55BD5100FB146D /* Info.plist */; };
 		46C6CDDF1C55BD5100FB146D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46C6CDD91C55BD5100FB146D /* ViewController.swift */; };
 		46C6CDE31C55BD6200FB146D /* MinamoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46C6CDE11C55BD6200FB146D /* MinamoTests.swift */; };
-		46C6CDE41C55BD6200FB146D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 46C6CDE21C55BD6200FB146D /* Info.plist */; };
 		46C6CDE51C55BD6800FB146D /* RippleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46C6CDCD1C55BD4600FB146D /* RippleView.swift */; };
 /* End PBXBuildFile section */
 
@@ -197,7 +194,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = yukiasai;
 				TargetAttributes = {
 					4622B5241C5111BF00DBE9E5 = {
@@ -236,7 +233,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				46C6CDCF1C55BD4600FB146D /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -244,7 +240,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				46C6CDE41C55BD6200FB146D /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -252,7 +247,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				46C6CDDE1C55BD5100FB146D /* Info.plist in Resources */,
 				46C6CDDD1C55BD5100FB146D /* Main.storyboard in Resources */,
 				46C6CDDB1C55BD5100FB146D /* Assets.xcassets in Resources */,
 				46C6CDDC1C55BD5100FB146D /* LaunchScreen.storyboard in Resources */,
diff --git a/Minamo/RippleView.swift b/Minamo/RippleView.swift
index 80a2bff..7ebbcaa 100644
--- a/Minamo/RippleView.swift
+++ b/Minamo/RippleView.swift
@@ -32,7 +32,13 @@ public class RippleView: UIView {
     public var coreImage: UIImage? {
         didSet { imageView.image = coreImage }
     }
-    
+
+    convenience init(image: UIImage?, tintColor: UIColor = UIColor(red: 0.3, green: 0.7, blue: 1, alpha: 1)) {
+        self.init()
+        imageView.image = image
+        self.tintColor = tintColor
+    }
+
     init() {
         super.init(frame: CGRectZero)
         commonInit()
diff --git a/MinamoExample/Base.lproj/LaunchScreen.storyboard b/MinamoExample/Base.lproj/LaunchScreen.storyboard
index d6f2932..78686cd 100644
--- a/MinamoExample/Base.lproj/LaunchScreen.storyboard
+++ b/MinamoExample/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="9060" systemVersion="14F27" 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="9531" systemVersion="15C50" 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="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -16,7 +16,6 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
diff --git a/MinamoExample/Base.lproj/Main.storyboard b/MinamoExample/Base.lproj/Main.storyboard
index 582b091..c305ffc 100644
--- a/MinamoExample/Base.lproj/Main.storyboard
+++ b/MinamoExample/Base.lproj/Main.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="9060" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="CWA-gU-AtV">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="CWA-gU-AtV">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->
@@ -14,7 +14,6 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="SaO-cA-lRg">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <animations/>
                     </navigationBar>
                     <connections>
                         <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="y8L-Dv-HsL"/>
@@ -58,7 +57,6 @@ written in Swift.</string>
                                 </constraints>
                             </imageView>
                         </subviews>
-                        <animations/>
                         <color key="backgroundColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="DUs-4n-AgT" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="GOl-Au-OYA"/>
diff --git a/MinamoExample/ViewController.swift b/MinamoExample/ViewController.swift
index b0d282b..b9e201f 100644
--- a/MinamoExample/ViewController.swift
+++ b/MinamoExample/ViewController.swift
@@ -11,9 +11,7 @@ import UIKit
 class ViewController: UIViewController {
     
     let rippleView = { Void -> RippleView in
-        let view = RippleView()
-        view.tintColor = UIColor(red: 0.3, green: 0.7, blue: 1, alpha: 1)
-        view.coreImage = UIImage(named: "q")
+        let view = RippleView(image: UIImage(named: "q"), tintColor: UIColor(red: 0.3, green: 0.7, blue: 1, alpha: 1))
         return view
     }()