Change Example default inset

kirpichenko · Nov 25, 2013 · 18e5c74 · 18e5c74
1 parent 016d719
commit 18e5c74
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/Example/EKKeyboardAvoidingExample.xcodeproj/project.pbxproj b/Example/EKKeyboardAvoidingExample.xcodeproj/project.pbxproj
@@ -364,7 +364,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EKKeyboardAvoidingScrollViewExample/EKKeyboardAvoidingExample-Prefix.pch";
 				INFOPLIST_FILE = "EKKeyboardAvoidingScrollViewExample/EKKeyboardAvoidingExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_NAME = EKKeyboardAvoidingExample;
 				PROVISIONING_PROFILE = "";
@@ -380,7 +380,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EKKeyboardAvoidingScrollViewExample/EKKeyboardAvoidingExample-Prefix.pch";
 				INFOPLIST_FILE = "EKKeyboardAvoidingScrollViewExample/EKKeyboardAvoidingExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_NAME = EKKeyboardAvoidingExample;
 				WRAPPER_EXTENSION = app;

diff --git a/Example/EKKeyboardAvoidingScrollViewExample/MultipleScrollsViewController.m b/Example/EKKeyboardAvoidingScrollViewExample/MultipleScrollsViewController.m
@@ -23,6 +23,14 @@ @implementation MultipleScrollsViewController
 #pragma mark -
 #pragma mark life cycle
 
+- (id)init
+{
+    if (self = [super init]) {
+        [self setAutomaticallyAdjustsScrollViewInsets:NO];
+    }
+    return self;
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];

diff --git a/Example/EKKeyboardAvoidingScrollViewExample/MultipleScrollsViewController~ipad.xib b/Example/EKKeyboardAvoidingScrollViewExample/MultipleScrollsViewController~ipad.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1072" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+        <deployment defaultVersion="1792" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MultipleScrollsViewController">
@@ -22,6 +22,8 @@
                     <rect key="frame" x="384" y="354" width="384" height="670"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                     <color key="backgroundColor" red="0.64613589189999998" green="1" blue="0.67744123229999997" alpha="1" colorSpace="calibratedRGB"/>
+                    <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="49"/>
+                    <inset key="scrollIndicatorInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="49"/>
                     <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                     <fontDescription key="fontDescription" type="system" pointSize="26"/>
                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -30,6 +32,8 @@
                     <rect key="frame" x="0.0" y="354" width="384" height="670"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                     <color key="backgroundColor" red="1" green="0.84376405139999999" blue="0.80910894389999999" alpha="1" colorSpace="calibratedRGB"/>
+                    <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="49"/>
+                    <inset key="scrollIndicatorInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="49"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="16"/>
                     </connections>
@@ -72,6 +76,8 @@
                         </label>
                     </subviews>
                     <color key="backgroundColor" red="0.72369522050000001" green="0.85519012250000004" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    <inset key="contentInset" minX="0.0" minY="64" maxX="0.0" maxY="0.0"/>
+                    <inset key="scrollIndicatorInsets" minX="0.0" minY="64" maxX="0.0" maxY="0.0"/>
                 </scrollView>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>

diff --git a/Example/EKKeyboardAvoidingScrollViewExample/MultipleScrollsViewController~iphone.xib b/Example/EKKeyboardAvoidingScrollViewExample/MultipleScrollsViewController~iphone.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1072" identifier="iOS"/>
+        <deployment defaultVersion="1792" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
     </dependencies>
     <objects>
@@ -56,9 +56,11 @@
                         </label>
                     </subviews>
                     <color key="backgroundColor" red="0.64613589189999998" green="1" blue="0.67744123229999997" alpha="1" colorSpace="calibratedRGB"/>
+                    <inset key="contentInset" minX="0.0" minY="64" maxX="0.0" maxY="0.0"/>
+                    <inset key="scrollIndicatorInsets" minX="0.0" minY="64" maxX="0.0" maxY="0.0"/>
                 </scrollView>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="16">
-                    <rect key="frame" x="0.0" y="178.9999999887857" width="160" height="388"/>
+                    <rect key="frame" x="0.0" y="178.99999997755162" width="160" height="388"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                     <color key="backgroundColor" red="0.72369522050000001" green="0.85519012250000004" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="49"/>
@@ -68,7 +70,7 @@
                     </connections>
                 </tableView>
                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="17">
-                    <rect key="frame" x="160" y="178.99999998878573" width="160" height="388"/>
+                    <rect key="frame" x="160" y="179" width="160" height="388"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                     <color key="backgroundColor" red="1" green="0.84376405139999999" blue="0.80910894389999999" alpha="1" colorSpace="calibratedRGB"/>
                     <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="49"/>

diff --git a/Example/EKKeyboardAvoidingScrollViewExample/SingleScrollViewController.m b/Example/EKKeyboardAvoidingScrollViewExample/SingleScrollViewController.m
@@ -29,10 +29,6 @@ - (void)viewDidLoad
     [self addViewTapGesture];
 }
 
-//- (void)dealloc {
-//    [scrollView setKeyboardAvoidingEnabled:NO];
-//}
-
 #pragma mark - actions
 
 - (IBAction)showNext