Fix keyboard height constraint

5 files changed, 41 insertions, 54 deletions

diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard
index b717079..130f09d 100644
--- a/Juick/Main.storyboard
+++ b/Juick/Main.storyboard
@@ -257,47 +257,35 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GB6-qL-STb">
-                                <rect key="frame" x="8" y="72" width="359" height="543"/>
-                                <subviews>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="XYj-Y4-lfM">
-                                        <rect key="frame" x="0.0" y="0.0" width="359" height="543"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowColor">
-                                                <color key="value" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="NO"/>
-                                            <userDefinedRuntimeAttribute type="string" keyPath="layer.shadowOpacity" value="0.16"/>
-                                            <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset">
-                                                <size key="value" width="0.0" height="3"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                    </textView>
-                                </subviews>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="XYj-Y4-lfM">
+                                <rect key="frame" x="4" y="60" width="367" height="559"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="XYj-Y4-lfM" secondAttribute="trailing" id="jI3-cJ-6Mp"/>
-                                    <constraint firstAttribute="bottom" secondItem="XYj-Y4-lfM" secondAttribute="bottom" id="jXU-c3-buK"/>
-                                    <constraint firstItem="XYj-Y4-lfM" firstAttribute="leading" secondItem="GB6-qL-STb" secondAttribute="leading" id="mVZ-wx-MTI"/>
-                                    <constraint firstItem="XYj-Y4-lfM" firstAttribute="top" secondItem="GB6-qL-STb" secondAttribute="top" id="t5x-bF-ptj"/>
-                                </constraints>
-                            </view>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowColor">
+                                        <color key="value" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="NO"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="layer.shadowOpacity" value="0.16"/>
+                                    <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset">
+                                        <size key="value" width="0.0" height="3"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </textView>
                         </subviews>
                         <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
-                            <constraint firstItem="GB6-qL-STb" firstAttribute="leading" secondItem="UJz-7C-l1q" secondAttribute="leading" constant="8" id="47p-h8-Jtb"/>
-                            <constraint firstItem="UJz-7C-l1q" firstAttribute="trailing" secondItem="GB6-qL-STb" secondAttribute="trailing" constant="8" id="4oU-Mg-KhG"/>
-                            <constraint firstItem="GB6-qL-STb" firstAttribute="top" secondItem="UJz-7C-l1q" secondAttribute="top" constant="8" id="IcR-4Z-amS"/>
-                            <constraint firstItem="UJz-7C-l1q" firstAttribute="bottom" secondItem="GB6-qL-STb" secondAttribute="bottom" constant="8" id="g8x-pU-RPk"/>
+                            <constraint firstItem="UJz-7C-l1q" firstAttribute="top" secondItem="XYj-Y4-lfM" secondAttribute="top" constant="4" id="5aN-lI-YBC"/>
+                            <constraint firstItem="UJz-7C-l1q" firstAttribute="bottom" secondItem="XYj-Y4-lfM" secondAttribute="bottom" constant="4" id="7HQ-Ue-xFR"/>
+                            <constraint firstItem="XYj-Y4-lfM" firstAttribute="leading" secondItem="UJz-7C-l1q" secondAttribute="leading" constant="4" id="aw6-Uf-tSS"/>
+                            <constraint firstItem="UJz-7C-l1q" firstAttribute="trailing" secondItem="XYj-Y4-lfM" secondAttribute="trailing" constant="4" id="gTz-QO-1CL"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="UJz-7C-l1q"/>
                     </view>
                     <navigationItem key="navigationItem" id="Yd6-Yh-gtd"/>
                     <connections>
-                        <outlet property="bottomConstraint" destination="g8x-pU-RPk" id="pan-Nq-6Tb"/>
+                        <outlet property="bottomConstraint" destination="7HQ-Ue-xFR" id="gZE-2Y-pQd"/>
                         <outlet property="textView" destination="XYj-Y4-lfM" id="AhV-B8-GYd"/>
                     </connections>
                 </viewController>
diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index 06427c7..5035e69 100644
--- a/Juick/Supporting Files/Juick-Info.plist
+++ b/Juick/Supporting Files/Juick-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.42</string>
+	<string>1.0.43</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Juick/ViewControllers/NewPostViewController.m b/Juick/ViewControllers/NewPostViewController.m
index 143dd96..e8c767c 100644
--- a/Juick/ViewControllers/NewPostViewController.m
+++ b/Juick/ViewControllers/NewPostViewController.m
@@ -26,6 +26,8 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    self.paddingValue = self.bottomConstraint.constant;
+    [self.view setBackgroundColor:[ColorScheme mainBackground]];
     if (_replyTo != nil) {
         MessageInputView *inputView =  (MessageInputView *) self.inputAccessoryView;
         inputView.quoteText.text = _replyTo.text;
@@ -63,11 +65,9 @@
 }
 
 -(void) keyboardDidShow:(NSNotification *)sender {
-    CGRect frame = [sender.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
-    CGRect newFrame = [self.view convertRect:frame fromView:[[UIApplication sharedApplication] delegate].window];    
-    [self.view layoutIfNeeded];
+    CGRect keyboardRect = [sender.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
     [UIView animateWithDuration:[sender.userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue] animations:^{
-        self.bottomConstraint.constant = newFrame.origin.y - CGRectGetHeight(self.view.frame) + self.paddingValue;
+        self.bottomConstraint.constant = keyboardRect.size.height - self.view.safeAreaInsets.bottom + self.paddingValue;
         [self.view layoutIfNeeded];
     }];
 }
@@ -90,5 +90,4 @@
     return _inputAccessoryView;
 }
 
-
 @end
diff --git a/Juick/Views/MessageCell.xib b/Juick/Views/MessageCell.xib
index d32defe..bb7f9c5 100644
--- a/Juick/Views/MessageCell.xib
+++ b/Juick/Views/MessageCell.xib
@@ -20,10 +20,10 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="Azj-pa-GEC">
-                        <rect key="frame" x="6" y="6" width="574" height="425.5"/>
+                        <rect key="frame" x="6" y="6" width="562" height="425.5"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="7FT-kJ-84d">
-                                <rect key="frame" x="0.0" y="0.0" width="574" height="52.5"/>
+                                <rect key="frame" x="0.0" y="0.0" width="562" height="52.5"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="999" verticalHuggingPriority="251" horizontalCompressionResistancePriority="999" translatesAutoresizingMaskIntoConstraints="NO" id="CZk-Q8-JqS">
                                         <rect key="frame" x="0.0" y="0.0" width="48" height="52.5"/>
@@ -32,16 +32,16 @@
                                         </constraints>
                                     </imageView>
                                     <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="252" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="o3h-ci-LWF">
-                                        <rect key="frame" x="60" y="0.0" width="574" height="52.5"/>
+                                        <rect key="frame" x="60" y="0.0" width="502" height="52.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CHd-h0-hPk">
-                                                <rect key="frame" x="0.0" y="0.0" width="574" height="20.5"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="502" height="20.5"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AVu-qV-q84">
-                                                <rect key="frame" x="0.0" y="36.5" width="574" height="16"/>
+                                                <rect key="frame" x="0.0" y="36.5" width="502" height="16"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
@@ -51,7 +51,7 @@
                                 </subviews>
                             </stackView>
                             <view contentMode="scaleToFill" verticalCompressionResistancePriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="N08-my-2Lr" customClass="TagListView">
-                                <rect key="frame" x="0.0" y="64.5" width="574" height="32.5"/>
+                                <rect key="frame" x="0.0" y="64.5" width="562" height="32"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
@@ -78,20 +78,20 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zZm-hh-bDO" customClass="TTTAttributedLabel">
-                                <rect key="frame" x="0.0" y="109" width="574" height="20.5"/>
+                                <rect key="frame" x="0.0" y="108.5" width="562" height="21"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Uha-ow-kFJ">
-                                <rect key="frame" x="0.0" y="141.5" width="574" height="256"/>
+                                <rect key="frame" x="0.0" y="141.5" width="562" height="256"/>
                                 <constraints>
                                     <constraint firstAttribute="height" priority="999" constant="256" identifier="attachHeight" id="Cuq-dQ-VYU"/>
                                     <constraint firstAttribute="width" priority="999" constant="256" id="oJg-1R-jp3"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJE-mZ-MCS">
-                                <rect key="frame" x="0.0" y="409.5" width="574" height="16"/>
+                                <rect key="frame" x="0.0" y="409.5" width="562" height="16"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
diff --git a/Juick/Views/MessageInputView.xib b/Juick/Views/MessageInputView.xib
index 125956d..0b2af25 100644
--- a/Juick/Views/MessageInputView.xib
+++ b/Juick/Views/MessageInputView.xib
@@ -13,14 +13,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <visualEffectView opaque="NO" contentMode="scaleToFill" id="8gV-Bq-kOk" customClass="MessageInputView">
-            <rect key="frame" x="0.0" y="0.0" width="368" height="90"/>
+            <rect key="frame" x="0.0" y="0.0" width="368" height="31"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="imu-GT-9JL">
-                <rect key="frame" x="0.0" y="0.0" width="368" height="90"/>
+                <rect key="frame" x="0.0" y="0.0" width="368" height="31"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" verticalCompressionResistancePriority="248" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Swn-59-jWb">
-                        <rect key="frame" x="6" y="6" width="356" height="78"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="252" verticalCompressionResistancePriority="248" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Swn-59-jWb">
+                        <rect key="frame" x="6" y="6" width="356" height="19"/>
                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
@@ -28,9 +28,9 @@
                 </subviews>
                 <constraints>
                     <constraint firstItem="Swn-59-jWb" firstAttribute="leading" secondItem="ZiU-Ll-9jB" secondAttribute="leading" constant="6" id="nTb-2n-vCy"/>
-                    <constraint firstItem="ZiU-Ll-9jB" firstAttribute="bottom" secondItem="Swn-59-jWb" secondAttribute="bottom" constant="6" id="snn-zN-hrV"/>
+                    <constraint firstItem="ZiU-Ll-9jB" firstAttribute="bottom" secondItem="Swn-59-jWb" secondAttribute="bottom" priority="750" constant="6" id="snn-zN-hrV"/>
                     <constraint firstItem="ZiU-Ll-9jB" firstAttribute="trailing" secondItem="Swn-59-jWb" secondAttribute="trailing" constant="6" id="tyN-OL-Y06"/>
-                    <constraint firstItem="Swn-59-jWb" firstAttribute="top" secondItem="ZiU-Ll-9jB" secondAttribute="top" constant="6" id="vVV-Yt-s8Q"/>
+                    <constraint firstItem="Swn-59-jWb" firstAttribute="top" secondItem="ZiU-Ll-9jB" secondAttribute="top" priority="750" constant="6" id="vVV-Yt-s8Q"/>
                 </constraints>
                 <viewLayoutGuide key="safeArea" id="ZiU-Ll-9jB"/>
             </view>
@@ -38,7 +38,7 @@
             <connections>
                 <outlet property="quoteText" destination="Swn-59-jWb" id="tky-lv-tWn"/>
             </connections>
-            <point key="canvasLocation" x="-433" y="56"/>
+            <point key="canvasLocation" x="-433" y="85.5"/>
         </visualEffectView>
     </objects>
 </document>