Commit 77e9e762090c2be96a0587bf6adc2c04b612e4c0

Authored by Imanol-Mikel Barba Sabariego
1 parent 012aa3cd

--no commit message

DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
3 <dependencies> 3 <dependencies>
4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> 4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
5 </dependencies> 5 </dependencies>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 28 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
29 <subviews> 29 <subviews>
30 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bPF-XH-a36"> 30 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bPF-XH-a36">
31 - <rect key="frame" x="0.0" y="0.0" width="280" height="602"/> 31 + <rect key="frame" x="0.0" y="0.0" width="320" height="602"/>
32 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 32 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
33 <subviews> 33 <subviews>
34 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="gUl-8z-CPz"> 34 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="gUl-8z-CPz">
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <nil key="highlightedColor"/> 45 <nil key="highlightedColor"/>
46 </label> 46 </label>
47 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="P5u-F4-X4a"> 47 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="P5u-F4-X4a">
48 - <rect key="frame" x="-100" y="59" width="480" height="162"/> 48 + <rect key="frame" x="-80" y="59" width="480" height="162"/>
49 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> 49 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
50 <date key="date" timeIntervalSinceReferenceDate="432266305.732934"> 50 <date key="date" timeIntervalSinceReferenceDate="432266305.732934">
51 <!--2014-09-13 01:58:25 +0000--> 51 <!--2014-09-13 01:58:25 +0000-->
@@ -86,7 +86,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -86,7 +86,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
86 </connections> 86 </connections>
87 </switch> 87 </switch>
88 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="mwj-Ys-4vf"> 88 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="mwj-Ys-4vf">
89 - <rect key="frame" x="-100" y="98" width="480" height="162"/> 89 + <rect key="frame" x="-80" y="98" width="480" height="162"/>
90 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> 90 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
91 <date key="date" timeIntervalSinceReferenceDate="432266362.26397198"> 91 <date key="date" timeIntervalSinceReferenceDate="432266362.26397198">
92 <!--2014-09-13 01:59:22 +0000--> 92 <!--2014-09-13 01:59:22 +0000-->
@@ -113,16 +113,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -113,16 +113,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
113 </data> 113 </data>
114 </timeZone> 114 </timeZone>
115 </datePicker> 115 </datePicker>
116 - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aYc-3W-Uqn">  
117 - <rect key="frame" x="122" y="105" width="37" height="30"/>  
118 - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>  
119 - <state key="normal" title="Done">  
120 - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>  
121 - </state>  
122 - <connections>  
123 - <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="20s-GW-y67"/>  
124 - </connections>  
125 - </button>  
126 </subviews> 116 </subviews>
127 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> 117 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
128 <constraints> 118 <constraints>
@@ -131,34 +121,42 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -131,34 +121,42 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
131 <constraint firstAttribute="height" constant="602" id="9TX-1i-78Z"/> 121 <constraint firstAttribute="height" constant="602" id="9TX-1i-78Z"/>
132 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="18" id="Ebo-Ll-h52"/> 122 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="18" id="Ebo-Ll-h52"/>
133 <constraint firstItem="gUl-8z-CPz" firstAttribute="leading" secondItem="xIo-vd-lE7" secondAttribute="trailing" constant="8" id="GGW-gp-gX0"/> 123 <constraint firstItem="gUl-8z-CPz" firstAttribute="leading" secondItem="xIo-vd-lE7" secondAttribute="trailing" constant="8" id="GGW-gp-gX0"/>
  124 + <constraint firstAttribute="width" constant="320" id="HeC-5b-Jcm"/>
134 <constraint firstItem="xIo-vd-lE7" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="25" id="Lre-tN-KLY"/> 125 <constraint firstItem="xIo-vd-lE7" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="25" id="Lre-tN-KLY"/>
135 - <constraint firstAttribute="centerX" secondItem="aYc-3W-Uqn" secondAttribute="centerX" constant="-0.5" id="Ply-4u-pHb"/>  
136 <constraint firstItem="IjI-S6-otK" firstAttribute="leading" secondItem="J6Y-lM-Rjf" secondAttribute="trailing" constant="8" id="SiP-L0-vna"/> 126 <constraint firstItem="IjI-S6-otK" firstAttribute="leading" secondItem="J6Y-lM-Rjf" secondAttribute="trailing" constant="8" id="SiP-L0-vna"/>
137 <constraint firstItem="xIo-vd-lE7" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="UYd-kA-RVe"/> 127 <constraint firstItem="xIo-vd-lE7" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="UYd-kA-RVe"/>
138 <constraint firstItem="mwj-Ys-4vf" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="8" symbolic="YES" id="awF-Ys-Dzh"/> 128 <constraint firstItem="mwj-Ys-4vf" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="8" symbolic="YES" id="awF-Ys-Dzh"/>
139 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="cA8-yk-fVJ"/> 129 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="cA8-yk-fVJ"/>
140 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="jXK-cV-gUA"/> 130 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="jXK-cV-gUA"/>
141 - <constraint firstItem="aYc-3W-Uqn" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="15" id="r6B-Uv-9fW"/>  
142 <constraint firstAttribute="centerX" secondItem="mwj-Ys-4vf" secondAttribute="centerX" id="vvq-Wh-sPa"/> 131 <constraint firstAttribute="centerX" secondItem="mwj-Ys-4vf" secondAttribute="centerX" id="vvq-Wh-sPa"/>
143 <constraint firstItem="gUl-8z-CPz" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="20" id="wxd-X3-cbH"/> 132 <constraint firstItem="gUl-8z-CPz" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="20" id="wxd-X3-cbH"/>
144 </constraints> 133 </constraints>
145 </view> 134 </view>
  135 + <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aYc-3W-Uqn">
  136 + <rect key="frame" x="122" y="98" width="37" height="30"/>
  137 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  138 + <state key="normal" title="Done">
  139 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  140 + </state>
  141 + <connections>
  142 + <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="20s-GW-y67"/>
  143 + </connections>
  144 + </button>
146 </subviews> 145 </subviews>
147 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/> 146 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
148 <constraints> 147 <constraints>
149 <constraint firstAttribute="bottom" secondItem="bPF-XH-a36" secondAttribute="bottom" constant="-463" id="BSg-SY-YvA"/> 148 <constraint firstAttribute="bottom" secondItem="bPF-XH-a36" secondAttribute="bottom" constant="-463" id="BSg-SY-YvA"/>
150 - <constraint firstItem="bPF-XH-a36" firstAttribute="width" secondItem="fz9-NP-VLV" secondAttribute="width" id="GmM-Hm-Avd"/>  
151 - <constraint firstItem="bPF-XH-a36" firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" id="JcL-2N-ehq"/> 149 + <constraint firstItem="bPF-XH-a36" firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" constant="20" id="JcL-2N-ehq"/>
  150 + <constraint firstItem="bPF-XH-a36" firstAttribute="leading" secondItem="fz9-NP-VLV" secondAttribute="leading" id="a6a-pD-vUI"/>
152 <constraint firstItem="bPF-XH-a36" firstAttribute="top" secondItem="fz9-NP-VLV" secondAttribute="top" id="dVI-xT-cob"/> 151 <constraint firstItem="bPF-XH-a36" firstAttribute="top" secondItem="fz9-NP-VLV" secondAttribute="top" id="dVI-xT-cob"/>
153 - <constraint firstAttribute="trailing" secondItem="bPF-XH-a36" secondAttribute="trailing" id="qyC-rv-007"/> 152 + <constraint firstAttribute="trailing" secondItem="bPF-XH-a36" secondAttribute="trailing" constant="-40" id="qyC-rv-007"/>
154 </constraints> 153 </constraints>
155 </scrollView> 154 </scrollView>
156 </subviews> 155 </subviews>
157 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/> 156 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
158 <constraints> 157 <constraints>
159 <constraint firstItem="fz9-NP-VLV" firstAttribute="top" secondItem="kvr-be-fbh" secondAttribute="top" constant="20" symbolic="YES" id="ENJ-tA-Y3H"/> 158 <constraint firstItem="fz9-NP-VLV" firstAttribute="top" secondItem="kvr-be-fbh" secondAttribute="top" constant="20" symbolic="YES" id="ENJ-tA-Y3H"/>
160 - <constraint firstItem="fz9-NP-VLV" firstAttribute="leading" secondItem="kvr-be-fbh" secondAttribute="leading" constant="20" id="fJ1-JO-Czs"/>  
161 - <constraint firstAttribute="trailing" secondItem="fz9-NP-VLV" secondAttribute="trailing" constant="20" id="pFv-mr-RlH"/> 159 + <constraint firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" id="X8u-75-ogj"/>
162 <constraint firstAttribute="bottom" secondItem="fz9-NP-VLV" secondAttribute="bottom" constant="321" id="qh2-6H-Nq5"/> 160 <constraint firstAttribute="bottom" secondItem="fz9-NP-VLV" secondAttribute="bottom" constant="321" id="qh2-6H-Nq5"/>
163 </constraints> 161 </constraints>
164 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> 162 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
3 <dependencies> 3 <dependencies>
4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> 4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
5 </dependencies> 5 </dependencies>
@@ -138,20 +138,19 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -138,20 +138,19 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
138 <constraint firstAttribute="height" constant="602" id="aC4-YZ-T3h"/> 138 <constraint firstAttribute="height" constant="602" id="aC4-YZ-T3h"/>
139 <constraint firstItem="MAy-lw-s1B" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" symbolic="YES" id="caz-mx-Bec"/> 139 <constraint firstItem="MAy-lw-s1B" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" symbolic="YES" id="caz-mx-Bec"/>
140 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="cTb-x4-h2w" secondAttribute="bottom" constant="8" id="lj7-2h-Tuu"/> 140 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="cTb-x4-h2w" secondAttribute="bottom" constant="8" id="lj7-2h-Tuu"/>
141 - <constraint firstItem="nfK-Us-pVk" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" id="pkJ-df-ypc"/>  
142 <constraint firstItem="WCO-rz-s5y" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="qzS-Hb-i2n"/> 141 <constraint firstItem="WCO-rz-s5y" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="qzS-Hb-i2n"/>
143 <constraint firstItem="Ses-ng-Dli" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="sOT-a5-RCf"/> 142 <constraint firstItem="Ses-ng-Dli" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="sOT-a5-RCf"/>
144 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="Ses-ng-Dli" secondAttribute="bottom" constant="13" id="uuD-yP-qFl"/> 143 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="Ses-ng-Dli" secondAttribute="bottom" constant="13" id="uuD-yP-qFl"/>
145 <constraint firstItem="MAy-lw-s1B" firstAttribute="leading" secondItem="84e-nH-INk" secondAttribute="leading" id="v55-li-xEh"/> 144 <constraint firstItem="MAy-lw-s1B" firstAttribute="leading" secondItem="84e-nH-INk" secondAttribute="leading" id="v55-li-xEh"/>
146 <constraint firstItem="cTb-x4-h2w" firstAttribute="leading" secondItem="Ses-ng-Dli" secondAttribute="trailing" constant="8" id="vTL-Oe-xpz"/> 145 <constraint firstItem="cTb-x4-h2w" firstAttribute="leading" secondItem="Ses-ng-Dli" secondAttribute="trailing" constant="8" id="vTL-Oe-xpz"/>
147 <constraint firstItem="D6M-uD-fFw" firstAttribute="leading" secondItem="WCO-rz-s5y" secondAttribute="trailing" constant="8" id="wcC-ev-DCg"/> 146 <constraint firstItem="D6M-uD-fFw" firstAttribute="leading" secondItem="WCO-rz-s5y" secondAttribute="trailing" constant="8" id="wcC-ev-DCg"/>
  147 + <constraint firstItem="nfK-Us-pVk" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" id="z2P-uq-uq4"/>
148 </constraints> 148 </constraints>
149 </view> 149 </view>
150 </subviews> 150 </subviews>
151 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/> 151 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
152 <constraints> 152 <constraints>
153 <constraint firstAttribute="trailing" secondItem="YyP-Hs-KVd" secondAttribute="trailing" id="2ue-Lq-Fiu"/> 153 <constraint firstAttribute="trailing" secondItem="YyP-Hs-KVd" secondAttribute="trailing" id="2ue-Lq-Fiu"/>
154 - <constraint firstItem="YyP-Hs-KVd" firstAttribute="width" secondItem="LR9-4f-pyO" secondAttribute="width" id="3pE-Bi-Nlz"/>  
155 <constraint firstItem="YyP-Hs-KVd" firstAttribute="top" secondItem="LR9-4f-pyO" secondAttribute="top" id="5tN-HC-Y4Y"/> 154 <constraint firstItem="YyP-Hs-KVd" firstAttribute="top" secondItem="LR9-4f-pyO" secondAttribute="top" id="5tN-HC-Y4Y"/>
156 <constraint firstAttribute="bottom" secondItem="YyP-Hs-KVd" secondAttribute="bottom" constant="-466" id="N0Z-v2-m3i"/> 155 <constraint firstAttribute="bottom" secondItem="YyP-Hs-KVd" secondAttribute="bottom" constant="-466" id="N0Z-v2-m3i"/>
157 <constraint firstItem="YyP-Hs-KVd" firstAttribute="leading" secondItem="LR9-4f-pyO" secondAttribute="leading" id="r0r-8k-tpO"/> 156 <constraint firstItem="YyP-Hs-KVd" firstAttribute="leading" secondItem="LR9-4f-pyO" secondAttribute="leading" id="r0r-8k-tpO"/>
@@ -163,7 +162,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -163,7 +162,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
163 <constraint firstItem="LR9-4f-pyO" firstAttribute="top" secondItem="4CX-TI-g0c" secondAttribute="top" constant="20" id="5bJ-Km-lml"/> 162 <constraint firstItem="LR9-4f-pyO" firstAttribute="top" secondItem="4CX-TI-g0c" secondAttribute="top" constant="20" id="5bJ-Km-lml"/>
164 <constraint firstItem="LR9-4f-pyO" firstAttribute="leading" secondItem="4CX-TI-g0c" secondAttribute="leading" constant="20" symbolic="YES" id="He8-2n-c8r"/> 163 <constraint firstItem="LR9-4f-pyO" firstAttribute="leading" secondItem="4CX-TI-g0c" secondAttribute="leading" constant="20" symbolic="YES" id="He8-2n-c8r"/>
165 <constraint firstAttribute="bottom" secondItem="LR9-4f-pyO" secondAttribute="bottom" constant="164" id="Kof-P4-pbo"/> 164 <constraint firstAttribute="bottom" secondItem="LR9-4f-pyO" secondAttribute="bottom" constant="164" id="Kof-P4-pbo"/>
166 - <constraint firstAttribute="trailing" secondItem="LR9-4f-pyO" secondAttribute="trailing" constant="20" id="Y2j-bK-dce"/> 165 + <constraint firstItem="LR9-4f-pyO" firstAttribute="centerX" secondItem="4CX-TI-g0c" secondAttribute="centerX" id="sXP-9K-cYu"/>
167 </constraints> 166 </constraints>
168 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> 167 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
169 <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/> 168 <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
3 <dependencies> 3 <dependencies>
4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> 4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
5 </dependencies> 5 </dependencies>
@@ -132,6 +132,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -132,6 +132,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
132 <constraint firstItem="5jh-Em-ORd" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" symbolic="YES" id="HEo-mI-aaq"/> 132 <constraint firstItem="5jh-Em-ORd" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" symbolic="YES" id="HEo-mI-aaq"/>
133 <constraint firstItem="WiF-nR-ajG" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="N5v-Sy-RWV"/> 133 <constraint firstItem="WiF-nR-ajG" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="N5v-Sy-RWV"/>
134 <constraint firstItem="5bA-94-boo" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" id="PPB-jm-7y8"/> 134 <constraint firstItem="5bA-94-boo" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" id="PPB-jm-7y8"/>
  135 + <constraint firstItem="JjT-6I-8h2" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="232" id="Sjv-9Y-pUr"/>
135 <constraint firstItem="5jh-Em-ORd" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" id="TGZ-nc-u8T"/> 136 <constraint firstItem="5jh-Em-ORd" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" id="TGZ-nc-u8T"/>
136 <constraint firstItem="dRe-Qx-Lml" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="d01-Ej-wEd"/> 137 <constraint firstItem="dRe-Qx-Lml" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="d01-Ej-wEd"/>
137 <constraint firstItem="5bA-94-boo" firstAttribute="leading" secondItem="dRe-Qx-Lml" secondAttribute="trailing" constant="8" id="eFD-VY-09E"/> 138 <constraint firstItem="5bA-94-boo" firstAttribute="leading" secondItem="dRe-Qx-Lml" secondAttribute="trailing" constant="8" id="eFD-VY-09E"/>
@@ -140,7 +141,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -140,7 +141,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
140 <constraint firstAttribute="centerX" secondItem="yQT-o9-gle" secondAttribute="centerX" id="t22-P0-QPH"/> 141 <constraint firstAttribute="centerX" secondItem="yQT-o9-gle" secondAttribute="centerX" id="t22-P0-QPH"/>
141 <constraint firstItem="JjT-6I-8h2" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="7" id="tQp-z3-Xn1"/> 142 <constraint firstItem="JjT-6I-8h2" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="7" id="tQp-z3-Xn1"/>
142 <constraint firstAttribute="height" constant="626" id="tS1-Rt-VK1"/> 143 <constraint firstAttribute="height" constant="626" id="tS1-Rt-VK1"/>
143 - <constraint firstAttribute="centerX" secondItem="JjT-6I-8h2" secondAttribute="centerX" constant="-0.5" id="ubr-xC-I3x"/>  
144 <constraint firstAttribute="width" constant="500" id="wri-92-iq4"/> 144 <constraint firstAttribute="width" constant="500" id="wri-92-iq4"/>
145 <constraint firstItem="qf5-xv-6RK" firstAttribute="leading" secondItem="WiF-nR-ajG" secondAttribute="trailing" constant="8" id="ws8-Uc-fCh"/> 145 <constraint firstItem="qf5-xv-6RK" firstAttribute="leading" secondItem="WiF-nR-ajG" secondAttribute="trailing" constant="8" id="ws8-Uc-fCh"/>
146 <constraint firstItem="WiF-nR-ajG" firstAttribute="top" secondItem="E2t-iZ-4z0" secondAttribute="top" constant="25" id="zdK-ew-c5q"/> 146 <constraint firstItem="WiF-nR-ajG" firstAttribute="top" secondItem="E2t-iZ-4z0" secondAttribute="top" constant="25" id="zdK-ew-c5q"/>
DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
3 <dependencies> 3 <dependencies>
4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> 4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
5 </dependencies> 5 </dependencies>
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <!--2014-09-19 14:59:03 +0000--> 51 <!--2014-09-19 14:59:03 +0000-->
52 </date> 52 </date>
53 <timeZone key="timeZone" name="America/Los_Angeles"> 53 <timeZone key="timeZone" name="America/Los_Angeles">
54 - <data key="data"> 54 + <mutableData key="data">
55 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ 55 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
56 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ 56 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
57 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g 57 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
@@ -69,7 +69,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA @@ -69,7 +69,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
69 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 69 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
70 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 70 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
71 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA 71 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
72 -</data> 72 +</mutableData>
73 </timeZone> 73 </timeZone>
74 </datePicker> 74 </datePicker>
75 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ke5-90-B8V"> 75 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ke5-90-B8V">
@@ -79,7 +79,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -79,7 +79,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
79 <!--2014-09-19 14:59:23 +0000--> 79 <!--2014-09-19 14:59:23 +0000-->
80 </date> 80 </date>
81 <timeZone key="timeZone" name="America/Los_Angeles"> 81 <timeZone key="timeZone" name="America/Los_Angeles">
82 - <data key="data"> 82 + <mutableData key="data">
83 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ 83 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
84 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ 84 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
85 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g 85 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
@@ -97,7 +97,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA @@ -97,7 +97,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
97 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 97 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
98 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 98 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
99 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA 99 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
100 -</data> 100 +</mutableData>
101 </timeZone> 101 </timeZone>
102 </datePicker> 102 </datePicker>
103 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8k-7k-O2i"> 103 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8k-7k-O2i">
@@ -127,6 +127,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -127,6 +127,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
127 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> 127 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
128 <constraints> 128 <constraints>
129 <constraint firstAttribute="centerX" secondItem="Ke5-90-B8V" secondAttribute="centerX" id="28y-vd-Y2h"/> 129 <constraint firstAttribute="centerX" secondItem="Ke5-90-B8V" secondAttribute="centerX" id="28y-vd-Y2h"/>
  130 + <constraint firstItem="hDh-hS-ruL" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="232" id="Ekb-HV-H85"/>
130 <constraint firstItem="hDh-hS-ruL" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="7" id="GS8-uL-yin"/> 131 <constraint firstItem="hDh-hS-ruL" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="7" id="GS8-uL-yin"/>
131 <constraint firstItem="z8k-7k-O2i" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="20" id="Gq5-cV-ofW"/> 132 <constraint firstItem="z8k-7k-O2i" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="20" id="Gq5-cV-ofW"/>
132 <constraint firstItem="95w-9e-lc5" firstAttribute="leading" secondItem="z8k-7k-O2i" secondAttribute="trailing" constant="8" id="Lpl-at-M2a"/> 133 <constraint firstItem="95w-9e-lc5" firstAttribute="leading" secondItem="z8k-7k-O2i" secondAttribute="trailing" constant="8" id="Lpl-at-M2a"/>
@@ -138,7 +139,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -138,7 +139,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
138 <constraint firstItem="Jbw-43-Qar" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" id="k7J-l3-qIy"/> 139 <constraint firstItem="Jbw-43-Qar" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" id="k7J-l3-qIy"/>
139 <constraint firstItem="7sY-pS-rR6" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="25" id="oqv-Fr-c2u"/> 140 <constraint firstItem="7sY-pS-rR6" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="25" id="oqv-Fr-c2u"/>
140 <constraint firstItem="Jbw-43-Qar" firstAttribute="top" secondItem="ycu-em-WhN" secondAttribute="bottom" constant="8" symbolic="YES" id="owB-Oe-jji"/> 141 <constraint firstItem="Jbw-43-Qar" firstAttribute="top" secondItem="ycu-em-WhN" secondAttribute="bottom" constant="8" symbolic="YES" id="owB-Oe-jji"/>
141 - <constraint firstAttribute="centerX" secondItem="hDh-hS-ruL" secondAttribute="centerX" constant="-0.5" id="p2z-oA-1jg"/>  
142 <constraint firstItem="ycu-em-WhN" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="20" id="tS4-38-qyM"/> 142 <constraint firstItem="ycu-em-WhN" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="20" id="tS4-38-qyM"/>
143 <constraint firstItem="Ke5-90-B8V" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="2" id="uZx-7C-faF"/> 143 <constraint firstItem="Ke5-90-B8V" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="2" id="uZx-7C-faF"/>
144 <constraint firstAttribute="width" constant="500" id="vFe-sZ-zeI"/> 144 <constraint firstAttribute="width" constant="500" id="vFe-sZ-zeI"/>
DUREX Vendor Control/DateRangePickerViewController.m
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 12
13 @property uint8_t isExtended; 13 @property uint8_t isExtended;
14 @property NSUInteger currentHeight; 14 @property NSUInteger currentHeight;
  15 +@property NSUInteger currentWidth;
15 16
16 @end 17 @end
17 18
@@ -40,7 +41,12 @@ @@ -40,7 +41,12 @@
40 [self.toDate setDate:[NSDate date]]; 41 [self.toDate setDate:[NSDate date]];
41 42
42 [self setIsExtended:0]; 43 [self setIsExtended:0];
  44 +
43 [self setCurrentHeight:[self scrollView].frame.size.height]; 45 [self setCurrentHeight:[self scrollView].frame.size.height];
  46 + [self setCurrentWidth:[self scrollView].frame.size.width];
  47 +
  48 + [self.scrollView setAutoresizesSubviews:YES];
  49 + [self.scrollView setAutoresizingMask: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
44 50
45 [super viewDidLoad]; 51 [super viewDidLoad];
46 // Do any additional setup after loading the view from its nib. 52 // Do any additional setup after loading the view from its nib.
@@ -60,24 +66,18 @@ @@ -60,24 +66,18 @@
60 - (void) parentViewControllerDidRotateWithOrientation: (UIDeviceOrientation) orientation 66 - (void) parentViewControllerDidRotateWithOrientation: (UIDeviceOrientation) orientation
61 { 67 {
62 NSLog(@"[DateRangePickerViewController.m]: Screen did rotate"); 68 NSLog(@"[DateRangePickerViewController.m]: Screen did rotate");
63 - [self resizeViewHeight:self.scrollView :self.currentHeight :FALSE :FALSE];  
64 - if([self.fromToggler isOn])  
65 - {  
66 - NSUInteger height = [self fromDate].frame.size.height;  
67 - self.currentHeight -= (height + 20);  
68 - [self toggleFromDate:self];  
69 - }  
70 - if([self.toToggler isOn])  
71 - {  
72 - NSUInteger height = [self toDate].frame.size.height;  
73 - self.currentHeight -= (height + 20);  
74 - [self toggleToDate:self];  
75 - } 69 + [UIView beginAnimations:nil context:NULL];
  70 + [UIView setAnimationDuration:0.25];
  71 + [self expandScrollView];
  72 + self.scrollView.frame = CGRectMake(self.scrollView.frame.origin.x, self.scrollView.frame.origin.y, self.currentWidth,self.currentHeight);
  73 + [UIView commitAnimations];
  74 + [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self currentHeight])];
76 } 75 }
77 76
78 - (void) parentViewControllerWillRotateToInterfaceOrientation: (UIInterfaceOrientation)toInterfaceOrientation duration: (NSTimeInterval)duration 77 - (void) parentViewControllerWillRotateToInterfaceOrientation: (UIInterfaceOrientation)toInterfaceOrientation duration: (NSTimeInterval)duration
79 { 78 {
80 NSLog(@"[DateRangePickerViewController.m]: Screen will rotate"); 79 NSLog(@"[DateRangePickerViewController.m]: Screen will rotate");
  80 + [self.scrollView setNeedsUpdateConstraints];
81 } 81 }
82 82
83 - (void) expandScrollView 83 - (void) expandScrollView
@@ -127,41 +127,30 @@ @@ -127,41 +127,30 @@
127 [UIView commitAnimations]; 127 [UIView commitAnimations];
128 } 128 }
129 129
130 -- (void) resizeViewHeight : (UIView*) view : (NSInteger) height : (Boolean) ignoreHeight : (Boolean) realResize 130 +- (void) resizeViewHeight : (UIView*) view : (NSInteger) height : (Boolean) ignoreHeight
131 { 131 {
132 - NSLog(@"[DateRangePickerViewController.m]: currentHeight is %d", self.currentHeight);  
133 CGRect screenRect = [[UIScreen mainScreen] bounds]; 132 CGRect screenRect = [[UIScreen mainScreen] bounds];
134 - CGFloat screenHeight;  
135 - if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) 133 + CGFloat screenHeight = screenRect.size.height;
  134 + if((height > screenHeight) && !ignoreHeight)
136 { 135 {
137 - screenHeight = screenRect.size.width; 136 + NSLog(@"[DateRangePickerViewController.m]: Screen height limit reached");
138 } 137 }
139 else 138 else
140 { 139 {
141 - screenHeight = screenRect.size.height; 140 + [UIView beginAnimations:nil context:NULL];
  141 + [UIView setAnimationDuration:0.5];
  142 + view.frame = CGRectMake(view.frame.origin.x, view.frame.origin.y, view.frame.size.width,height);
  143 + [UIView commitAnimations];
142 } 144 }
143 - if((height > (screenHeight-40)) && !ignoreHeight) 145 + if(height < 0)
144 { 146 {
145 - NSLog(@"[DateRangePickerViewController.m]: Screen height limit reached");  
146 - height = screenHeight-40; 147 + [self setIsExtended: [self isExtended] - 1];
147 } 148 }
148 - [UIView beginAnimations:nil context:NULL];  
149 - [UIView setAnimationDuration:0.5];  
150 - view.frame = CGRectMake(view.frame.origin.x, view.frame.origin.y, view.frame.size.width,height);  
151 - [UIView commitAnimations];  
152 - if(realResize) 149 + else
153 { 150 {
154 - if(height < 0)  
155 - {  
156 - [self setIsExtended: [self isExtended] - 1];  
157 - }  
158 - else  
159 - {  
160 - [self setIsExtended: [self isExtended] + 1];  
161 - } 151 + [self setIsExtended: [self isExtended] + 1];
162 } 152 }
163 [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self currentHeight])]; 153 [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self currentHeight])];
164 - [self.scrollView flashScrollIndicators];  
165 } 154 }
166 155
167 - (IBAction)toggleFromDate:(id)sender 156 - (IBAction)toggleFromDate:(id)sender
@@ -176,7 +165,7 @@ @@ -176,7 +165,7 @@
176 [self moveDown:[self doneButton] :height]; 165 [self moveDown:[self doneButton] :height];
177 [self moveDown:[self toLabel] :height]; 166 [self moveDown:[self toLabel] :height];
178 [self setCurrentHeight:[self currentHeight] + height + 20]; 167 [self setCurrentHeight:[self currentHeight] + height + 20];
179 - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; 168 + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
180 } 169 }
181 else 170 else
182 { 171 {
@@ -187,7 +176,7 @@ @@ -187,7 +176,7 @@
187 [self moveUp:[self doneButton] :height]; 176 [self moveUp:[self doneButton] :height];
188 [self moveUp:[self toLabel] :height]; 177 [self moveUp:[self toLabel] :height];
189 [self setCurrentHeight:[self currentHeight] - height - 20]; 178 [self setCurrentHeight:[self currentHeight] - height - 20];
190 - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; 179 + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
191 } 180 }
192 } 181 }
193 - (IBAction)toggleToDate:(id)sender 182 - (IBAction)toggleToDate:(id)sender
@@ -199,7 +188,7 @@ @@ -199,7 +188,7 @@
199 [[self toDate] setHidden:FALSE]; 188 [[self toDate] setHidden:FALSE];
200 [self moveDown:[self doneButton] :height]; 189 [self moveDown:[self doneButton] :height];
201 [self setCurrentHeight:[self currentHeight] + height + 20]; 190 [self setCurrentHeight:[self currentHeight] + height + 20];
202 - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; 191 + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
203 } 192 }
204 else 193 else
205 { 194 {
@@ -207,7 +196,7 @@ @@ -207,7 +196,7 @@
207 [[self toDate] setHidden:TRUE]; 196 [[self toDate] setHidden:TRUE];
208 [self moveUp:[self doneButton] :height]; 197 [self moveUp:[self doneButton] :height];
209 [self setCurrentHeight:[self currentHeight] - height - 20]; 198 [self setCurrentHeight:[self currentHeight] - height - 20];
210 - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; 199 + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
211 } 200 }
212 } 201 }
213 202