Skip to content

Commit e4effc0

Browse files
davidaskdavidask
committed
Clean up example
1 parent 9e85209 commit e4effc0

File tree

20 files changed

+148
-1286
lines changed

20 files changed

+148
-1286
lines changed

‎Example/StateViewControllerExample.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,36 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
B76FCF8D24DBECFE0014697B /* StateViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B76FCF8B24DBECFA0014697B /* StateViewController.framework */; };
11+
B76FCF8E24DBECFE0014697B /* StateViewController.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B76FCF8B24DBECFA0014697B /* StateViewController.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1012
B77C0EEC2125ED3700E88C7E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B77C0EEB2125ED3700E88C7E /* AppDelegate.swift */; };
1113
B77C0EEE2125ED3700E88C7E /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B77C0EED2125ED3700E88C7E /* TableViewController.swift */; };
1214
B77C0EF12125ED3800E88C7E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B77C0EEF2125ED3800E88C7E /* Main.storyboard */; };
1315
B77C0EF32125ED3900E88C7E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B77C0EF22125ED3900E88C7E /* Assets.xcassets */; };
1416
B77C0EF62125ED3900E88C7E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B77C0EF42125ED3900E88C7E /* LaunchScreen.storyboard */; };
15-
B77C0F052125EE1A00E88C7E /* StateViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B77C0F022125ED5800E88C7E /* StateViewController.framework */; };
16-
B77C0F062125EE1A00E88C7E /* StateViewController.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B77C0F022125ED5800E88C7E /* StateViewController.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1717
B77C0F0C2125EF4000E88C7E /* ListStateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B77C0F0B2125EF4000E88C7E /* ListStateViewController.swift */; };
1818
B77C0F0E2125EFC300E88C7E /* ActivityIndicatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B77C0F0D2125EFC300E88C7E /* ActivityIndicatorViewController.swift */; };
1919
B77C0F102125F14400E88C7E /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B77C0F0F2125F14400E88C7E /* Comment.swift */; };
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXContainerItemProxy section */
23-
B77C0F012125ED5800E88C7E /* PBXContainerItemProxy */ = {
23+
B76FCF8A24DBECFA0014697B /* PBXContainerItemProxy */ = {
2424
isa = PBXContainerItemProxy;
2525
containerPortal = B77C0EFD2125ED5800E88C7E /* StateViewController.xcodeproj */;
2626
proxyType = 2;
27-
remoteGlobalIDString = B76AA3B7212052B500020277;
28-
remoteInfo = "StateViewController iOS";
29-
};
30-
B77C0F072125EE1A00E88C7E /* PBXContainerItemProxy */ = {
31-
isa = PBXContainerItemProxy;
32-
containerPortal = B77C0EFD2125ED5800E88C7E /* StateViewController.xcodeproj */;
33-
proxyType = 1;
34-
remoteGlobalIDString = B76AA3B6212052B500020277;
35-
remoteInfo = "StateViewController iOS";
27+
remoteGlobalIDString = "StateViewController::StateViewController::Product";
28+
remoteInfo = StateViewController;
3629
};
3730
/* End PBXContainerItemProxy section */
3831

3932
/* Begin PBXCopyFilesBuildPhase section */
40-
B77C0F092125EE1A00E88C7E /* Embed Frameworks */ = {
33+
B76FCF8F24DBECFE0014697B /* Embed Frameworks */ = {
4134
isa = PBXCopyFilesBuildPhase;
4235
buildActionMask = 2147483647;
4336
dstPath = "";
4437
dstSubfolderSpec = 10;
4538
files = (
46-
B77C0F062125EE1A00E88C7E /* StateViewController.framework in Embed Frameworks */,
39+
B76FCF8E24DBECFE0014697B /* StateViewController.framework in Embed Frameworks */,
4740
);
4841
name = "Embed Frameworks";
4942
runOnlyForDeploymentPostprocessing = 0;
@@ -69,19 +62,27 @@
6962
isa = PBXFrameworksBuildPhase;
7063
buildActionMask = 2147483647;
7164
files = (
72-
B77C0F052125EE1A00E88C7E /* StateViewController.framework in Frameworks */,
65+
B76FCF8D24DBECFE0014697B /* StateViewController.framework in Frameworks */,
7366
);
7467
runOnlyForDeploymentPostprocessing = 0;
7568
};
7669
/* End PBXFrameworksBuildPhase section */
7770

7871
/* Begin PBXGroup section */
72+
B76FCF8C24DBECFE0014697B /* Frameworks */ = {
73+
isa = PBXGroup;
74+
children = (
75+
);
76+
name = Frameworks;
77+
sourceTree = "<group>";
78+
};
7979
B77C0EDF2125ED3700E88C7E = {
8080
isa = PBXGroup;
8181
children = (
8282
B77C0EFD2125ED5800E88C7E /* StateViewController.xcodeproj */,
8383
B77C0EEA2125ED3700E88C7E /* StateViewControllerExample */,
8484
B77C0EE92125ED3700E88C7E /* Products */,
85+
B76FCF8C24DBECFE0014697B /* Frameworks */,
8586
);
8687
sourceTree = "<group>";
8788
};
@@ -112,7 +113,7 @@
112113
B77C0EFE2125ED5800E88C7E /* Products */ = {
113114
isa = PBXGroup;
114115
children = (
115-
B77C0F022125ED5800E88C7E /* StateViewController.framework */,
116+
B76FCF8B24DBECFA0014697B /* StateViewController.framework */,
116117
);
117118
name = Products;
118119
sourceTree = "<group>";
@@ -127,12 +128,11 @@
127128
B77C0EE42125ED3700E88C7E /* Sources */,
128129
B77C0EE52125ED3700E88C7E /* Frameworks */,
129130
B77C0EE62125ED3700E88C7E /* Resources */,
130-
B77C0F092125EE1A00E88C7E /* Embed Frameworks */,
131+
B76FCF8F24DBECFE0014697B /* Embed Frameworks */,
131132
);
132133
buildRules = (
133134
);
134135
dependencies = (
135-
B77C0F082125EE1A00E88C7E /* PBXTargetDependency */,
136136
);
137137
name = StateViewControllerExample;
138138
productName = StateViewControllerExample;
@@ -151,6 +151,7 @@
151151
TargetAttributes = {
152152
B77C0EE72125ED3700E88C7E = {
153153
CreatedOnToolsVersion = 9.4.1;
154+
LastSwiftMigration = 1150;
154155
};
155156
};
156157
};
@@ -179,11 +180,11 @@
179180
/* End PBXProject section */
180181

181182
/* Begin PBXReferenceProxy section */
182-
B77C0F022125ED5800E88C7E /* StateViewController.framework */ = {
183+
B76FCF8B24DBECFA0014697B /* StateViewController.framework */ = {
183184
isa = PBXReferenceProxy;
184185
fileType = wrapper.framework;
185186
path = StateViewController.framework;
186-
remoteRef = B77C0F012125ED5800E88C7E /* PBXContainerItemProxy */;
187+
remoteRef = B76FCF8A24DBECFA0014697B /* PBXContainerItemProxy */;
187188
sourceTree = BUILT_PRODUCTS_DIR;
188189
};
189190
/* End PBXReferenceProxy section */
@@ -216,14 +217,6 @@
216217
};
217218
/* End PBXSourcesBuildPhase section */
218219

219-
/* Begin PBXTargetDependency section */
220-
B77C0F082125EE1A00E88C7E /* PBXTargetDependency */ = {
221-
isa = PBXTargetDependency;
222-
name = "StateViewController iOS";
223-
targetProxy = B77C0F072125EE1A00E88C7E /* PBXContainerItemProxy */;
224-
};
225-
/* End PBXTargetDependency section */
226-
227220
/* Begin PBXVariantGroup section */
228221
B77C0EEF2125ED3800E88C7E /* Main.storyboard */ = {
229222
isa = PBXVariantGroup;
@@ -361,40 +354,36 @@
361354
B77C0EFB2125ED3900E88C7E /* Debug */ = {
362355
isa = XCBuildConfiguration;
363356
buildSettings = {
364-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
365357
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
366358
CODE_SIGN_STYLE = Automatic;
367359
DEVELOPMENT_TEAM = "";
368360
INFOPLIST_FILE = StateViewControllerExample/Info.plist;
369-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
370361
LD_RUNPATH_SEARCH_PATHS = (
371362
"$(inherited)",
372363
"@executable_path/Frameworks",
373364
);
374365
PRODUCT_BUNDLE_IDENTIFIER = com.formbound.StateViewControllerExample;
375366
PRODUCT_NAME = "$(TARGET_NAME)";
376-
SWIFT_VERSION = 4.0;
377-
TARGETED_DEVICE_FAMILY = 1;
367+
SWIFT_VERSION = 5.0;
368+
TARGETED_DEVICE_FAMILY = "1,2";
378369
};
379370
name = Debug;
380371
};
381372
B77C0EFC2125ED3900E88C7E /* Release */ = {
382373
isa = XCBuildConfiguration;
383374
buildSettings = {
384-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
385375
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
386376
CODE_SIGN_STYLE = Automatic;
387377
DEVELOPMENT_TEAM = "";
388378
INFOPLIST_FILE = StateViewControllerExample/Info.plist;
389-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
390379
LD_RUNPATH_SEARCH_PATHS = (
391380
"$(inherited)",
392381
"@executable_path/Frameworks",
393382
);
394383
PRODUCT_BUNDLE_IDENTIFIER = com.formbound.StateViewControllerExample;
395384
PRODUCT_NAME = "$(TARGET_NAME)";
396-
SWIFT_VERSION = 4.0;
397-
TARGETED_DEVICE_FAMILY = 1;
385+
SWIFT_VERSION = 5.0;
386+
TARGETED_DEVICE_FAMILY = "1,2";
398387
};
399388
name = Release;
400389
};

‎Example/StateViewControllerExample/ActivityIndicatorViewController.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ class ActivityIndicatorViewController: UIViewController {
1313

1414
@IBOutlet private var activityIndicator: UIActivityIndicatorView!
1515

16-
@IBOutlet private var activityIndicatorBackground: UIView!
16+
@IBOutlet private var activityIndicatorContainer: UIView!
1717

1818
override func viewDidLoad() {
1919
super.viewDidLoad()
20-
activityIndicatorBackground.layer.cornerRadius = 10
20+
activityIndicatorContainer.layer.cornerRadius = 5
2121
}
2222

2323
override func viewWillAppear(_ animated: Bool) {
@@ -42,30 +42,30 @@ extension ActivityIndicatorViewController: StateViewControllerTransitioning {
4242
func stateTransitionWillBegin(isAppearing: Bool) {
4343
if isAppearing {
4444
view.alpha = 0
45-
activityIndicator.transform = CGAffineTransform.identity.scaledBy(x: 3, y: 3)
46-
activityIndicatorBackground.transform = CGAffineTransform.identity.scaledBy(x: 0.5, y: 0.5)
45+
activityIndicatorContainer.transform = CGAffineTransform
46+
.identity
47+
.scaledBy(x: 0.5, y: 0.5)
4748
}
4849
}
4950

5051
func stateTransitionDidEnd(isAppearing: Bool) {
5152
view.alpha = 1
52-
activityIndicator.transform = .identity
53-
activityIndicatorBackground.transform = .identity
53+
activityIndicatorContainer.transform = .identity
5454
}
5555

5656
func animateAlongsideStateTransition(isAppearing: Bool) {
5757
if isAppearing {
5858
view.alpha = 1
59-
activityIndicator.transform = .identity
60-
activityIndicatorBackground.transform = .identity
59+
activityIndicatorContainer.transform = .identity
6160
} else {
6261
view.alpha = 0
63-
activityIndicator.transform = CGAffineTransform.identity.scaledBy(x: 0.5, y: 0.5)
64-
activityIndicatorBackground.transform = CGAffineTransform.identity.scaledBy(x: 1.25, y: 1.25)
62+
activityIndicatorContainer.transform = CGAffineTransform
63+
.identity
64+
.scaledBy(x: 1.5, y: 1.5)
6565
}
6666
}
6767

6868
func stateTransitionDelay(isAppearing: Bool) -> TimeInterval {
69-
return isAppearing ? 0 : 0.25
69+
return isAppearing ? 0 : 0.5
7070
}
7171
}

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

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="pve-hl-mJu">
3-
<device id="retina4_7" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="pve-hl-mJu">
3+
<device id="retina4_7" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
97
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
108
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
119
</dependencies>
@@ -36,21 +34,21 @@
3634
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3735
<prototypes>
3836
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" textLabel="yg8-ba-1tB" detailTextLabel="8ri-NI-s8Q" style="IBUITableViewCellStyleSubtitle" id="VjJ-fc-qfZ">
39-
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
37+
<rect key="frame" x="0.0" y="28" width="375" height="55.5"/>
4038
<autoresizingMask key="autoresizingMask"/>
4139
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VjJ-fc-qfZ" id="iF8-Wm-RXH">
42-
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
40+
<rect key="frame" x="0.0" y="0.0" width="375" height="55.5"/>
4341
<autoresizingMask key="autoresizingMask"/>
4442
<subviews>
4543
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yg8-ba-1tB">
46-
<rect key="frame" x="16" y="5" width="33.5" height="20.5"/>
44+
<rect key="frame" x="16" y="10" width="33.5" height="20.5"/>
4745
<autoresizingMask key="autoresizingMask"/>
4846
<fontDescription key="fontDescription" type="system" pointSize="17"/>
4947
<nil key="textColor"/>
5048
<nil key="highlightedColor"/>
5149
</label>
5250
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8ri-NI-s8Q">
53-
<rect key="frame" x="16" y="25.5" width="44" height="14.5"/>
51+
<rect key="frame" x="16" y="31.5" width="44" height="14.5"/>
5452
<autoresizingMask key="autoresizingMask"/>
5553
<fontDescription key="fontDescription" type="system" pointSize="12"/>
5654
<nil key="textColor"/>
@@ -78,32 +76,32 @@
7876
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
7977
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
8078
<subviews>
81-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RDM-Bn-wL7">
82-
<rect key="frame" x="149" y="304.5" width="77" height="77"/>
79+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M1S-NT-uHg">
80+
<rect key="frame" x="149" y="295" width="77" height="77"/>
8381
<subviews>
8482
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="syB-XM-5Fz">
85-
<rect key="frame" x="29" y="29" width="20" height="20"/>
83+
<rect key="frame" x="28.5" y="28.5" width="20" height="20"/>
8684
</activityIndicatorView>
8785
</subviews>
88-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
86+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
8987
<constraints>
90-
<constraint firstItem="syB-XM-5Fz" firstAttribute="centerX" secondItem="RDM-Bn-wL7" secondAttribute="centerX" id="71Y-ja-vcg"/>
91-
<constraint firstAttribute="width" constant="77" id="GIb-4G-DXt"/>
92-
<constraint firstAttribute="height" constant="77" id="Zfv-E0-qjg"/>
93-
<constraint firstItem="syB-XM-5Fz" firstAttribute="centerY" secondItem="RDM-Bn-wL7" secondAttribute="centerY" id="zM6-bQ-noC"/>
88+
<constraint firstItem="syB-XM-5Fz" firstAttribute="centerY" secondItem="M1S-NT-uHg" secondAttribute="centerY" id="H8p-84-dem"/>
89+
<constraint firstAttribute="height" constant="77" id="HtG-Ma-YP7"/>
90+
<constraint firstItem="syB-XM-5Fz" firstAttribute="centerX" secondItem="M1S-NT-uHg" secondAttribute="centerX" id="gKH-RX-5Tw"/>
91+
<constraint firstAttribute="width" constant="77" id="vnw-Zp-5yX"/>
9492
</constraints>
9593
</view>
9694
</subviews>
97-
<color key="backgroundColor" red="0.09892837703" green="0.130219996" blue="0.16634854669999999" alpha="0.77081549657534243" colorSpace="custom" customColorSpace="displayP3"/>
95+
<color key="backgroundColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
9896
<constraints>
99-
<constraint firstItem="RDM-Bn-wL7" firstAttribute="centerX" secondItem="1yS-p3-bkJ" secondAttribute="centerX" id="rQj-Q0-e9Y"/>
100-
<constraint firstItem="syB-XM-5Fz" firstAttribute="centerY" secondItem="1yS-p3-bkJ" secondAttribute="centerY" id="u0J-YH-iTo"/>
97+
<constraint firstItem="M1S-NT-uHg" firstAttribute="centerY" secondItem="iWw-Nq-NbT" secondAttribute="centerY" id="NZa-64-iPo"/>
98+
<constraint firstItem="M1S-NT-uHg" firstAttribute="centerX" secondItem="iWw-Nq-NbT" secondAttribute="centerX" id="Oeb-gU-UYt"/>
10199
</constraints>
102100
<viewLayoutGuide key="safeArea" id="1yS-p3-bkJ"/>
103101
</view>
104102
<connections>
105103
<outlet property="activityIndicator" destination="syB-XM-5Fz" id="DJn-L0-T2R"/>
106-
<outlet property="activityIndicatorBackground" destination="RDM-Bn-wL7" id="BbT-75-VlB"/>
104+
<outlet property="activityIndicatorContainer" destination="M1S-NT-uHg" id="3nT-2f-nuj"/>
107105
</connections>
108106
</viewController>
109107
<placeholder placeholderIdentifier="IBFirstResponder" id="8wb-4Y-cBo" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -115,7 +113,7 @@
115113
<objects>
116114
<navigationController id="pve-hl-mJu" sceneMemberID="viewController">
117115
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Q1F-wL-BZD">
118-
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
116+
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
119117
<autoresizingMask key="autoresizingMask"/>
120118
</navigationBar>
121119
<connections>

0 commit comments

Comments
 (0)