Skip to content
This repository has been archived by the owner on Nov 13, 2017. It is now read-only.

Commit

Permalink
Merge pull request #2 from stefz/master
Browse files Browse the repository at this point in the history
Added UIViewController+MBT3DGrid category
  • Loading branch information
m4tbat committed Dec 16, 2014
2 parents 8d9b7d0 + 8aab5ed commit 8c7b329
Show file tree
Hide file tree
Showing 241 changed files with 2,090 additions and 6,010 deletions.
48 changes: 30 additions & 18 deletions Example/3DGridViewController.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
1557BC065D064849A498DC91 /* libPods-3DGridViewController.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C2135E56A83D49F2A2ABA3AD /* libPods-3DGridViewController.a */; };
4C75C7C1B77C491BA5D73056 /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E4C580761F64EA9904D743A /* libPods-Tests.a */; };
3CBF6F3F255614966B045A15 /* libPods-3DGridViewController.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F5ABA8962CE603B1E13C24D /* libPods-3DGridViewController.a */; };
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
Expand All @@ -22,6 +21,7 @@
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
84E3940C652F91BC71ED0B70 /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B85D69FB24A6BA6B6B3D0B3C /* libPods-Tests.a */; };
959FA3CC199820F600F35DB4 /* MBT3DGridDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 959FA3C7199820F600F35DB4 /* MBT3DGridDataSource.m */; };
959FA3CD199820F600F35DB4 /* MBT3DGridDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 959FA3C9199820F600F35DB4 /* MBT3DGridDelegate.m */; };
959FA3D01998281000F35DB4 /* MBTSplashViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 959FA3CF1998281000F35DB4 /* MBTSplashViewController.m */; };
Expand Down Expand Up @@ -57,18 +57,20 @@
6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
82A5B0A9A641F97A1E293B44 /* Pods-3DGridViewController.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-3DGridViewController.release.xcconfig"; path = "Pods/Target Support Files/Pods-3DGridViewController/Pods-3DGridViewController.release.xcconfig"; sourceTree = "<group>"; };
82E1F3629C2522F38045B34A /* Pods-3DGridViewController.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-3DGridViewController.debug.xcconfig"; path = "Pods/Target Support Files/Pods-3DGridViewController/Pods-3DGridViewController.debug.xcconfig"; sourceTree = "<group>"; };
8F5ABA8962CE603B1E13C24D /* libPods-3DGridViewController.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-3DGridViewController.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8F805A2B02C3415091958F27 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
959FA3C6199820F600F35DB4 /* MBT3DGridDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBT3DGridDataSource.h; sourceTree = "<group>"; };
959FA3C7199820F600F35DB4 /* MBT3DGridDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBT3DGridDataSource.m; sourceTree = "<group>"; };
959FA3C8199820F600F35DB4 /* MBT3DGridDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBT3DGridDelegate.h; sourceTree = "<group>"; };
959FA3C9199820F600F35DB4 /* MBT3DGridDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBT3DGridDelegate.m; sourceTree = "<group>"; };
959FA3CE1998281000F35DB4 /* MBTSplashViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBTSplashViewController.h; sourceTree = "<group>"; };
959FA3CF1998281000F35DB4 /* MBTSplashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBTSplashViewController.m; sourceTree = "<group>"; };
9E4C580761F64EA9904D743A /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
C2135E56A83D49F2A2ABA3AD /* libPods-3DGridViewController.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-3DGridViewController.a"; sourceTree = BUILT_PRODUCTS_DIR; };
CE77DF9AB3614379A938A4FB /* Pods-3DGridViewController.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-3DGridViewController.xcconfig"; path = "Pods/Pods-3DGridViewController.xcconfig"; sourceTree = "<group>"; };
B85D69FB24A6BA6B6B3D0B3C /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
DC58902E318B454BA983F095 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = "<group>"; };
FB0715BC167D4D93A702E40C /* Pods-Tests.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.xcconfig"; path = "Pods/Pods-Tests.xcconfig"; sourceTree = "<group>"; };
F34CEF3FC3DFBFEE44436360 /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = "<group>"; };
FF8006FED2014B228D54FE5F /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -79,7 +81,7 @@
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
1557BC065D064849A498DC91 /* libPods-3DGridViewController.a in Frameworks */,
3CBF6F3F255614966B045A15 /* libPods-3DGridViewController.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -90,7 +92,7 @@
6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
4C75C7C1B77C491BA5D73056 /* libPods-Tests.a in Frameworks */,
84E3940C652F91BC71ED0B70 /* libPods-Tests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -105,8 +107,7 @@
6003F5B5195388D20070C39A /* Tests */,
6003F58C195388D20070C39A /* Frameworks */,
6003F58B195388D20070C39A /* Products */,
CE77DF9AB3614379A938A4FB /* Pods-3DGridViewController.xcconfig */,
FB0715BC167D4D93A702E40C /* Pods-Tests.xcconfig */,
8681B5A970FE93B0F055D4C8 /* Pods */,
);
sourceTree = "<group>";
};
Expand All @@ -126,8 +127,8 @@
6003F58F195388D20070C39A /* CoreGraphics.framework */,
6003F591195388D20070C39A /* UIKit.framework */,
6003F5AF195388D20070C39A /* XCTest.framework */,
C2135E56A83D49F2A2ABA3AD /* libPods-3DGridViewController.a */,
9E4C580761F64EA9904D743A /* libPods-Tests.a */,
8F5ABA8962CE603B1E13C24D /* libPods-3DGridViewController.a */,
B85D69FB24A6BA6B6B3D0B3C /* libPods-Tests.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -190,6 +191,17 @@
name = "Podspec Metadata";
sourceTree = "<group>";
};
8681B5A970FE93B0F055D4C8 /* Pods */ = {
isa = PBXGroup;
children = (
82E1F3629C2522F38045B34A /* Pods-3DGridViewController.debug.xcconfig */,
82A5B0A9A641F97A1E293B44 /* Pods-3DGridViewController.release.xcconfig */,
F34CEF3FC3DFBFEE44436360 /* Pods-Tests.debug.xcconfig */,
FF8006FED2014B228D54FE5F /* Pods-Tests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -330,7 +342,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Pods-Tests-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
DBCB6E713E3043329EA4A151 /* Copy Pods Resources */ = {
Expand All @@ -345,7 +357,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Pods-3DGridViewController-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-3DGridViewController/Pods-3DGridViewController-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -483,7 +495,7 @@
};
6003F5C0195388D20070C39A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = CE77DF9AB3614379A938A4FB /* Pods-3DGridViewController.xcconfig */;
baseConfigurationReference = 82E1F3629C2522F38045B34A /* Pods-3DGridViewController.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -497,7 +509,7 @@
};
6003F5C1195388D20070C39A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = CE77DF9AB3614379A938A4FB /* Pods-3DGridViewController.xcconfig */;
baseConfigurationReference = 82A5B0A9A641F97A1E293B44 /* Pods-3DGridViewController.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -511,7 +523,7 @@
};
6003F5C3195388D20070C39A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FB0715BC167D4D93A702E40C /* Pods-Tests.xcconfig */;
baseConfigurationReference = F34CEF3FC3DFBFEE44436360 /* Pods-Tests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/3DGridViewController.app/3DGridViewController";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -534,7 +546,7 @@
};
6003F5C4195388D20070C39A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FB0715BC167D4D93A702E40C /* Pods-Tests.xcconfig */;
baseConfigurationReference = FF8006FED2014B228D54FE5F /* Pods-Tests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/3DGridViewController.app/3DGridViewController";
FRAMEWORK_SEARCH_PATHS = (
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Example/3DGridViewController/MBT3DGridDataSource.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

#import "MBT3DGridDataSource.h"
#import <UIViewController+MBT3DGrid.h>

typedef struct {
CGFloat x, y, z;
Expand Down
6 changes: 6 additions & 0 deletions Example/3DGridViewController/MBT3DGridDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ - (instancetype)initWithGridController:(MBT3DGridViewController *)gridController
}
}

- (id <UIViewControllerAnimatedTransitioning>)backgoundAnimationControllerForTransitionDirection:(MBT3DGridTransitionDirection)direction {
MBTBackgroundParallaxAnimator *alphaAnimator = [[MBTBackgroundParallaxAnimator alloc] initWith3DGridViewController:self.gridController parallaxRatio:1.0/3.0];

return (id<UIViewControllerAnimatedTransitioning>)alphaAnimator;
}

- (id <UIViewControllerInteractiveTransitioning>)interactionControllerForTransitionDirection:(MBT3DGridTransitionDirection)direction withAnimator:(id <UIViewControllerAnimatedTransitioning>)animator {
self.interactionController = [[AWPercentDrivenInteractiveTransition alloc] initWithAnimator:animator];

Expand Down
10 changes: 5 additions & 5 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- 3DGridViewController (0.1.4):
- 3DGridViewController (0.1.6):
- AWPercentDrivenInteractiveTransition (~> 0.1)
- AWPercentDrivenInteractiveTransition (0.1.0)
- AWPercentDrivenInteractiveTransition (0.1.1)
- Expecta (0.3.1)
- Specta (0.2.1)

Expand All @@ -15,9 +15,9 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
3DGridViewController: 38734ea1d72d7223af6e44f6c7d8cc86047eb781
AWPercentDrivenInteractiveTransition: a2cea96b9b63d2b7a66f14ef925cdc2e4cfc3ee4
3DGridViewController: 40ee21faea5a2274a635d50a69907fb0f6fe229e
AWPercentDrivenInteractiveTransition: b6227fc5c055f06e23a5826fcf42c6f1eca3a810
Expecta: 03aabd0a89d8dea843baecb19a7fd7466a69a31d
Specta: 9141310f46b1f68b676650ff2854e1ed0b74163a

COCOAPODS: 0.33.1
COCOAPODS: 0.35.0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPBlockDefinedMatcher.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPDefines.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPDoubleTuple.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPExpect.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPFloatTuple.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPMatcher.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPMatcherHelpers.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPMatchers+beCloseTo.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Expecta/EXPMatchers+beFalsy.h

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8c7b329

Please sign in to comment.