Support the view controller be embedded in container view

ikesyo · ikesyo · commit 7d629e0c0bec · 2014-12-03T15:05:38.000+09:00
Calculate the bottom margin to its enclosing window. This unifies `appropriateTabBarHeight` consideration.
diff --git a/Examples/Messenger/Messenger-Storyboard/Base.lproj/Main.storyboard b/Examples/Messenger/Messenger-Storyboard/Base.lproj/Main.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A386a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="nJp-d0-Z0H">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="0WO-Kt-Oxc">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6246"/>
     </dependencies>
     <scenes>
         <!--Message View Controller-->
@@ -23,10 +24,29 @@
             </objects>
             <point key="canvasLocation" x="1302" y="492"/>
         </scene>
-        <!--Navigation Controller-->
+        <!--Tab Bar Controller-->
+        <scene sceneID="SEt-8k-R87">
+            <objects>
+                <tabBarController id="0WO-Kt-Oxc" sceneMemberID="viewController">
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <tabBar key="tabBar" contentMode="scaleToFill" id="US0-fN-o9u">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    </tabBar>
+                    <connections>
+                        <segue destination="nJp-d0-Z0H" kind="relationship" relationship="viewControllers" id="nd7-Np-oUR"/>
+                    </connections>
+                </tabBarController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="bQn-nb-Tgr" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-132" y="492"/>
+        </scene>
+        <!--Tab-->
         <scene sceneID="5B4-6e-pdF">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="nJp-d0-Z0H" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Tab" image="icn_editing" id="whH-lj-Whp"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="fWe-MD-oZ3">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
@@ -42,4 +62,7 @@
             <point key="canvasLocation" x="583" y="492"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="icn_editing" width="24" height="24"/>
+    </resources>
 </document>
diff --git a/Source/Classes/SLKTextViewController.m b/Source/Classes/SLKTextViewController.m
@@ -449,7 +449,7 @@ - (CGFloat)appropriateKeyboardHeight:(NSNotification *)notification
         }
     }
     
-    keyboardHeight -= [self appropriateTabBarHeight];
+    keyboardHeight -= [self appropriateBottomMarginToWindow];
     keyboardHeight -= CGRectGetHeight(self.textView.inputAccessoryView.bounds);
     
     if (keyboardHeight < 0) {
@@ -472,13 +472,12 @@ - (CGFloat)appropriateScrollViewHeight
     else return roundf(height);
 }
 
-- (CGFloat)appropriateTabBarHeight
+- (CGFloat)appropriateBottomMarginToWindow
 {
-    if (self.tabBarController.tabBar.isHidden || self.hidesBottomBarWhenPushed) {
-        return 0.0;
-    }
-    
-    return CGRectGetHeight(self.tabBarController.tabBar.frame);
+    UIWindow *window = self.view.window;
+    CGRect convertedRect = [self.view convertRect:self.view.bounds toView:window];
+    CGFloat bottomMargin = CGRectGetMaxY(window.frame) - CGRectGetMaxY(convertedRect);
+    return bottomMargin;
 }
 
 - (NSString *)appropriateKeyboardNotificationName:(NSNotification *)notification
@@ -946,7 +945,7 @@ - (BOOL)detectExternalKeyboardInNotification:(NSNotification *)notification
 
     if (!self.isMovingKeyboard) {
         CGFloat maxKeyboardHeight = keyboardFrame.origin.y + keyboardFrame.size.height;
-        maxKeyboardHeight -= [self appropriateTabBarHeight];
+        maxKeyboardHeight -= [self appropriateBottomMarginToWindow];
 
         return (maxKeyboardHeight > CGRectGetHeight(self.view.bounds));
     }

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ - (CGFloat)appropriateKeyboardHeight:(NSNotification *)notification`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
`452`		`- keyboardHeight -= [self appropriateTabBarHeight];`
	`452`	`+ keyboardHeight -= [self appropriateBottomMarginToWindow];`
`453`	`453`	`keyboardHeight -= CGRectGetHeight(self.textView.inputAccessoryView.bounds);`
`454`	`454`
`455`	`455`	`if (keyboardHeight < 0) {`
`@@ -472,13 +472,12 @@ - (CGFloat)appropriateScrollViewHeight`
`472`	`472`	`else return roundf(height);`
`473`	`473`	`}`
`474`	`474`
`475`		`-- (CGFloat)appropriateTabBarHeight`
	`475`	`+- (CGFloat)appropriateBottomMarginToWindow`
`476`	`476`	`{`
`477`		`- if (self.tabBarController.tabBar.isHidden \|\| self.hidesBottomBarWhenPushed) {`
`478`		`- return 0.0;`
`479`		`- }`
`480`		`-`
`481`		`- return CGRectGetHeight(self.tabBarController.tabBar.frame);`
	`477`	`+ UIWindow *window = self.view.window;`
	`478`	`+ CGRect convertedRect = [self.view convertRect:self.view.bounds toView:window];`
	`479`	`+ CGFloat bottomMargin = CGRectGetMaxY(window.frame) - CGRectGetMaxY(convertedRect);`
	`480`	`+ return bottomMargin;`
`482`	`481`	`}`
`483`	`482`
`484`	`483`	`- (NSString )appropriateKeyboardNotificationName:(NSNotification )notification`
`@@ -946,7 +945,7 @@ - (BOOL)detectExternalKeyboardInNotification:(NSNotification *)notification`
`946`	`945`
`947`	`946`	`if (!self.isMovingKeyboard) {`
`948`	`947`	`CGFloat maxKeyboardHeight = keyboardFrame.origin.y + keyboardFrame.size.height;`
`949`		`- maxKeyboardHeight -= [self appropriateTabBarHeight];`
	`948`	`+ maxKeyboardHeight -= [self appropriateBottomMarginToWindow];`
`950`	`949`
`951`	`950`	`return (maxKeyboardHeight > CGRectGetHeight(self.view.bounds));`
`952`	`951`	`}`