Skip to content

Commit 90bee6b

Browse files
zhouhao27zhouhao27
committed
Support Storyboard and code at the same time
1 parent c30c0f4 commit 90bee6b

File tree

11 files changed

+220
-37
lines changed

11 files changed

+220
-37
lines changed

‎Example/WOWCardStackView.xcodeproj/project.pbxproj

+8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
386177201E7BBF68006F4F5E /* DetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3861771F1E7BBF68006F4F5E /* DetailsViewController.swift */; };
11+
386177221E7BC2DD006F4F5E /* placeholder.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 386177211E7BC2DD006F4F5E /* placeholder.jpg */; };
1012
38F5CE7A1E7B881700A7FCA0 /* MyCard.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38F5CE791E7B881700A7FCA0 /* MyCard.xib */; };
1113
38F5CE7C1E7B8A1600A7FCA0 /* MyCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38F5CE7B1E7B8A1600A7FCA0 /* MyCard.swift */; };
1214
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
@@ -34,6 +36,8 @@
3436
0C60282BA410B7570717C313 /* Pods-WOWCardStackView_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WOWCardStackView_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WOWCardStackView_Tests/Pods-WOWCardStackView_Tests.debug.xcconfig"; sourceTree = "<group>"; };
3537
22BB6C624B682C38943B9C46 /* Pods_WOWCardStackView_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WOWCardStackView_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3638
30091B23E72D1AB9E49886BF /* Pods-WOWCardStackView_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WOWCardStackView_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-WOWCardStackView_Example/Pods-WOWCardStackView_Example.release.xcconfig"; sourceTree = "<group>"; };
39+
3861771F1E7BBF68006F4F5E /* DetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailsViewController.swift; sourceTree = "<group>"; };
40+
386177211E7BC2DD006F4F5E /* placeholder.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = placeholder.jpg; sourceTree = "<group>"; };
3741
38F5CE791E7B881700A7FCA0 /* MyCard.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyCard.xib; sourceTree = "<group>"; };
3842
38F5CE7B1E7B8A1600A7FCA0 /* MyCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyCard.swift; sourceTree = "<group>"; };
3943
5D57B462CADD95BAA877731F /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
@@ -108,6 +112,7 @@
108112
607FACD21AFB9204008FA782 /* Example for WOWCardStackView */ = {
109113
isa = PBXGroup;
110114
children = (
115+
386177211E7BC2DD006F4F5E /* placeholder.jpg */,
111116
38F5CE7B1E7B8A1600A7FCA0 /* MyCard.swift */,
112117
38F5CE791E7B881700A7FCA0 /* MyCard.xib */,
113118
607FACD51AFB9204008FA782 /* AppDelegate.swift */,
@@ -116,6 +121,7 @@
116121
607FACDC1AFB9204008FA782 /* Images.xcassets */,
117122
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
118123
607FACD31AFB9204008FA782 /* Supporting Files */,
124+
3861771F1E7BBF68006F4F5E /* DetailsViewController.swift */,
119125
);
120126
name = "Example for WOWCardStackView";
121127
path = WOWCardStackView;
@@ -257,6 +263,7 @@
257263
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
258264
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
259265
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */,
266+
386177221E7BC2DD006F4F5E /* placeholder.jpg in Resources */,
260267
38F5CE7A1E7B881700A7FCA0 /* MyCard.xib in Resources */,
261268
);
262269
runOnlyForDeploymentPostprocessing = 0;
@@ -371,6 +378,7 @@
371378
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
372379
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
373380
38F5CE7C1E7B8A1600A7FCA0 /* MyCard.swift in Sources */,
381+
386177201E7BBF68006F4F5E /* DetailsViewController.swift in Sources */,
374382
);
375383
runOnlyForDeploymentPostprocessing = 0;
376384
};

‎Example/WOWCardStackView/Base.lproj/Main.storyboard

+66-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="op4-yf-pKr">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
@@ -23,10 +23,10 @@
2323
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2424
<subviews>
2525
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dDK-WX-GHa" customClass="CardStackView" customModule="WOWCardStackView">
26-
<rect key="frame" x="16" y="46" width="343" height="240"/>
26+
<rect key="frame" x="16" y="90" width="343" height="160"/>
2727
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
2828
<constraints>
29-
<constraint firstAttribute="height" constant="240" id="fAk-FB-6sw"/>
29+
<constraint firstAttribute="height" constant="160" id="fAk-FB-6sw"/>
3030
</constraints>
3131
<userDefinedRuntimeAttributes>
3232
<userDefinedRuntimeAttribute type="number" keyPath="offsetY">
@@ -45,12 +45,75 @@
4545
<constraint firstItem="dDK-WX-GHa" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="26" id="qEt-xJ-I2T"/>
4646
</constraints>
4747
</view>
48+
<navigationItem key="navigationItem" id="qIW-yo-dKi"/>
4849
<connections>
4950
<outlet property="cardStackView" destination="dDK-WX-GHa" id="JNs-fP-TUY"/>
51+
<segue destination="mHi-HE-Qju" kind="show" identifier="ShowDetails" id="gPK-Ia-wKS"/>
5052
</connections>
5153
</viewController>
5254
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
5355
</objects>
56+
<point key="canvasLocation" x="1076" y="138.98050974512745"/>
57+
</scene>
58+
<!--Details View Controller-->
59+
<scene sceneID="TFS-vb-h7A">
60+
<objects>
61+
<viewController storyboardIdentifier="DetailsViewController" id="mHi-HE-Qju" customClass="DetailsViewController" customModule="WOWCardStackView_Example" customModuleProvider="target" sceneMemberID="viewController">
62+
<layoutGuides>
63+
<viewControllerLayoutGuide type="top" id="Byb-Zc-DtF"/>
64+
<viewControllerLayoutGuide type="bottom" id="Kf6-Tq-1eM"/>
65+
</layoutGuides>
66+
<view key="view" contentMode="scaleToFill" id="NM4-L1-Iov">
67+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
68+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
69+
<subviews>
70+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CL8-c8-W96" customClass="CardStackView" customModule="WOWCardStackView">
71+
<rect key="frame" x="16" y="84" width="343" height="320"/>
72+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
73+
<constraints>
74+
<constraint firstAttribute="height" constant="320" id="T33-cE-T53"/>
75+
</constraints>
76+
<userDefinedRuntimeAttributes>
77+
<userDefinedRuntimeAttribute type="number" keyPath="offsetY">
78+
<real key="value" value="10"/>
79+
</userDefinedRuntimeAttribute>
80+
<userDefinedRuntimeAttribute type="number" keyPath="scaleFactor">
81+
<real key="value" value="0.98999999999999999"/>
82+
</userDefinedRuntimeAttribute>
83+
</userDefinedRuntimeAttributes>
84+
</view>
85+
</subviews>
86+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
87+
<constraints>
88+
<constraint firstItem="CL8-c8-W96" firstAttribute="top" secondItem="Byb-Zc-DtF" secondAttribute="bottom" constant="20" id="LNe-1e-FDN"/>
89+
<constraint firstItem="CL8-c8-W96" firstAttribute="leading" secondItem="NM4-L1-Iov" secondAttribute="leadingMargin" id="VX7-v2-UKN"/>
90+
<constraint firstItem="CL8-c8-W96" firstAttribute="trailing" secondItem="NM4-L1-Iov" secondAttribute="trailingMargin" id="sVp-RI-2OM"/>
91+
</constraints>
92+
</view>
93+
<connections>
94+
<outlet property="cardStackView" destination="CL8-c8-W96" id="wly-Hz-2Be"/>
95+
</connections>
96+
</viewController>
97+
<placeholder placeholderIdentifier="IBFirstResponder" id="dZP-uD-Gf3" userLabel="First Responder" sceneMemberID="firstResponder"/>
98+
</objects>
99+
<point key="canvasLocation" x="1892" y="131.78410794602701"/>
100+
</scene>
101+
<!--Navigation Controller-->
102+
<scene sceneID="IJB-WP-ss1">
103+
<objects>
104+
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="op4-yf-pKr" sceneMemberID="viewController">
105+
<toolbarItems/>
106+
<navigationBar key="navigationBar" contentMode="scaleToFill" id="QaB-pn-J39">
107+
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
108+
<autoresizingMask key="autoresizingMask"/>
109+
</navigationBar>
110+
<nil name="viewControllers"/>
111+
<connections>
112+
<segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="UTh-1x-FVi"/>
113+
</connections>
114+
</navigationController>
115+
<placeholder placeholderIdentifier="IBFirstResponder" id="pCu-VV-fi7" userLabel="First Responder" sceneMemberID="firstResponder"/>
116+
</objects>
54117
<point key="canvasLocation" x="136.80000000000001" y="138.98050974512745"/>
55118
</scene>
56119
</scenes>

‎Example/WOWCardStackView/DetailsViewController.swift

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
//
2+
// DetailsViewController.swift
3+
// WOWCardStackView
4+
//
5+
// Created by Zhou Hao on 17/3/17.
6+
// Copyright © 2017 CocoaPods. All rights reserved.
7+
//
8+
9+
import UIKit
10+
import WOWCardStackView
11+
12+
class DetailsViewController: UIViewController, CardStackViewDataSource {
13+
14+
@IBOutlet weak var cardStackView: CardStackView!
15+
var id: Int!
16+
var orderNo: Int = 5
17+
18+
override func viewDidLoad() {
19+
super.viewDidLoad()
20+
21+
self.title = "\(id!)"
22+
23+
cardStackView.register(nib: UINib(nibName: "MyCard", bundle: nil))
24+
cardStackView.dataSource = self
25+
26+
}
27+
28+
func nextCard(in: CardStackView) -> CardView? {
29+
let card = cardStackView.dequeueCardView() as! MyCard
30+
card.numberLabel.text = "\(orderNo)"
31+
orderNo += 1
32+
return card
33+
}
34+
35+
func cardStackView(_ cardStackView: CardStackView, cardAt index: Int) -> CardView {
36+
let card = cardStackView.dequeueCardView() as! MyCard
37+
card.numberLabel.text = "\(index)"
38+
return card
39+
}
40+
41+
func numOfCardInStackView(_ cardStackView: CardStackView) -> Int {
42+
return 5
43+
}
44+
45+
}

‎Example/WOWCardStackView/MyCard.swift

+12
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,17 @@ import WOWCardStackView
1111

1212
class MyCard: CardView {
1313
@IBOutlet weak var numberLabel: UILabel!
14+
15+
var id: Int
16+
17+
init(id: Int) {
18+
self.id = id
19+
super.init(frame: CGRect.zero)
20+
}
21+
22+
required init?(coder aDecoder: NSCoder) {
23+
self.id = 0
24+
super.init(coder: aDecoder)
25+
}
1426

1527
}

‎Example/WOWCardStackView/MyCard.xib

+24-6
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,34 @@
1212
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MyCard" customModule="WOWCardStackView_Example" customModuleProvider="target"/>
1313
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
1414
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MyCard" customModule="WOWCardStackView_Example" customModuleProvider="target">
15-
<rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
15+
<rect key="frame" x="0.0" y="0.0" width="375" height="300"/>
1616
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1717
<subviews>
18-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ngz-wL-ZLy">
19-
<rect key="frame" x="166.5" y="90" width="42" height="21"/>
18+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="placeholder.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="fkF-YI-OSe">
19+
<rect key="frame" x="0.0" y="0.0" width="375" height="240"/>
20+
<constraints>
21+
<constraint firstAttribute="height" constant="240" id="DXe-0C-9LA"/>
22+
</constraints>
23+
</imageView>
24+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6j4-eA-66Y">
25+
<rect key="frame" x="6" y="259" width="88" height="21"/>
26+
<constraints>
27+
<constraint firstAttribute="height" constant="21" id="jXL-Pv-tZY"/>
28+
<constraint firstAttribute="width" constant="88" id="jkG-49-l0l"/>
29+
</constraints>
2030
<fontDescription key="fontDescription" type="system" pointSize="17"/>
2131
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
2232
<nil key="highlightedColor"/>
2333
</label>
2434
</subviews>
2535
<color key="backgroundColor" red="0.01176470588" green="0.66274509800000003" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
2636
<constraints>
27-
<constraint firstItem="Ngz-wL-ZLy" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="RAH-Ae-Ysf"/>
28-
<constraint firstItem="Ngz-wL-ZLy" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="UZy-M5-sUv"/>
37+
<constraint firstItem="6j4-eA-66Y" firstAttribute="top" secondItem="fkF-YI-OSe" secondAttribute="bottom" constant="19" id="3nC-By-N8r"/>
38+
<constraint firstItem="6j4-eA-66Y" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="6" id="DcU-rP-W87"/>
39+
<constraint firstAttribute="trailing" secondItem="fkF-YI-OSe" secondAttribute="trailing" id="LQx-Vu-0GK"/>
40+
<constraint firstItem="fkF-YI-OSe" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="T8D-d6-9Cp"/>
41+
<constraint firstItem="fkF-YI-OSe" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="lH3-DK-Mdo"/>
42+
<constraint firstAttribute="bottom" secondItem="6j4-eA-66Y" secondAttribute="bottom" constant="20" id="sMK-YU-WGE"/>
2943
</constraints>
3044
<nil key="simulatedStatusBarMetrics"/>
3145
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -39,8 +53,12 @@
3953
<userDefinedRuntimeAttribute type="boolean" keyPath="isShadowed" value="YES"/>
4054
</userDefinedRuntimeAttributes>
4155
<connections>
42-
<outlet property="numberLabel" destination="Ngz-wL-ZLy" id="v1t-RG-0c1"/>
56+
<outlet property="numberLabel" destination="6j4-eA-66Y" id="aSN-ey-bcs"/>
4357
</connections>
58+
<point key="canvasLocation" x="33.5" y="54"/>
4459
</view>
4560
</objects>
61+
<resources>
62+
<image name="placeholder.jpg" width="1280" height="800"/>
63+
</resources>
4664
</document>

‎Example/WOWCardStackView/ViewController.swift

+31-8
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,58 @@
99
import UIKit
1010
import WOWCardStackView
1111

12-
class ViewController: UIViewController, CardStackViewDataSource {
12+
class ViewController: UIViewController, CardStackViewDataSource, CardStackViewDelegate {
1313

1414
@IBOutlet weak var cardStackView: CardStackView!
1515
var orderNo: Int = 3
1616

1717
override func viewDidLoad() {
1818
super.viewDidLoad()
1919

20-
cardStackView.register(nib: UINib(nibName: "MyCard", bundle: nil))
2120
cardStackView.dataSource = self
22-
cardStackView.reloadData()
21+
cardStackView.delegate = self
2322
}
2423

2524
func nextCard(in: CardStackView) -> CardView? {
26-
let card = cardStackView.dequeueCardView() as! MyCard
27-
card.numberLabel.text = "\(orderNo)"
25+
let card = createCard(order: orderNo)
2826
orderNo += 1
2927
return card
3028
}
3129

3230
func cardStackView(_ cardStackView: CardStackView, cardAt index: Int) -> CardView {
33-
let card = cardStackView.dequeueCardView() as! MyCard
34-
card.numberLabel.text = "\(index)"
35-
return card
31+
return createCard(order: index)
3632
}
3733

3834
func numOfCardInStackView(_ cardStackView: CardStackView) -> Int {
3935
return 3
4036
}
37+
38+
public func cardStackView(_: CardStackView, didSelect card: CardView) {
39+
if let card = card as? MyCard {
40+
print("Clicked: \(card.id)")
41+
42+
if let details = self.storyboard?.instantiateViewController(withIdentifier: "DetailsViewController") as? DetailsViewController {
43+
details.id = card.id
44+
self.navigationController?.pushViewController(details, animated: true)
45+
}
46+
}
47+
}
48+
49+
func createCard(order: Int) -> MyCard {
50+
let card = MyCard(id: order)
51+
card.id = order
52+
let label = UILabel(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
53+
label.font = UIFont(name: "Arial", size: 28)
54+
label.text = "\(order)"
55+
label.textAlignment = .center
56+
label.textColor = UIColor.white
57+
card.addSubview(label)
58+
card.backgroundColor = UIColor.red
59+
card.borderWidth = 1.0
60+
card.borderColor = UIColor.lightGray
61+
card.isShadowed = true
62+
return card
63+
}
4164

4265
}
4366

‎Example/WOWCardStackView/placeholder.jpg

72.4 KB
Loading

‎WOWCardStackView.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'WOWCardStackView'
11-
s.version = '0.1.2'
11+
s.version = '0.1.3'
1212
s.summary = 'Swapable Card Stack View in Swift 3.0.'
1313

1414
# This description is used to generate tags and improve search results.

0 commit comments

Comments
 (0)