diff --git a/ECSlidingViewController.xcodeproj/project.pbxproj b/ECSlidingViewController.xcodeproj/project.pbxproj index 570e666..d263e9e 100644 --- a/ECSlidingViewController.xcodeproj/project.pbxproj +++ b/ECSlidingViewController.xcodeproj/project.pbxproj @@ -20,7 +20,7 @@ 2750E79D14CDBA48007727A0 /* ThirdTopViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2750E79C14CDBA48007727A0 /* ThirdTopViewController.m */; }; 2750E7A014CDBC32007727A0 /* UnderRightViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2750E79F14CDBC32007727A0 /* UnderRightViewController.m */; }; 2750E7AE14CF1306007727A0 /* ECSlidingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2750E7AB14CF1306007727A0 /* ECSlidingViewController.m */; }; - 2750E7AF14CF1306007727A0 /* UIImage+UIImage_ImageWithUIView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2750E7AD14CF1306007727A0 /* UIImage+UIImage_ImageWithUIView.m */; }; + 2750E7AF14CF1306007727A0 /* UIImage+ImageWithUIView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2750E7AD14CF1306007727A0 /* UIImage+ImageWithUIView.m */; }; 27FC94E014D0C14E0000B18C /* InitialSlidingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27FC94DF14D0C14E0000B18C /* InitialSlidingViewController.m */; }; 27FC94E314D105C60000B18C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27FC94E214D105C60000B18C /* QuartzCore.framework */; }; /* End PBXBuildFile section */ @@ -49,8 +49,8 @@ 2750E79F14CDBC32007727A0 /* UnderRightViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnderRightViewController.m; sourceTree = ""; }; 2750E7AA14CF1306007727A0 /* ECSlidingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECSlidingViewController.h; sourceTree = ""; }; 2750E7AB14CF1306007727A0 /* ECSlidingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ECSlidingViewController.m; sourceTree = ""; }; - 2750E7AC14CF1306007727A0 /* UIImage+UIImage_ImageWithUIView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+UIImage_ImageWithUIView.h"; sourceTree = ""; }; - 2750E7AD14CF1306007727A0 /* UIImage+UIImage_ImageWithUIView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+UIImage_ImageWithUIView.m"; sourceTree = ""; }; + 2750E7AD14CF1306007727A0 /* UIImage+ImageWithUIView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+ImageWithUIView.m"; sourceTree = ""; }; + 279E158D14D737F60028A9EE /* UIImage+ImageWithUIView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+ImageWithUIView.h"; sourceTree = ""; }; 27FC94DE14D0C14E0000B18C /* InitialSlidingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialSlidingViewController.h; sourceTree = ""; }; 27FC94DF14D0C14E0000B18C /* InitialSlidingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialSlidingViewController.m; sourceTree = ""; }; 27FC94E214D105C60000B18C /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -155,8 +155,8 @@ children = ( 2750E7AA14CF1306007727A0 /* ECSlidingViewController.h */, 2750E7AB14CF1306007727A0 /* ECSlidingViewController.m */, - 2750E7AC14CF1306007727A0 /* UIImage+UIImage_ImageWithUIView.h */, - 2750E7AD14CF1306007727A0 /* UIImage+UIImage_ImageWithUIView.m */, + 279E158D14D737F60028A9EE /* UIImage+ImageWithUIView.h */, + 2750E7AD14CF1306007727A0 /* UIImage+ImageWithUIView.m */, ); name = ECSlidingViewController; path = Vendor/ECSlidingViewController; @@ -232,7 +232,7 @@ 2750E79D14CDBA48007727A0 /* ThirdTopViewController.m in Sources */, 2750E7A014CDBC32007727A0 /* UnderRightViewController.m in Sources */, 2750E7AE14CF1306007727A0 /* ECSlidingViewController.m in Sources */, - 2750E7AF14CF1306007727A0 /* UIImage+UIImage_ImageWithUIView.m in Sources */, + 2750E7AF14CF1306007727A0 /* UIImage+ImageWithUIView.m in Sources */, 27FC94E014D0C14E0000B18C /* InitialSlidingViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.h b/ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.h index 6faa739..7f9db16 100644 --- a/ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.h +++ b/ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.h @@ -7,7 +7,7 @@ // #import -#import "UIImage+UIImage_ImageWithUIView.h" +#import "UIImage+ImageWithUIView.h" /** @constant ECSide side of screen */ typedef enum { diff --git a/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+UIImage_ImageWithUIView.h b/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+ImageWithUIView.h similarity index 64% rename from ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+UIImage_ImageWithUIView.h rename to ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+ImageWithUIView.h index 26a7eb4..d5c280b 100644 --- a/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+UIImage_ImageWithUIView.h +++ b/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+ImageWithUIView.h @@ -1,11 +1,11 @@ // -// UIImage+UIImage_ImageWithUIView.h +// UIImage+ImageWithUIView.h // Taken from http://stackoverflow.com/a/7233268 // #import #import -@interface UIImage (UIImage_ImagewithUIView) +@interface UIImage (ImageWithUIView) + (UIImage *)imageWithUIView:(UIView *)view; @end \ No newline at end of file diff --git a/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+UIImage_ImageWithUIView.m b/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+ImageWithUIView.m similarity index 88% rename from ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+UIImage_ImageWithUIView.m rename to ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+ImageWithUIView.m index 27bf21a..8f3f979 100644 --- a/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+UIImage_ImageWithUIView.m +++ b/ECSlidingViewController/Vendor/ECSlidingViewController/UIImage+ImageWithUIView.m @@ -1,11 +1,11 @@ // -// UIImage+UIImage_ImageWithUIView.m +// UIImage+ImageWithUIView.m // Taken from http://stackoverflow.com/a/7233268 // -#import "UIImage+UIImage_ImageWithUIView.h" +#import "UIImage+ImageWithUIView.h" -@implementation UIImage (UIImage_ImagewithUIView) +@implementation UIImage (ImageWithUIView) #pragma mark - #pragma mark TakeScreenShot static CGContextRef createBitmapContext(int pixelsWide, int pixelsHigh)