Commit cd745155b86b40c86e8b55c3c4f32711bb4e6133
1 parent
1dbccbb9
FINAL COMMIT
Showing
8 changed files
with
15 additions
and
6 deletions
BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
... | ... | @@ -394,11 +394,11 @@ |
394 | 394 | ignoreCount = "0" |
395 | 395 | continueAfterRunningActions = "No" |
396 | 396 | filePath = "DateRangePickerViewController.m" |
397 | - timestampString = "437250832.810266" | |
397 | + timestampString = "438271870.875677" | |
398 | 398 | startingColumnNumber = "9223372036854775807" |
399 | 399 | endingColumnNumber = "9223372036854775807" |
400 | - startingLineNumber = "190" | |
401 | - endingLineNumber = "190" | |
400 | + startingLineNumber = "191" | |
401 | + endingLineNumber = "191" | |
402 | 402 | landmarkName = "-toggleFromDate:" |
403 | 403 | landmarkType = "5"> |
404 | 404 | </BreakpointContent> |
... | ... | @@ -410,11 +410,11 @@ |
410 | 410 | ignoreCount = "0" |
411 | 411 | continueAfterRunningActions = "No" |
412 | 412 | filePath = "DateRangePickerViewController.m" |
413 | - timestampString = "437250832.810266" | |
413 | + timestampString = "438271870.875677" | |
414 | 414 | startingColumnNumber = "9223372036854775807" |
415 | 415 | endingColumnNumber = "9223372036854775807" |
416 | - startingLineNumber = "189" | |
417 | - endingLineNumber = "189" | |
416 | + startingLineNumber = "190" | |
417 | + endingLineNumber = "190" | |
418 | 418 | landmarkName = "-toggleFromDate:" |
419 | 419 | landmarkType = "5"> |
420 | 420 | </BreakpointContent> | ... | ... |
BT Vendor/Base.lproj/DateRangePickerViewController.xib
... | ... | @@ -6,6 +6,7 @@ |
6 | 6 | <objects> |
7 | 7 | <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController"> |
8 | 8 | <connections> |
9 | + <outlet property="cancelButton" destination="l4A-Bb-3KM" id="F2s-Cv-IWE"/> | |
9 | 10 | <outlet property="dateRangePickerView" destination="fz9-NP-VLV" id="SCJ-Kj-RVG"/> |
10 | 11 | <outlet property="doneButton" destination="aYc-3W-Uqn" id="ewN-ug-nXe"/> |
11 | 12 | <outlet property="fromDate" destination="P5u-F4-X4a" id="O8W-IK-kwx"/> | ... | ... |
BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib
... | ... | @@ -6,6 +6,7 @@ |
6 | 6 | <objects> |
7 | 7 | <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController"> |
8 | 8 | <connections> |
9 | + <outlet property="cancelButton" destination="WOi-cd-26B" id="aXN-u5-Q0k"/> | |
9 | 10 | <outlet property="dateRangePickerView" destination="LR9-4f-pyO" id="LYi-RA-hmD"/> |
10 | 11 | <outlet property="doneButton" destination="nfK-Us-pVk" id="jUi-mH-I0g"/> |
11 | 12 | <outlet property="fromDate" destination="84e-nH-INk" id="Oau-6P-Msv"/> | ... | ... |
BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib
... | ... | @@ -6,6 +6,7 @@ |
6 | 6 | <objects> |
7 | 7 | <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController"> |
8 | 8 | <connections> |
9 | + <outlet property="cancelButton" destination="wdk-T2-ctc" id="Ulh-02-Crz"/> | |
9 | 10 | <outlet property="dateRangePickerView" destination="RS5-ft-hEF" id="zvw-DN-Tyw"/> |
10 | 11 | <outlet property="doneButton" destination="JjT-6I-8h2" id="RNp-OD-Bgm"/> |
11 | 12 | <outlet property="fromDate" destination="5jh-Em-ORd" id="T14-Qf-rI8"/> | ... | ... |
BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
... | ... | @@ -6,6 +6,7 @@ |
6 | 6 | <objects> |
7 | 7 | <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController"> |
8 | 8 | <connections> |
9 | + <outlet property="cancelButton" destination="Z81-HA-twu" id="NCx-Z8-XZH"/> | |
9 | 10 | <outlet property="dateRangePickerView" destination="haQ-nr-OEH" id="7Gt-Ti-cL1"/> |
10 | 11 | <outlet property="doneButton" destination="hDh-hS-ruL" id="MV2-19-R2e"/> |
11 | 12 | <outlet property="fromDate" destination="Jbw-43-Qar" id="vnZ-bR-T93"/> | ... | ... |
BT Vendor/DateRangePickerViewController.h
... | ... | @@ -34,6 +34,7 @@ |
34 | 34 | @property (strong, nonatomic) IBOutlet UISwitch *fromToggler; |
35 | 35 | @property (strong, nonatomic) IBOutlet UISwitch *toToggler; |
36 | 36 | @property (strong, nonatomic) IBOutlet UIButton *doneButton; |
37 | +@property (strong, nonatomic) IBOutlet UIButton *cancelButton; | |
37 | 38 | @property (strong, nonatomic) IBOutlet UILabel *toLabel; |
38 | 39 | @property (strong, nonatomic) IBOutlet UIScrollView *scrollView; |
39 | 40 | @property (strong, nonatomic) IBOutlet UIView *scrolledView; | ... | ... |
BT Vendor/DateRangePickerViewController.m
... | ... | @@ -178,6 +178,7 @@ |
178 | 178 | [self moveDown:[self toDate] :height]; |
179 | 179 | [self moveDown:[self doneButton] :height]; |
180 | 180 | [self moveDown:[self toLabel] :height]; |
181 | + [self moveDown:self.cancelButton :height]; | |
181 | 182 | [self setCurrentHeight:[self currentHeight] + height + 20]; |
182 | 183 | [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; |
183 | 184 | } |
... | ... | @@ -189,6 +190,7 @@ |
189 | 190 | [self moveUp:[self toDate] :height]; |
190 | 191 | [self moveUp:[self doneButton] :height]; |
191 | 192 | [self moveUp:[self toLabel] :height]; |
193 | + [self moveUp:self.cancelButton :height]; | |
192 | 194 | [self setCurrentHeight:[self currentHeight] - height - 20]; |
193 | 195 | [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; |
194 | 196 | } |
... | ... | @@ -201,6 +203,7 @@ |
201 | 203 | [[self toDate] setEnabled:TRUE]; |
202 | 204 | [[self toDate] setHidden:FALSE]; |
203 | 205 | [self moveDown:[self doneButton] :height]; |
206 | + [self moveDown:self.cancelButton :height]; | |
204 | 207 | [self setCurrentHeight:[self currentHeight] + height + 20]; |
205 | 208 | [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; |
206 | 209 | } |
... | ... | @@ -209,6 +212,7 @@ |
209 | 212 | [[self toDate] setEnabled:FALSE]; |
210 | 213 | [[self toDate] setHidden:TRUE]; |
211 | 214 | [self moveUp:[self doneButton] :height]; |
215 | + [self moveUp:self.cancelButton : height]; | |
212 | 216 | [self setCurrentHeight:[self currentHeight] - height - 20]; |
213 | 217 | [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE]; |
214 | 218 | } | ... | ... |