Change keyboard frame observatoin

kirpichenko · Oct 30, 2013 · 90c32a4 · 90c32a4
1 parent de937cd
commit 90c32a4
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 386 deletions.
diff --git a/EKKeyboardAvoiding-UnitTests/AvoidingDisabledTest.m b/EKKeyboardAvoiding-UnitTests/AvoidingDisabledTest.m
diff --git a/EKKeyboardAvoiding-UnitTests/AvoidingEnabledTest.m b/EKKeyboardAvoiding-UnitTests/AvoidingEnabledTest.m
diff --git a/EKKeyboardAvoiding-UnitTests/ContentInsetsCalculationTest.m b/EKKeyboardAvoiding-UnitTests/ContentInsetsCalculationTest.m
@@ -11,7 +11,7 @@
 #import "EKAvoidingListener.h"
 
 #import "EKFakeKeyboard.h"
-#import "EKFakeKeyboardFrameConverter.h"
+#import "EKFakeKeyboardFrameListener.h"
 
 @interface EKAvoidingListenerTest : XCTestCase {
     UIScrollView *scrollView;
@@ -29,7 +29,9 @@ - (void)setUp {
     scrollView.contentInset = UIEdgeInsetsMake(40, 0, 100, 0);
 
     listener = [[EKAvoidingListener alloc] initWithScrollView:scrollView];
-    listener.frameConverter = [EKFakeKeyboardFrameConverter new];
+    listener.keyboardListener = [EKFakeKeyboardFrameListener new];
+
+    [listener startAvoiding];
 }
 
 - (void)tearDown {

diff --git a/EKKeyboardAvoiding-UnitTests/ContentInsetsChangesTest.m b/EKKeyboardAvoiding-UnitTests/ContentInsetsChangesTest.m
@@ -11,7 +11,7 @@
 #import "EKAvoidingListener.h"
 
 #import "EKFakeKeyboard.h"
-#import "EKFakeKeyboardFrameConverter.h"
+#import "EKFakeKeyboardFrameListener.h"
 
 @interface ContentInsetsChangesTest : XCTestCase {
     UIScrollView *scrollView;
@@ -29,7 +29,16 @@ - (void)setUp
     scrollView.contentInset = UIEdgeInsetsMake(40, 0, 100, 0);
 
     listener = [[EKAvoidingListener alloc] initWithScrollView:scrollView];
-    listener.frameConverter = [EKFakeKeyboardFrameConverter new];
+    listener.keyboardListener = [EKFakeKeyboardFrameListener new];
+
+    [listener startAvoiding];
+}
+
+- (void)tearDown
+{
+    [listener stopAvoiding];
+
+    [super tearDown];
 }
 
 - (void)testBottomIntersection

diff --git a/EKKeyboardAvoiding-UnitTests/EKAvoidingCalculatorTest.m b/EKKeyboardAvoiding-UnitTests/EKAvoidingCalculatorTest.m
diff --git a/EKKeyboardAvoiding-UnitTests/EKFakeKeyboardFrameConverter.m b/EKKeyboardAvoiding-UnitTests/EKFakeKeyboardFrameConverter.m
diff --git a/...-UnitTests/EKFakeKeyboardFrameConverter.h → ...g-UnitTests/EKFakeKeyboardFrameListener.h b/...-UnitTests/EKFakeKeyboardFrameConverter.h → ...g-UnitTests/EKFakeKeyboardFrameListener.h
@@ -6,8 +6,8 @@
 //  Copyright (c) 2013 Evgeniy Kirpichenko. All rights reserved.
 //
 
-#import "EKKeyboardFrameConverter.h"
+#import "EKKeyboardFrameListener.h"
 
-@interface EKFakeKeyboardFrameConverter : EKKeyboardFrameConverter
+@interface EKFakeKeyboardFrameListener : EKKeyboardFrameListener
 
 @end
diff --git a/EKKeyboardAvoiding-UnitTests/EKFakeKeyboardFrameListener.m b/EKKeyboardAvoiding-UnitTests/EKFakeKeyboardFrameListener.m
@@ -0,0 +1,17 @@
+//
+//  EKFakeKeyboardFrameListener.m
+//  EKKeyboardAvoiding
+//
+//  Created by Evgeniy Kirpichenko on 10/28/13.
+//  Copyright (c) 2013 Evgeniy Kirpichenko. All rights reserved.
+//
+
+#import "EKFakeKeyboardFrameListener.h"
+
+@implementation EKFakeKeyboardFrameListener
+
+- (CGRect)convertedKeyboardFrameForView:(UIView *)view {
+    return [self keyboardFrame];
+}
+
+@end