From 39a1451c2aa65284747a306ecdb144ccb4394f52 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Sun, 9 Nov 2014 18:41:35 +0000 Subject: [PATCH] FINAL CODE --- BT Vendor/BT Vendor.xcodeproj/project.pbxproj | 10 ++++++---- BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 386327 -> 0 bytes BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------ BT Vendor/Base.lproj/DateRangePickerViewController.xib | 6 +++--- BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib | 6 +++--- BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib | 6 +++--- BT Vendor/DateRangePickerViewController.m | 23 +++++++++++++---------- 7 files changed, 124 insertions(+), 119 deletions(-) diff --git a/BT Vendor/BT Vendor.xcodeproj/project.pbxproj b/BT Vendor/BT Vendor.xcodeproj/project.pbxproj index 42167f5..1ffd513 100644 --- a/BT Vendor/BT Vendor.xcodeproj/project.pbxproj +++ b/BT Vendor/BT Vendor.xcodeproj/project.pbxproj @@ -847,7 +847,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "FirstAppExample/BT Vendor-Prefix.pch"; INFOPLIST_FILE = "FirstAppExample/BT Vendor-Info.plist"; @@ -859,7 +860,7 @@ OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = "-all_load"; PRODUCT_NAME = "BT Vendor"; - PROVISIONING_PROFILE = "c5dc5eb6-c9b6-4dd0-b872-572aba3a7cd7"; + PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; @@ -870,7 +871,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "FirstAppExample/BT Vendor-Prefix.pch"; INFOPLIST_FILE = "FirstAppExample/BT Vendor-Info.plist"; @@ -882,7 +884,7 @@ OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = "-all_load"; PRODUCT_NAME = "BT Vendor"; - PROVISIONING_PROFILE = "c5dc5eb6-c9b6-4dd0-b872-572aba3a7cd7"; + PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; 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 559a558..52c06c6 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 fcd7691..5a92c47 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 @@ -26,11 +26,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "988" - endingLineNumber = "988" + startingLineNumber = "1068" + endingLineNumber = "1068" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "734" - endingLineNumber = "734" + startingLineNumber = "737" + endingLineNumber = "737" landmarkName = "-toggleDropList:" landmarkType = "5"> @@ -170,11 +170,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1107" - endingLineNumber = "1107" + startingLineNumber = "1187" + endingLineNumber = "1187" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -202,11 +202,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "860" - endingLineNumber = "860" + startingLineNumber = "863" + endingLineNumber = "863" landmarkName = "-tableView:numberOfRowsInSection:" landmarkType = "5"> @@ -218,12 +218,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1206" - endingLineNumber = "1206" - landmarkName = "-numberOfSectionsInTableView:" + startingLineNumber = "1286" + endingLineNumber = "1286" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -234,13 +234,13 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1207" - endingLineNumber = "1207" - landmarkName = "@implementation MenuTableViewController" - landmarkType = "3"> + startingLineNumber = "1287" + endingLineNumber = "1287" + landmarkName = "-tableView:cellForRowAtIndexPath:" + landmarkType = "5"> @@ -282,11 +282,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "664" - endingLineNumber = "664" + startingLineNumber = "667" + endingLineNumber = "667" landmarkName = "-willRotateToInterfaceOrientation:duration:" landmarkType = "5"> @@ -298,11 +298,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1409" - endingLineNumber = "1409" + startingLineNumber = "1489" + endingLineNumber = "1489" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -314,11 +314,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1401" - endingLineNumber = "1401" + startingLineNumber = "1481" + endingLineNumber = "1481" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -330,12 +330,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1198" - endingLineNumber = "1198" - landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" + startingLineNumber = "1278" + endingLineNumber = "1278" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -346,12 +346,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1196" - endingLineNumber = "1196" - landmarkName = "-tableView:indentationLevelForRowAtIndexPath:" + startingLineNumber = "1276" + endingLineNumber = "1276" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -378,11 +378,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964226.359983" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "159" - endingLineNumber = "159" + startingLineNumber = "162" + endingLineNumber = "162" landmarkName = "-resizeViewHeight::::" landmarkType = "5"> @@ -394,11 +394,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964363.033461" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "187" - endingLineNumber = "187" + startingLineNumber = "190" + endingLineNumber = "190" landmarkName = "-toggleFromDate:" landmarkType = "5"> @@ -410,11 +410,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964363.033461" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "186" - endingLineNumber = "186" + startingLineNumber = "189" + endingLineNumber = "189" landmarkName = "-toggleFromDate:" landmarkType = "5"> @@ -426,11 +426,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1525" - endingLineNumber = "1525" + startingLineNumber = "1605" + endingLineNumber = "1605" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -442,11 +442,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1510" - endingLineNumber = "1510" + startingLineNumber = "1590" + endingLineNumber = "1590" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -458,11 +458,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964363.033461" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "169" - endingLineNumber = "169" + startingLineNumber = "172" + endingLineNumber = "172" landmarkName = "-toggleFromDate:" landmarkType = "5"> @@ -488,11 +488,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964226.359983" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "76" - endingLineNumber = "76" + startingLineNumber = "79" + endingLineNumber = "79" landmarkName = "-parentViewControllerDidRotateWithOrientation:" landmarkType = "5"> @@ -552,12 +552,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1184" - endingLineNumber = "1184" - landmarkName = "-tableView:didSelectRowAtIndexPath:" + startingLineNumber = "1264" + endingLineNumber = "1264" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -568,11 +568,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "890" - endingLineNumber = "890" + startingLineNumber = "893" + endingLineNumber = "893" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -584,11 +584,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "889" - endingLineNumber = "889" + startingLineNumber = "892" + endingLineNumber = "892" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -600,11 +600,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "879" - endingLineNumber = "879" + startingLineNumber = "882" + endingLineNumber = "882" landmarkName = "-tableView:sectionForSectionIndexTitle:atIndex:" landmarkType = "5"> @@ -616,11 +616,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964226.359983" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "138" - endingLineNumber = "138" + startingLineNumber = "141" + endingLineNumber = "141" landmarkName = "-resizeViewHeight::::" landmarkType = "5"> @@ -632,11 +632,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964226.359983" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "143" - endingLineNumber = "143" + startingLineNumber = "146" + endingLineNumber = "146" landmarkName = "-resizeViewHeight::::" landmarkType = "5"> @@ -648,11 +648,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435964226.359983" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "135" - endingLineNumber = "135" + startingLineNumber = "138" + endingLineNumber = "138" landmarkName = "-resizeViewHeight::::" landmarkType = "5"> @@ -664,11 +664,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DateRangePickerViewController.m" - timestampString = "435963776.690848" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "64" - endingLineNumber = "64" + startingLineNumber = "66" + endingLineNumber = "66" landmarkName = "-parentViewControllerDidRotateWithOrientation:" landmarkType = "5"> @@ -744,11 +744,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437071840.751211" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1039" - endingLineNumber = "1039" + startingLineNumber = "1119" + endingLineNumber = "1119" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -760,11 +760,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437071843.599188" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1036" - endingLineNumber = "1036" + startingLineNumber = "1116" + endingLineNumber = "1116" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -776,11 +776,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437071844.006923" + timestampString = "437250832.810266" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1035" - endingLineNumber = "1035" + startingLineNumber = "1115" + endingLineNumber = "1115" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController.xib b/BT Vendor/Base.lproj/DateRangePickerViewController.xib index f74f87f..0c792f9 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController.xib @@ -24,7 +24,7 @@ - + @@ -146,7 +146,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + @@ -159,7 +159,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib index b3f2518..881eb94 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib @@ -1,5 +1,5 @@ - + @@ -24,7 +24,7 @@ - + @@ -160,7 +160,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib index 8fe159d..0d60d0d 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib @@ -1,5 +1,5 @@ - + @@ -24,7 +24,7 @@ - + @@ -160,7 +160,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + diff --git a/BT Vendor/DateRangePickerViewController.m b/BT Vendor/DateRangePickerViewController.m index 83132b6..3d8c0e6 100644 --- a/BT Vendor/DateRangePickerViewController.m +++ b/BT Vendor/DateRangePickerViewController.m @@ -61,17 +61,20 @@ { NSLog(@"[DateRangePickerViewController.m]: Screen did rotate"); [self resizeViewHeight:self.scrollView :self.currentHeight :FALSE :FALSE]; - if([self.fromToggler isOn]) + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) //iPhones need this fix { - NSUInteger height = [self fromDate].frame.size.height; - self.currentHeight -= (height + 20); - [self toggleFromDate:self]; - } - if([self.toToggler isOn]) - { - NSUInteger height = [self toDate].frame.size.height; - self.currentHeight -= (height + 20); - [self toggleToDate:self]; + if([self.fromToggler isOn]) + { + NSUInteger height = [self fromDate].frame.size.height; + self.currentHeight -= (height + 20); + [self toggleFromDate:self]; + } + if([self.toToggler isOn]) + { + NSUInteger height = [self toDate].frame.size.height; + self.currentHeight -= (height + 20); + [self toggleToDate:self]; + } } } -- libgit2 0.22.2