Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit cd745155b86b40c86e8b55c3c4f32711bb4e6133

Authored by Imanol-Mikel Barba Sabariego
1 parent 1dbccbb9

FINAL COMMIT

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