Skip to content

Commit 8a0bd22

Browse files
markstmarkst
authored
Merge pull request #9 from Papercloud/issue/8
iPhone X Compatibility
2 parents 701e546 + 6added4 commit 8a0bd22

File tree

3 files changed

+42
-18
lines changed

3 files changed

+42
-18
lines changed

‎Example/KeyboardConstraintDemo/Main.storyboard‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
59
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
10+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
611
</dependencies>
712
<scenes>
813
<!--View Controller-->
@@ -14,37 +19,43 @@
1419
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
1520
</layoutGuides>
1621
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17-
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
22+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1823
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1924
<subviews>
2025
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AMY-Hu-kE3">
21-
<rect key="frame" x="16" y="28" width="288" height="40"/>
26+
<rect key="frame" x="16" y="28" width="343" height="40"/>
2227
<constraints>
2328
<constraint firstAttribute="height" constant="40" id="f9v-zl-Ayg"/>
2429
</constraints>
2530
<fontDescription key="fontDescription" type="system" pointSize="14"/>
2631
<textInputTraits key="textInputTraits"/>
2732
</textField>
2833
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EDp-Dw-qxj">
29-
<rect key="frame" x="16" y="518" width="288" height="30"/>
34+
<rect key="frame" x="16" y="617" width="343" height="50"/>
35+
<color key="backgroundColor" red="0.1764705882" green="0.1764705882" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
3036
<constraints>
31-
<constraint firstAttribute="height" constant="30" id="hRM-Ec-YVx"/>
37+
<constraint firstAttribute="height" constant="50" id="hRM-Ec-YVx"/>
3238
</constraints>
3339
<state key="normal" title="Dismiss">
34-
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
40+
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
3541
</state>
3642
<connections>
3743
<action selector="resign:" destination="dkx-z0-nzr" eventType="touchUpInside" id="gmh-iP-Dx7"/>
3844
</connections>
3945
</button>
46+
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kkz-1t-g9C">
47+
<rect key="frame" x="135" y="186" width="240" height="128"/>
48+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
49+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
50+
</view>
4051
</subviews>
41-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
52+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4253
<constraints>
4354
<constraint firstItem="AMY-Hu-kE3" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="8" id="3lF-kK-yy4"/>
4455
<constraint firstItem="EDp-Dw-qxj" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="AkY-Vd-oca"/>
4556
<constraint firstItem="AMY-Hu-kE3" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="FWN-Gj-tlx"/>
4657
<constraint firstItem="EDp-Dw-qxj" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="TXL-Fw-b7p"/>
47-
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="EDp-Dw-qxj" secondAttribute="bottom" constant="20" id="qny-Gp-4Vs" customClass="KeyboardAdjustConstraint"/>
58+
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="EDp-Dw-qxj" secondAttribute="bottom" id="qny-Gp-4Vs" customClass="KeyboardAdjustConstraint"/>
4859
<constraint firstItem="AMY-Hu-kE3" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="z31-z7-nMu"/>
4960
</constraints>
5061
</view>
@@ -54,9 +65,4 @@
5465
<point key="canvasLocation" x="340" y="579"/>
5566
</scene>
5667
</scenes>
57-
<simulatedMetricsContainer key="defaultSimulatedMetrics">
58-
<simulatedStatusBarMetrics key="statusBar"/>
59-
<simulatedOrientationMetrics key="orientation"/>
60-
<simulatedScreenMetrics key="destination" type="retina4"/>
61-
</simulatedMetricsContainer>
6268
</document>

‎KeyboardConstraint.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KeyboardConstraint'
3-
s.version = '0.0.2'
3+
s.version = '0.0.3'
44
s.license = 'MIT'
55
s.summary = 'A NSLayoutConstraint subclass which observes keyboard notifications.'
66
s.homepage = 'https://github.com/Papercloud/KeyboardConstraint/'

‎KeyboardConstraint/KeyboardAdjustConstraint.m‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,27 @@ - (void)_keyboardDidChangeVisible:(NSNotification *)notification
4949
endFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
5050
}
5151

52-
UIView *superview = [(UIView *)self.firstItem superview];
52+
UIView *superview = [(UIView *)self.secondItem superview];
5353
CGRect windowRelativeFrame = [superview convertRect:superview.bounds toView:nil];
54-
CGFloat keyboardHeight = CGRectGetMaxY(windowRelativeFrame) - CGRectGetMinY(endFrame);
54+
55+
CGRect intersection = CGRectIntersection(windowRelativeFrame, endFrame);
56+
CGFloat keyboardHeight = 0.0;
57+
58+
if (!CGRectIsNull(intersection)) {
59+
keyboardHeight = intersection.size.height;
60+
}
61+
62+
// If one of the constraint items is a layout guide; subtract it's length:
63+
64+
if (notification.name == UIKeyboardWillShowNotification) {
65+
if ([self.firstItem conformsToProtocol:@protocol(UILayoutSupport)]) {
66+
id<UILayoutSupport> layoutGuide = self.firstItem;
67+
keyboardHeight -= layoutGuide.length;
68+
} else if ([self.secondItem conformsToProtocol:@protocol(UILayoutSupport)]) {
69+
id<UILayoutSupport> layoutGuide = self.secondItem;
70+
keyboardHeight -= layoutGuide.length;
71+
}
72+
}
5573

5674
if (superview) {
5775
//Force layout before animation...

0 commit comments

Comments
 (0)