Skip to content

Commit 48598d4

Browse files
andreamazzandreamazz
committedOct 31, 2015
Update demo
·
0.6.20.6.1
1 parent c2a1dad commit 48598d4

20 files changed

+82
-67
lines changed
 

‎Demo/Demo.xcodeproj/project.pbxproj

+22-9
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
65BD291019114A28002AC110 /* ThirdViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThirdViewController.h; sourceTree = "<group>"; };
5050
65BD291119114A28002AC110 /* ThirdViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThirdViewController.m; sourceTree = "<group>"; };
5151
65BD9C571A2DB45900BD0DC5 /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = "<group>"; };
52-
65E0370618FE6BE200EFA799 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
52+
65E0370618FE6BE200EFA799 /* WaveTransition.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WaveTransition.app; sourceTree = BUILT_PRODUCTS_DIR; };
5353
65E0370918FE6BE200EFA799 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
5454
65E0370B18FE6BE200EFA799 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
5555
65E0370D18FE6BE200EFA799 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -127,7 +127,7 @@
127127
65E0370718FE6BE200EFA799 /* Products */ = {
128128
isa = PBXGroup;
129129
children = (
130-
65E0370618FE6BE200EFA799 /* Demo.app */,
130+
65E0370618FE6BE200EFA799 /* WaveTransition.app */,
131131
65E0372718FE6BE200EFA799 /* DemoTests.xctest */,
132132
);
133133
name = Products;
@@ -147,13 +147,11 @@
147147
65E0370F18FE6BE200EFA799 /* Demo */ = {
148148
isa = PBXGroup;
149149
children = (
150+
65EBDB8E1BE5030200A13244 /* Resources */,
150151
65E0373E18FE6C2500EFA799 /* AMWaveTransition */,
151152
65A0940E19124A5500596A86 /* ViewControllers */,
152153
65E0371818FE6BE200EFA799 /* AppDelegate.h */,
153154
65E0371918FE6BE200EFA799 /* AppDelegate.m */,
154-
65E0371B18FE6BE200EFA799 /* Main.storyboard */,
155-
65BD9C571A2DB45900BD0DC5 /* Launch Screen.xib */,
156-
65E0372118FE6BE200EFA799 /* Images.xcassets */,
157155
65E0371018FE6BE200EFA799 /* Supporting Files */,
158156
);
159157
path = Demo;
@@ -200,6 +198,16 @@
200198
path = ../../AMWaveTransition;
201199
sourceTree = "<group>";
202200
};
201+
65EBDB8E1BE5030200A13244 /* Resources */ = {
202+
isa = PBXGroup;
203+
children = (
204+
65E0371B18FE6BE200EFA799 /* Main.storyboard */,
205+
65BD9C571A2DB45900BD0DC5 /* Launch Screen.xib */,
206+
65E0372118FE6BE200EFA799 /* Images.xcassets */,
207+
);
208+
name = Resources;
209+
sourceTree = "<group>";
210+
};
203211
/* End PBXGroup section */
204212

205213
/* Begin PBXNativeTarget section */
@@ -218,7 +226,7 @@
218226
);
219227
name = Demo;
220228
productName = Demo;
221-
productReference = 65E0370618FE6BE200EFA799 /* Demo.app */;
229+
productReference = 65E0370618FE6BE200EFA799 /* WaveTransition.app */;
222230
productType = "com.apple.product-type.application";
223231
};
224232
65E0372618FE6BE200EFA799 /* DemoTests */ = {
@@ -245,7 +253,7 @@
245253
65E036FE18FE6BE100EFA799 /* Project object */ = {
246254
isa = PBXProject;
247255
attributes = {
248-
LastUpgradeCheck = 0510;
256+
LastUpgradeCheck = 0710;
249257
ORGANIZATIONNAME = "Fancy Pixel";
250258
TargetAttributes = {
251259
65E0372618FE6BE200EFA799 = {
@@ -393,6 +401,7 @@
393401
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
394402
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
395403
COPY_PHASE_STRIP = NO;
404+
ENABLE_TESTABILITY = YES;
396405
GCC_C_LANGUAGE_STANDARD = gnu99;
397406
GCC_DYNAMIC_NO_PIC = NO;
398407
GCC_OPTIMIZATION_LEVEL = 0;
@@ -479,7 +488,8 @@
479488
GCC_PREFIX_HEADER = "Demo/Demo-Prefix.pch";
480489
INFOPLIST_FILE = "Demo/Demo-Info.plist";
481490
OTHER_LDFLAGS = "-ObjC";
482-
PRODUCT_NAME = "$(TARGET_NAME)";
491+
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.${PRODUCT_NAME:rfc1034identifier}";
492+
PRODUCT_NAME = WaveTransition;
483493
WRAPPER_EXTENSION = app;
484494
};
485495
name = Debug;
@@ -494,7 +504,8 @@
494504
GCC_PREFIX_HEADER = "Demo/Demo-Prefix.pch";
495505
INFOPLIST_FILE = "Demo/Demo-Info.plist";
496506
OTHER_LDFLAGS = "-ObjC";
497-
PRODUCT_NAME = "$(TARGET_NAME)";
507+
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.${PRODUCT_NAME:rfc1034identifier}";
508+
PRODUCT_NAME = WaveTransition;
498509
WRAPPER_EXTENSION = app;
499510
};
500511
name = Release;
@@ -515,6 +526,7 @@
515526
"$(inherited)",
516527
);
517528
INFOPLIST_FILE = "DemoTests/DemoTests-Info.plist";
529+
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.${PRODUCT_NAME:rfc1034identifier}";
518530
PRODUCT_NAME = "$(TARGET_NAME)";
519531
TEST_HOST = "$(BUNDLE_LOADER)";
520532
WRAPPER_EXTENSION = xctest;
@@ -533,6 +545,7 @@
533545
GCC_PRECOMPILE_PREFIX_HEADER = YES;
534546
GCC_PREFIX_HEADER = "Demo/Demo-Prefix.pch";
535547
INFOPLIST_FILE = "DemoTests/DemoTests-Info.plist";
548+
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.${PRODUCT_NAME:rfc1034identifier}";
536549
PRODUCT_NAME = "$(TARGET_NAME)";
537550
TEST_HOST = "$(BUNDLE_LOADER)";
538551
WRAPPER_EXTENSION = xctest;

‎Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0510"
3+
LastUpgradeVersion = "0710"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
3232
skipped = "NO">
@@ -48,17 +48,21 @@
4848
ReferencedContainer = "container:Demo.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
5153
</TestAction>
5254
<LaunchAction
55+
buildConfiguration = "Debug"
5356
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5457
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5558
launchStyle = "0"
5659
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Debug"
5860
ignoresPersistentStateOnLaunch = "NO"
5961
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
6063
allowLocationSimulation = "YES">
61-
<BuildableProductRunnable>
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
6266
<BuildableReference
6367
BuildableIdentifier = "primary"
6468
BlueprintIdentifier = "65E0370518FE6BE200EFA799"
@@ -71,12 +75,13 @@
7175
</AdditionalOptions>
7276
</LaunchAction>
7377
<ProfileAction
78+
buildConfiguration = "Release"
7479
shouldUseLaunchSchemeArgsEnv = "YES"
7580
savedToolIdentifier = ""
7681
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7882
debugDocumentVersioning = "YES">
79-
<BuildableProductRunnable>
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
8085
<BuildableReference
8186
BuildableIdentifier = "primary"
8287
BlueprintIdentifier = "65E0370518FE6BE200EFA799"

‎Demo/Demo/Base.lproj/Main.storyboard

+36-15
Large diffs are not rendered by default.

‎Demo/Demo/Demo-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>it.fancypixel.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/AMWaveTransition-120.png

1.14 KB
Loading

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/AMWaveTransition-121.png

1.14 KB
Loading

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/AMWaveTransition-180.png

1.9 KB
Loading

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/AMWaveTransition-58.png

548 Bytes
Loading

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/AMWaveTransition-80.png

694 Bytes
Loading

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/AMWaveTransition-87.png

803 Bytes
Loading

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/Artboard 4-120-1.png

-1.05 KB
Binary file not shown.

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/Artboard 4-120.png

-1.05 KB
Binary file not shown.

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/Artboard 4-180.png

-1.63 KB
Binary file not shown.

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/Artboard 4-58.png

-576 Bytes
Binary file not shown.

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/Artboard 4-80.png

-727 Bytes
Binary file not shown.

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/Artboard 4-87.png

-763 Bytes
Binary file not shown.

‎Demo/Demo/Images.xcassets/AppIcon.appiconset/Contents.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
{
44
"size" : "29x29",
55
"idiom" : "iphone",
6-
"filename" : "Artboard 4-58.png",
6+
"filename" : "AMWaveTransition-58.png",
77
"scale" : "2x"
88
},
99
{
1010
"size" : "29x29",
1111
"idiom" : "iphone",
12-
"filename" : "Artboard 4-87.png",
12+
"filename" : "AMWaveTransition-87.png",
1313
"scale" : "3x"
1414
},
1515
{
1616
"size" : "40x40",
1717
"idiom" : "iphone",
18-
"filename" : "Artboard 4-80.png",
18+
"filename" : "AMWaveTransition-80.png",
1919
"scale" : "2x"
2020
},
2121
{
2222
"size" : "40x40",
2323
"idiom" : "iphone",
24-
"filename" : "Artboard 4-120.png",
24+
"filename" : "AMWaveTransition-121.png",
2525
"scale" : "3x"
2626
},
2727
{
2828
"size" : "60x60",
2929
"idiom" : "iphone",
30-
"filename" : "Artboard 4-120-1.png",
30+
"filename" : "AMWaveTransition-120.png",
3131
"scale" : "2x"
3232
},
3333
{
3434
"size" : "60x60",
3535
"idiom" : "iphone",
36-
"filename" : "Artboard 4-180.png",
36+
"filename" : "AMWaveTransition-180.png",
3737
"scale" : "3x"
3838
}
3939
],

‎Demo/Demo/Launch Screen.xib

+3-27
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C78c" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
33
<dependencies>
44
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
6-
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
76
</dependencies>
87
<objects>
98
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
109
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
1110
<view contentMode="scaleToFill" id="iN0-l3-epB">
1211
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
1312
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
14-
<subviews>
15-
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="kuF-Rg-en9">
16-
<rect key="frame" x="100" y="100" width="280" height="280"/>
17-
<constraints>
18-
<constraint firstAttribute="width" secondItem="kuF-Rg-en9" secondAttribute="height" multiplier="1:1" id="9W4-Ps-pa4"/>
19-
</constraints>
20-
</imageView>
21-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AMWaveTransition" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ecg-al-pPd">
22-
<rect key="frame" x="112" y="410" width="257" height="39"/>
23-
<fontDescription key="fontDescription" name="GillSans-Light" family="Gill Sans" pointSize="34"/>
24-
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
25-
<nil key="highlightedColor"/>
26-
</label>
27-
</subviews>
13+
<animations/>
2814
<color key="backgroundColor" red="0.93725490196078431" green="0.50588235294117645" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
29-
<constraints>
30-
<constraint firstAttribute="trailing" secondItem="kuF-Rg-en9" secondAttribute="trailing" constant="100" id="JmG-nC-aQX"/>
31-
<constraint firstItem="kuF-Rg-en9" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="100" id="anC-Ja-PvG"/>
32-
<constraint firstItem="Ecg-al-pPd" firstAttribute="top" secondItem="kuF-Rg-en9" secondAttribute="bottom" constant="30" id="dPD-Ex-Ewp"/>
33-
<constraint firstAttribute="centerX" secondItem="Ecg-al-pPd" secondAttribute="centerX" id="sqP-OJ-8QX"/>
34-
<constraint firstAttribute="centerY" secondItem="kuF-Rg-en9" secondAttribute="centerY" id="wIF-Fc-6aj"/>
35-
</constraints>
3615
<nil key="simulatedStatusBarMetrics"/>
3716
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
3817
<point key="canvasLocation" x="404" y="445"/>
3918
</view>
4019
</objects>
41-
<resources>
42-
<image name="logo" width="180" height="180"/>
43-
</resources>
4420
</document>

‎Demo/DemoTests/DemoTests-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>it.fancypixel.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

‎Source/AMWaveTransition.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
397397
[transitionContext containerView].backgroundColor = fromVC.view.backgroundColor;
398398

399399
// First step is required to trigger the load of the visible cells.
400-
[UIView animateWithDuration:0 delay:0 options:UIViewAnimationOptionCurveEaseIn animations:nil completion:^(BOOL finished) {
400+
[UIView animateWithDuration:0 delay:0 options:UIViewAnimationOptionCurveEaseIn animations:^{} completion:^(BOOL finished) {
401401

402402
// Plain animation that moves the destination controller in place. Once it's done it will notify the transition context
403403
if (self.operation == UINavigationControllerOperationPush) {

0 commit comments

Comments
 (0)
Please sign in to comment.