From 656419bdb2cc1eb322c6b1d1afdb356260711424 Mon Sep 17 00:00:00 2001
From: Chris Li <chris@kiwix.org>
Date: Thu, 8 Sep 2016 10:41:01 -0400
Subject: [PATCH] SearchController layout fix

---
 Kiwix-iOS/Info.plist                   |  2 +-
 Kiwix-iOS/Storyboard/Search.storyboard | 55 ++++++++++----------------
 Kiwix-iOSWidgets/Bookmarks/Info.plist  |  2 +-
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index b568f5a1..b7f4e16e 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.7.1826</string>
+	<string>1.7.1829</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Kiwix-iOS/Storyboard/Search.storyboard b/Kiwix-iOS/Storyboard/Search.storyboard
index d8624ab6..0caffb70 100644
--- a/Kiwix-iOS/Storyboard/Search.storyboard
+++ b/Kiwix-iOS/Storyboard/Search.storyboard
@@ -28,21 +28,6 @@
                                 </connections>
                             </containerView>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l6w-E8-vrr" customClass="SearchRoundedCornerView" customModule="Kiwix" customModuleProvider="target">
-                                <constraints>
-                                    <constraint firstAttribute="height" relation="lessThanOrEqual" constant="436" id="UlE-Qk-NYa">
-                                        <variation key="widthClass=regular" constant="700"/>
-                                    </constraint>
-                                </constraints>
-                                <variation key="default">
-                                    <mask key="constraints">
-                                        <exclude reference="UlE-Qk-NYa"/>
-                                    </mask>
-                                </variation>
-                                <variation key="widthClass=regular">
-                                    <mask key="constraints">
-                                        <include reference="UlE-Qk-NYa"/>
-                                    </mask>
-                                </variation>
                                 <connections>
                                     <segue destination="fgz-Yy-Pok" kind="embed" identifier="EmbeddedSearchResultTBVC" id="hg6-op-GYf"/>
                                 </connections>
@@ -62,17 +47,13 @@
                             <constraint firstAttribute="trailing" secondItem="wyO-bR-owd" secondAttribute="trailing" id="8yE-Hw-hmZ"/>
                             <constraint firstAttribute="trailing" secondItem="l6w-E8-vrr" secondAttribute="trailing" id="BKR-eS-WSs"/>
                             <constraint firstItem="vCx-YB-CHS" firstAttribute="centerX" secondItem="l6w-E8-vrr" secondAttribute="centerX" id="Ce5-0C-iQ7"/>
-                            <constraint firstItem="l6w-E8-vrr" firstAttribute="top" secondItem="Bhr-Sz-DsQ" secondAttribute="bottom" constant="-64" id="GMC-Xe-adz">
-                                <variation key="widthClass=regular" constant="0.0"/>
-                            </constraint>
+                            <constraint firstItem="wyO-bR-owd" firstAttribute="top" secondItem="anA-WQ-694" secondAttribute="top" id="Ld9-Bd-U8z"/>
                             <constraint firstItem="wyO-bR-owd" firstAttribute="leading" secondItem="anA-WQ-694" secondAttribute="leading" id="QS1-ss-pEv"/>
+                            <constraint firstItem="l6w-E8-vrr" firstAttribute="top" secondItem="anA-WQ-694" secondAttribute="top" id="Uny-Rs-soW"/>
                             <constraint firstItem="wyO-bR-owd" firstAttribute="width" secondItem="anA-WQ-694" secondAttribute="width" multiplier="0.7" id="aKL-Ij-zYi"/>
                             <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="l6w-E8-vrr" secondAttribute="bottom" id="eBL-Xw-Qoy"/>
                             <constraint firstItem="wyO-bR-owd" firstAttribute="top" secondItem="Bhr-Sz-DsQ" secondAttribute="bottom" id="eBi-Pg-0Ka"/>
                             <constraint firstItem="vCx-YB-CHS" firstAttribute="height" secondItem="wyO-bR-owd" secondAttribute="height" id="ewd-yX-U7y"/>
-                            <constraint firstItem="wyO-bR-owd" firstAttribute="top" secondItem="Bhr-Sz-DsQ" secondAttribute="bottom" constant="-64" id="fic-m4-aX2">
-                                <variation key="widthClass=regular" constant="0.0"/>
-                            </constraint>
                             <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="wyO-bR-owd" secondAttribute="bottom" id="i5e-7F-ctC"/>
                             <constraint firstItem="vCx-YB-CHS" firstAttribute="width" secondItem="wyO-bR-owd" secondAttribute="width" id="itt-a3-Qgu"/>
                             <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="wyO-bR-owd" secondAttribute="bottom" priority="750" constant="100" id="kf7-tp-XAe">
@@ -99,6 +80,14 @@
                                 <exclude reference="ewd-yX-U7y"/>
                                 <exclude reference="itt-a3-Qgu"/>
                                 <exclude reference="y9U-EJ-3QB"/>
+                                <exclude reference="Uny-Rs-soW"/>
+                                <exclude reference="Ld9-Bd-U8z"/>
+                            </mask>
+                        </variation>
+                        <variation key="widthClass=compact">
+                            <mask key="constraints">
+                                <include reference="Uny-Rs-soW"/>
+                                <include reference="Ld9-Bd-U8z"/>
                             </mask>
                         </variation>
                         <variation key="widthClass=regular">
@@ -109,7 +98,6 @@
                                 <include reference="0NT-oh-5ye"/>
                                 <exclude reference="3Hc-So-OgY"/>
                                 <exclude reference="BKR-eS-WSs"/>
-                                <exclude reference="GMC-Xe-adz"/>
                                 <include reference="krr-dd-vSg"/>
                                 <include reference="m88-tH-cDI"/>
                                 <include reference="2D4-7f-Usz"/>
@@ -117,7 +105,6 @@
                                 <exclude reference="QS1-ss-pEv"/>
                                 <include reference="aKL-Ij-zYi"/>
                                 <include reference="eBi-Pg-0Ka"/>
-                                <exclude reference="fic-m4-aX2"/>
                                 <include reference="3Ye-Dy-tJA"/>
                                 <exclude reference="eBL-Xw-Qoy"/>
                                 <exclude reference="i5e-7F-ctC"/>
@@ -132,10 +119,8 @@
                             <mask key="constraints">
                                 <exclude reference="3Hc-So-OgY"/>
                                 <exclude reference="BKR-eS-WSs"/>
-                                <exclude reference="GMC-Xe-adz"/>
                                 <exclude reference="8yE-Hw-hmZ"/>
                                 <exclude reference="QS1-ss-pEv"/>
-                                <exclude reference="fic-m4-aX2"/>
                                 <exclude reference="eBL-Xw-Qoy"/>
                                 <exclude reference="i5e-7F-ctC"/>
                             </mask>
@@ -172,10 +157,10 @@
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="CheckMarkBookCell" id="BZj-UA-kZf" customClass="CheckMarkBookCell" customModule="Kiwix">
-                                        <rect key="frame" x="0.0" y="28" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="538" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BZj-UA-kZf" id="QkJ-pZ-dqx">
-                                            <frame key="frameInset" width="414" height="43.5"/>
+                                            <frame key="frameInset" width="538" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" minimumFontSize="8" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GW1-dh-vyc">
@@ -289,14 +274,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" textLabel="jU7-ZQ-dsg" style="IBUITableViewCellStyleDefault" id="jhQ-Rz-z7y">
-                                        <rect key="frame" x="0.0" y="72" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="72" width="538" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jhQ-Rz-z7y" id="0Qp-fj-4c4">
-                                            <frame key="frameInset" width="414" height="43.5"/>
+                                            <frame key="frameInset" width="538" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jU7-ZQ-dsg">
-                                                    <frame key="frameInset" minX="15" width="384" height="43.5"/>
+                                                    <frame key="frameInset" minX="15" width="508" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -347,17 +332,17 @@
                         <viewControllerLayoutGuide type="bottom" id="U6y-Va-LE0"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="oES-Vw-jgP">
-                        <rect key="frame" x="0.0" y="0.0" width="538" height="700"/>
+                        <rect key="frame" x="0.0" y="0.0" width="538" height="910"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="526-mx-VrZ">
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ArticleCell" id="z8v-Ld-3tX" customClass="ArticleCell" customModule="Kiwix" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="28" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="538" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="z8v-Ld-3tX" id="PYl-F0-kUl">
-                                            <frame key="frameInset" width="414" height="43.5"/>
+                                            <frame key="frameInset" width="538" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="UgG-QR-OX4">
@@ -408,10 +393,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ArticleSnippetCell" rowHeight="87" id="wBv-ub-ny7" customClass="ArticleSnippetCell" customModule="Kiwix" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="72" width="414" height="87"/>
+                                        <rect key="frame" x="0.0" y="72" width="538" height="87"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wBv-ub-ny7" id="fk4-EM-rH7">
-                                            <frame key="frameInset" width="414" height="86.5"/>
+                                            <frame key="frameInset" width="538" height="86.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ien-Dp-MNO">
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index d688110d..5c9ec6c6 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.7.2384</string>
+	<string>1.7.2387</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>