Commit 012aa3cd25361a3b2be266568eec56491ac6be89
1 parent
f2e72882
--no commit message
Showing
7 changed files
with
152 additions
and
90 deletions
DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib
1 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> | |
2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> | |
3 | 3 | <dependencies> |
4 | 4 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> |
5 | 5 | </dependencies> |
... | ... | @@ -28,7 +28,7 @@ |
28 | 28 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
29 | 29 | <subviews> |
30 | 30 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bPF-XH-a36"> |
31 | - <rect key="frame" x="0.0" y="0.0" width="320" height="602"/> | |
31 | + <rect key="frame" x="0.0" y="0.0" width="280" height="602"/> | |
32 | 32 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
33 | 33 | <subviews> |
34 | 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 | 45 | <nil key="highlightedColor"/> |
46 | 46 | </label> |
47 | 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="-80" y="59" width="480" height="162"/> | |
48 | + <rect key="frame" x="-100" y="59" width="480" height="162"/> | |
49 | 49 | <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> |
50 | 50 | <date key="date" timeIntervalSinceReferenceDate="432266305.732934"> |
51 | 51 | <!--2014-09-13 01:58:25 +0000--> |
... | ... | @@ -86,7 +86,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
86 | 86 | </connections> |
87 | 87 | </switch> |
88 | 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="-80" y="98" width="480" height="162"/> | |
89 | + <rect key="frame" x="-100" y="98" width="480" height="162"/> | |
90 | 90 | <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> |
91 | 91 | <date key="date" timeIntervalSinceReferenceDate="432266362.26397198"> |
92 | 92 | <!--2014-09-13 01:59:22 +0000--> |
... | ... | @@ -113,6 +113,16 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
113 | 113 | </data> |
114 | 114 | </timeZone> |
115 | 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> | |
116 | 126 | </subviews> |
117 | 127 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> |
118 | 128 | <constraints> |
... | ... | @@ -121,42 +131,34 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
121 | 131 | <constraint firstAttribute="height" constant="602" id="9TX-1i-78Z"/> |
122 | 132 | <constraint firstItem="J6Y-lM-Rjf" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="18" id="Ebo-Ll-h52"/> |
123 | 133 | <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"/> | |
125 | 134 | <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"/> | |
126 | 136 | <constraint firstItem="IjI-S6-otK" firstAttribute="leading" secondItem="J6Y-lM-Rjf" secondAttribute="trailing" constant="8" id="SiP-L0-vna"/> |
127 | 137 | <constraint firstItem="xIo-vd-lE7" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="UYd-kA-RVe"/> |
128 | 138 | <constraint firstItem="mwj-Ys-4vf" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="8" symbolic="YES" id="awF-Ys-Dzh"/> |
129 | 139 | <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="cA8-yk-fVJ"/> |
130 | 140 | <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"/> | |
131 | 142 | <constraint firstAttribute="centerX" secondItem="mwj-Ys-4vf" secondAttribute="centerX" id="vvq-Wh-sPa"/> |
132 | 143 | <constraint firstItem="gUl-8z-CPz" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="20" id="wxd-X3-cbH"/> |
133 | 144 | </constraints> |
134 | 145 | </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> | |
145 | 146 | </subviews> |
146 | 147 | <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/> |
147 | 148 | <constraints> |
148 | 149 | <constraint firstAttribute="bottom" secondItem="bPF-XH-a36" secondAttribute="bottom" constant="-463" id="BSg-SY-YvA"/> |
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"/> | |
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"/> | |
151 | 152 | <constraint firstItem="bPF-XH-a36" firstAttribute="top" secondItem="fz9-NP-VLV" secondAttribute="top" id="dVI-xT-cob"/> |
152 | - <constraint firstAttribute="trailing" secondItem="bPF-XH-a36" secondAttribute="trailing" constant="-40" id="qyC-rv-007"/> | |
153 | + <constraint firstAttribute="trailing" secondItem="bPF-XH-a36" secondAttribute="trailing" id="qyC-rv-007"/> | |
153 | 154 | </constraints> |
154 | 155 | </scrollView> |
155 | 156 | </subviews> |
156 | 157 | <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/> |
157 | 158 | <constraints> |
158 | 159 | <constraint firstItem="fz9-NP-VLV" firstAttribute="top" secondItem="kvr-be-fbh" secondAttribute="top" constant="20" symbolic="YES" id="ENJ-tA-Y3H"/> |
159 | - <constraint firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" id="X8u-75-ogj"/> | |
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"/> | |
160 | 162 | <constraint firstAttribute="bottom" secondItem="fz9-NP-VLV" secondAttribute="bottom" constant="321" id="qh2-6H-Nq5"/> |
161 | 163 | </constraints> |
162 | 164 | <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> | ... | ... |
DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib
1 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> | |
2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> | |
3 | 3 | <dependencies> |
4 | 4 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> |
5 | 5 | </dependencies> |
... | ... | @@ -138,19 +138,20 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
138 | 138 | <constraint firstAttribute="height" constant="602" id="aC4-YZ-T3h"/> |
139 | 139 | <constraint firstItem="MAy-lw-s1B" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" symbolic="YES" id="caz-mx-Bec"/> |
140 | 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"/> | |
141 | 142 | <constraint firstItem="WCO-rz-s5y" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="qzS-Hb-i2n"/> |
142 | 143 | <constraint firstItem="Ses-ng-Dli" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="sOT-a5-RCf"/> |
143 | 144 | <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="Ses-ng-Dli" secondAttribute="bottom" constant="13" id="uuD-yP-qFl"/> |
144 | 145 | <constraint firstItem="MAy-lw-s1B" firstAttribute="leading" secondItem="84e-nH-INk" secondAttribute="leading" id="v55-li-xEh"/> |
145 | 146 | <constraint firstItem="cTb-x4-h2w" firstAttribute="leading" secondItem="Ses-ng-Dli" secondAttribute="trailing" constant="8" id="vTL-Oe-xpz"/> |
146 | 147 | <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 | 148 | </constraints> |
149 | 149 | </view> |
150 | 150 | </subviews> |
151 | 151 | <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/> |
152 | 152 | <constraints> |
153 | 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"/> | |
154 | 155 | <constraint firstItem="YyP-Hs-KVd" firstAttribute="top" secondItem="LR9-4f-pyO" secondAttribute="top" id="5tN-HC-Y4Y"/> |
155 | 156 | <constraint firstAttribute="bottom" secondItem="YyP-Hs-KVd" secondAttribute="bottom" constant="-466" id="N0Z-v2-m3i"/> |
156 | 157 | <constraint firstItem="YyP-Hs-KVd" firstAttribute="leading" secondItem="LR9-4f-pyO" secondAttribute="leading" id="r0r-8k-tpO"/> |
... | ... | @@ -162,7 +163,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
162 | 163 | <constraint firstItem="LR9-4f-pyO" firstAttribute="top" secondItem="4CX-TI-g0c" secondAttribute="top" constant="20" id="5bJ-Km-lml"/> |
163 | 164 | <constraint firstItem="LR9-4f-pyO" firstAttribute="leading" secondItem="4CX-TI-g0c" secondAttribute="leading" constant="20" symbolic="YES" id="He8-2n-c8r"/> |
164 | 165 | <constraint firstAttribute="bottom" secondItem="LR9-4f-pyO" secondAttribute="bottom" constant="164" id="Kof-P4-pbo"/> |
165 | - <constraint firstItem="LR9-4f-pyO" firstAttribute="centerX" secondItem="4CX-TI-g0c" secondAttribute="centerX" id="sXP-9K-cYu"/> | |
166 | + <constraint firstAttribute="trailing" secondItem="LR9-4f-pyO" secondAttribute="trailing" constant="20" id="Y2j-bK-dce"/> | |
166 | 167 | </constraints> |
167 | 168 | <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> |
168 | 169 | <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/> | ... | ... |
DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib
1 | 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="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES"> | |
2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES"> | |
3 | 3 | <dependencies> |
4 | 4 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> |
5 | 5 | </dependencies> |
... | ... | @@ -132,7 +132,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
132 | 132 | <constraint firstItem="5jh-Em-ORd" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" symbolic="YES" id="HEo-mI-aaq"/> |
133 | 133 | <constraint firstItem="WiF-nR-ajG" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="N5v-Sy-RWV"/> |
134 | 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"/> | |
136 | 135 | <constraint firstItem="5jh-Em-ORd" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" id="TGZ-nc-u8T"/> |
137 | 136 | <constraint firstItem="dRe-Qx-Lml" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="d01-Ej-wEd"/> |
138 | 137 | <constraint firstItem="5bA-94-boo" firstAttribute="leading" secondItem="dRe-Qx-Lml" secondAttribute="trailing" constant="8" id="eFD-VY-09E"/> |
... | ... | @@ -141,6 +140,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
141 | 140 | <constraint firstAttribute="centerX" secondItem="yQT-o9-gle" secondAttribute="centerX" id="t22-P0-QPH"/> |
142 | 141 | <constraint firstItem="JjT-6I-8h2" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="7" id="tQp-z3-Xn1"/> |
143 | 142 | <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 | 144 | <constraint firstAttribute="width" constant="500" id="wri-92-iq4"/> |
145 | 145 | <constraint firstItem="qf5-xv-6RK" firstAttribute="leading" secondItem="WiF-nR-ajG" secondAttribute="trailing" constant="8" id="ws8-Uc-fCh"/> |
146 | 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 | 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="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES"> | |
2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES"> | |
3 | 3 | <dependencies> |
4 | 4 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> |
5 | 5 | </dependencies> |
... | ... | @@ -51,7 +51,7 @@ |
51 | 51 | <!--2014-09-19 14:59:03 +0000--> |
52 | 52 | </date> |
53 | 53 | <timeZone key="timeZone" name="America/Los_Angeles"> |
54 | - <mutableData key="data"> | |
54 | + <data key="data"> | |
55 | 55 | VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ |
56 | 56 | y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ |
57 | 57 | 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g |
... | ... | @@ -69,7 +69,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA |
69 | 69 | AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA |
70 | 70 | AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA |
71 | 71 | AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
72 | -</mutableData> | |
72 | +</data> | |
73 | 73 | </timeZone> |
74 | 74 | </datePicker> |
75 | 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 | 79 | <!--2014-09-19 14:59:23 +0000--> |
80 | 80 | </date> |
81 | 81 | <timeZone key="timeZone" name="America/Los_Angeles"> |
82 | - <mutableData key="data"> | |
82 | + <data key="data"> | |
83 | 83 | VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ |
84 | 84 | y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ |
85 | 85 | 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g |
... | ... | @@ -97,7 +97,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA |
97 | 97 | AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA |
98 | 98 | AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA |
99 | 99 | AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
100 | -</mutableData> | |
100 | +</data> | |
101 | 101 | </timeZone> |
102 | 102 | </datePicker> |
103 | 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,7 +127,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
127 | 127 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> |
128 | 128 | <constraints> |
129 | 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"/> | |
131 | 130 | <constraint firstItem="hDh-hS-ruL" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="7" id="GS8-uL-yin"/> |
132 | 131 | <constraint firstItem="z8k-7k-O2i" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="20" id="Gq5-cV-ofW"/> |
133 | 132 | <constraint firstItem="95w-9e-lc5" firstAttribute="leading" secondItem="z8k-7k-O2i" secondAttribute="trailing" constant="8" id="Lpl-at-M2a"/> |
... | ... | @@ -139,6 +138,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA |
139 | 138 | <constraint firstItem="Jbw-43-Qar" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" id="k7J-l3-qIy"/> |
140 | 139 | <constraint firstItem="7sY-pS-rR6" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="25" id="oqv-Fr-c2u"/> |
141 | 140 | <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 | 142 | <constraint firstItem="ycu-em-WhN" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="20" id="tS4-38-qyM"/> |
143 | 143 | <constraint firstItem="Ke5-90-B8V" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="2" id="uZx-7C-faF"/> |
144 | 144 | <constraint firstAttribute="width" constant="500" id="vFe-sZ-zeI"/> | ... | ... |
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
... | ... | @@ -410,12 +410,12 @@ |
410 | 410 | ignoreCount = "0" |
411 | 411 | continueAfterRunningActions = "No" |
412 | 412 | filePath = "DateRangePickerViewController.m" |
413 | - timestampString = "435674474.73691" | |
413 | + timestampString = "435964226.359983" | |
414 | 414 | startingColumnNumber = "9223372036854775807" |
415 | 415 | endingColumnNumber = "9223372036854775807" |
416 | - startingLineNumber = "150" | |
417 | - endingLineNumber = "150" | |
418 | - landmarkName = "-resizeViewHeight:::" | |
416 | + startingLineNumber = "159" | |
417 | + endingLineNumber = "159" | |
418 | + landmarkName = "-resizeViewHeight::::" | |
419 | 419 | landmarkType = "5"> |
420 | 420 | </BreakpointContent> |
421 | 421 | </BreakpointProxy> |
... | ... | @@ -426,11 +426,11 @@ |
426 | 426 | ignoreCount = "0" |
427 | 427 | continueAfterRunningActions = "No" |
428 | 428 | filePath = "DateRangePickerViewController.m" |
429 | - timestampString = "435674474.73691" | |
429 | + timestampString = "435964363.033461" | |
430 | 430 | startingColumnNumber = "9223372036854775807" |
431 | 431 | endingColumnNumber = "9223372036854775807" |
432 | - startingLineNumber = "176" | |
433 | - endingLineNumber = "176" | |
432 | + startingLineNumber = "187" | |
433 | + endingLineNumber = "187" | |
434 | 434 | landmarkName = "-toggleFromDate:" |
435 | 435 | landmarkType = "5"> |
436 | 436 | </BreakpointContent> |
... | ... | @@ -442,11 +442,11 @@ |
442 | 442 | ignoreCount = "0" |
443 | 443 | continueAfterRunningActions = "No" |
444 | 444 | filePath = "DateRangePickerViewController.m" |
445 | - timestampString = "435674474.73691" | |
445 | + timestampString = "435964363.033461" | |
446 | 446 | startingColumnNumber = "9223372036854775807" |
447 | 447 | endingColumnNumber = "9223372036854775807" |
448 | - startingLineNumber = "175" | |
449 | - endingLineNumber = "175" | |
448 | + startingLineNumber = "186" | |
449 | + endingLineNumber = "186" | |
450 | 450 | landmarkName = "-toggleFromDate:" |
451 | 451 | landmarkType = "5"> |
452 | 452 | </BreakpointContent> |
... | ... | @@ -490,11 +490,11 @@ |
490 | 490 | ignoreCount = "0" |
491 | 491 | continueAfterRunningActions = "No" |
492 | 492 | filePath = "DateRangePickerViewController.m" |
493 | - timestampString = "435674474.73691" | |
493 | + timestampString = "435964363.033461" | |
494 | 494 | startingColumnNumber = "9223372036854775807" |
495 | 495 | endingColumnNumber = "9223372036854775807" |
496 | - startingLineNumber = "158" | |
497 | - endingLineNumber = "158" | |
496 | + startingLineNumber = "169" | |
497 | + endingLineNumber = "169" | |
498 | 498 | landmarkName = "-toggleFromDate:" |
499 | 499 | landmarkType = "5"> |
500 | 500 | </BreakpointContent> |
... | ... | @@ -520,11 +520,11 @@ |
520 | 520 | ignoreCount = "0" |
521 | 521 | continueAfterRunningActions = "No" |
522 | 522 | filePath = "DateRangePickerViewController.m" |
523 | - timestampString = "435674474.73691" | |
523 | + timestampString = "435964226.359983" | |
524 | 524 | startingColumnNumber = "9223372036854775807" |
525 | 525 | endingColumnNumber = "9223372036854775807" |
526 | - startingLineNumber = "75" | |
527 | - endingLineNumber = "75" | |
526 | + startingLineNumber = "76" | |
527 | + endingLineNumber = "76" | |
528 | 528 | landmarkName = "-parentViewControllerDidRotateWithOrientation:" |
529 | 529 | landmarkType = "5"> |
530 | 530 | </BreakpointContent> |
... | ... | @@ -603,8 +603,8 @@ |
603 | 603 | timestampString = "435859231.211213" |
604 | 604 | startingColumnNumber = "9223372036854775807" |
605 | 605 | endingColumnNumber = "9223372036854775807" |
606 | - startingLineNumber = "806" | |
607 | - endingLineNumber = "806" | |
606 | + startingLineNumber = "1100" | |
607 | + endingLineNumber = "1100" | |
608 | 608 | landmarkName = "-tableView:didSelectRowAtIndexPath:" |
609 | 609 | landmarkType = "5"> |
610 | 610 | </BreakpointContent> |
... | ... | @@ -616,11 +616,11 @@ |
616 | 616 | ignoreCount = "0" |
617 | 617 | continueAfterRunningActions = "No" |
618 | 618 | filePath = "MenuTableViewController.m" |
619 | - timestampString = "435859231.211213" | |
619 | + timestampString = "435855046.616674" | |
620 | 620 | startingColumnNumber = "9223372036854775807" |
621 | 621 | endingColumnNumber = "9223372036854775807" |
622 | - startingLineNumber = "1100" | |
623 | - endingLineNumber = "1100" | |
622 | + startingLineNumber = "780" | |
623 | + endingLineNumber = "780" | |
624 | 624 | landmarkName = "-tableView:didSelectRowAtIndexPath:" |
625 | 625 | landmarkType = "5"> |
626 | 626 | </BreakpointContent> |
... | ... | @@ -635,8 +635,8 @@ |
635 | 635 | timestampString = "435855046.616674" |
636 | 636 | startingColumnNumber = "9223372036854775807" |
637 | 637 | endingColumnNumber = "9223372036854775807" |
638 | - startingLineNumber = "780" | |
639 | - endingLineNumber = "780" | |
638 | + startingLineNumber = "779" | |
639 | + endingLineNumber = "779" | |
640 | 640 | landmarkName = "-tableView:didSelectRowAtIndexPath:" |
641 | 641 | landmarkType = "5"> |
642 | 642 | </BreakpointContent> |
... | ... | @@ -651,9 +651,9 @@ |
651 | 651 | timestampString = "435855046.616674" |
652 | 652 | startingColumnNumber = "9223372036854775807" |
653 | 653 | endingColumnNumber = "9223372036854775807" |
654 | - startingLineNumber = "779" | |
655 | - endingLineNumber = "779" | |
656 | - landmarkName = "-tableView:didSelectRowAtIndexPath:" | |
654 | + startingLineNumber = "768" | |
655 | + endingLineNumber = "768" | |
656 | + landmarkName = "-tableView:sectionForSectionIndexTitle:atIndex:" | |
657 | 657 | landmarkType = "5"> |
658 | 658 | </BreakpointContent> |
659 | 659 | </BreakpointProxy> |
... | ... | @@ -663,13 +663,61 @@ |
663 | 663 | shouldBeEnabled = "No" |
664 | 664 | ignoreCount = "0" |
665 | 665 | continueAfterRunningActions = "No" |
666 | - filePath = "MenuTableViewController.m" | |
667 | - timestampString = "435855046.616674" | |
666 | + filePath = "DateRangePickerViewController.m" | |
667 | + timestampString = "435964226.359983" | |
668 | 668 | startingColumnNumber = "9223372036854775807" |
669 | 669 | endingColumnNumber = "9223372036854775807" |
670 | - startingLineNumber = "768" | |
671 | - endingLineNumber = "768" | |
672 | - landmarkName = "-tableView:sectionForSectionIndexTitle:atIndex:" | |
670 | + startingLineNumber = "138" | |
671 | + endingLineNumber = "138" | |
672 | + landmarkName = "-resizeViewHeight::::" | |
673 | + landmarkType = "5"> | |
674 | + </BreakpointContent> | |
675 | + </BreakpointProxy> | |
676 | + <BreakpointProxy | |
677 | + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | |
678 | + <BreakpointContent | |
679 | + shouldBeEnabled = "No" | |
680 | + ignoreCount = "0" | |
681 | + continueAfterRunningActions = "No" | |
682 | + filePath = "DateRangePickerViewController.m" | |
683 | + timestampString = "435964226.359983" | |
684 | + startingColumnNumber = "9223372036854775807" | |
685 | + endingColumnNumber = "9223372036854775807" | |
686 | + startingLineNumber = "143" | |
687 | + endingLineNumber = "143" | |
688 | + landmarkName = "-resizeViewHeight::::" | |
689 | + landmarkType = "5"> | |
690 | + </BreakpointContent> | |
691 | + </BreakpointProxy> | |
692 | + <BreakpointProxy | |
693 | + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | |
694 | + <BreakpointContent | |
695 | + shouldBeEnabled = "No" | |
696 | + ignoreCount = "0" | |
697 | + continueAfterRunningActions = "No" | |
698 | + filePath = "DateRangePickerViewController.m" | |
699 | + timestampString = "435964226.359983" | |
700 | + startingColumnNumber = "9223372036854775807" | |
701 | + endingColumnNumber = "9223372036854775807" | |
702 | + startingLineNumber = "135" | |
703 | + endingLineNumber = "135" | |
704 | + landmarkName = "-resizeViewHeight::::" | |
705 | + landmarkType = "5"> | |
706 | + </BreakpointContent> | |
707 | + </BreakpointProxy> | |
708 | + <BreakpointProxy | |
709 | + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | |
710 | + <BreakpointContent | |
711 | + shouldBeEnabled = "No" | |
712 | + ignoreCount = "0" | |
713 | + continueAfterRunningActions = "No" | |
714 | + filePath = "DateRangePickerViewController.m" | |
715 | + timestampString = "435963776.690848" | |
716 | + startingColumnNumber = "9223372036854775807" | |
717 | + endingColumnNumber = "9223372036854775807" | |
718 | + startingLineNumber = "64" | |
719 | + endingLineNumber = "64" | |
720 | + landmarkName = "-parentViewControllerDidRotateWithOrientation:" | |
673 | 721 | landmarkType = "5"> |
674 | 722 | </BreakpointContent> |
675 | 723 | </BreakpointProxy> | ... | ... |
DUREX Vendor Control/DateRangePickerViewController.m
... | ... | @@ -12,7 +12,6 @@ |
12 | 12 | |
13 | 13 | @property uint8_t isExtended; |
14 | 14 | @property NSUInteger currentHeight; |
15 | -@property NSUInteger currentWidth; | |
16 | 15 | |
17 | 16 | @end |
18 | 17 | |
... | ... | @@ -41,12 +40,7 @@ |
41 | 40 | [self.toDate setDate:[NSDate date]]; |
42 | 41 | |
43 | 42 | [self setIsExtended:0]; |
44 | - | |
45 | 43 | [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]; | |
50 | 44 | |
51 | 45 | [super viewDidLoad]; |
52 | 46 | // Do any additional setup after loading the view from its nib. |
... | ... | @@ -66,18 +60,24 @@ |
66 | 60 | - (void) parentViewControllerDidRotateWithOrientation: (UIDeviceOrientation) orientation |
67 | 61 | { |
68 | 62 | NSLog(@"[DateRangePickerViewController.m]: Screen did rotate"); |
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])]; | |
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 | + } | |
75 | 76 | } |
76 | 77 | |
77 | 78 | - (void) parentViewControllerWillRotateToInterfaceOrientation: (UIInterfaceOrientation)toInterfaceOrientation duration: (NSTimeInterval)duration |
78 | 79 | { |
79 | 80 | NSLog(@"[DateRangePickerViewController.m]: Screen will rotate"); |
80 | - [self.scrollView setNeedsUpdateConstraints]; | |
81 | 81 | } |
82 | 82 | |
83 | 83 | - (void) expandScrollView |
... | ... | @@ -127,30 +127,41 @@ |
127 | 127 | [UIView commitAnimations]; |
128 | 128 | } |
129 | 129 | |
130 | -- (void) resizeViewHeight : (UIView*) view : (NSInteger) height : (Boolean) ignoreHeight | |
130 | +- (void) resizeViewHeight : (UIView*) view : (NSInteger) height : (Boolean) ignoreHeight : (Boolean) realResize | |
131 | 131 | { |
132 | + NSLog(@"[DateRangePickerViewController.m]: currentHeight is %d", self.currentHeight); | |
132 | 133 | CGRect screenRect = [[UIScreen mainScreen] bounds]; |
133 | - CGFloat screenHeight = screenRect.size.height; | |
134 | - if((height > screenHeight) && !ignoreHeight) | |
134 | + CGFloat screenHeight; | |
135 | + if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) | |
135 | 136 | { |
136 | - NSLog(@"[DateRangePickerViewController.m]: Screen height limit reached"); | |
137 | + screenHeight = screenRect.size.width; | |
137 | 138 | } |
138 | 139 | else |
139 | 140 | { |
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]; | |
141 | + screenHeight = screenRect.size.height; | |
144 | 142 | } |
145 | - if(height < 0) | |
143 | + if((height > (screenHeight-40)) && !ignoreHeight) | |
146 | 144 | { |
147 | - [self setIsExtended: [self isExtended] - 1]; | |
145 | + NSLog(@"[DateRangePickerViewController.m]: Screen height limit reached"); | |
146 | + height = screenHeight-40; | |
148 | 147 | } |
149 | - else | |
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) | |
150 | 153 | { |
151 | - [self setIsExtended: [self isExtended] + 1]; | |
154 | + if(height < 0) | |
155 | + { | |
156 | + [self setIsExtended: [self isExtended] - 1]; | |
157 | + } | |
158 | + else | |
159 | + { | |
160 | + [self setIsExtended: [self isExtended] + 1]; | |
161 | + } | |
152 | 162 | } |
153 | 163 | [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self currentHeight])]; |
164 | + [self.scrollView flashScrollIndicators]; | |
154 | 165 | } |
155 | 166 | |
156 | 167 | - (IBAction)toggleFromDate:(id)sender |
... | ... | @@ -165,7 +176,7 @@ |
165 | 176 | [self moveDown:[self doneButton] :height]; |
166 | 177 | [self moveDown:[self toLabel] :height]; |
167 | 178 | [self setCurrentHeight:[self currentHeight] + height + 20]; |
168 | - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE]; | |
179 | + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; | |
169 | 180 | } |
170 | 181 | else |
171 | 182 | { |
... | ... | @@ -176,7 +187,7 @@ |
176 | 187 | [self moveUp:[self doneButton] :height]; |
177 | 188 | [self moveUp:[self toLabel] :height]; |
178 | 189 | [self setCurrentHeight:[self currentHeight] - height - 20]; |
179 | - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE]; | |
190 | + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; | |
180 | 191 | } |
181 | 192 | } |
182 | 193 | - (IBAction)toggleToDate:(id)sender |
... | ... | @@ -188,7 +199,7 @@ |
188 | 199 | [[self toDate] setHidden:FALSE]; |
189 | 200 | [self moveDown:[self doneButton] :height]; |
190 | 201 | [self setCurrentHeight:[self currentHeight] + height + 20]; |
191 | - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE]; | |
202 | + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; | |
192 | 203 | } |
193 | 204 | else |
194 | 205 | { |
... | ... | @@ -196,7 +207,7 @@ |
196 | 207 | [[self toDate] setHidden:TRUE]; |
197 | 208 | [self moveUp:[self doneButton] :height]; |
198 | 209 | [self setCurrentHeight:[self currentHeight] - height - 20]; |
199 | - [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE]; | |
210 | + [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; | |
200 | 211 | } |
201 | 212 | } |
202 | 213 | ... | ... |