diff --git a/.gitignore b/.gitignore index e3ced7b..320ecfb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ DerivedData .DS* *.xcworkspace xcuserdata +Pods +Podfile.lock diff --git a/EKKeyboardAvoidingScrollView.xcodeproj/project.pbxproj b/EKKeyboardAvoidingScrollView.xcodeproj/project.pbxproj index f34d43f..4268e7a 100644 --- a/EKKeyboardAvoidingScrollView.xcodeproj/project.pbxproj +++ b/EKKeyboardAvoidingScrollView.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + D921D05016721EF500AF97A7 /* CGRectTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = D921D04F16721EF500AF97A7 /* CGRectTransform.h */; settings = {ATTRIBUTES = (); }; }; D9F3BB35166F4B8A00F0DEAE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3BB34166F4B8A00F0DEAE /* Foundation.framework */; }; D9F3BB3A166F4B8A00F0DEAE /* EKKeyboardAvoidingScrollView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D9F3BB39166F4B8A00F0DEAE /* EKKeyboardAvoidingScrollView.h */; }; D9F3BB3C166F4B8A00F0DEAE /* EKKeyboardAvoidingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D9F3BB3B166F4B8A00F0DEAE /* EKKeyboardAvoidingScrollView.m */; }; @@ -30,6 +31,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + D921D04F16721EF500AF97A7 /* CGRectTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGRectTransform.h; sourceTree = ""; }; D9F3BB31166F4B8A00F0DEAE /* libEKKeyboardAvoidingScrollView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEKKeyboardAvoidingScrollView.a; sourceTree = BUILT_PRODUCTS_DIR; }; D9F3BB34166F4B8A00F0DEAE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D9F3BB38166F4B8A00F0DEAE /* EKKeyboardAvoidingScrollView-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EKKeyboardAvoidingScrollView-Prefix.pch"; sourceTree = ""; }; @@ -51,6 +53,14 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + D921D054167222D200AF97A7 /* CGRectTransform */ = { + isa = PBXGroup; + children = ( + D921D04F16721EF500AF97A7 /* CGRectTransform.h */, + ); + name = CGRectTransform; + sourceTree = ""; + }; D9F3BB26166F4B8A00F0DEAE = { isa = PBXGroup; children = ( @@ -84,6 +94,7 @@ D9F3BB39166F4B8A00F0DEAE /* EKKeyboardAvoidingScrollView.h */, D9F3BB3B166F4B8A00F0DEAE /* EKKeyboardAvoidingScrollView.m */, D9F3BB37166F4B8A00F0DEAE /* Supporting Files */, + D921D054167222D200AF97A7 /* CGRectTransform */, ); path = EKKeyboardAvoidingScrollView; sourceTree = ""; @@ -104,6 +115,7 @@ buildActionMask = 2147483647; files = ( D9F3BB95166F6A9200F0DEAE /* EKKeyboardAvoidingScrollViewManger.h in Headers */, + D921D05016721EF500AF97A7 /* CGRectTransform.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/EKKeyboardAvoidingScrollView/CGRectTransform.h b/EKKeyboardAvoidingScrollView/CGRectTransform.h new file mode 100644 index 0000000..99d44ce --- /dev/null +++ b/EKKeyboardAvoidingScrollView/CGRectTransform.h @@ -0,0 +1,41 @@ +// +// CGRectTransform.h +// EKKeyboardAvoidingScrollView +// +// Created by Evgeniy Kirpichenko on 12/7/12. +// Copyright (c) 2012 Evgeniy Kirpichenko. All rights reserved. +// + +// + +#import + +typedef enum { + CGRectTransformRotateLeft, + CGRectTransformRotateRight, + CGRectTransformExpand +} CGRectTransform; + +CGRect CGRectTransformed(CGRect rect, CGSize viewSize, CGRectTransform transform) +{ + switch (transform) { + case CGRectTransformRotateLeft: + return CGRectMake(rect.origin.y, + viewSize.width - CGRectGetMaxX(rect), + rect.size.height, + rect.size.width); + case CGRectTransformRotateRight: + return CGRectMake(viewSize.height - CGRectGetMaxY(rect), + rect.origin.x, + rect.size.height, + rect.size.width); + case CGRectTransformExpand: + return CGRectMake(viewSize.width - CGRectGetMaxX(rect), + viewSize.height - CGRectGetMaxY(rect), + rect.size.width, + rect.size.height); + default: + return rect; + } +} + diff --git a/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollView-Prefix.pch b/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollView-Prefix.pch index e337da5..058db26 100644 --- a/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollView-Prefix.pch +++ b/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollView-Prefix.pch @@ -5,3 +5,4 @@ #ifdef __OBJC__ #import #endif + diff --git a/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollViewManger.m b/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollViewManger.m index 5802031..3868429 100644 --- a/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollViewManger.m +++ b/EKKeyboardAvoidingScrollView/EKKeyboardAvoidingScrollViewManger.m @@ -7,6 +7,9 @@ // #import "EKKeyboardAvoidingScrollViewManger.h" +#import "CGRectTransform.h" + +#import @interface RegisteredScrollPack : NSObject @property (nonatomic, assign) UIScrollView *scrollView; @@ -14,14 +17,10 @@ @interface RegisteredScrollPack : NSObject @end @implementation RegisteredScrollPack +@end -- (void) dealloc -{ - [self setScrollView:nil]; - [super dealloc]; -} -@end +//NSString *const kFrameKeyPath = @"frame"; static EKKeyboardAvoidingScrollViewManger *kUIScrollViewDisplayManager; @@ -70,6 +69,11 @@ - (void) registerScrollViewForKeyboardAvoiding:(UIScrollView *) scrollView scrollPack = [self prepareScrollPackWithScrollView:scrollView]; [registeredScrolls addObject:scrollPack]; [self updateRegisteredScroll:scrollPack]; + +// [scrollView addObserver:self +// forKeyPath:kFrameKeyPath +// options:NSKeyValueObservingOptionNew +// context:nil]; } } } @@ -80,7 +84,9 @@ - (void) unregisterScrollViewFromKeyboardAvoiding:(UIScrollView *) scrollView if (scrollView != nil) { RegisteredScrollPack *scrollPack = [self registeredScrollForView:scrollView]; if (scrollPack != nil) { + [scrollView window]; [scrollView setContentInset:[scrollPack scrollDefaultInsets]]; +// [scrollView removeObserver:self forKeyPath:kFrameKeyPath context:nil]; [registeredScrolls removeObject:scrollPack]; } } @@ -105,7 +111,7 @@ - (void) keyboardFrameDidChange:(NSNotification *) notification [self setKeyboardFrame:[keyboardFrameValue CGRectValue]]; [self updateRegisteredScrolls]; - NSLog(@"scrolls count = %d",[registeredScrolls count]); + NSLog(@"keyboardframe = %@",NSStringFromCGRect([self keyboardFrame])); } #pragma mark - @@ -146,24 +152,117 @@ - (void) updateRegisteredScroll:(RegisteredScrollPack *) scrollPack - (UIEdgeInsets) scrollViewContentInsets:(RegisteredScrollPack *) scrollPack { - UIEdgeInsets insets = [scrollPack scrollDefaultInsets]; + UIScrollView *scrollView = [scrollPack scrollView]; + + CGRect scrollViewFrame = [[scrollView superview] convertRect:[scrollView frame] toView:nil]; + NSLog(@"wind scrollviewframe = %@",NSStringFromCGRect(scrollViewFrame)); + // fromView:nil]; + + CGRect transformedScrollFrame = [self transformCGRectToDefaultCoordinates:scrollViewFrame]; + CGRect transformedKeyboardFrame = [self transformCGRectToDefaultCoordinates:[self keyboardFrame]]; + + + + + UIEdgeInsets inset = [self contentInsetWithDefaultInset:[scrollPack scrollDefaultInsets] + viewFrame:transformedScrollFrame + keyboardFrame:transformedKeyboardFrame]; + NSLog(@"inset = %@",NSStringFromUIEdgeInsets(inset)); + NSLog(@"transf keyb = %@",NSStringFromCGRect(transformedKeyboardFrame)); + NSLog(@"transformedScrollFrame = %@",NSStringFromCGRect(transformedScrollFrame)); + + return [self contentInsetWithDefaultInset:[scrollPack scrollDefaultInsets] + viewFrame:transformedScrollFrame + keyboardFrame:transformedKeyboardFrame]; + +// return insets; +} - CGRect scrollViewFrame = [[scrollPack scrollView] frame]; - CGRect keyboardRect = [[[scrollPack scrollView] superview] convertRect:[self keyboardFrame] - fromView:nil]; - if (CGRectIntersectsRect(keyboardRect, scrollViewFrame) && - !CGRectEqualToRect(keyboardRect, CGRectZero) && - !CGRectContainsRect(keyboardRect, scrollViewFrame)) +#pragma mark - +#pragma mark geometry + +- (UIEdgeInsets) contentInsetWithDefaultInset:(UIEdgeInsets) inset + viewFrame:(CGRect) scrollViewFrame + keyboardFrame:(CGRect) keyboardFrame +{ + UIEdgeInsets contentInset = inset; + if (CGRectIntersectsRect(keyboardFrame, scrollViewFrame) && + !CGRectEqualToRect(keyboardFrame, CGRectZero) && + !CGRectContainsRect(keyboardFrame, scrollViewFrame)) { - if (keyboardRect.origin.y <= scrollViewFrame.origin.y) { - insets.top += CGRectGetMaxY(keyboardRect) - CGRectGetMinY(scrollViewFrame); + if (keyboardFrame.origin.y <= scrollViewFrame.origin.y) { + contentInset.top += CGRectGetMaxY(keyboardFrame) - CGRectGetMinY(scrollViewFrame); } - else if (keyboardRect.origin.y <= CGRectGetMaxY(scrollViewFrame) && - CGRectGetMaxY(keyboardRect) >= CGRectGetMaxY(scrollViewFrame)) { - insets.bottom += CGRectGetMaxY(scrollViewFrame) - CGRectGetMinY(keyboardRect); + else if (keyboardFrame.origin.y <= CGRectGetMaxY(scrollViewFrame) && + CGRectGetMaxY(keyboardFrame) >= CGRectGetMaxY(scrollViewFrame)) { + contentInset.bottom += CGRectGetMaxY(scrollViewFrame) - CGRectGetMinY(keyboardFrame); } } - return insets; + return contentInset; +} + +- (CGRect) transformCGRectToDefaultCoordinates:(CGRect) rect +{ + UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation]; + CGSize windowSize = [[[[UIApplication sharedApplication] windows] objectAtIndex:0] frame].size; + return [self transformCGRect:rect inViewWithSize:windowSize withOrientation:orientation]; +} + +- (CGRect) transformCGRect:(CGRect) rect + inViewWithSize:(CGSize) size + withOrientation:(UIInterfaceOrientation) orientation +{ + switch (orientation) { + case UIInterfaceOrientationLandscapeRight: + return CGRectTransformed(rect, size, CGRectTransformRotateLeft); + case UIInterfaceOrientationLandscapeLeft: + return CGRectTransformed(rect, size, CGRectTransformRotateRight); + case UIInterfaceOrientationPortraitUpsideDown: + return CGRectTransformed(rect, size, CGRectTransformExpand); + default: + return rect; + } +} + +#pragma mark - +#pragma mark scroll frame changes observing + +- (void) observeValueForKeyPath:(NSString *)keyPath + ofObject:(id)object + change:(NSDictionary *)change + context:(void *)context +{ + NSLog(@"data = %@",change); + NSLog(@"scroll frame = %@",NSStringFromCGRect([object frame])); + RegisteredScrollPack *scrollPack = [self registeredScrollForView:object]; + [self updateRegisteredScroll:scrollPack]; +} + + +#pragma mark - +#pragma mark window observing + +- (void) registerForWindowObserving:(void (^)(id _self, UIView* subview)) listener +{ + if (listener == NULL ) { + NSLog(@"listener cannot be NULL."); + return; + } + + Method setWindowMethod = class_getInstanceMethod([UIView class], @selector(setWindow:)); + IMP originalImplementation = method_getImplementation(setWindowMethod); + + void (^block)(id, UIWindow*) = ^(id _self, UIWindow* window) { + originalImplementation(_self, @selector(setWindow:), window); + listener(_self, window); + }; + + IMP newImplementation = imp_implementationWithBlock((void*)block); + method_setImplementation(setWindowMethod, newImplementation); +} + +- (void) unregisterForWindowObserving { + } @end diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default-568h@2x.png b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default-568h@2x.png new file mode 100644 index 0000000..0891b7a Binary files /dev/null and b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default-568h@2x.png differ diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default.png b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default.png new file mode 100644 index 0000000..4c8ca6f Binary files /dev/null and b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default.png differ diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default@2x.png b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default@2x.png new file mode 100644 index 0000000..35b84cf Binary files /dev/null and b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/Default@2x.png differ diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist new file mode 100644 index 0000000..6e6467d --- /dev/null +++ b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist @@ -0,0 +1,45 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + mls.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch new file mode 100644 index 0000000..c31ddae --- /dev/null +++ b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch @@ -0,0 +1,16 @@ +// +// Prefix header for all source files of the 'EKKeyboardAvoidingScrollViewExample-unit_tests' target in the 'EKKeyboardAvoidingScrollViewExample-unit_tests' project +// + +#import + +#ifndef __IPHONE_3_0 +#warning "This project uses features only available in iOS SDK 3.0 and later." +#endif + +#ifdef __OBJC__ + #import + #import + + #import +#endif diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollmanagerSpec.mm b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollmanagerSpec.mm new file mode 100644 index 0000000..d622a55 --- /dev/null +++ b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollmanagerSpec.mm @@ -0,0 +1,45 @@ +#import +#import + +using namespace Cedar::Matchers; +using namespace Cedar::Doubles; + +SPEC_BEGIN(CGRectTransforming) + +describe(@"CGRect transformation:", ^{ + context(@"CGRectTransformLeft",^{ + it(@"Rectangle {{10,15},{50,100}} in view with size {320,480} should be transformed to {{15,260},{100,50}}", ^{ + CGRect baseRect = CGRectMake(10, 15, 50, 100); + CGRect transformedRect = CGRectTransformed(baseRect, {320,480}, CGRectTransformRotateLeft); + expect(transformedRect.origin.x).to(equal(15)); + expect(transformedRect.origin.y).to(equal(260)); + expect(transformedRect.size.width).to(equal(100)); + expect(transformedRect.size.height).to(equal(50)); + }); + }); + + context(@"CGRectTransformRight",^{ + it(@"Rectangle {{10,15},{50,100}} in view with size {320,480} should be transformed to {{365,10},{100,50}}", ^{ + CGRect baseRect = CGRectMake(10, 15, 50, 100); + CGRect transformedRect = CGRectTransformed(baseRect, {320,480}, CGRectTransformRotateRight); + expect(transformedRect.origin.x).to(equal(365)); + expect(transformedRect.origin.y).to(equal(10)); + expect(transformedRect.size.width).to(equal(100)); + expect(transformedRect.size.height).to(equal(50)); + }); + }); + + context(@"CGRectTransformExpand",^{ + it(@"Rectangle {{10,15},{50,100}} in view with size {320,480} should be transformed to {{260,365},{50,100}}", ^{ + CGRect baseRect = CGRectMake(10, 15, 50, 100); + CGRect transformedRect = CGRectTransformed(baseRect, {320,480}, CGRectTransformExpand); + expect(transformedRect.origin.x).to(equal(260)); + expect(transformedRect.origin.y).to(equal(365)); + expect(transformedRect.size.width).to(equal(50)); + expect(transformedRect.size.height).to(equal(100)); + }); + }); +}); + +SPEC_END + diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/en.lproj/InfoPlist.strings b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/en.lproj/InfoPlist.strings new file mode 100644 index 0000000..477b28f --- /dev/null +++ b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/main.m b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/main.m new file mode 100644 index 0000000..5e95e2a --- /dev/null +++ b/Example/EKKeyboardAvoidingScrollViewExample-unit_tests/main.m @@ -0,0 +1,17 @@ +// +// main.m +// EKKeyboardAvoidingScrollViewExample-unit_tests +// +// Created by Evgeniy Kirpichenko on 12/7/12. +// Copyright (c) 2012 Evgeniy Kirpichenko. All rights reserved. +// + +#import +#import + +int main(int argc, char *argv[]) +{ + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([CedarApplicationDelegate class])); + } +} diff --git a/Example/EKKeyboardAvoidingScrollViewExample.xcodeproj/project.pbxproj b/Example/EKKeyboardAvoidingScrollViewExample.xcodeproj/project.pbxproj index b56a665..8996be6 100644 --- a/Example/EKKeyboardAvoidingScrollViewExample.xcodeproj/project.pbxproj +++ b/Example/EKKeyboardAvoidingScrollViewExample.xcodeproj/project.pbxproj @@ -7,6 +7,17 @@ objects = { /* Begin PBXBuildFile section */ + 5E50240F0F854F4FA3075C4E /* libPods-EKKeyboardAvoidingScrollViewExample-unit_tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 11A735D05168431AB87498E5 /* libPods-EKKeyboardAvoidingScrollViewExample-unit_tests.a */; }; + D91626F0167216C200BC4B9B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3BB51166F4E2F00F0DEAE /* UIKit.framework */; }; + D91626F1167216C200BC4B9B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3BB53166F4E2F00F0DEAE /* Foundation.framework */; }; + D91626F2167216C200BC4B9B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3BB55166F4E2F00F0DEAE /* CoreGraphics.framework */; }; + D91626F8167216C200BC4B9B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D91626F6167216C200BC4B9B /* InfoPlist.strings */; }; + D91626FA167216C200BC4B9B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D91626F9167216C200BC4B9B /* main.m */; }; + D9162700167216C200BC4B9B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = D91626FF167216C200BC4B9B /* Default.png */; }; + D9162702167216C200BC4B9B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D9162701167216C200BC4B9B /* Default@2x.png */; }; + D9162704167216C200BC4B9B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D9162703167216C200BC4B9B /* Default-568h@2x.png */; }; + D916272816721A5400BC4B9B /* EKKeyboardAvoidingScrollmanagerSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = D916272716721A5400BC4B9B /* EKKeyboardAvoidingScrollmanagerSpec.mm */; }; + D916273316721B5600BC4B9B /* libEKKeyboardAvoidingScrollView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3BB7A166F4E4C00F0DEAE /* libEKKeyboardAvoidingScrollView.a */; }; D96C117916709DE3005FEE63 /* SingleScrollViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D96C117816709DE3005FEE63 /* SingleScrollViewController_iPad.xib */; }; D9F3BB52166F4E2F00F0DEAE /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3BB51166F4E2F00F0DEAE /* UIKit.framework */; }; D9F3BB54166F4E2F00F0DEAE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3BB53166F4E2F00F0DEAE /* Foundation.framework */; }; @@ -27,6 +38,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + D916272D16721B1600BC4B9B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D9F3BB72166F4E4C00F0DEAE /* EKKeyboardAvoidingScrollView.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = D9F3BB30166F4B8A00F0DEAE; + remoteInfo = EKKeyboardAvoidingScrollView; + }; D9F3BB79166F4E4C00F0DEAE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D9F3BB72166F4E4C00F0DEAE /* EKKeyboardAvoidingScrollView.xcodeproj */; @@ -44,6 +62,18 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 11A735D05168431AB87498E5 /* libPods-EKKeyboardAvoidingScrollViewExample-unit_tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-EKKeyboardAvoidingScrollViewExample-unit_tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 476A269706304903A6DBD96F /* Pods-EKKeyboardAvoidingScrollViewExample-unit_tests.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EKKeyboardAvoidingScrollViewExample-unit_tests.xcconfig"; path = "Pods/Pods-EKKeyboardAvoidingScrollViewExample-unit_tests.xcconfig"; sourceTree = SOURCE_ROOT; }; + D5D533A4F654436892EA2778 /* Pods-EKKeyboardAvoidingScrollViewExample.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EKKeyboardAvoidingScrollViewExample.xcconfig"; path = "Pods/Pods-EKKeyboardAvoidingScrollViewExample.xcconfig"; sourceTree = SOURCE_ROOT; }; + D91626EE167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "EKKeyboardAvoidingScrollViewExample-unit_tests.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + D91626F5167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist"; sourceTree = ""; }; + D91626F7167216C200BC4B9B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + D91626F9167216C200BC4B9B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + D91626FB167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch"; sourceTree = ""; }; + D91626FF167216C200BC4B9B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + D9162701167216C200BC4B9B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + D9162703167216C200BC4B9B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + D916272716721A5400BC4B9B /* EKKeyboardAvoidingScrollmanagerSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EKKeyboardAvoidingScrollmanagerSpec.mm; sourceTree = ""; }; D96C117816709DE3005FEE63 /* SingleScrollViewController_iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SingleScrollViewController_iPad.xib; sourceTree = ""; }; D9F3BB4D166F4E2F00F0DEAE /* EKKeyboardAvoidingScrollViewExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EKKeyboardAvoidingScrollViewExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; D9F3BB51166F4E2F00F0DEAE /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -68,9 +98,22 @@ D9F3BB87166F522700F0DEAE /* SingleScrollViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SingleScrollViewController.xib; sourceTree = ""; }; D9F3BBA1166F9D9C00F0DEAE /* UIViewController+LoadWithXib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+LoadWithXib.h"; sourceTree = ""; }; D9F3BBA2166F9D9C00F0DEAE /* UIViewController+LoadWithXib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+LoadWithXib.m"; sourceTree = ""; }; + FD9C8928A25648D9BA1A661B /* libPods-EKKeyboardAvoidingScrollViewExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-EKKeyboardAvoidingScrollViewExample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + D91626EB167216C200BC4B9B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D916273316721B5600BC4B9B /* libEKKeyboardAvoidingScrollView.a in Frameworks */, + D91626F0167216C200BC4B9B /* UIKit.framework in Frameworks */, + D91626F1167216C200BC4B9B /* Foundation.framework in Frameworks */, + D91626F2167216C200BC4B9B /* CoreGraphics.framework in Frameworks */, + 5E50240F0F854F4FA3075C4E /* libPods-EKKeyboardAvoidingScrollViewExample-unit_tests.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D9F3BB4A166F4E2F00F0DEAE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -85,6 +128,37 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + D91626F3167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests */ = { + isa = PBXGroup; + children = ( + D916272616721A0F00BC4B9B /* Specs */, + D91626F4167216C200BC4B9B /* Supporting Files */, + ); + path = "EKKeyboardAvoidingScrollViewExample-unit_tests"; + sourceTree = ""; + }; + D91626F4167216C200BC4B9B /* Supporting Files */ = { + isa = PBXGroup; + children = ( + D91626F5167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist */, + D91626F6167216C200BC4B9B /* InfoPlist.strings */, + D91626F9167216C200BC4B9B /* main.m */, + D91626FB167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch */, + D91626FF167216C200BC4B9B /* Default.png */, + D9162701167216C200BC4B9B /* Default@2x.png */, + D9162703167216C200BC4B9B /* Default-568h@2x.png */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + D916272616721A0F00BC4B9B /* Specs */ = { + isa = PBXGroup; + children = ( + D916272716721A5400BC4B9B /* EKKeyboardAvoidingScrollmanagerSpec.mm */, + ); + name = Specs; + sourceTree = ""; + }; D96C11861670DDFF005FEE63 /* MultipleScrolsViewcontroller */ = { isa = PBXGroup; children = ( @@ -112,8 +186,11 @@ children = ( D9F3BB72166F4E4C00F0DEAE /* EKKeyboardAvoidingScrollView.xcodeproj */, D9F3BB57166F4E2F00F0DEAE /* EKKeyboardAvoidingScrollViewExample */, + D91626F3167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests */, D9F3BB50166F4E2F00F0DEAE /* Frameworks */, D9F3BB4E166F4E2F00F0DEAE /* Products */, + D5D533A4F654436892EA2778 /* Pods-EKKeyboardAvoidingScrollViewExample.xcconfig */, + 476A269706304903A6DBD96F /* Pods-EKKeyboardAvoidingScrollViewExample-unit_tests.xcconfig */, ); sourceTree = ""; }; @@ -121,6 +198,7 @@ isa = PBXGroup; children = ( D9F3BB4D166F4E2F00F0DEAE /* EKKeyboardAvoidingScrollViewExample.app */, + D91626EE167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests.app */, ); name = Products; sourceTree = ""; @@ -131,6 +209,8 @@ D9F3BB51166F4E2F00F0DEAE /* UIKit.framework */, D9F3BB53166F4E2F00F0DEAE /* Foundation.framework */, D9F3BB55166F4E2F00F0DEAE /* CoreGraphics.framework */, + FD9C8928A25648D9BA1A661B /* libPods-EKKeyboardAvoidingScrollViewExample.a */, + 11A735D05168431AB87498E5 /* libPods-EKKeyboardAvoidingScrollViewExample-unit_tests.a */, ); name = Frameworks; sourceTree = ""; @@ -198,6 +278,25 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + D91626ED167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = D9162705167216C200BC4B9B /* Build configuration list for PBXNativeTarget "EKKeyboardAvoidingScrollViewExample-unit_tests" */; + buildPhases = ( + D91626EA167216C200BC4B9B /* Sources */, + D91626EB167216C200BC4B9B /* Frameworks */, + D91626EC167216C200BC4B9B /* Resources */, + 0485AAC723364B44BF7A507C /* Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + D916272E16721B1600BC4B9B /* PBXTargetDependency */, + ); + name = "EKKeyboardAvoidingScrollViewExample-unit_tests"; + productName = "EKKeyboardAvoidingScrollViewExample-unit_tests"; + productReference = D91626EE167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests.app */; + productType = "com.apple.product-type.application"; + }; D9F3BB4C166F4E2F00F0DEAE /* EKKeyboardAvoidingScrollViewExample */ = { isa = PBXNativeTarget; buildConfigurationList = D9F3BB6B166F4E2F00F0DEAE /* Build configuration list for PBXNativeTarget "EKKeyboardAvoidingScrollViewExample" */; @@ -205,6 +304,7 @@ D9F3BB49166F4E2F00F0DEAE /* Sources */, D9F3BB4A166F4E2F00F0DEAE /* Frameworks */, D9F3BB4B166F4E2F00F0DEAE /* Resources */, + C4D0B2BB422245BDA7B213FC /* Copy Pods Resources */, ); buildRules = ( ); @@ -244,6 +344,7 @@ projectRoot = ""; targets = ( D9F3BB4C166F4E2F00F0DEAE /* EKKeyboardAvoidingScrollViewExample */, + D91626ED167216C200BC4B9B /* EKKeyboardAvoidingScrollViewExample-unit_tests */, ); }; /* End PBXProject section */ @@ -259,6 +360,17 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + D91626EC167216C200BC4B9B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D91626F8167216C200BC4B9B /* InfoPlist.strings in Resources */, + D9162700167216C200BC4B9B /* Default.png in Resources */, + D9162702167216C200BC4B9B /* Default@2x.png in Resources */, + D9162704167216C200BC4B9B /* Default-568h@2x.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D9F3BB4B166F4E2F00F0DEAE /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -276,7 +388,47 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 0485AAC723364B44BF7A507C /* Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Pods-EKKeyboardAvoidingScrollViewExample-unit_tests-resources.sh\"\n"; + }; + C4D0B2BB422245BDA7B213FC /* Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Pods-EKKeyboardAvoidingScrollViewExample-resources.sh\"\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ + D91626EA167216C200BC4B9B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D91626FA167216C200BC4B9B /* main.m in Sources */, + D916272816721A5400BC4B9B /* EKKeyboardAvoidingScrollmanagerSpec.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D9F3BB49166F4E2F00F0DEAE /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -292,6 +444,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + D916272E16721B1600BC4B9B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = EKKeyboardAvoidingScrollView; + targetProxy = D916272D16721B1600BC4B9B /* PBXContainerItemProxy */; + }; D9F3BB90166F692D00F0DEAE /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = EKKeyboardAvoidingScrollView; @@ -300,6 +457,14 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ + D91626F6167216C200BC4B9B /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + D91626F7167216C200BC4B9B /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; D9F3BB5A166F4E2F00F0DEAE /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -311,6 +476,32 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + D9162706167216C200BC4B9B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 476A269706304903A6DBD96F /* Pods-EKKeyboardAvoidingScrollViewExample-unit_tests.xcconfig */; + buildSettings = { + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch"; + INFOPLIST_FILE = "EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + D9162707167216C200BC4B9B /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 476A269706304903A6DBD96F /* Pods-EKKeyboardAvoidingScrollViewExample-unit_tests.xcconfig */; + buildSettings = { + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Prefix.pch"; + INFOPLIST_FILE = "EKKeyboardAvoidingScrollViewExample-unit_tests/EKKeyboardAvoidingScrollViewExample-unit_tests-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; D9F3BB69166F4E2F00F0DEAE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -363,6 +554,7 @@ }; D9F3BB6C166F4E2F00F0DEAE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D5D533A4F654436892EA2778 /* Pods-EKKeyboardAvoidingScrollViewExample.xcconfig */; buildSettings = { GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "EKKeyboardAvoidingScrollViewExample/EKKeyboardAvoidingScrollViewExample-Prefix.pch"; @@ -375,6 +567,7 @@ }; D9F3BB6D166F4E2F00F0DEAE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D5D533A4F654436892EA2778 /* Pods-EKKeyboardAvoidingScrollViewExample.xcconfig */; buildSettings = { GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "EKKeyboardAvoidingScrollViewExample/EKKeyboardAvoidingScrollViewExample-Prefix.pch"; @@ -388,6 +581,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + D9162705167216C200BC4B9B /* Build configuration list for PBXNativeTarget "EKKeyboardAvoidingScrollViewExample-unit_tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D9162706167216C200BC4B9B /* Debug */, + D9162707167216C200BC4B9B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; D9F3BB47166F4E2F00F0DEAE /* Build configuration list for PBXProject "EKKeyboardAvoidingScrollViewExample" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Example/EKKeyboardAvoidingScrollViewExample/SingleScrollViewController.m b/Example/EKKeyboardAvoidingScrollViewExample/SingleScrollViewController.m index 1881cf0..de1b713 100644 --- a/Example/EKKeyboardAvoidingScrollViewExample/SingleScrollViewController.m +++ b/Example/EKKeyboardAvoidingScrollViewExample/SingleScrollViewController.m @@ -18,11 +18,11 @@ @implementation SingleScrollViewController #pragma mark - #pragma mark life cycle -- (void) viewDidAppear:(BOOL)animated -{ - [super viewDidAppear:animated]; - [[EKKeyboardAvoidingScrollViewManger sharedInstance] updateRegisteredScrolls]; -} +//- (void) viewDidAppear:(BOOL)animated +//{ +// [super viewDidAppear:animated]; +// [[EKKeyboardAvoidingScrollViewManger sharedInstance] updateRegisteredScrolls]; +//} - (void)viewDidLoad { diff --git a/Example/Podfile b/Example/Podfile new file mode 100644 index 0000000..ca28747 --- /dev/null +++ b/Example/Podfile @@ -0,0 +1,5 @@ +platform :ios, '5.0' + +target :'EKKeyboardAvoidingScrollViewExample-unit_tests' do + pod 'Cedar' +end