From cd745155b86b40c86e8b55c3c4f32711bb4e6133 Mon Sep 17 00:00:00 2001
From: Imanol-Mikel Barba Sabariego <imanol@imanolbarba.net>
Date: Fri, 21 Nov 2014 14:13:39 +0000
Subject: [PATCH] FINAL COMMIT

---
 BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 489360 -> 0 bytes
 BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist               | 12 ++++++------
 BT Vendor/Base.lproj/DateRangePickerViewController.xib                                                         |  1 +
 BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib                                               |  1 +
 BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib                                                    |  1 +
 BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib                                          |  1 +
 BT Vendor/DateRangePickerViewController.h                                                                      |  1 +
 BT Vendor/DateRangePickerViewController.m                                                                      |  4 ++++
 8 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
index c63a0a2..b864dba 100644
Binary files a/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate and b/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 338a5d4..4772986 100644
--- a/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -394,11 +394,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DateRangePickerViewController.m"
-            timestampString = "437250832.810266"
+            timestampString = "438271870.875677"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "190"
-            endingLineNumber = "190"
+            startingLineNumber = "191"
+            endingLineNumber = "191"
             landmarkName = "-toggleFromDate:"
             landmarkType = "5">
          </BreakpointContent>
@@ -410,11 +410,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DateRangePickerViewController.m"
-            timestampString = "437250832.810266"
+            timestampString = "438271870.875677"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "189"
-            endingLineNumber = "189"
+            startingLineNumber = "190"
+            endingLineNumber = "190"
             landmarkName = "-toggleFromDate:"
             landmarkType = "5">
          </BreakpointContent>
diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController.xib b/BT Vendor/Base.lproj/DateRangePickerViewController.xib
index 5698d2a..6639b87 100644
--- a/BT Vendor/Base.lproj/DateRangePickerViewController.xib
+++ b/BT Vendor/Base.lproj/DateRangePickerViewController.xib
@@ -6,6 +6,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController">
             <connections>
+                <outlet property="cancelButton" destination="l4A-Bb-3KM" id="F2s-Cv-IWE"/>
                 <outlet property="dateRangePickerView" destination="fz9-NP-VLV" id="SCJ-Kj-RVG"/>
                 <outlet property="doneButton" destination="aYc-3W-Uqn" id="ewN-ug-nXe"/>
                 <outlet property="fromDate" destination="P5u-F4-X4a" id="O8W-IK-kwx"/>
diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib
index c4369bb..7784f00 100644
--- a/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib
+++ b/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib
@@ -6,6 +6,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController">
             <connections>
+                <outlet property="cancelButton" destination="WOi-cd-26B" id="aXN-u5-Q0k"/>
                 <outlet property="dateRangePickerView" destination="LR9-4f-pyO" id="LYi-RA-hmD"/>
                 <outlet property="doneButton" destination="nfK-Us-pVk" id="jUi-mH-I0g"/>
                 <outlet property="fromDate" destination="84e-nH-INk" id="Oau-6P-Msv"/>
diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib
index 275aaed..96d445f 100644
--- a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib
+++ b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib
@@ -6,6 +6,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController">
             <connections>
+                <outlet property="cancelButton" destination="wdk-T2-ctc" id="Ulh-02-Crz"/>
                 <outlet property="dateRangePickerView" destination="RS5-ft-hEF" id="zvw-DN-Tyw"/>
                 <outlet property="doneButton" destination="JjT-6I-8h2" id="RNp-OD-Bgm"/>
                 <outlet property="fromDate" destination="5jh-Em-ORd" id="T14-Qf-rI8"/>
diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
index fb5d47a..f44028f 100644
--- a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
+++ b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
@@ -6,6 +6,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController">
             <connections>
+                <outlet property="cancelButton" destination="Z81-HA-twu" id="NCx-Z8-XZH"/>
                 <outlet property="dateRangePickerView" destination="haQ-nr-OEH" id="7Gt-Ti-cL1"/>
                 <outlet property="doneButton" destination="hDh-hS-ruL" id="MV2-19-R2e"/>
                 <outlet property="fromDate" destination="Jbw-43-Qar" id="vnZ-bR-T93"/>
diff --git a/BT Vendor/DateRangePickerViewController.h b/BT Vendor/DateRangePickerViewController.h
index 0b54474..207c697 100644
--- a/BT Vendor/DateRangePickerViewController.h
+++ b/BT Vendor/DateRangePickerViewController.h
@@ -34,6 +34,7 @@
 @property (strong, nonatomic) IBOutlet UISwitch *fromToggler;
 @property (strong, nonatomic) IBOutlet UISwitch *toToggler;
 @property (strong, nonatomic) IBOutlet UIButton *doneButton;
+@property (strong, nonatomic) IBOutlet UIButton *cancelButton;
 @property (strong, nonatomic) IBOutlet UILabel *toLabel;
 @property (strong, nonatomic) IBOutlet UIScrollView *scrollView;
 @property (strong, nonatomic) IBOutlet UIView *scrolledView;
diff --git a/BT Vendor/DateRangePickerViewController.m b/BT Vendor/DateRangePickerViewController.m
index ff74a5f..08a2670 100644
--- a/BT Vendor/DateRangePickerViewController.m
+++ b/BT Vendor/DateRangePickerViewController.m
@@ -178,6 +178,7 @@
         [self moveDown:[self toDate] :height];
         [self moveDown:[self doneButton] :height];
         [self moveDown:[self toLabel] :height];
+        [self moveDown:self.cancelButton :height];
         [self setCurrentHeight:[self currentHeight] + height + 20];
         [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
@@ -189,6 +190,7 @@
         [self moveUp:[self toDate] :height];
         [self moveUp:[self doneButton] :height];
         [self moveUp:[self toLabel] :height];
+        [self moveUp:self.cancelButton :height];
         [self setCurrentHeight:[self currentHeight] - height - 20];
         [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
@@ -201,6 +203,7 @@
         [[self toDate] setEnabled:TRUE];
         [[self toDate] setHidden:FALSE];
         [self moveDown:[self doneButton] :height];
+        [self moveDown:self.cancelButton :height];
         [self setCurrentHeight:[self currentHeight] + height + 20];
         [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
@@ -209,6 +212,7 @@
         [[self toDate] setEnabled:FALSE];
         [[self toDate] setHidden:TRUE];
         [self moveUp:[self doneButton] :height];
+        [self moveUp:self.cancelButton : height];
         [self setCurrentHeight:[self currentHeight] - height - 20];
         [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
--
libgit2 0.22.2