Skip to content
Browse files

Merge branch 'release/2.4.1'

  • Loading branch information...
2 parents d33a6bf + 05f8c20 commit b021895335da5c1b94f04374a18d5a5ec2f9f937 @michaelochs michaelochs committed
View
6 Example/Podfile.lock
@@ -1,5 +1,5 @@
PODS:
- - ViewDeck (2.3.1)
+ - ViewDeck (2.4.1)
DEPENDENCIES:
- ViewDeck (from `../`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
:path: "../"
SPEC CHECKSUMS:
- ViewDeck: deab9bd325bf7108063b80facfa5bcd6b9007811
+ ViewDeck: e4c744cb5383cbae40cf286c6e7246df33962020
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0
View
11 Example/Pods/Local Podspecs/ViewDeck.podspec.json
@@ -1,21 +1,22 @@
{
"name": "ViewDeck",
- "version": "2.3.1",
+ "version": "2.4.1",
"platforms": {
"ios": null
},
"summary": "An implementation of the sliding functionality found in the Path 2.0 or Facebook iOS apps.",
- "homepage": "https://github.com/Inferis/ViewDeck",
+ "homepage": "https://github.com/ViewDeck/ViewDeck",
"license": {
"type": "MIT",
"text": " Copyright (C) 2011-2015, ViewDeck\n\n Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
},
"authors": {
- "Tom Adriaenssen": "http://inferis.org/"
+ "Tom Adriaenssen": "http://inferis.org/",
+ "Michael Ochs": "http://ios-coding.com/"
},
"source": {
- "git": "https://github.com/Inferis/ViewDeck.git",
- "tag": "2.3.1"
+ "git": "https://github.com/ViewDeck/ViewDeck.git",
+ "tag": "2.4.1"
},
"source_files": "ViewDeck/*.{h,m}",
"frameworks": "QuartzCore",
View
6 Example/Pods/Manifest.lock
@@ -1,5 +1,5 @@
PODS:
- - ViewDeck (2.3.1)
+ - ViewDeck (2.4.1)
DEPENDENCIES:
- ViewDeck (from `../`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
:path: "../"
SPEC CHECKSUMS:
- ViewDeck: deab9bd325bf7108063b80facfa5bcd6b9007811
+ ViewDeck: e4c744cb5383cbae40cf286c6e7246df33962020
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0
View
318 Example/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,122 +7,103 @@
objects = {
/* Begin PBXBuildFile section */
- 19FD441179159371A0E7ED801FAF8BE6 /* IISideController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11CF88C0BD2D0732F899F88183ED07BC /* IISideController.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
- 20C6D66E59B22D7F6C17757528222C24 /* IIWrapController.h in Headers */ = {isa = PBXBuildFile; fileRef = E5FD8004FB4083D9488FF94952501B60 /* IIWrapController.h */; };
- 2DEE4EF5CCE3AFEA71864A7365A7FA71 /* IIViewDeckController.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D0F1D2CC5B86FFFC55D03B30702C59 /* IIViewDeckController.h */; };
- 5819546E7187A6CE17C140B3529CFDD0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5891F33FCF5C5D2077A6303DBED83653 /* Foundation.framework */; };
- 594BD401B18DF64347D410F3BEAD0B43 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5891F33FCF5C5D2077A6303DBED83653 /* Foundation.framework */; };
- 6693E0A546B58E97A2F9492119F158B4 /* IISideController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CF32D7F8D54A4CA18160F6D92E08E81 /* IISideController.h */; };
- 78D7BFC47CE6026CE842077F021A1C40 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF76D3E10804A25B69F6608922F74A08 /* QuartzCore.framework */; };
- 9C5F632BC25560905FC21FD366DE284A /* ViewDeck-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A26341727FC220551E8BC5E72100724 /* ViewDeck-dummy.m */; };
- A1527DFC57D5FBA8EAE0ED97BA5698AF /* IIWrapController.m in Sources */ = {isa = PBXBuildFile; fileRef = A75F40D6E0BD6B064B2EA7FE3B12EDDF /* IIWrapController.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
- B6928663F2C5C3CC36491BCA6BE83288 /* ViewDeck.h in Headers */ = {isa = PBXBuildFile; fileRef = 79B3AF4D0FD8138A0D61FF7BB8241002 /* ViewDeck.h */; };
- D1694F651488729BDFC4C5FBCB8C0408 /* Pods-ViewDeckExample-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = C05C14469E528ED5B79C93596B428F64 /* Pods-ViewDeckExample-dummy.m */; };
- F435F09382AC99EC3C003040C52B8DB9 /* IIViewDeckController.m in Sources */ = {isa = PBXBuildFile; fileRef = 64C87D25C891F8645D1BBCFE343A6F0B /* IIViewDeckController.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+ 123D5CCDEFB62AE040FE948334AB83E1 /* IIViewDeckController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9528C1E7B58B0AA2DD09FE5C6EEA83E6 /* IIViewDeckController.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+ 20D558BA6128BC7E477171D148AB6EDE /* IIWrapController.m in Sources */ = {isa = PBXBuildFile; fileRef = E37094CDACCA020F488E543C017CDEC5 /* IIWrapController.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+ 4F8B56B50844B01466E15F0F9ECBF77A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B18F24645AA4D651DFC7B69A3A0833DB /* QuartzCore.framework */; };
+ 5F083144CD4AC08145EF08527448EAD4 /* ViewDeck.h in Headers */ = {isa = PBXBuildFile; fileRef = D2955D8D2BE69FCFC44C7F6A37116B64 /* ViewDeck.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 6905D78949E7CB2B0FB848B69B3C5653 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 258B0C8029B3982F03A30ED9FB271283 /* Foundation.framework */; };
+ 75C9CE8315B688A35A5B223DE4448DA9 /* Pods-ViewDeckExample-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = C1ADC089DA5E35EEC33A60FE612153D5 /* Pods-ViewDeckExample-dummy.m */; };
+ 8399ABC2A54E4959AAB29FAE17E8C50E /* IIViewDeckController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCBD3D68D7228CBA7C02DA6C1F6E32F /* IIViewDeckController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 99E896FA0E1B505B449C65EF6BBF5BD1 /* IIWrapController.h in Headers */ = {isa = PBXBuildFile; fileRef = C658ECFF04E08A9807FF9ACFB2B61E33 /* IIWrapController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BB6D3DC18A60763AFF6F4FBEC8FA574E /* IISideController.h in Headers */ = {isa = PBXBuildFile; fileRef = F565D8F1FD8AA2A5AADA9D3D04DB44A5 /* IISideController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ C657BE8F76BCC52ACD466675C825E667 /* ViewDeck-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 781DD5769B4AE14F14BCCC2F8A48CB43 /* ViewDeck-dummy.m */; };
+ CB784716CF477BE4CEF7DA429D459487 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 258B0C8029B3982F03A30ED9FB271283 /* Foundation.framework */; };
+ EA5B469FC32F95E22EBFB7FA086CD56B /* IISideController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C8600CD7DAE58D338D68523DCD0C89B /* IISideController.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 4E1A8F2527C675B221EA73D00695F6DB /* PBXContainerItemProxy */ = {
+ 85D8AAA59A0E1FF2B896C34BF5C44716 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 71ABE673658A243F2670B4DE9D1B8211;
+ remoteGlobalIDString = D823F9361216B8B251FE9A4415FF5E59;
remoteInfo = ViewDeck;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
- 0FF73980CA40FADDDB7D79568F76F779 /* Pods-ViewDeckExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ViewDeckExample.release.xcconfig"; sourceTree = "<group>"; };
- 11CF88C0BD2D0732F899F88183ED07BC /* IISideController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = IISideController.m; sourceTree = "<group>"; };
- 23BA0A5C85231D44E988FB1CA8EE2D8F /* ViewDeck.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = ViewDeck.xcconfig; sourceTree = "<group>"; };
- 250683C9BE73AC8152E82F1476BF8A55 /* ViewDeck-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "ViewDeck-Private.xcconfig"; sourceTree = "<group>"; };
- 3A26341727FC220551E8BC5E72100724 /* ViewDeck-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ViewDeck-dummy.m"; sourceTree = "<group>"; };
- 3CF32D7F8D54A4CA18160F6D92E08E81 /* IISideController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = IISideController.h; sourceTree = "<group>"; };
- 4813933E3437E087039B74A286A5D96C /* Pods-ViewDeckExample-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ViewDeckExample-resources.sh"; sourceTree = "<group>"; };
- 57B535B3E3872D534B70541A3E588427 /* Pods-ViewDeckExample-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ViewDeckExample-acknowledgements.markdown"; sourceTree = "<group>"; };
- 5891F33FCF5C5D2077A6303DBED83653 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
- 64C87D25C891F8645D1BBCFE343A6F0B /* IIViewDeckController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = IIViewDeckController.m; sourceTree = "<group>"; };
- 65A4878198C861757422DCDAAF64A8CF /* ViewDeck-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ViewDeck-prefix.pch"; sourceTree = "<group>"; };
- 79B3AF4D0FD8138A0D61FF7BB8241002 /* ViewDeck.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ViewDeck.h; sourceTree = "<group>"; };
- 909F79F85F418EE14FCFF4BA40D0B036 /* Pods-ViewDeckExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ViewDeckExample.debug.xcconfig"; sourceTree = "<group>"; };
- A2F3D44488F00969AFEF364BDFAC9165 /* libPods-ViewDeckExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ViewDeckExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
- A75F40D6E0BD6B064B2EA7FE3B12EDDF /* IIWrapController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = IIWrapController.m; sourceTree = "<group>"; };
- B6D0F1D2CC5B86FFFC55D03B30702C59 /* IIViewDeckController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = IIViewDeckController.h; sourceTree = "<group>"; };
+ 02364AD612465ED069A4DAB855784DD5 /* Pods-ViewDeckExample-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ViewDeckExample-acknowledgements.plist"; sourceTree = "<group>"; };
+ 0467AA3AE3AB9B8307767CC013D9EBCB /* libPods-ViewDeckExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ViewDeckExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 112B50C5714126A5795EEA814C8EC2FC /* Pods-ViewDeckExample-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ViewDeckExample-resources.sh"; sourceTree = "<group>"; };
+ 1C8600CD7DAE58D338D68523DCD0C89B /* IISideController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = IISideController.m; sourceTree = "<group>"; };
+ 258B0C8029B3982F03A30ED9FB271283 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+ 3D40387E265E272C3F937CB23A9522D2 /* Pods-ViewDeckExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ViewDeckExample.debug.xcconfig"; sourceTree = "<group>"; };
+ 4678C9710598ADDBB174C5336B2BCFB7 /* Pods-ViewDeckExample-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ViewDeckExample-frameworks.sh"; sourceTree = "<group>"; };
+ 5091E13BEDB9588EA98B81F0047BC330 /* libViewDeck.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libViewDeck.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 5CCBD3D68D7228CBA7C02DA6C1F6E32F /* IIViewDeckController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = IIViewDeckController.h; sourceTree = "<group>"; };
+ 68371B7405A4842FDDCC4375F130D339 /* Pods-ViewDeckExample-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ViewDeckExample-acknowledgements.markdown"; sourceTree = "<group>"; };
+ 781DD5769B4AE14F14BCCC2F8A48CB43 /* ViewDeck-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ViewDeck-dummy.m"; sourceTree = "<group>"; };
+ 9528C1E7B58B0AA2DD09FE5C6EEA83E6 /* IIViewDeckController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = IIViewDeckController.m; sourceTree = "<group>"; };
+ B18F24645AA4D651DFC7B69A3A0833DB /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
- BF76D3E10804A25B69F6608922F74A08 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
- C05C14469E528ED5B79C93596B428F64 /* Pods-ViewDeckExample-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ViewDeckExample-dummy.m"; sourceTree = "<group>"; };
- CB6E808D593B96873F502D4EAC0FE3CC /* Pods-ViewDeckExample-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ViewDeckExample-acknowledgements.plist"; sourceTree = "<group>"; };
- E5FD8004FB4083D9488FF94952501B60 /* IIWrapController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = IIWrapController.h; sourceTree = "<group>"; };
- FCBE414322E62E21D833924E4D365904 /* libViewDeck.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libViewDeck.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ C15D6C7B43659D5D511E58FC94B1EE2F /* ViewDeck-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ViewDeck-prefix.pch"; sourceTree = "<group>"; };
+ C1ADC089DA5E35EEC33A60FE612153D5 /* Pods-ViewDeckExample-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ViewDeckExample-dummy.m"; sourceTree = "<group>"; };
+ C658ECFF04E08A9807FF9ACFB2B61E33 /* IIWrapController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = IIWrapController.h; sourceTree = "<group>"; };
+ D2955D8D2BE69FCFC44C7F6A37116B64 /* ViewDeck.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = ViewDeck.h; sourceTree = "<group>"; };
+ DE34C8228011CF0ED4D1B57F8D357F93 /* Pods-ViewDeckExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ViewDeckExample.release.xcconfig"; sourceTree = "<group>"; };
+ E22010B76A13DCFB021B5887C002CB3F /* ViewDeck.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = ViewDeck.xcconfig; sourceTree = "<group>"; };
+ E37094CDACCA020F488E543C017CDEC5 /* IIWrapController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = IIWrapController.m; sourceTree = "<group>"; };
+ F565D8F1FD8AA2A5AADA9D3D04DB44A5 /* IISideController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = IISideController.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 4671FDBF2A32C1EABD0FDC505DBD52EF /* Frameworks */ = {
+ 5C1CE2EF5E386C0EF8EBBAED812E6A91 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 594BD401B18DF64347D410F3BEAD0B43 /* Foundation.framework in Frameworks */,
- 78D7BFC47CE6026CE842077F021A1C40 /* QuartzCore.framework in Frameworks */,
+ CB784716CF477BE4CEF7DA429D459487 /* Foundation.framework in Frameworks */,
+ 4F8B56B50844B01466E15F0F9ECBF77A /* QuartzCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
- 95BCD3E303040794CAAAC9C8B9C0C110 /* Frameworks */ = {
+ BC15450819EB86A7B359B23429ECBAC5 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 5819546E7187A6CE17C140B3529CFDD0 /* Foundation.framework in Frameworks */,
+ 6905D78949E7CB2B0FB848B69B3C5653 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 00FC04B06EEF8A155D545C321FDCC389 /* iOS */ = {
+ 3926C638AD0708942C88C2BC89261735 /* iOS */ = {
isa = PBXGroup;
children = (
- 5891F33FCF5C5D2077A6303DBED83653 /* Foundation.framework */,
- BF76D3E10804A25B69F6608922F74A08 /* QuartzCore.framework */,
+ 258B0C8029B3982F03A30ED9FB271283 /* Foundation.framework */,
+ B18F24645AA4D651DFC7B69A3A0833DB /* QuartzCore.framework */,
);
name = iOS;
sourceTree = "<group>";
};
- 034CF931F070DA37B8401C0A1383E8D6 /* Targets Support Files */ = {
- isa = PBXGroup;
- children = (
- 7B5201403087CCA3CF7E8455B61325D0 /* Pods-ViewDeckExample */,
- );
- name = "Targets Support Files";
- sourceTree = "<group>";
- };
433CD3331B6C3787F473C941B61FC68F /* Frameworks */ = {
isa = PBXGroup;
children = (
- 00FC04B06EEF8A155D545C321FDCC389 /* iOS */,
+ 3926C638AD0708942C88C2BC89261735 /* iOS */,
);
name = Frameworks;
sourceTree = "<group>";
};
- 7353ABF450A36301F86D5D6D2718C29F /* Support Files */ = {
+ 4343C465707038745988B53C5F1A5942 /* Pods-ViewDeckExample */ = {
isa = PBXGroup;
children = (
- 23BA0A5C85231D44E988FB1CA8EE2D8F /* ViewDeck.xcconfig */,
- 250683C9BE73AC8152E82F1476BF8A55 /* ViewDeck-Private.xcconfig */,
- 3A26341727FC220551E8BC5E72100724 /* ViewDeck-dummy.m */,
- 65A4878198C861757422DCDAAF64A8CF /* ViewDeck-prefix.pch */,
- );
- name = "Support Files";
- path = "Example/Pods/Target Support Files/ViewDeck";
- sourceTree = "<group>";
- };
- 7B5201403087CCA3CF7E8455B61325D0 /* Pods-ViewDeckExample */ = {
- isa = PBXGroup;
- children = (
- 57B535B3E3872D534B70541A3E588427 /* Pods-ViewDeckExample-acknowledgements.markdown */,
- CB6E808D593B96873F502D4EAC0FE3CC /* Pods-ViewDeckExample-acknowledgements.plist */,
- C05C14469E528ED5B79C93596B428F64 /* Pods-ViewDeckExample-dummy.m */,
- 4813933E3437E087039B74A286A5D96C /* Pods-ViewDeckExample-resources.sh */,
- 909F79F85F418EE14FCFF4BA40D0B036 /* Pods-ViewDeckExample.debug.xcconfig */,
- 0FF73980CA40FADDDB7D79568F76F779 /* Pods-ViewDeckExample.release.xcconfig */,
+ 68371B7405A4842FDDCC4375F130D339 /* Pods-ViewDeckExample-acknowledgements.markdown */,
+ 02364AD612465ED069A4DAB855784DD5 /* Pods-ViewDeckExample-acknowledgements.plist */,
+ C1ADC089DA5E35EEC33A60FE612153D5 /* Pods-ViewDeckExample-dummy.m */,
+ 4678C9710598ADDBB174C5336B2BCFB7 /* Pods-ViewDeckExample-frameworks.sh */,
+ 112B50C5714126A5795EEA814C8EC2FC /* Pods-ViewDeckExample-resources.sh */,
+ 3D40387E265E272C3F937CB23A9522D2 /* Pods-ViewDeckExample.debug.xcconfig */,
+ DE34C8228011CF0ED4D1B57F8D357F93 /* Pods-ViewDeckExample.release.xcconfig */,
);
name = "Pods-ViewDeckExample";
path = "Target Support Files/Pods-ViewDeckExample";
@@ -131,7 +112,7 @@
7D2E3D760B020AFFD1E982DC37FA625C /* Development Pods */ = {
isa = PBXGroup;
children = (
- DFEDBE77208039E7DFA284EC19E04478 /* ViewDeck */,
+ F047DBF99F18478B19BD11D96EBE888E /* ViewDeck */,
);
name = "Development Pods";
sourceTree = "<group>";
@@ -142,39 +123,58 @@
BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */,
7D2E3D760B020AFFD1E982DC37FA625C /* Development Pods */,
433CD3331B6C3787F473C941B61FC68F /* Frameworks */,
- CCA510CFBEA2D207524CDA0D73C3B561 /* Products */,
- 034CF931F070DA37B8401C0A1383E8D6 /* Targets Support Files */,
+ 994408572E862DA6FEA1527C20FAD6B0 /* Products */,
+ D122940635BC6B265A2FD72D662C3EE4 /* Targets Support Files */,
);
sourceTree = "<group>";
};
- C63C1CC4853B17B11AF451D03D1F7290 /* ViewDeck */ = {
+ 994408572E862DA6FEA1527C20FAD6B0 /* Products */ = {
isa = PBXGroup;
children = (
- 3CF32D7F8D54A4CA18160F6D92E08E81 /* IISideController.h */,
- 11CF88C0BD2D0732F899F88183ED07BC /* IISideController.m */,
- B6D0F1D2CC5B86FFFC55D03B30702C59 /* IIViewDeckController.h */,
- 64C87D25C891F8645D1BBCFE343A6F0B /* IIViewDeckController.m */,
- E5FD8004FB4083D9488FF94952501B60 /* IIWrapController.h */,
- A75F40D6E0BD6B064B2EA7FE3B12EDDF /* IIWrapController.m */,
- 79B3AF4D0FD8138A0D61FF7BB8241002 /* ViewDeck.h */,
+ 0467AA3AE3AB9B8307767CC013D9EBCB /* libPods-ViewDeckExample.a */,
+ 5091E13BEDB9588EA98B81F0047BC330 /* libViewDeck.a */,
);
- path = ViewDeck;
+ name = Products;
sourceTree = "<group>";
};
- CCA510CFBEA2D207524CDA0D73C3B561 /* Products */ = {
+ CC7FBE0BF32006CEB909F357834A887A /* Support Files */ = {
isa = PBXGroup;
children = (
- A2F3D44488F00969AFEF364BDFAC9165 /* libPods-ViewDeckExample.a */,
- FCBE414322E62E21D833924E4D365904 /* libViewDeck.a */,
+ E22010B76A13DCFB021B5887C002CB3F /* ViewDeck.xcconfig */,
+ 781DD5769B4AE14F14BCCC2F8A48CB43 /* ViewDeck-dummy.m */,
+ C15D6C7B43659D5D511E58FC94B1EE2F /* ViewDeck-prefix.pch */,
);
- name = Products;
+ name = "Support Files";
+ path = "Example/Pods/Target Support Files/ViewDeck";
sourceTree = "<group>";
};
- DFEDBE77208039E7DFA284EC19E04478 /* ViewDeck */ = {
+ D122940635BC6B265A2FD72D662C3EE4 /* Targets Support Files */ = {
isa = PBXGroup;
children = (
- 7353ABF450A36301F86D5D6D2718C29F /* Support Files */,
- C63C1CC4853B17B11AF451D03D1F7290 /* ViewDeck */,
+ 4343C465707038745988B53C5F1A5942 /* Pods-ViewDeckExample */,
+ );
+ name = "Targets Support Files";
+ sourceTree = "<group>";
+ };
+ E223A711A1D3B19564B59BFE03D48DE7 /* ViewDeck */ = {
+ isa = PBXGroup;
+ children = (
+ F565D8F1FD8AA2A5AADA9D3D04DB44A5 /* IISideController.h */,
+ 1C8600CD7DAE58D338D68523DCD0C89B /* IISideController.m */,
+ 5CCBD3D68D7228CBA7C02DA6C1F6E32F /* IIViewDeckController.h */,
+ 9528C1E7B58B0AA2DD09FE5C6EEA83E6 /* IIViewDeckController.m */,
+ C658ECFF04E08A9807FF9ACFB2B61E33 /* IIWrapController.h */,
+ E37094CDACCA020F488E543C017CDEC5 /* IIWrapController.m */,
+ D2955D8D2BE69FCFC44C7F6A37116B64 /* ViewDeck.h */,
+ );
+ path = ViewDeck;
+ sourceTree = "<group>";
+ };
+ F047DBF99F18478B19BD11D96EBE888E /* ViewDeck */ = {
+ isa = PBXGroup;
+ children = (
+ CC7FBE0BF32006CEB909F357834A887A /* Support Files */,
+ E223A711A1D3B19564B59BFE03D48DE7 /* ViewDeck */,
);
name = ViewDeck;
path = ../..;
@@ -183,44 +183,44 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
- B7BF0250E1217CA9EE0A44347A9665C7 /* Headers */ = {
+ 64BEF88C8814E521AD382D4F5C614F9B /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- 6693E0A546B58E97A2F9492119F158B4 /* IISideController.h in Headers */,
- 2DEE4EF5CCE3AFEA71864A7365A7FA71 /* IIViewDeckController.h in Headers */,
- 20C6D66E59B22D7F6C17757528222C24 /* IIWrapController.h in Headers */,
- B6928663F2C5C3CC36491BCA6BE83288 /* ViewDeck.h in Headers */,
+ BB6D3DC18A60763AFF6F4FBEC8FA574E /* IISideController.h in Headers */,
+ 8399ABC2A54E4959AAB29FAE17E8C50E /* IIViewDeckController.h in Headers */,
+ 99E896FA0E1B505B449C65EF6BBF5BD1 /* IIWrapController.h in Headers */,
+ 5F083144CD4AC08145EF08527448EAD4 /* ViewDeck.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 6DAA3567F761CFAB08E8B7113D357FC1 /* Pods-ViewDeckExample */ = {
+ CF140A273CD5F3BCBA83000B91D9F1FB /* Pods-ViewDeckExample */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 83933858FD2175905364AE1D6156DBDE /* Build configuration list for PBXNativeTarget "Pods-ViewDeckExample" */;
+ buildConfigurationList = 0C7663DA389EE600D0BC874DA68BCE53 /* Build configuration list for PBXNativeTarget "Pods-ViewDeckExample" */;
buildPhases = (
- 9FD19DC9FBEC82914549005F8550558F /* Sources */,
- 95BCD3E303040794CAAAC9C8B9C0C110 /* Frameworks */,
+ 8ABD340FF96AA051681CF3A58C1ED66D /* Sources */,
+ BC15450819EB86A7B359B23429ECBAC5 /* Frameworks */,
);
buildRules = (
);
dependencies = (
- 1FA2E373D3630ABAB0C503671E13CE0F /* PBXTargetDependency */,
+ 46D9D05CA654B05FF945B65E6658D91D /* PBXTargetDependency */,
);
name = "Pods-ViewDeckExample";
productName = "Pods-ViewDeckExample";
- productReference = A2F3D44488F00969AFEF364BDFAC9165 /* libPods-ViewDeckExample.a */;
+ productReference = 0467AA3AE3AB9B8307767CC013D9EBCB /* libPods-ViewDeckExample.a */;
productType = "com.apple.product-type.library.static";
};
- 71ABE673658A243F2670B4DE9D1B8211 /* ViewDeck */ = {
+ D823F9361216B8B251FE9A4415FF5E59 /* ViewDeck */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 635B586379290B0F0EFBECC683E882E9 /* Build configuration list for PBXNativeTarget "ViewDeck" */;
+ buildConfigurationList = D0083572CDFFCAC61AA3B1655FD2CAB4 /* Build configuration list for PBXNativeTarget "ViewDeck" */;
buildPhases = (
- 87109C4DE85764924711B640CADFB8A3 /* Sources */,
- 4671FDBF2A32C1EABD0FDC505DBD52EF /* Frameworks */,
- B7BF0250E1217CA9EE0A44347A9665C7 /* Headers */,
+ 3AA9D3468394DBB0BF8582167953A548 /* Sources */,
+ 5C1CE2EF5E386C0EF8EBBAED812E6A91 /* Frameworks */,
+ 64BEF88C8814E521AD382D4F5C614F9B /* Headers */,
);
buildRules = (
);
@@ -228,7 +228,7 @@
);
name = ViewDeck;
productName = ViewDeck;
- productReference = FCBE414322E62E21D833924E4D365904 /* libViewDeck.a */;
+ productReference = 5091E13BEDB9588EA98B81F0047BC330 /* libViewDeck.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
@@ -248,48 +248,65 @@
en,
);
mainGroup = 7DB346D0F39D3F0E887471402A8071AB;
- productRefGroup = CCA510CFBEA2D207524CDA0D73C3B561 /* Products */;
+ productRefGroup = 994408572E862DA6FEA1527C20FAD6B0 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
- 6DAA3567F761CFAB08E8B7113D357FC1 /* Pods-ViewDeckExample */,
- 71ABE673658A243F2670B4DE9D1B8211 /* ViewDeck */,
+ CF140A273CD5F3BCBA83000B91D9F1FB /* Pods-ViewDeckExample */,
+ D823F9361216B8B251FE9A4415FF5E59 /* ViewDeck */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
- 87109C4DE85764924711B640CADFB8A3 /* Sources */ = {
+ 3AA9D3468394DBB0BF8582167953A548 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 19FD441179159371A0E7ED801FAF8BE6 /* IISideController.m in Sources */,
- F435F09382AC99EC3C003040C52B8DB9 /* IIViewDeckController.m in Sources */,
- A1527DFC57D5FBA8EAE0ED97BA5698AF /* IIWrapController.m in Sources */,
- 9C5F632BC25560905FC21FD366DE284A /* ViewDeck-dummy.m in Sources */,
+ EA5B469FC32F95E22EBFB7FA086CD56B /* IISideController.m in Sources */,
+ 123D5CCDEFB62AE040FE948334AB83E1 /* IIViewDeckController.m in Sources */,
+ 20D558BA6128BC7E477171D148AB6EDE /* IIWrapController.m in Sources */,
+ C657BE8F76BCC52ACD466675C825E667 /* ViewDeck-dummy.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
- 9FD19DC9FBEC82914549005F8550558F /* Sources */ = {
+ 8ABD340FF96AA051681CF3A58C1ED66D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- D1694F651488729BDFC4C5FBCB8C0408 /* Pods-ViewDeckExample-dummy.m in Sources */,
+ 75C9CE8315B688A35A5B223DE4448DA9 /* Pods-ViewDeckExample-dummy.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 1FA2E373D3630ABAB0C503671E13CE0F /* PBXTargetDependency */ = {
+ 46D9D05CA654B05FF945B65E6658D91D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = ViewDeck;
- target = 71ABE673658A243F2670B4DE9D1B8211 /* ViewDeck */;
- targetProxy = 4E1A8F2527C675B221EA73D00695F6DB /* PBXContainerItemProxy */;
+ target = D823F9361216B8B251FE9A4415FF5E59 /* ViewDeck */;
+ targetProxy = 85D8AAA59A0E1FF2B896C34BF5C44716 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
+ 23DE98A200C6EA1864480CA8F045FB77 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = DE34C8228011CF0ED4D1B57F8D357F93 /* Pods-ViewDeckExample.release.xcconfig */;
+ buildSettings = {
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ MACH_O_TYPE = staticlib;
+ MTL_ENABLE_DEBUG_INFO = NO;
+ OTHER_LDFLAGS = "";
+ OTHER_LIBTOOLFLAGS = "";
+ PODS_ROOT = "$(SRCROOT)";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = iphoneos;
+ SKIP_INSTALL = YES;
+ };
+ name = Release;
+ };
58FB81DAEDB38D05BAD33920A5B5D63D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -324,13 +341,14 @@
};
name = Release;
};
- 5FF633E720803FEAD41D1E1472A1FE5E /* Release */ = {
+ 5C8DF9E58E03E4E2D9997992FB4F4870 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 0FF73980CA40FADDDB7D79568F76F779 /* Pods-ViewDeckExample.release.xcconfig */;
+ baseConfigurationReference = 3D40387E265E272C3F937CB23A9522D2 /* Pods-ViewDeckExample.debug.xcconfig */;
buildSettings = {
ENABLE_STRICT_OBJC_MSGSEND = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- MTL_ENABLE_DEBUG_INFO = NO;
+ MACH_O_TYPE = staticlib;
+ MTL_ENABLE_DEBUG_INFO = YES;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
PODS_ROOT = "$(SRCROOT)";
@@ -338,23 +356,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
- name = Release;
- };
- 86D032F06AFCCF672D49BC36D257D44C /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 250683C9BE73AC8152E82F1476BF8A55 /* ViewDeck-Private.xcconfig */;
- buildSettings = {
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_PREFIX_HEADER = "Target Support Files/ViewDeck/ViewDeck-prefix.pch";
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- MTL_ENABLE_DEBUG_INFO = NO;
- OTHER_LDFLAGS = "";
- OTHER_LIBTOOLFLAGS = "";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = iphoneos;
- SKIP_INSTALL = YES;
- };
- name = Release;
+ name = Debug;
};
BEF1BC204DE94B02454F00D0FC406B16 /* Debug */ = {
isa = XCBuildConfiguration;
@@ -395,9 +397,9 @@
};
name = Debug;
};
- C22428C4927EB83F69CF88AB6155892C /* Debug */ = {
+ BF6463CD34461EBF32F298BF86239A77 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 250683C9BE73AC8152E82F1476BF8A55 /* ViewDeck-Private.xcconfig */;
+ baseConfigurationReference = E22010B76A13DCFB021B5887C002CB3F /* ViewDeck.xcconfig */;
buildSettings = {
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_PREFIX_HEADER = "Target Support Files/ViewDeck/ViewDeck-prefix.pch";
@@ -405,54 +407,58 @@
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
+ PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
+ PUBLIC_HEADERS_FOLDER_PATH = "";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Debug;
};
- DD003A361DC3A281B3EE010A7CCACBDF /* Debug */ = {
+ C4A9F7ECCE8652315A7FB7312EC8E683 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 909F79F85F418EE14FCFF4BA40D0B036 /* Pods-ViewDeckExample.debug.xcconfig */;
+ baseConfigurationReference = E22010B76A13DCFB021B5887C002CB3F /* ViewDeck.xcconfig */;
buildSettings = {
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_PREFIX_HEADER = "Target Support Files/ViewDeck/ViewDeck-prefix.pch";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- MTL_ENABLE_DEBUG_INFO = YES;
+ MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
- PODS_ROOT = "$(SRCROOT)";
+ PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
+ PUBLIC_HEADERS_FOLDER_PATH = "";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
- name = Debug;
+ name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
+ 0C7663DA389EE600D0BC874DA68BCE53 /* Build configuration list for PBXNativeTarget "Pods-ViewDeckExample" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- BEF1BC204DE94B02454F00D0FC406B16 /* Debug */,
- 58FB81DAEDB38D05BAD33920A5B5D63D /* Release */,
+ 5C8DF9E58E03E4E2D9997992FB4F4870 /* Debug */,
+ 23DE98A200C6EA1864480CA8F045FB77 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 635B586379290B0F0EFBECC683E882E9 /* Build configuration list for PBXNativeTarget "ViewDeck" */ = {
+ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- C22428C4927EB83F69CF88AB6155892C /* Debug */,
- 86D032F06AFCCF672D49BC36D257D44C /* Release */,
+ BEF1BC204DE94B02454F00D0FC406B16 /* Debug */,
+ 58FB81DAEDB38D05BAD33920A5B5D63D /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 83933858FD2175905364AE1D6156DBDE /* Build configuration list for PBXNativeTarget "Pods-ViewDeckExample" */ = {
+ D0083572CDFFCAC61AA3B1655FD2CAB4 /* Build configuration list for PBXNativeTarget "ViewDeck" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- DD003A361DC3A281B3EE010A7CCACBDF /* Debug */,
- 5FF633E720803FEAD41D1E1472A1FE5E /* Release */,
+ BF6463CD34461EBF32F298BF86239A77 /* Debug */,
+ C4A9F7ECCE8652315A7FB7312EC8E683 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
View
22 Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ViewDeck.xcscheme
@@ -7,17 +7,17 @@
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
+ buildForAnalyzing = "YES"
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
+ buildForArchiving = "YES">
<BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "DEC2CE70C05BAA84CBFE73E9"
- BuildableName = "libViewDeck.a"
- BlueprintName = "ViewDeck"
- ReferencedContainer = "container:Pods.xcodeproj">
+ BuildableIdentifier = 'primary'
+ BlueprintIdentifier = '960B0C31F0157F319EB1C3D3'
+ BlueprintName = 'ViewDeck'
+ ReferencedContainer = 'container:Pods.xcodeproj'
+ BuildableName = 'libViewDeck.a'>
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@@ -29,28 +29,26 @@
buildConfiguration = "Debug">
<AdditionalOptions>
</AdditionalOptions>
- <Testables>
- </Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
+ buildConfiguration = "Debug"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES"
buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
+ shouldUseLaunchSchemeArgsEnv = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
View
84 Example/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-frameworks.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+set -e
+
+echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+
+install_framework()
+{
+ if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
+ local source="${BUILT_PRODUCTS_DIR}/$1"
+ elif [ -r "${BUILT_PRODUCTS_DIR}/$(basename "$1")" ]; then
+ local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
+ elif [ -r "$1" ]; then
+ local source="$1"
+ fi
+
+ local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+ if [ -L "${source}" ]; then
+ echo "Symlinked..."
+ source="$(readlink "${source}")"
+ fi
+
+ # use filter instead of exclude so missing patterns dont' throw errors
+ echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\""
+ rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
+
+ local basename
+ basename="$(basename -s .framework "$1")"
+ binary="${destination}/${basename}.framework/${basename}"
+ if ! [ -r "$binary" ]; then
+ binary="${destination}/${basename}"
+ fi
+
+ # Strip invalid architectures so "fat" simulator / device frameworks work on device
+ if [[ "$(file "$binary")" == *"dynamically linked shared library"* ]]; then
+ strip_invalid_archs "$binary"
+ fi
+
+ # Resign the code if required by the build settings to avoid unstable apps
+ code_sign_if_enabled "${destination}/$(basename "$1")"
+
+ # Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
+ if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
+ local swift_runtime_libs
+ swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u && exit ${PIPESTATUS[0]})
+ for lib in $swift_runtime_libs; do
+ echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\""
+ rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
+ code_sign_if_enabled "${destination}/${lib}"
+ done
+ fi
+}
+
+# Signs a framework with the provided identity
+code_sign_if_enabled() {
+ if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+ # Use the current code_sign_identitiy
+ echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
+ echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\""
+ /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+ fi
+}
+
+# Strip invalid architectures
+strip_invalid_archs() {
+ binary="$1"
+ # Get architectures for current file
+ archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+ stripped=""
+ for arch in $archs; do
+ if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then
+ # Strip non-valid architectures in-place
+ lipo -remove "$arch" -output "$binary" "$binary" || exit 1
+ stripped="$stripped $arch"
+ fi
+ done
+ if [[ "$stripped" ]]; then
+ echo "Stripped $binary of architectures:$stripped"
+ fi
+}
+
View
2 Example/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-resources.sh
@@ -60,7 +60,7 @@ install_resource()
mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-if [[ "${ACTION}" == "install" ]]; then
+if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
fi
View
6 Example/Pods/Target Support Files/ViewDeck/ViewDeck-Private.xcconfig
@@ -1,6 +0,0 @@
-#include "ViewDeck.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/ViewDeck" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/ViewDeck"
-OTHER_LDFLAGS = ${VIEWDECK_OTHER_LDFLAGS}
-PODS_ROOT = ${SRCROOT}
-SKIP_INSTALL = YES
View
6 Example/Pods/Target Support Files/ViewDeck/ViewDeck.xcconfig
@@ -1 +1,5 @@
-VIEWDECK_OTHER_LDFLAGS = -framework "QuartzCore"
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/ViewDeck" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/ViewDeck"
+OTHER_LDFLAGS = -framework "QuartzCore"
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
View
16 Example/ViewDeckExample.xcodeproj/project.pbxproj
@@ -179,6 +179,7 @@
E240A9A4148AB3770077282A /* Frameworks */,
E240A9A5148AB3770077282A /* Resources */,
ADB09EC62F5FE01FB6540340 /* Copy Pods Resources */,
+ 14779D12D059593AFC718EC8 /* Embed Pods Frameworks */,
);
buildRules = (
);
@@ -250,6 +251,21 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
+ 14779D12D059593AFC718EC8 /* Embed Pods Frameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Embed Pods Frameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-frameworks.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
ADB09EC62F5FE01FB6540340 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
View
33 README.md
@@ -29,7 +29,7 @@ The library supports both ARC and non-ARC projects (the ARC mode is detected aut
You're probably curious how it looks. Here's some shots from the example app:
-![Left opened](http://cl.ly/063X412a1i2U2e3f3D02/Image%202012.01.26%2023:26:55.png) ![Right opened](http://cl.ly/381S0i1c2c1Z2l2U3303/Image%202012.01.26%2023:29:31.png)
+![Center](docs/screen1.png) ![Right opened](docs/screen2.png)
See the controller in action: http://vimeo.com/34538429 (general demo) and http://vimeo.com/35716738 (elasticity).
These are demos of the included `ViewDeckExample` app.
@@ -62,14 +62,15 @@ After integrating ViewDeck via CocoaPods, all you need to do is `#import <ViewDe
### Factories
The class currently supports a left and a right side controller. Each of these can be nil (if it is, no panning or opening to that side will work).
+```objc
#import "IIViewDeckController.h"
// prepare view controllers
UIViewController* leftController = [[UIViewController alloc] init];
UIViewController* rightController = [[UIViewController alloc] init];
- IIViewDeckController* deckController = [[IIViewDeckController alloc] initWithCenterViewController:self.centerController leftViewController:leftController
- rightViewController:rightController];
+ IIViewDeckController* deckController = [[IIViewDeckController alloc] initWithCenterViewController:self.centerController leftViewController:leftController rightViewController:rightController];
+```
There's also two convenience factory methods for just a left or right view controller.
@@ -77,9 +78,11 @@ There's also two convenience factory methods for just a left or right view contr
You can also switch view controllers in mid flight. Just assign a viewcontroller to the appropriate property and the view deck controller will do the rest:
+```objc
// prepare view controllers
UIViewController* newController = [[UIViewController alloc] init];
self.viewDeckController.leftController = newController;
+```
You can also use this to remove a side controller: just set it to `nil`.
@@ -87,7 +90,9 @@ You can also use this to remove a side controller: just set it to `nil`.
Like `UINavigationViewController` the `IIViewDeckController` assigns itself to its childviews. You can use the `viewDeckController` property to get access to the enclosing view deck controller:
+```objc
[self.viewDeckController toggleLeftViewAnimated:YES]
+```
If the controller is not enclosed by a IIViewDeckController, this property returns `nil`.
@@ -103,29 +108,39 @@ It is possible to have the viewController always show a side controller. You do
The controller also allows you to close the side views with a bouncing animation like Path does. To achieve this, use the `closeLeftViewBouncing:` and `closeRightViewBouncing:` methods. These take a block as their only parameter: this block is executed while the animation is running, on the exact moment where the center view is completely hidden from the view (the animation first fully opens the side view, and then closes it). This block allows you to change the centerview controller, for example (since it's obscured). You can pass `nil` if you don't need to execute something in the middle of the animation.
+```objc
[self.viewDeckController closeLeftViewBouncing:^(IIViewDeckController *controller) {
controller.centerController = [UIViewController alloc] init];
// ...
}];
+```
### open/close animation duration
The view deck controller allows you to set the speed at which the opening and closing animations play. To do so, use the following properties.
+```objc
self.viewDeckController.openSlideAnimationDuration = 0.15f; // In seconds
self.viewDeckController.closeSlideAnimationDuration = 0.25f;
+```
The default speed of both, if not set, is 0.3f.
### bounce animation duration
You can set the duration of the bounce animation as a factor (multiple) of the close/openSlideAnimationDurations. To control both the open and close of the bounce, you can simply use:
+
+```objc
self.viewDeckController.bounceDurationFactor = 0.5; // Animate at twice the speed (half the duration)
+```
The default factor is 1.0 if bounceDurationFactor is not set.
For even more control, you can also set the animation duration for the bounce open (the first part of the bounce):
+
+```objc
self.viewDeckController.bounceOpenSideDurationFactor = 0.3f;
+```
If bounceOpenSideDurationFactor is not set, it will fallback to the bounceDurationFactor behavior. If bounceOpenSideDurationFactor is set, bounceDurationFactor affects only the "close" (2nd half) of the bounce animation.
@@ -136,6 +151,7 @@ You can override the shadow (or leave it out alltogether) by assigning a delegat
For example:
+```objc
// applies a small, red shadow
- (void)viewDeckController:(IIViewDeckController *)viewDeckController applyShadow:(CALayer *)shadowLayer withBounds:(CGRect)rect {
shadowLayer.masksToBounds = NO;
@@ -145,6 +161,7 @@ For example:
shadowLayer.shadowOffset = CGSizeZero;
shadowLayer.shadowPath = [[UIBezierPath bezierPathWithRect:rect] CGPath];
}
+```
The bounds passed in through `rect` can be used for setting the shadow path to the layer, for performance reasons. It will be set to the bounds of the center view.
@@ -155,22 +172,28 @@ The controller supports "elasticity": when you pan the center view "over" one of
Of course, you can turn this behavior off. Just set `elasticity = NO` when loading the controller and you're set.
When rotating, the controller will move the open center views to the correct location: the ledge will be the same before and after rotation (this means a different part of the underlying side view will be exposed). You can control this behavior through the `sizeMode` property. You can use one of the following values:
+
+```objc
typdef enum {
IIViewDeckLedgeSizeMode, // when rotating, the ledge sizes are kept (side views are more/less visible)
IIViewDeckViewSizeMode // when rotating, the size view sizes are kept (ledges change)
} IIViewDeckSizeMode;
+```
+
The default is `IIViewDeckLedgeSizeMode`, which keeps the sizes of the defined ledges the same when rotating.
### panning
It is possible to control the panning behavior a bit. Set the `panningMode` on the controller to achieve 3 different modes:
+```objc
typedef enum {
IIViewDeckNoPanning, // no panning allowed
IIViewDeckFullViewPanning, // the default: touch anywhere in the center view to drag the center view around
IIViewDeckNavigationBarPanning, // panning only occurs when you start touching in the navigation bar (when the center controller is a UINavigationController with a visible navigation bar). Otherwise it will behave as IIViewDeckNoPanning.
IIViewDeckPanningViewPanning // panning only occurs when you start touching in a UIView set in panningView property
} IIViewDeckPanningMode;
+```
When you specify `IIViewDeckPanningViewPanning`, you have to set the `panningView` property on the controller. This view will react to pan motions that will pan the view deck.
@@ -178,16 +201,20 @@ When you specify `IIViewDeckPanningViewPanning`, you have to set the `panningVie
The center view can be disabled if it is slided out of the way. You do this by setting the `centerhiddenInteractivity` property on the controller.
+```objc
typedef enum {
IIViewDeckCenterHiddenUserInteractive, // the center view stays interactive
IIViewDeckCenterHiddenNotUserInteractive, // the center view will become nonresponsive to useractions
IIViewDeckCenterHiddenNotUserInteractiveWithTapToClose, // the center view will become nonresponsive to useractions, but will allow the user to tap it so that it closes
IIViewDeckCenterHiddenNotUserInteractiveWithTapToCloseBouncing, // same as IIViewDeckCenterHiddenNotUserInteractiveWithTapToClose, but closes the center view bouncing
} IIViewDeckCenterHiddenInteractivity;
+```
When you need to change the centercontroller (or something else) when the center view is bounced away, use the following message to react:
+```objc
- (void)viewDeckController:(IIViewDeckController *)viewDeckController didBounceWithClosingController:(UIViewController*)openController;
+```
## UINavigationController
View
2 VERSION
@@ -1 +1 @@
-2.4.0
+2.4.1
View
2 ViewDeck.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ViewDeck'
- s.version = '2.4.0'
+ s.version = '2.4.1'
s.platform = :ios
s.summary = 'An implementation of the sliding functionality found in the ' \
'Path 2.0 or Facebook iOS apps.'
View
41 ViewDeck/IIViewDeckController.m
@@ -456,6 +456,8 @@ - (void)dealloc {
self.leftController = nil;
self.rightController.viewDeckController = nil;
self.rightController = nil;
+
+ [self removePanners];
self.panners = nil;
// observations related to UIViewController properties
@@ -533,14 +535,17 @@ - (CGFloat)statusBarHeight {
}
- (CGRect)centerViewBounds {
- if (self.navigationControllerBehavior == IIViewDeckNavigationControllerContained)
+ BOOL greaterThanOrEqual7 = [@"7.0" compare:UIDevice.currentDevice.systemVersion options:NSNumericSearch] != NSOrderedDescending;
+ if (self.navigationControllerBehavior == IIViewDeckNavigationControllerContained || greaterThanOrEqual7) {
return self.referenceBounds;
+ }
return II_CGRectShrink(self.referenceBounds, 0, [self relativeStatusBarHeight] + (self.navigationController.navigationBarHidden ? 0 : self.navigationController.navigationBar.frame.size.height));
}
- (CGRect)sideViewBounds {
- if (self.navigationControllerBehavior == IIViewDeckNavigationControllerContained)
+ BOOL greaterThanOrEqual7 = [@"7.0" compare:UIDevice.currentDevice.systemVersion options:NSNumericSearch] != NSOrderedDescending;
+ if (self.navigationControllerBehavior == IIViewDeckNavigationControllerContained || greaterThanOrEqual7)
return self.referenceBounds;
return II_CGRectOffsetTopAndShrink(self.referenceBounds, [self relativeStatusBarHeight]);
@@ -1229,6 +1234,25 @@ - (void)arrangeViewsAfterRotation {
_preRotationSize = CGSizeZero;
}
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
+ [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+
+ if (CGSizeEqualToSize(_preRotationSize, CGSizeZero) == NO) {
+ return;
+ }
+
+ _preRotationSize = self.referenceBounds.size;
+ _preRotationCenterSize = self.centerView.bounds.size;
+ _preRotationIsLandscape = UIInterfaceOrientationIsLandscape(self.interfaceOrientation);
+
+ [coordinator animateAlongsideTransition:NULL completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
+ [self arrangeViewsAfterRotation];
+
+ [self applyCenterViewCornerRadiusAnimated:NO];
+ [self applyShadowToSlidingViewAnimated:NO];
+ }];
+}
+
- (void)setLedgeValue:(CGFloat)ledge forSide:(IIViewDeckSide)side {
if (_maxLedge > 0)
ledge = MIN(_maxLedge, ledge);
@@ -2751,6 +2775,7 @@ - (void)addPanners {
- (void)removePanners {
for (UIGestureRecognizer* panner in self.panners) {
[panner.view removeGestureRecognizer:panner];
+ panner.delegate = nil;
}
[self.panners removeAllObjects];
}
@@ -3004,7 +3029,6 @@ - (void)setController:(UIViewController *)controller forSide:(IIViewDeckSide)sid
if (currentSide != IIViewDeckNoSide) _controllers[currentSide] = nil;
[prevController setViewDeckController:nil];
[prevController removeFromParentViewController];
- [prevController didMoveToParentViewController:nil];
}
// make the switch
@@ -3017,12 +3041,10 @@ - (void)setController:(UIViewController *)controller forSide:(IIViewDeckSide)sid
if (controller) {
// and finish the transition
void(^finishTransition)(void) = ^{
- UIViewController* parentController = [[self parentViewController] parentViewController] ?: [self presentingViewController] ?: self;
-
- [parentController addChildViewController:controller];
+ [self addChildViewController:controller];
[controller setViewDeckController:self];
afterBlock(controller);
- [controller didMoveToParentViewController:parentController];
+ [controller didMoveToParentViewController:self];
[self applyCenterViewOpacityIfNeeded];
};
@@ -3138,9 +3160,7 @@ - (void)setCenterController:(UIViewController *)centerController {
@catch (NSException *exception) {}
[_centerController setViewDeckController:nil];
[_centerController removeFromParentViewController];
-
- [_centerController didMoveToParentViewController:nil];
II_RELEASE(_centerController);
}
@@ -3149,7 +3169,6 @@ - (void)setCenterController:(UIViewController *)centerController {
if (_centerController) {
II_RETAIN(_centerController);
- [_centerController willMoveToParentViewController:self];
[self addChildViewController:_centerController];
[_centerController setViewDeckController:self];
[_centerController addObserver:self forKeyPath:@"title" options:0 context:nil];
@@ -3275,7 +3294,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
#pragma mark - transition blocks
- (void)enqueueFinishTransitionBlock:(void(^)(void))finishTransition forController:(UIViewController*)controller {
- [controller willMoveToParentViewController:self];
+ [self addChildViewController:controller];
if (self.referenceView) {
finishTransition();
}
View
BIN docs/screen1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN docs/screen2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b021895

Please sign in to comment.
Something went wrong with that request. Please try again.