From 6d6d3f861b9fc179484028f7a5a9a7bbb29caa7e Mon Sep 17 00:00:00 2001 From: "stefano.antonelli" Date: Wed, 3 Apr 2013 13:57:47 +0200 Subject: [PATCH] Fixed issues #47,#52,#53 added an iPad example in SASlideMenuiPad --- CHANGELOG.md | 5 + SASlideMenu.xcodeproj/project.pbxproj | 252 +++++++++++++++++ .../ExampleDynamicMenuViewController.h | 2 +- .../ExampleDynamicMenuViewController.m | 16 +- SASlideMenu/ExampleStaticMenuViewController.h | 3 +- SASlideMenu/ExampleStaticMenuViewController.m | 19 +- .../SASlideMenuRootViewController.h | 8 +- .../SASlideMenu/SASlideMenuViewController.m | 27 +- SASlideMenuiPad/Default-568h@2x.png | Bin 0 -> 18594 bytes SASlideMenuiPad/Default.png | Bin 0 -> 6540 bytes SASlideMenuiPad/Default@2x.png | Bin 0 -> 16107 bytes SASlideMenuiPad/ExampleiPadAppDelegate.h | 15 + SASlideMenuiPad/ExampleiPadAppDelegate.m | 46 ++++ SASlideMenuiPad/ExampleiPadViewController.h | 16 ++ SASlideMenuiPad/ExampleiPadViewController.m | 160 +++++++++++ SASlideMenuiPad/SASlideMenuiPad-Info.plist | 49 ++++ SASlideMenuiPad/SASlideMenuiPad-Prefix.pch | 14 + SASlideMenuiPad/en.lproj/InfoPlist.strings | 2 + .../en.lproj/MainStoryboard_iPad.storyboard | 259 ++++++++++++++++++ .../en.lproj/MainStoryboard_iPhone.storyboard | 26 ++ SASlideMenuiPad/main.m | 18 ++ 21 files changed, 897 insertions(+), 40 deletions(-) create mode 100644 SASlideMenuiPad/Default-568h@2x.png create mode 100644 SASlideMenuiPad/Default.png create mode 100644 SASlideMenuiPad/Default@2x.png create mode 100644 SASlideMenuiPad/ExampleiPadAppDelegate.h create mode 100644 SASlideMenuiPad/ExampleiPadAppDelegate.m create mode 100644 SASlideMenuiPad/ExampleiPadViewController.h create mode 100644 SASlideMenuiPad/ExampleiPadViewController.m create mode 100644 SASlideMenuiPad/SASlideMenuiPad-Info.plist create mode 100644 SASlideMenuiPad/SASlideMenuiPad-Prefix.pch create mode 100644 SASlideMenuiPad/en.lproj/InfoPlist.strings create mode 100644 SASlideMenuiPad/en.lproj/MainStoryboard_iPad.storyboard create mode 100644 SASlideMenuiPad/en.lproj/MainStoryboard_iPhone.storyboard create mode 100644 SASlideMenuiPad/main.m diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b7e90b..62f5acb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,3 +5,8 @@ Version 1.2.0 * Changes to SASlideMenuDataSource * SASlideMenuStatic example now cache the content view controllers * Added CHANGELOG.md + +Version 1.2.1 +* Fixed issues #47,#52,#53 +* added an iPad example in SASlideMenuiPad + diff --git a/SASlideMenu.xcodeproj/project.pbxproj b/SASlideMenu.xcodeproj/project.pbxproj index b9f0231..09393ad 100644 --- a/SASlideMenu.xcodeproj/project.pbxproj +++ b/SASlideMenu.xcodeproj/project.pbxproj @@ -10,6 +10,58 @@ 7B27435A16D2820600F89C69 /* LightViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B27435916D2820600F89C69 /* LightViewController.m */; }; 7B27435C16D3638300F89C69 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 7B27435B16D3638300F89C69 /* CHANGELOG.md */; }; 7B27436B16D7801E00F89C69 /* FirstViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B27436A16D7801E00F89C69 /* FirstViewController.m */; }; + 7B38FC1916F0797400B7DFC3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8C3FDE15D8D55800E42A41 /* UIKit.framework */; }; + 7B38FC1A16F0797400B7DFC3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8C3FE015D8D55800E42A41 /* Foundation.framework */; }; + 7B38FC1B16F0797400B7DFC3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8C3FE215D8D55800E42A41 /* CoreGraphics.framework */; }; + 7B38FC2116F0797400B7DFC3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7B38FC1F16F0797400B7DFC3 /* InfoPlist.strings */; }; + 7B38FC2316F0797400B7DFC3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B38FC2216F0797400B7DFC3 /* main.m */; }; + 7B38FC2716F0797400B7DFC3 /* ExampleiPadAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B38FC2616F0797400B7DFC3 /* ExampleiPadAppDelegate.m */; }; + 7B38FC2916F0797400B7DFC3 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B38FC2816F0797400B7DFC3 /* Default.png */; }; + 7B38FC2B16F0797400B7DFC3 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B38FC2A16F0797400B7DFC3 /* Default@2x.png */; }; + 7B38FC2D16F0797400B7DFC3 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B38FC2C16F0797400B7DFC3 /* Default-568h@2x.png */; }; + 7B38FC3016F0797400B7DFC3 /* MainStoryboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B38FC2E16F0797400B7DFC3 /* MainStoryboard_iPhone.storyboard */; }; + 7B38FC3316F0797400B7DFC3 /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B38FC3116F0797400B7DFC3 /* MainStoryboard_iPad.storyboard */; }; + 7B38FC3616F0797400B7DFC3 /* ExampleiPadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B38FC3516F0797400B7DFC3 /* ExampleiPadViewController.m */; }; + 7B38FC3A16F07D0F00B7DFC3 /* ColoredViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B28D2A6165CCB10000EE929 /* ColoredViewController.m */; }; + 7B38FC3B16F07D3600B7DFC3 /* SASlideMenuContentSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC688F416A99DA3004ED00D /* SASlideMenuContentSegue.m */; }; + 7B38FC3C16F07D3600B7DFC3 /* SASlideMenuLeftMenuSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC688F616A99DA3004ED00D /* SASlideMenuLeftMenuSegue.m */; }; + 7B38FC3D16F07D3600B7DFC3 /* SASlideMenuRightMenuSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B28D2D81662B8D8000EE929 /* SASlideMenuRightMenuSegue.m */; }; + 7B38FC3E16F07D3600B7DFC3 /* SASlideMenuPushSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BFEA28616C0FACF00455A22 /* SASlideMenuPushSegue.m */; }; + 7B38FC3F16F07D3600B7DFC3 /* SASlideMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC688F816A99DA4004ED00D /* SASlideMenuViewController.m */; }; + 7B38FC4016F07D3600B7DFC3 /* SASlideMenuRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC688BE16A6FD08004ED00D /* SASlideMenuRootViewController.m */; }; + 7B38FC4116F07D3600B7DFC3 /* SASlideMenuRightMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BFEA28916C1545000455A22 /* SASlideMenuRightMenuViewController.m */; }; + 7B38FC4216F07D3600B7DFC3 /* SASlideMenuNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BFEA28C16C2573F00455A22 /* SASlideMenuNavigationController.m */; }; + 7B38FC4316F07D5000B7DFC3 /* SASlideMenuPushSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BFEA28616C0FACF00455A22 /* SASlideMenuPushSegue.m */; }; + 7B38FC4416F07D5B00B7DFC3 /* SASlideMenuRightMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BFEA28916C1545000455A22 /* SASlideMenuRightMenuViewController.m */; }; + 7B38FC4516F07D9200B7DFC3 /* ColoredDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B28D2F91664EE39000EE929 /* ColoredDetailViewController.m */; }; + 7B38FC4616F07E5F00B7DFC3 /* Screenshot-Dynamic-Menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BDBF417166CB2B600FDA327 /* Screenshot-Dynamic-Menu.png */; }; + 7B38FC4716F07E5F00B7DFC3 /* Screenshot-Dynamic-Right.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BDBF418166CB2B600FDA327 /* Screenshot-Dynamic-Right.png */; }; + 7B38FC4816F07E5F00B7DFC3 /* Screenshot-Static-Menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BDBF419166CB2B600FDA327 /* Screenshot-Static-Menu.png */; }; + 7B38FC4916F07E5F00B7DFC3 /* menuright.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2F41664E6FD000EE929 /* menuright.png */; }; + 7B38FC4A16F07E5F00B7DFC3 /* menuright@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2F51664E6FE000EE929 /* menuright@2x.png */; }; + 7B38FC4B16F07E5F00B7DFC3 /* rowcircle.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2E21664D418000EE929 /* rowcircle.png */; }; + 7B38FC4C16F07E5F00B7DFC3 /* rowcircle@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2E31664D418000EE929 /* rowcircle@2x.png */; }; + 7B38FC4D16F07E5F00B7DFC3 /* rowpenta.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2E41664D419000EE929 /* rowpenta.png */; }; + 7B38FC4E16F07E5F00B7DFC3 /* rowpenta@@x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2E51664D41A000EE929 /* rowpenta@@x.png */; }; + 7B38FC4F16F07E5F00B7DFC3 /* rowpenta@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2E61664D41B000EE929 /* rowpenta@2x.png */; }; + 7B38FC5016F07E5F00B7DFC3 /* rowsquare.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2E71664D41C000EE929 /* rowsquare.png */; }; + 7B38FC5116F07E5F00B7DFC3 /* rowsquare@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2E81664D41D000EE929 /* rowsquare@2x.png */; }; + 7B38FC5216F07E5F00B7DFC3 /* selectedColoredRow.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2AC165E27A3000EE929 /* selectedColoredRow.png */; }; + 7B38FC5316F07E5F00B7DFC3 /* selectedColoredRow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B28D2AD165E27A3000EE929 /* selectedColoredRow@2x.png */; }; + 7B38FC5416F07E5F00B7DFC3 /* Screenshot-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B1141A7161B658D00549B42 /* Screenshot-Landscape.png */; }; + 7B38FC5516F07E5F00B7DFC3 /* Screenshot-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B1141A8161B658D00549B42 /* Screenshot-Portrait.png */; }; + 7B38FC5616F07E5F00B7DFC3 /* menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B05395715E15A7F00D72377 /* menu.png */; }; + 7B38FC5716F07E5F00B7DFC3 /* menu@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B05395815E15A7F00D72377 /* menu@2x.png */; }; + 7B38FC5816F07E5F00B7DFC3 /* menuhighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B05395915E15A7F00D72377 /* menuhighlighted.png */; }; + 7B38FC5916F07E5F00B7DFC3 /* menuhighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B05395A15E15A7F00D72377 /* menuhighlighted@2x.png */; }; + 7B38FC5A16F07E5F00B7DFC3 /* menuicon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B05395B15E15A7F00D72377 /* menuicon.png */; }; + 7B38FC5B16F07E5F00B7DFC3 /* menuicon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B05395C15E15A7F00D72377 /* menuicon@2x.png */; }; + 7B38FC5C16F07E5F00B7DFC3 /* disclosure.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BF0A6AA15DE499F00B3B57F /* disclosure.png */; }; + 7B38FC5D16F07E5F00B7DFC3 /* disclosure@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BF0A6AB15DE499F00B3B57F /* disclosure@2x.png */; }; + 7B38FC5E16F07E5F00B7DFC3 /* row.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BF0A6AC15DE499F00B3B57F /* row.png */; }; + 7B38FC5F16F07E5F00B7DFC3 /* row@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BF0A6AD15DE499F00B3B57F /* row@2x.png */; }; + 7B38FC6016F07E5F00B7DFC3 /* rowselected.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BF0A6AE15DE499F00B3B57F /* rowselected.png */; }; + 7B38FC6116F07E5F00B7DFC3 /* rowselected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7BF0A6AF15DE499F00B3B57F /* rowselected@2x.png */; }; 7BC688BF16A6FD08004ED00D /* SASlideMenuRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC688BE16A6FD08004ED00D /* SASlideMenuRootViewController.m */; }; 7BC688FC16A99DB2004ED00D /* SASlideMenuContentSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC688F416A99DA3004ED00D /* SASlideMenuContentSegue.m */; }; 7BC688FD16A99DB2004ED00D /* SASlideMenuLeftMenuSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC688F616A99DA3004ED00D /* SASlideMenuLeftMenuSegue.m */; }; @@ -148,6 +200,20 @@ 7B28D2F51664E6FE000EE929 /* menuright@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menuright@2x.png"; sourceTree = ""; }; 7B28D2F81664EE37000EE929 /* ColoredDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColoredDetailViewController.h; path = ../SASlideMenu/ColoredDetailViewController.h; sourceTree = ""; }; 7B28D2F91664EE39000EE929 /* ColoredDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColoredDetailViewController.m; path = ../SASlideMenu/ColoredDetailViewController.m; sourceTree = ""; }; + 7B38FC1816F0797400B7DFC3 /* SASlideMenuiPad.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SASlideMenuiPad.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 7B38FC1E16F0797400B7DFC3 /* SASlideMenuiPad-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SASlideMenuiPad-Info.plist"; sourceTree = ""; }; + 7B38FC2016F0797400B7DFC3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 7B38FC2216F0797400B7DFC3 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 7B38FC2416F0797400B7DFC3 /* SASlideMenuiPad-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SASlideMenuiPad-Prefix.pch"; sourceTree = ""; }; + 7B38FC2516F0797400B7DFC3 /* ExampleiPadAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExampleiPadAppDelegate.h; sourceTree = ""; }; + 7B38FC2616F0797400B7DFC3 /* ExampleiPadAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExampleiPadAppDelegate.m; sourceTree = ""; }; + 7B38FC2816F0797400B7DFC3 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + 7B38FC2A16F0797400B7DFC3 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + 7B38FC2C16F0797400B7DFC3 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 7B38FC2F16F0797400B7DFC3 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPhone.storyboard; sourceTree = ""; }; + 7B38FC3216F0797400B7DFC3 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPad.storyboard; sourceTree = ""; }; + 7B38FC3416F0797400B7DFC3 /* ExampleiPadViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExampleiPadViewController.h; sourceTree = ""; }; + 7B38FC3516F0797400B7DFC3 /* ExampleiPadViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExampleiPadViewController.m; sourceTree = ""; }; 7B3B2D5215DCE0E1009F4AB8 /* DarkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DarkViewController.h; path = ../SASlideMenu/DarkViewController.h; sourceTree = ""; }; 7B3B2D5315DCE0E1009F4AB8 /* DarkViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DarkViewController.m; path = ../SASlideMenu/DarkViewController.m; sourceTree = ""; }; 7B56BF48163C2ECF00D9C143 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; @@ -220,6 +286,16 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 7B38FC1516F0797400B7DFC3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7B38FC1916F0797400B7DFC3 /* UIKit.framework in Frameworks */, + 7B38FC1A16F0797400B7DFC3 /* Foundation.framework in Frameworks */, + 7B38FC1B16F0797400B7DFC3 /* CoreGraphics.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7BDBF41F166CC79300FDA327 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -278,6 +354,34 @@ name = Images; sourceTree = ""; }; + 7B38FC1C16F0797400B7DFC3 /* SASlideMenuiPad */ = { + isa = PBXGroup; + children = ( + 7B38FC2516F0797400B7DFC3 /* ExampleiPadAppDelegate.h */, + 7B38FC2616F0797400B7DFC3 /* ExampleiPadAppDelegate.m */, + 7B38FC2E16F0797400B7DFC3 /* MainStoryboard_iPhone.storyboard */, + 7B38FC3116F0797400B7DFC3 /* MainStoryboard_iPad.storyboard */, + 7B38FC3416F0797400B7DFC3 /* ExampleiPadViewController.h */, + 7B38FC3516F0797400B7DFC3 /* ExampleiPadViewController.m */, + 7B38FC1D16F0797400B7DFC3 /* Supporting Files */, + ); + path = SASlideMenuiPad; + sourceTree = ""; + }; + 7B38FC1D16F0797400B7DFC3 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 7B38FC1E16F0797400B7DFC3 /* SASlideMenuiPad-Info.plist */, + 7B38FC1F16F0797400B7DFC3 /* InfoPlist.strings */, + 7B38FC2216F0797400B7DFC3 /* main.m */, + 7B38FC2416F0797400B7DFC3 /* SASlideMenuiPad-Prefix.pch */, + 7B38FC2816F0797400B7DFC3 /* Default.png */, + 7B38FC2A16F0797400B7DFC3 /* Default@2x.png */, + 7B38FC2C16F0797400B7DFC3 /* Default-568h@2x.png */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; 7B8C3FCF15D8D55800E42A41 = { isa = PBXGroup; children = ( @@ -289,6 +393,7 @@ 7B8C3FE415D8D55800E42A41 /* SASlideMenu */, 7BDBF427166CC79300FDA327 /* SASlideMenuDynamic */, 7BDBF46F166CDEB100FDA327 /* SASlideMenuStatic */, + 7B38FC1C16F0797400B7DFC3 /* SASlideMenuiPad */, 7B8C3FDD15D8D55800E42A41 /* Frameworks */, 7B8C3FDB15D8D55800E42A41 /* Products */, ); @@ -299,6 +404,7 @@ children = ( 7BDBF422166CC79300FDA327 /* SASlideMenuDynamic.app */, 7BDBF46A166CDEB100FDA327 /* SASlideMenuStatic.app */, + 7B38FC1816F0797400B7DFC3 /* SASlideMenuiPad.app */, ); name = Products; sourceTree = ""; @@ -434,6 +540,23 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 7B38FC1716F0797400B7DFC3 /* SASlideMenuiPad */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7B38FC3716F0797400B7DFC3 /* Build configuration list for PBXNativeTarget "SASlideMenuiPad" */; + buildPhases = ( + 7B38FC1416F0797400B7DFC3 /* Sources */, + 7B38FC1516F0797400B7DFC3 /* Frameworks */, + 7B38FC1616F0797400B7DFC3 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SASlideMenuiPad; + productName = SASlideMenuiPad; + productReference = 7B38FC1816F0797400B7DFC3 /* SASlideMenuiPad.app */; + productType = "com.apple.product-type.application"; + }; 7BDBF421166CC79300FDA327 /* SASlideMenuDynamic */ = { isa = PBXNativeTarget; buildConfigurationList = 7BDBF43F166CC79400FDA327 /* Build configuration list for PBXNativeTarget "SASlideMenuDynamic" */; @@ -492,11 +615,53 @@ targets = ( 7BDBF421166CC79300FDA327 /* SASlideMenuDynamic */, 7BDBF469166CDEB100FDA327 /* SASlideMenuStatic */, + 7B38FC1716F0797400B7DFC3 /* SASlideMenuiPad */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 7B38FC1616F0797400B7DFC3 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7B38FC2116F0797400B7DFC3 /* InfoPlist.strings in Resources */, + 7B38FC2916F0797400B7DFC3 /* Default.png in Resources */, + 7B38FC2B16F0797400B7DFC3 /* Default@2x.png in Resources */, + 7B38FC2D16F0797400B7DFC3 /* Default-568h@2x.png in Resources */, + 7B38FC3016F0797400B7DFC3 /* MainStoryboard_iPhone.storyboard in Resources */, + 7B38FC3316F0797400B7DFC3 /* MainStoryboard_iPad.storyboard in Resources */, + 7B38FC4616F07E5F00B7DFC3 /* Screenshot-Dynamic-Menu.png in Resources */, + 7B38FC4716F07E5F00B7DFC3 /* Screenshot-Dynamic-Right.png in Resources */, + 7B38FC4816F07E5F00B7DFC3 /* Screenshot-Static-Menu.png in Resources */, + 7B38FC4916F07E5F00B7DFC3 /* menuright.png in Resources */, + 7B38FC4A16F07E5F00B7DFC3 /* menuright@2x.png in Resources */, + 7B38FC4B16F07E5F00B7DFC3 /* rowcircle.png in Resources */, + 7B38FC4C16F07E5F00B7DFC3 /* rowcircle@2x.png in Resources */, + 7B38FC4D16F07E5F00B7DFC3 /* rowpenta.png in Resources */, + 7B38FC4E16F07E5F00B7DFC3 /* rowpenta@@x.png in Resources */, + 7B38FC4F16F07E5F00B7DFC3 /* rowpenta@2x.png in Resources */, + 7B38FC5016F07E5F00B7DFC3 /* rowsquare.png in Resources */, + 7B38FC5116F07E5F00B7DFC3 /* rowsquare@2x.png in Resources */, + 7B38FC5216F07E5F00B7DFC3 /* selectedColoredRow.png in Resources */, + 7B38FC5316F07E5F00B7DFC3 /* selectedColoredRow@2x.png in Resources */, + 7B38FC5416F07E5F00B7DFC3 /* Screenshot-Landscape.png in Resources */, + 7B38FC5516F07E5F00B7DFC3 /* Screenshot-Portrait.png in Resources */, + 7B38FC5616F07E5F00B7DFC3 /* menu.png in Resources */, + 7B38FC5716F07E5F00B7DFC3 /* menu@2x.png in Resources */, + 7B38FC5816F07E5F00B7DFC3 /* menuhighlighted.png in Resources */, + 7B38FC5916F07E5F00B7DFC3 /* menuhighlighted@2x.png in Resources */, + 7B38FC5A16F07E5F00B7DFC3 /* menuicon.png in Resources */, + 7B38FC5B16F07E5F00B7DFC3 /* menuicon@2x.png in Resources */, + 7B38FC5C16F07E5F00B7DFC3 /* disclosure.png in Resources */, + 7B38FC5D16F07E5F00B7DFC3 /* disclosure@2x.png in Resources */, + 7B38FC5E16F07E5F00B7DFC3 /* row.png in Resources */, + 7B38FC5F16F07E5F00B7DFC3 /* row@2x.png in Resources */, + 7B38FC6016F07E5F00B7DFC3 /* rowselected.png in Resources */, + 7B38FC6116F07E5F00B7DFC3 /* rowselected@2x.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7BDBF420166CC79300FDA327 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -585,6 +750,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 7B38FC1416F0797400B7DFC3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7B38FC2316F0797400B7DFC3 /* main.m in Sources */, + 7B38FC2716F0797400B7DFC3 /* ExampleiPadAppDelegate.m in Sources */, + 7B38FC3616F0797400B7DFC3 /* ExampleiPadViewController.m in Sources */, + 7B38FC3A16F07D0F00B7DFC3 /* ColoredViewController.m in Sources */, + 7B38FC3B16F07D3600B7DFC3 /* SASlideMenuContentSegue.m in Sources */, + 7B38FC3C16F07D3600B7DFC3 /* SASlideMenuLeftMenuSegue.m in Sources */, + 7B38FC3D16F07D3600B7DFC3 /* SASlideMenuRightMenuSegue.m in Sources */, + 7B38FC3E16F07D3600B7DFC3 /* SASlideMenuPushSegue.m in Sources */, + 7B38FC3F16F07D3600B7DFC3 /* SASlideMenuViewController.m in Sources */, + 7B38FC4016F07D3600B7DFC3 /* SASlideMenuRootViewController.m in Sources */, + 7B38FC4116F07D3600B7DFC3 /* SASlideMenuRightMenuViewController.m in Sources */, + 7B38FC4216F07D3600B7DFC3 /* SASlideMenuNavigationController.m in Sources */, + 7B38FC4516F07D9200B7DFC3 /* ColoredDetailViewController.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7BDBF41E166CC79300FDA327 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -624,12 +809,38 @@ 7BC6890216A9F51C004ED00D /* SASlideMenuRootViewController.m in Sources */, 7BFEA28E16C2573F00455A22 /* SASlideMenuNavigationController.m in Sources */, 7B27435A16D2820600F89C69 /* LightViewController.m in Sources */, + 7B38FC4316F07D5000B7DFC3 /* SASlideMenuPushSegue.m in Sources */, + 7B38FC4416F07D5B00B7DFC3 /* SASlideMenuRightMenuViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ + 7B38FC1F16F0797400B7DFC3 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 7B38FC2016F0797400B7DFC3 /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 7B38FC2E16F0797400B7DFC3 /* MainStoryboard_iPhone.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 7B38FC2F16F0797400B7DFC3 /* en */, + ); + name = MainStoryboard_iPhone.storyboard; + sourceTree = ""; + }; + 7B38FC3116F0797400B7DFC3 /* MainStoryboard_iPad.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 7B38FC3216F0797400B7DFC3 /* en */, + ); + name = MainStoryboard_iPad.storyboard; + sourceTree = ""; + }; 7B8C3FE715D8D55800E42A41 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -673,6 +884,39 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 7B38FC3816F0797400B7DFC3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_EMPTY_BODY = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "SASlideMenuiPad/SASlideMenuiPad-Prefix.pch"; + INFOPLIST_FILE = "SASlideMenuiPad/SASlideMenuiPad-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + 7B38FC3916F0797400B7DFC3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_EMPTY_BODY = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "SASlideMenuiPad/SASlideMenuiPad-Prefix.pch"; + INFOPLIST_FILE = "SASlideMenuiPad/SASlideMenuiPad-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; 7B8C3FF615D8D55800E42A41 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -793,6 +1037,14 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 7B38FC3716F0797400B7DFC3 /* Build configuration list for PBXNativeTarget "SASlideMenuiPad" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7B38FC3816F0797400B7DFC3 /* Debug */, + 7B38FC3916F0797400B7DFC3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; 7B8C3FD415D8D55800E42A41 /* Build configuration list for PBXProject "SASlideMenu" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/SASlideMenu/ExampleDynamicMenuViewController.h b/SASlideMenu/ExampleDynamicMenuViewController.h index 1d2e379..d31d7fb 100644 --- a/SASlideMenu/ExampleDynamicMenuViewController.h +++ b/SASlideMenu/ExampleDynamicMenuViewController.h @@ -9,7 +9,7 @@ #import "SASlideMenuViewController.h" #import "SASlideMenuDataSource.h" #import "SASlideMenuDelegate.h" -@interface ExampleDynamicMenuViewController : SASlideMenuViewController +@interface ExampleDynamicMenuViewController : SASlideMenuViewController -(void) tap:(id) sender; @end diff --git a/SASlideMenu/ExampleDynamicMenuViewController.m b/SASlideMenu/ExampleDynamicMenuViewController.m index d112639..c7f624b 100644 --- a/SASlideMenu/ExampleDynamicMenuViewController.m +++ b/SASlideMenu/ExampleDynamicMenuViewController.m @@ -9,7 +9,7 @@ #import "ExampleDynamicMenuViewController.h" #import "ColoredViewController.h" -@interface ExampleDynamicMenuViewController () +@interface ExampleDynamicMenuViewController () @property (nonatomic) CGFloat selectedHue; @property (nonatomic) CGFloat selectedBrightness; @@ -23,28 +23,16 @@ @implementation ExampleDynamicMenuViewController -(id) initWithCoder:(NSCoder *)aDecoder{ if (self = [super initWithCoder:aDecoder]) { - // Assign self to the slideMenuDataSource because self will implement SASlideMenuDatSource - self.slideMenuDataSource = self; - self.slideMenuDelegate = self; self.selectedBrightness = 0.3; self.selectedHue = 0.0; } return self; } --(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil{ - if(self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]){ - // Assign self to the slideMenuDataSource because self will implement SASlideMenuDataSource - self.slideMenuDataSource = self; - self.selectedBrightness = 0.3; - self.selectedHue = 0.0; - } - return self; -} - -(void)tap:(id)sender{ } + -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation{ return YES; } diff --git a/SASlideMenu/ExampleStaticMenuViewController.h b/SASlideMenu/ExampleStaticMenuViewController.h index 6020565..6d7067d 100644 --- a/SASlideMenu/ExampleStaticMenuViewController.h +++ b/SASlideMenu/ExampleStaticMenuViewController.h @@ -9,6 +9,5 @@ #import #import "SASlideMenuViewController.h" #import "SASlideMenuDataSource.h" -@interface ExampleStaticMenuViewController :SASlideMenuViewController - +@interface ExampleStaticMenuViewController :SASlideMenuViewController @end diff --git a/SASlideMenu/ExampleStaticMenuViewController.m b/SASlideMenu/ExampleStaticMenuViewController.m index 82f74de..94f1585 100644 --- a/SASlideMenu/ExampleStaticMenuViewController.m +++ b/SASlideMenu/ExampleStaticMenuViewController.m @@ -12,29 +12,12 @@ #import "MenuCell.h" #import "DarkViewController.h" #import "LightViewController.h" -@interface ExampleStaticMenuViewController () +@interface ExampleStaticMenuViewController() @end @implementation ExampleStaticMenuViewController --(id) initWithCoder:(NSCoder *)aDecoder{ - if (self = [super initWithCoder:aDecoder]) { - // Assign self to the slideMenuDataSource because self will implement SASlideMenuDatSource - self.slideMenuDataSource = self; - self.slideMenuDelegate = self; - } - return self; -} - --(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil{ - if(self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]){ - // Assign self to the slideMenuDataSource because self will implement SASlideMenuDataSource - self.slideMenuDataSource = self; - } - return self; -} - - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation{ return YES; } diff --git a/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h b/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h index cf20229..10ac57b 100644 --- a/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h +++ b/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h @@ -14,10 +14,10 @@ @interface SASlideMenuRootViewController : UIViewController -@property (strong, nonatomic) SASlideMenuViewController* leftMenu; -@property (strong, nonatomic) UIViewController* rightMenu; -@property (assign, nonatomic) Boolean isRightMenuEnabled; -@property (strong, nonatomic) SASlideMenuNavigationController* navigationController; +@property (nonatomic,strong) SASlideMenuViewController* leftMenu; +@property (nonatomic,strong) UIViewController* rightMenu; +@property (nonatomic,assign) Boolean isRightMenuEnabled; +@property (nonatomic,strong) SASlideMenuNavigationController* navigationController; -(void) switchToContentViewController:(UINavigationController*) content; -(void) addContentViewController:(UIViewController*) content withIndexPath:(NSIndexPath*)indexPath; diff --git a/SASlideMenu/SASlideMenu/SASlideMenuViewController.m b/SASlideMenu/SASlideMenu/SASlideMenuViewController.m index d7048ac..86816dd 100644 --- a/SASlideMenu/SASlideMenu/SASlideMenuViewController.m +++ b/SASlideMenu/SASlideMenu/SASlideMenuViewController.m @@ -8,11 +8,36 @@ #import "SASlideMenuViewController.h" #import "SASlideMenuRootViewController.h" -@interface SASlideMenuViewController () +@interface SASlideMenuViewController () @end @implementation SASlideMenuViewController +#pragma mark - +#pragma mark Init +-(void)setup; { + if(self.slideMenuDataSource == nil) + self.slideMenuDataSource = self; + if(self.slideMenuDelegate == nil) + self.slideMenuDelegate = self; + +} + +-(id)initWithCoder:(NSCoder *)aDecoder; { + self = [super initWithCoder:aDecoder]; + if (self) { + [self setup]; + } + return self; +} + +-(id)init; { + self = [super self]; + if (self) { + [self setup]; + } + return self; +} #pragma mark - #pragma mark SASlideMenuViewController diff --git a/SASlideMenuiPad/Default-568h@2x.png b/SASlideMenuiPad/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/SASlideMenuiPad/Default.png b/SASlideMenuiPad/Default.png new file mode 100644 index 0000000000000000000000000000000000000000..4c8ca6f693f96d511e9113c0eb59eec552354e42 GIT binary patch literal 6540 zcmeAS@N?(olHy`uVBq!ia0y~yU~~ZD2OMlbkt;o0To@QwR5G2N13aCb6#|O#(=u~X z85k@CTSM>X-wqM6>&y>YB4)1;;ojbLbbV-W^iFB1wa3^zCog^LCAReC4K0-?R_2{6 zrP*)4+_uWUy3w5N52M3PW_}MFMP9a~>YLvVZ1D_k*IMQ2QT^fwzoOb(*3gH$%aYWC zkHmcab=va2<#X%jakpJ;<1@F;k__#bwtC&%^D0v(FBh9K&$sK+<}2RJS609D)17$w ztdQP8(eLM8Ka}m_IQ@3wyMKP)l=oM4-?`YS_*P?4V_ORLPxsj&7Ju#kH;>6^Kp?T7~ zl+q?{UOOqV==?+d{=)5s|M~T1mwtH@+Z^$G&eEO9JNP^AX@3jZ*J*!!>lc|1-W%fA z@AOQpXZ_Lt>rxFXrGp*zLPiW@uo_c7C{As>j zWeX)wi+LTp_)@KYZCX{j;H?|1yXT4DnlS(Fr8gyP5|uaX_gLvaW0ScZdnG7o+u{T6 zFI-%d{ls*WuCDa5UJ@|RXv&ejZe}*BMkiWY51&pnRPw(hlykSzvj6e%mYz-GdvzBD zF10?szF_~!jS=?2HyQuPCvARXAe}C}WP|yQ*>5~~=*Nxq8+HHW1~FMDRCP^TcacKuk$ z(U#REVv)D!PhJ*ecH-ELFUrfyV&*)Z)>UCOuS?yd^L@Afk>ihynYPc{^CRwu+JHX+#$@YsC4c|l0tGigsn@jy) zXD($Ouk>H+V(Mr6NQT0S9BFM~V6nkj;1OBOz`zY;a|<&v%$g$sEJPk;hD4M^`1)8S z=jZArrsOB3>Q&?x097+E*i={nnYpPYi3%0DIeEoa6}C!X6;?ntNLXJ<0j#7X+g2&U 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 literal 0 HcmV?d00001 diff --git a/SASlideMenuiPad/ExampleiPadAppDelegate.h b/SASlideMenuiPad/ExampleiPadAppDelegate.h new file mode 100644 index 0000000..68adf87 --- /dev/null +++ b/SASlideMenuiPad/ExampleiPadAppDelegate.h @@ -0,0 +1,15 @@ +// +// ExampleiPadAppDelegate.h +// SASlideMenuiPad +// +// Created by Stefano Antonelli on 3/13/13. +// Copyright (c) 2013 Stefano Antonelli. All rights reserved. +// + +#import + +@interface ExampleiPadAppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + +@end diff --git a/SASlideMenuiPad/ExampleiPadAppDelegate.m b/SASlideMenuiPad/ExampleiPadAppDelegate.m new file mode 100644 index 0000000..6b073f2 --- /dev/null +++ b/SASlideMenuiPad/ExampleiPadAppDelegate.m @@ -0,0 +1,46 @@ +// +// ExampleiPadAppDelegate.m +// SASlideMenuiPad +// +// Created by Stefano Antonelli on 3/13/13. +// Copyright (c) 2013 Stefano Antonelli. All rights reserved. +// + +#import "ExampleiPadAppDelegate.h" + +@implementation ExampleiPadAppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions +{ + // Override point for customization after application launch. + return YES; +} + +- (void)applicationWillResignActive:(UIApplication *)application +{ + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. +} + +- (void)applicationDidEnterBackground:(UIApplication *)application +{ + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. +} + +- (void)applicationWillEnterForeground:(UIApplication *)application +{ + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. +} + +- (void)applicationDidBecomeActive:(UIApplication *)application +{ + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. +} + +- (void)applicationWillTerminate:(UIApplication *)application +{ + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. +} + +@end diff --git a/SASlideMenuiPad/ExampleiPadViewController.h b/SASlideMenuiPad/ExampleiPadViewController.h new file mode 100644 index 0000000..5c48792 --- /dev/null +++ b/SASlideMenuiPad/ExampleiPadViewController.h @@ -0,0 +1,16 @@ +// +// ExampleiPadViewController.h +// SASlideMenuiPad +// +// Created by Stefano Antonelli on 3/13/13. +// Copyright (c) 2013 Stefano Antonelli. All rights reserved. +// + +#import +#import "SASlideMenuViewController.h" +#import "SASlideMenuDataSource.h" +#import "SASlideMenuDelegate.h" + +@interface ExampleiPadViewController : SASlideMenuViewController + +@end diff --git a/SASlideMenuiPad/ExampleiPadViewController.m b/SASlideMenuiPad/ExampleiPadViewController.m new file mode 100644 index 0000000..1a00149 --- /dev/null +++ b/SASlideMenuiPad/ExampleiPadViewController.m @@ -0,0 +1,160 @@ +// +// ExampleiPadViewController.m +// SASlideMenuiPad +// +// Created by Stefano Antonelli on 3/13/13. +// Copyright (c) 2013 Stefano Antonelli. All rights reserved. +// + +#import "ExampleiPadViewController.h" +#import "ColoredViewController.h" +#import "SASlideMenuRootViewController.h" + +@interface ExampleiPadViewController () +@property (nonatomic) CGFloat selectedHue; +@property (nonatomic) CGFloat selectedBrightness; + +@end + +@implementation ExampleiPadViewController + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation{ + return YES; +} + +#pragma mark - +#pragma mark SASlideMenuDataSource + +-(void) prepareForSwitchToContentViewController:(UINavigationController *)content{ + UIViewController* controller = [content.viewControllers objectAtIndex:0]; + if ([controller isKindOfClass:[ColoredViewController class]]) { + ColoredViewController* coloredViewController = (ColoredViewController*) controller; + [coloredViewController setBackgroundHue:self.selectedHue brightness:self.selectedBrightness]; + } +} + +// It configure the menu button. The beahviour of the button should not be modified +-(void) configureMenuButton:(UIButton *)menuButton{ + menuButton.frame = CGRectMake(0, 0, 40, 29); + [menuButton setImage:[UIImage imageNamed:@"menuicon.png"] forState:UIControlStateNormal]; + [menuButton setBackgroundImage:[UIImage imageNamed:@"menu.png"] forState:UIControlStateNormal]; + [menuButton setBackgroundImage:[UIImage imageNamed:@"menuhighlighted.png"] forState:UIControlStateHighlighted]; + [menuButton setAdjustsImageWhenHighlighted:NO]; + [menuButton setAdjustsImageWhenDisabled:NO]; +} + +// It configure the right menu button. The beahviour of the button should not be modified +-(void) configureRightMenuButton:(UIButton *)menuButton{ + menuButton.frame = CGRectMake(0, 0, 40, 29); + [menuButton setImage:[UIImage imageNamed:@"menuright.png"] forState:UIControlStateNormal]; + [menuButton setBackgroundImage:[UIImage imageNamed:@"menu.png"] forState:UIControlStateNormal]; + [menuButton setBackgroundImage:[UIImage imageNamed:@"menuhighlighted.png"] forState:UIControlStateHighlighted]; + [menuButton setAdjustsImageWhenHighlighted:NO]; + [menuButton setAdjustsImageWhenDisabled:NO]; +} + +// This is the segue you want visibile when the controller is loaded the first time +-(NSIndexPath*) selectedIndexPath{ + return [NSIndexPath indexPathForRow:0 inSection:0]; +} + +// It maps each indexPath to the segueId to be used. The segue is performed only the first time the controller needs to loaded, subsequent switch to the content controller will use the already loaded controller + +-(NSString*) segueIdForIndexPath:(NSIndexPath *)indexPath{ + return @"colored"; +} + +#pragma mark - +#pragma mark UITableViewDataSource + +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView{ + return 3; +} + +-(NSString*)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section{ + if (section == 0) { + return @"Red"; + }else if (section == 1){ + return @"Green"; + }else { + return @"Blue"; + } +} + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ + return 4; +} +-(void) tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath{ + CGFloat brightness = 1-((double) indexPath.row)/5; + NSInteger section = indexPath.section; + CGFloat hue=0; + if (section == 0) { + hue = 0.0; + }else if (section==1){ + hue = 0.33; + }else if (section==2){ + hue = 0.66; + } + cell.backgroundColor = [UIColor colorWithHue:hue saturation:1.0 brightness:brightness alpha:1.0]; +} + +-(UITableViewCell*) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ + UITableViewCell* cell = [self.tableView dequeueReusableCellWithIdentifier:@"item"]; + return cell; +} + +-(CGFloat) leftMenuVisibleWidth{ + return 600; +} + +-(CGFloat) rightMenuVisibleWidth{ + return 300; +} + +#pragma mark - +#pragma mark UITableViewDelegate +-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ + CGFloat brightness = 1-((double) indexPath.row)/5; + NSInteger section = indexPath.section; + CGFloat hue=0; + if (section == 0) { + hue = 0.0; + }else if (section==1){ + hue = 0.33; + }else if (section==2){ + hue = 0.66; + } + self.selectedHue = hue; + self.selectedBrightness = brightness; + [super tableView:tableView didSelectRowAtIndexPath:indexPath]; +} + +#pragma mark - +#pragma mark SASlideMenuDelegate + +-(void) slideMenuWillSlideIn{ + NSLog(@"slideMenuWillSlideIn"); +} +-(void) slideMenuDidSlideIn{ + NSLog(@"slideMenuDidSlideIn"); +} +-(void) slideMenuWillSlideToSide{ + NSLog(@"slideMenuWillSlideToSide"); +} +-(void) slideMenuDidSlideToSide{ + NSLog(@"slideMenuDidSlideToSide"); +} +-(void) slideMenuWillSlideOut{ + NSLog(@"slideMenuWillSlideOut"); +} +-(void) slideMenuDidSlideOut{ + NSLog(@"slideMenuDidSlideOut"); +} +-(void) slideMenuWillSlideToLeft{ + NSLog(@"slideMenuWillSlideToLeft"); +} +-(void) slideMenuDidSlideToLeft{ + NSLog(@"slideMenuDidSlideToLeft"); +} + +@end diff --git a/SASlideMenuiPad/SASlideMenuiPad-Info.plist b/SASlideMenuiPad/SASlideMenuiPad-Info.plist new file mode 100644 index 0000000..4c6c566 --- /dev/null +++ b/SASlideMenuiPad/SASlideMenuiPad-Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + SA.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + UIMainStoryboardFile + MainStoryboard_iPhone + UIMainStoryboardFile~ipad + MainStoryboard_iPad + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/SASlideMenuiPad/SASlideMenuiPad-Prefix.pch b/SASlideMenuiPad/SASlideMenuiPad-Prefix.pch new file mode 100644 index 0000000..3567a18 --- /dev/null +++ b/SASlideMenuiPad/SASlideMenuiPad-Prefix.pch @@ -0,0 +1,14 @@ +// +// Prefix header for all source files of the 'SASlideMenuiPad' target in the 'SASlideMenuiPad' project +// + +#import + +#ifndef __IPHONE_5_0 +#warning "This project uses features only available in iOS SDK 5.0 and later." +#endif + +#ifdef __OBJC__ + #import + #import +#endif diff --git a/SASlideMenuiPad/en.lproj/InfoPlist.strings b/SASlideMenuiPad/en.lproj/InfoPlist.strings new file mode 100644 index 0000000..477b28f --- /dev/null +++ b/SASlideMenuiPad/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/SASlideMenuiPad/en.lproj/MainStoryboard_iPad.storyboard b/SASlideMenuiPad/en.lproj/MainStoryboard_iPad.storyboard new file mode 100644 index 0000000..5e3d32a --- /dev/null +++ b/SASlideMenuiPad/en.lproj/MainStoryboard_iPad.storyboard @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SASlideMenuiPad/en.lproj/MainStoryboard_iPhone.storyboard b/SASlideMenuiPad/en.lproj/MainStoryboard_iPhone.storyboard new file mode 100644 index 0000000..b649d38 --- /dev/null +++ b/SASlideMenuiPad/en.lproj/MainStoryboard_iPhone.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SASlideMenuiPad/main.m b/SASlideMenuiPad/main.m new file mode 100644 index 0000000..407f48a --- /dev/null +++ b/SASlideMenuiPad/main.m @@ -0,0 +1,18 @@ +// +// main.m +// SASlideMenuiPad +// +// Created by Stefano Antonelli on 3/13/13. +// Copyright (c) 2013 Stefano Antonelli. All rights reserved. +// + +#import + +#import "ExampleiPadAppDelegate.h" + +int main(int argc, char *argv[]) +{ + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([ExampleiPadAppDelegate class])); + } +}