Skip to content

Commit 2d88caf

Browse files
jcavarjcavar
committed
Merge branch 'subviews'
# Conflicts: # PullToRefreshDemo/Base.lproj/Main.storyboard # PullToRefreshDemo/BeatAnimator.swift # PullToRefreshDemo/PacmanAnimator.swift # PullToRefreshDemo/PullToRefreshViewController.swift # Refresher/Animator.swift # Refresher/PullToRefreshView.swift
2 parents 8359636 + 687f3d4 commit 2d88caf

11 files changed

+498
-226
lines changed

‎PullToRefresh.xcodeproj/project.pbxproj

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
C7AC6CFC19A894DF007107DF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7AC6CF619A894DF007107DF /* AppDelegate.swift */; };
2323
C7AC6CFD19A894DF007107DF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C7AC6CF719A894DF007107DF /* Main.storyboard */; };
2424
C7AC6CFE19A894DF007107DF /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C7AC6CF919A894DF007107DF /* Images.xcassets */; };
25-
C7AC6D0019A894DF007107DF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7AC6CFB19A894DF007107DF /* ViewController.swift */; };
25+
C7AC6D0019A894DF007107DF /* PullToRefreshViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7AC6CFB19A894DF007107DF /* PullToRefreshViewController.swift */; };
26+
C7AEDC171B6D53D100E09098 /* ChooseModeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7AEDC161B6D53D100E09098 /* ChooseModeViewController.swift */; };
27+
C7B53A431AC996B80021914B /* CustomSubview.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7B53A421AC996B80021914B /* CustomSubview.swift */; };
28+
C7B53A451AC9971C0021914B /* CustomSubview.xib in Resources */ = {isa = PBXBuildFile; fileRef = C7B53A441AC9971C0021914B /* CustomSubview.xib */; };
2629
C7DA91CD19B31B7C00C4012B /* Animator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7DA91CC19B31B7C00C4012B /* Animator.swift */; };
2730
C7DA91CE19B348EA00C4012B /* Animator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7DA91CC19B31B7C00C4012B /* Animator.swift */; };
2831
/* End PBXBuildFile section */
@@ -82,7 +85,10 @@
8285
C7AC6CF819A894DF007107DF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8386
C7AC6CF919A894DF007107DF /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
8487
C7AC6CFA19A894DF007107DF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
85-
C7AC6CFB19A894DF007107DF /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
88+
C7AC6CFB19A894DF007107DF /* PullToRefreshViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PullToRefreshViewController.swift; sourceTree = "<group>"; };
89+
C7AEDC161B6D53D100E09098 /* ChooseModeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChooseModeViewController.swift; sourceTree = "<group>"; };
90+
C7B53A421AC996B80021914B /* CustomSubview.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomSubview.swift; sourceTree = "<group>"; };
91+
C7B53A441AC9971C0021914B /* CustomSubview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomSubview.xib; sourceTree = "<group>"; };
8692
C7D1CF8F199BB3C8009FD485 /* PullToRefreshDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PullToRefreshDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
8793
C7DA91CC19B31B7C00C4012B /* Animator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Animator.swift; sourceTree = "<group>"; };
8894
/* End PBXFileReference section */
@@ -164,14 +170,33 @@
164170
isa = PBXGroup;
165171
children = (
166172
C7AC6CF619A894DF007107DF /* AppDelegate.swift */,
167-
C7AC6CFB19A894DF007107DF /* ViewController.swift */,
173+
C7AEDC181B6D53DA00E09098 /* ViewController */,
168174
C7AC6CF719A894DF007107DF /* Main.storyboard */,
169175
C7AC6CF919A894DF007107DF /* Images.xcassets */,
170176
C7956A3D19A8966400CF6484 /* Supporting Files */,
177+
C7AEDC191B6D53E000E09098 /* Animator */,
178+
);
179+
path = PullToRefreshDemo;
180+
sourceTree = "<group>";
181+
};
182+
C7AEDC181B6D53DA00E09098 /* ViewController */ = {
183+
isa = PBXGroup;
184+
children = (
185+
C7AC6CFB19A894DF007107DF /* PullToRefreshViewController.swift */,
186+
C7AEDC161B6D53D100E09098 /* ChooseModeViewController.swift */,
187+
);
188+
name = ViewController;
189+
sourceTree = "<group>";
190+
};
191+
C7AEDC191B6D53E000E09098 /* Animator */ = {
192+
isa = PBXGroup;
193+
children = (
171194
C7A355A119B612D5000DDC72 /* BeatAnimator.swift */,
172195
C7A355D019B62125000DDC72 /* PacmanAnimator.swift */,
196+
C7B53A421AC996B80021914B /* CustomSubview.swift */,
197+
C7B53A441AC9971C0021914B /* CustomSubview.xib */,
173198
);
174-
path = PullToRefreshDemo;
199+
name = Animator;
175200
sourceTree = "<group>";
176201
};
177202
C7D1CF86199BB3C8009FD485 = {
@@ -326,6 +351,7 @@
326351
files = (
327352
C7AC6CFD19A894DF007107DF /* Main.storyboard in Resources */,
328353
C7AC6CFE19A894DF007107DF /* Images.xcassets in Resources */,
354+
C7B53A451AC9971C0021914B /* CustomSubview.xib in Resources */,
329355
);
330356
runOnlyForDeploymentPostprocessing = 0;
331357
};
@@ -360,8 +386,10 @@
360386
buildActionMask = 2147483647;
361387
files = (
362388
C7A355D119B62125000DDC72 /* PacmanAnimator.swift in Sources */,
363-
C7AC6D0019A894DF007107DF /* ViewController.swift in Sources */,
389+
C7B53A431AC996B80021914B /* CustomSubview.swift in Sources */,
390+
C7AC6D0019A894DF007107DF /* PullToRefreshViewController.swift in Sources */,
364391
C7AC6CFC19A894DF007107DF /* AppDelegate.swift in Sources */,
392+
C7AEDC171B6D53D100E09098 /* ChooseModeViewController.swift in Sources */,
365393
C7A355A219B612D5000DDC72 /* BeatAnimator.swift in Sources */,
366394
);
367395
runOnlyForDeploymentPostprocessing = 0;

‎PullToRefreshDemo/Base.lproj/Main.storyboard

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,97 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="RWb-co-Zty">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="RWb-co-Zty">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
55
</dependencies>
66
<scenes>
77
<!--Navigation Controller-->
88
<scene sceneID="Rsh-zy-279">
99
<objects>
1010
<navigationController id="RWb-co-Zty" sceneMemberID="viewController">
11-
<navigationBar key="navigationBar" contentMode="scaleToFill" id="UI3-5k-GHX">
11+
<navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="UI3-5k-GHX">
1212
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
1313
<autoresizingMask key="autoresizingMask"/>
1414
<color key="barTintColor" red="0.96862751245498657" green="0.96862751245498657" blue="0.96862751245498657" alpha="1" colorSpace="deviceRGB"/>
1515
</navigationBar>
1616
<connections>
17-
<segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="UhW-aa-ZwF"/>
17+
<segue destination="RFH-zq-9gR" kind="relationship" relationship="rootViewController" id="WGV-CK-QNn"/>
1818
</connections>
1919
</navigationController>
2020
<placeholder placeholderIdentifier="IBFirstResponder" id="Vwd-RL-BVZ" userLabel="First Responder" sceneMemberID="firstResponder"/>
2121
</objects>
2222
<point key="canvasLocation" x="-655" y="59"/>
2323
</scene>
24+
<!--Choose Mode View Controller-->
25+
<scene sceneID="oAy-Hl-ycD">
26+
<objects>
27+
<viewController id="RFH-zq-9gR" customClass="ChooseModeViewController" customModule="PullToRefreshDemo" customModuleProvider="target" sceneMemberID="viewController">
28+
<layoutGuides>
29+
<viewControllerLayoutGuide type="top" id="Jwa-dH-WnZ"/>
30+
<viewControllerLayoutGuide type="bottom" id="WkW-1z-Uxh"/>
31+
</layoutGuides>
32+
<view key="view" contentMode="scaleToFill" id="SeT-4b-Nhw">
33+
<rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
34+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
35+
<subviews>
36+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8ef-eQ-bwJ">
37+
<rect key="frame" x="144" y="96" width="32" height="30"/>
38+
<state key="normal" title="Beat">
39+
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
40+
</state>
41+
<connections>
42+
<action selector="beatAction:" destination="RFH-zq-9gR" eventType="touchUpInside" id="j1e-Ug-Hw7"/>
43+
</connections>
44+
</button>
45+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Phb-fN-T5w">
46+
<rect key="frame" x="132" y="134" width="56" height="30"/>
47+
<state key="normal" title="Pacman">
48+
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
49+
</state>
50+
<connections>
51+
<action selector="pacmanAction:" destination="RFH-zq-9gR" eventType="touchUpInside" id="aK3-Na-Pco"/>
52+
</connections>
53+
</button>
54+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bnx-XC-RaR">
55+
<rect key="frame" x="133" y="172" width="54" height="30"/>
56+
<state key="normal" title="Custom">
57+
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
58+
</state>
59+
<connections>
60+
<action selector="customAction:" destination="RFH-zq-9gR" eventType="touchUpInside" id="LfN-aH-EiW"/>
61+
</connections>
62+
</button>
63+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h5G-X9-Qyf">
64+
<rect key="frame" x="136" y="58" width="49" height="30"/>
65+
<state key="normal" title="Default">
66+
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
67+
</state>
68+
<connections>
69+
<action selector="defaultAction:" destination="RFH-zq-9gR" eventType="touchUpInside" id="vuF-tC-pFA"/>
70+
</connections>
71+
</button>
72+
</subviews>
73+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
74+
<constraints>
75+
<constraint firstAttribute="centerX" secondItem="Phb-fN-T5w" secondAttribute="centerX" id="PCV-Gn-Hr1"/>
76+
<constraint firstAttribute="centerX" secondItem="8ef-eQ-bwJ" secondAttribute="centerX" id="age-3w-nqf"/>
77+
<constraint firstAttribute="centerX" secondItem="Bnx-XC-RaR" secondAttribute="centerX" id="b7p-mx-ov2"/>
78+
<constraint firstItem="8ef-eQ-bwJ" firstAttribute="top" secondItem="h5G-X9-Qyf" secondAttribute="bottom" constant="8" id="d05-jf-IhB"/>
79+
<constraint firstItem="h5G-X9-Qyf" firstAttribute="top" secondItem="Jwa-dH-WnZ" secondAttribute="bottom" constant="58" id="eMs-2s-g1f"/>
80+
<constraint firstItem="Bnx-XC-RaR" firstAttribute="top" secondItem="Phb-fN-T5w" secondAttribute="bottom" constant="8" id="mTB-9E-ci7"/>
81+
<constraint firstItem="Phb-fN-T5w" firstAttribute="top" secondItem="8ef-eQ-bwJ" secondAttribute="bottom" constant="8" id="u0s-Uu-qxY"/>
82+
<constraint firstAttribute="centerX" secondItem="h5G-X9-Qyf" secondAttribute="centerX" id="wpB-gj-h9z"/>
83+
</constraints>
84+
</view>
85+
<navigationItem key="navigationItem" id="o92-TZ-fbq"/>
86+
</viewController>
87+
<placeholder placeholderIdentifier="IBFirstResponder" id="V7h-TM-QaQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
88+
</objects>
89+
<point key="canvasLocation" x="-243" y="59"/>
90+
</scene>
2491
<!--Pull to refresh example-->
2592
<scene sceneID="tne-QT-ifu">
2693
<objects>
27-
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="PullToRefreshDemo" customModuleProvider="target" sceneMemberID="viewController">
94+
<viewController storyboardIdentifier="PullToRefreshViewController" id="BYZ-38-t0r" customClass="PullToRefreshViewController" customModule="PullToRefreshDemo" customModuleProvider="target" sceneMemberID="viewController">
2895
<layoutGuides>
2996
<viewControllerLayoutGuide type="top" id="Da1-dG-drI"/>
3097
<viewControllerLayoutGuide type="bottom" id="Uca-LH-LIW"/>
@@ -34,7 +101,7 @@
34101
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
35102
<subviews>
36103
<tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="h8l-ma-AYT">
37-
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
104+
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
38105
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
39106
<sections/>
40107
<connections>
@@ -44,9 +111,9 @@
44111
</subviews>
45112
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
46113
<constraints>
47-
<constraint firstItem="h8l-ma-AYT" firstAttribute="top" secondItem="Da1-dG-drI" secondAttribute="bottom" id="38z-sU-HmL"/>
48114
<constraint firstItem="Uca-LH-LIW" firstAttribute="top" secondItem="h8l-ma-AYT" secondAttribute="bottom" id="D8K-CE-Vq7"/>
49115
<constraint firstAttribute="trailing" secondItem="h8l-ma-AYT" secondAttribute="trailing" id="Er9-4b-QHO"/>
116+
<constraint firstItem="h8l-ma-AYT" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="Nkq-8N-Au9"/>
50117
<constraint firstItem="h8l-ma-AYT" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="Z3q-lz-tWx"/>
51118
</constraints>
52119
</view>
@@ -57,7 +124,7 @@
57124
</viewController>
58125
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
59126
</objects>
60-
<point key="canvasLocation" x="-231" y="59"/>
127+
<point key="canvasLocation" x="124" y="59"/>
61128
</scene>
62129
</scenes>
63130
<simulatedMetricsContainer key="defaultSimulatedMetrics">

0 commit comments

Comments
 (0)