From 004789f070c5b13b89ee698f8b841b7a4c05f06a Mon Sep 17 00:00:00 2001 From: StuFF mc Date: Wed, 27 Feb 2013 10:54:30 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Adding=20external=20outlet=20to=20the=20too?= =?UTF-8?q?lbar=20=E2=80=94=C2=A0allowing=20to=20(for=20example)=20rearran?= =?UTF-8?q?ge=20or=20remove=20items.=20Personal=20Use=20case:=20removing?= =?UTF-8?q?=20the=20Clear=20button.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/TDDatePickerController.h | 1 + Source/TDDatePickerController.m | 1 + Source/TDDatePickerController.xib | 402 ++++-------------------------- 3 files changed, 46 insertions(+), 358 deletions(-) diff --git a/Source/TDDatePickerController.h b/Source/TDDatePickerController.h index b30d808..84711c3 100644 --- a/Source/TDDatePickerController.h +++ b/Source/TDDatePickerController.h @@ -15,6 +15,7 @@ @property (nonatomic, strong) IBOutlet id delegate; @property (nonatomic, strong) IBOutlet UIDatePicker* datePicker; +@property (weak, nonatomic) IBOutlet UIToolbar *toolbar; -(IBAction)saveDateEdit:(id)sender; -(IBAction)clearDateEdit:(id)sender; diff --git a/Source/TDDatePickerController.m b/Source/TDDatePickerController.m index 0b8a59e..ef5a26f 100644 --- a/Source/TDDatePickerController.m +++ b/Source/TDDatePickerController.m @@ -62,6 +62,7 @@ - (void)didReceiveMemoryWarning { } - (void)viewDidUnload { + [self setToolbar:nil]; [super viewDidUnload]; self.datePicker = nil; diff --git a/Source/TDDatePickerController.xib b/Source/TDDatePickerController.xib index 689555c..88848bf 100644 --- a/Source/TDDatePickerController.xib +++ b/Source/TDDatePickerController.xib @@ -1,31 +1,30 @@ - 1024 - 10F569 - 804 - 1038.29 - 461.00 + 1552 + 12C3006 + 3084 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 123 + 2083 - + YES - + IBProxyObject + IBUIBarButtonItem + IBUIDatePicker + IBUIToolbar + IBUIView YES com.apple.InterfaceBuilder.IBCocoaTouchPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -138,6 +137,22 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA 12 + + + datePicker + + + + 17 + + + + toolbar + + + + 18 + clearDateEdit: @@ -162,21 +177,15 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA 15 - - - datePicker - - - - 17 - YES 0 - + + YES + @@ -245,38 +254,28 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA YES -1.CustomClassName + -1.IBPluginDependency -2.CustomClassName + -2.IBPluginDependency 10.IBPluginDependency 11.IBPluginDependency - 5.IBEditorWindowLastContentRect 5.IBPluginDependency - 5.IBViewBoundsToFrameTransform 6.IBPluginDependency - 6.IBViewBoundsToFrameTransform 7.IBPluginDependency - 7.IBViewBoundsToFrameTransform 8.IBPluginDependency 9.IBPluginDependency - + YES TDDatePickerController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{667, 254}, {320, 460}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw+UAAA - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw3IAAA - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAADClAAAw+UAAA - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -284,343 +283,30 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA YES - - YES - + YES - - YES - + - 17 - - - - YES - - NSObject - - IBProjectSource - ../Source/TDDatePickerController.h - - - - TDDatePickerController - TDSemiModalViewController - - YES - - YES - cancelDateEdit: - clearDateEdit: - saveDateEdit: - - - YES - id - id - id - - - - YES - - YES - cancelDateEdit: - clearDateEdit: - saveDateEdit: - - - YES - - cancelDateEdit: - id - - - clearDateEdit: - id - - - saveDateEdit: - id - - - - - YES - - YES - datePicker - delegate - - - YES - UIDatePicker - id - - - - YES - - YES - datePicker - delegate - - - YES - - datePicker - UIDatePicker - - - delegate - id - - - - - - - TDSemiModalViewController - UIViewController - - IBProjectSource - ../Source/TDSemiModalViewController.h - - - - UIViewController - - IBProjectSource - ../Source/UIViewController+TDSemiModalExtension.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIBarButtonItem - UIBarItem - - IBFrameworkSource - UIKit.framework/Headers/UIBarButtonItem.h - - - - UIBarItem - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIBarItem.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIDatePicker - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIDatePicker.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UIToolbar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIToolbar.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - + 18 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 YES - ../Demo/TDSemiModal.xcodeproj 3 - 123 + 2083 From 489219a221e3fac4c11b8201a85e6fa95d9c3cf9 Mon Sep 17 00:00:00 2001 From: StuFF mc Date: Wed, 27 Feb 2013 10:56:18 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Using=20`rootViewController`=20doesn't=20sc?= =?UTF-8?q?ale=20if=20the=20VC=20which=20presents=20SemiModal=20has=20alre?= =?UTF-8?q?ady=20been=20presented=20modally.=20In=20this=20case=20the=20Se?= =?UTF-8?q?miModal=20view=20is=20"hidden"=20behind=20the=20current=20view?= =?UTF-8?q?=20=E2=80=94=C2=A0option=20to=20pass=20in=20a=20view=20where=20?= =?UTF-8?q?the=20Modal=20VC=20will=20be=20presented.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/UIViewController+TDSemiModalExtension.h | 1 + Source/UIViewController+TDSemiModalExtension.m | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/UIViewController+TDSemiModalExtension.h b/Source/UIViewController+TDSemiModalExtension.h index 42d0ec6..6a71c7c 100644 --- a/Source/UIViewController+TDSemiModalExtension.h +++ b/Source/UIViewController+TDSemiModalExtension.h @@ -12,6 +12,7 @@ @interface UIViewController (TDSemiModalExtension) -(void)presentSemiModalViewController:(TDSemiModalViewController*)vc; +-(void)presentSemiModalViewController:(TDSemiModalViewController*)vc inView:(UIView *)rootView; -(void)dismissSemiModalViewController:(TDSemiModalViewController*)vc; -(void)dismissSemiModalViewControllerEnded:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context; diff --git a/Source/UIViewController+TDSemiModalExtension.m b/Source/UIViewController+TDSemiModalExtension.m index b7cc6f9..93fa5fb 100644 --- a/Source/UIViewController+TDSemiModalExtension.m +++ b/Source/UIViewController+TDSemiModalExtension.m @@ -12,9 +12,13 @@ @implementation UIViewController (TDSemiModalExtension) // Use this to show the modal view (pops-up from the bottom) - (void) presentSemiModalViewController:(TDSemiModalViewController*)vc { + [self presentSemiModalViewController:vc inView:UIApplication.sharedApplication.delegate.window.rootViewController.view]; +} + +- (void) presentSemiModalViewController:(TDSemiModalViewController*)vc inView:(UIView *)rootView { + UIView* modalView = vc.view; UIView* coverView = vc.coverView; - UIView *rootView = UIApplication.sharedApplication.delegate.window.rootViewController.view; coverView.frame = rootView.bounds; coverView.alpha = 0.0f; From bf179d3298b2e90c83530d90bceb42753b330bf0 Mon Sep 17 00:00:00 2001 From: StuFF mc Date: Wed, 27 Feb 2013 11:14:25 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Using=20default=20date=20insteaf=20of=20US.?= =?UTF-8?q?=20Fixes=20#14=20=E2=80=94=C2=A0yeah,=20makes=20more=20sense=20?= =?UTF-8?q?this=20way=20instead=20of=20my=20previous=20comment.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/TDDatePickerController.xib | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/TDDatePickerController.xib b/Source/TDDatePickerController.xib index 88848bf..ef3258f 100644 --- a/Source/TDDatePickerController.xib +++ b/Source/TDDatePickerController.xib @@ -50,9 +50,6 @@ 0 0 1 - - en_US_POSIX - America/Los_Angeles