Skip to content

Convenience init for RippleView #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jstnheo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convenience init for RippleView #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Minamo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -197,7 +194,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0710;
LastUpgradeCheck = 0720;
ORGANIZATIONNAME = yukiasai;
TargetAttributes = {
4622B5241C5111BF00DBE9E5 = {
Expand Down Expand Up @@ -236,23 +233,20 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
46C6CDCF1C55BD4600FB146D /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4622B52D1C5111BF00DBE9E5 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
46C6CDE41C55BD6200FB146D /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4622B5431C51160600DBE9E5 /* Resources */ = {
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 */,
Expand Down
8 changes: 7 additions & 1 deletion Minamo/RippleView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 2 additions & 3 deletions MinamoExample/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-->
Expand All @@ -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>
Expand Down
6 changes: 2 additions & 4 deletions MinamoExample/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-->
Expand All @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down
4 changes: 1 addition & 3 deletions MinamoExample/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}()

Expand Down