Added workaround for a bug in UIDatePicker in count down mode.

ObjC-Example/ActionSheetPicker Tests/ActionSheetDatePickerTestCase.m

@@ -8,10 +8,11 @@
 
 #import <XCTest/XCTest.h>
 #import <CoreActionSheetPicker/CoreActionSheetPicker.h>
+#import <CoreActionSheetPicker/ActionSheetDatePicker.h>
 #import "AbstractActionSheetPicker+CustomButton.h"
 
 static const int countdownTestInt = 360;
-UIView *origin;
+UIView           *origin;
 
 @interface ActionSheetDatePickerTestCase : XCTestCase
 @property(nonatomic, strong) ActionSheetDatePicker *actionSheetDatePicker;
@@ -22,35 +23,74 @@ @implementation ActionSheetDatePickerTestCase
     NSString *_title;
 }
 
-+(void)setUp{
-    UIWindow *window = [[UIApplication sharedApplication] keyWindow];
-    UIView *topView = window.rootViewController.view;
-    origin = topView;    
++ (void)setUp
+{
+    UIWindow *window  = [[UIApplication sharedApplication] keyWindow];
+    UIView   *topView = window.rootViewController.view;
+    origin = topView;
 }
 
-- (void)setUp {
+- (void)setUp
+{
     [super setUp];
-    _title = @"Title";
+    _title                 = @"Title";
     _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"Test title" datePickerMode:UIDatePickerModeDate selectedDate:[NSDate date] target:nil action:nil origin:origin cancelAction:nil];
     // Put setup code here. This method is called before the invocation of each test method in the class.
 }
 
-- (void)tearDown {
+- (void)tearDown
+{
     // Put teardown code here. This method is called after the invocation of each test method in the class.
     [super tearDown];
 }
 
+- (void)testInitPicker
+{
+    _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTarget:self successAction:@selector(exampleSelector) cancelAction:@selector(exampleSelector) origin:origin];
+    XCTAssertNotNil(_actionSheetDatePicker);
+}
+
+- (void)testInitPicker2
+{
+    _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"" datePickerMode:UIDatePickerModeCountDownTimer selectedDate:[NSDate date] doneBlock:nil cancelBlock:nil origin:origin];
+    XCTAssertNotNil(_actionSheetDatePicker);
+}
+
+- (void)testInitPicker3
+{
+    _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"" datePickerMode:UIDatePickerModeCountDownTimer selectedDate:[NSDate date] target:self action:@selector(exampleSelector) origin:origin];
+    XCTAssertNotNil(_actionSheetDatePicker);
+}
+
+- (void)testInitPicker4
+{
+    _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"" datePickerMode:UIDatePickerModeCountDownTimer selectedDate:NSDate.date target:self action:@selector(exampleSelector) origin:origin cancelAction:@selector(exampleSelector)];
+    XCTAssertNotNil(_actionSheetDatePicker);
+}
+
+- (void)testInitPicker5
+{
+    _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"" datePickerMode:UIDatePickerModeCountDownTimer selectedDate:[NSDate date] minimumDate:[NSDate date] maximumDate:[NSDate date] target:self action:@selector(exampleSelector) origin:origin];
+    XCTAssertNotNil(_actionSheetDatePicker);
+}
+
+- (void)testInitPicker6
+{
+    _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"" datePickerMode:UIDatePickerModeCountDownTimer selectedDate:NSDate.date minimumDate:NSDate.date maximumDate:NSDate.date target:self action:@selector(exampleSelector) cancelAction:@selector(exampleSelector) origin:origin];
+    XCTAssertNotNil(_actionSheetDatePicker);
+}
+
 - (void)testPickerWithCustomActionBlockOnButton
 {
     NSString *custom_title = @"Custom label:";
-    
+
     [_actionSheetDatePicker addCustomButtonWithTitle:custom_title actionBlock:^{
         NSLog(@"Test block invoked");
     }];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
-    
+
     XCTAssertNotNil(_actionSheetDatePicker);
 }
 
@@ -60,7 +100,7 @@ - (void)testPickerWithCustomActionBlockOnButtonAndNilString
         NSLog(@"Test block invoked");
     }];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
 
     XCTAssertNotNil(_actionSheetDatePicker);
@@ -70,19 +110,19 @@ - (void)testPickerWithNilCustomActionBlockOnButton
 {
     [_actionSheetDatePicker addCustomButtonWithTitle:_title actionBlock:nil];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
-    
+
     XCTAssertNotNil(_actionSheetDatePicker);
 }
 
 - (void)testPickerWithNilCustomActionBlockOnButtonAndNilString
 {
     [_actionSheetDatePicker addCustomButtonWithTitle:nil actionBlock:nil];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
-    
+
     XCTAssertNotNil(_actionSheetDatePicker);
 }
 
@@ -100,39 +140,39 @@ - (void)testPickerWithCustomActionSelectorOnButtonAndNilString
 {
     [_actionSheetDatePicker addCustomButtonWithTitle:nil target:self selector:@selector(exampleSelector)];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
-    
+
     XCTAssertNotNil(_actionSheetDatePicker);
 }
 
 - (void)testPickerWithNilCustomActionSelectorOnButton
 {
     [_actionSheetDatePicker addCustomButtonWithTitle:_title target:self selector:nil];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
-    
+
     XCTAssertNotNil(_actionSheetDatePicker);
 }
 
 - (void)testPickerWithCustomActionSelectorOnButtonAndNilTarget
 {
     [_actionSheetDatePicker addCustomButtonWithTitle:_title target:nil selector:@selector(exampleSelector)];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
-    
+
     XCTAssertNotNil(_actionSheetDatePicker);
 }
 
 - (void)testPickerWithNilCustomActionSelectorOnButtonNilTargetAndNilString
 {
     [_actionSheetDatePicker addCustomButtonWithTitle:nil target:nil selector:nil];
     [_actionSheetDatePicker showActionSheetPicker];
-    
+
     [_actionSheetDatePicker pressFirstCustomButton];
-    
+
     XCTAssertNotNil(_actionSheetDatePicker);
 }
 
@@ -141,7 +181,12 @@ - (void)testPickerCountDownTimerModeValueWithSelector
     _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"Test title" datePickerMode:UIDatePickerModeCountDownTimer selectedDate:nil target:self action:@selector(countDownTest:) origin:origin cancelAction:nil];
     _actionSheetDatePicker.countDownDuration = countdownTestInt;
     [_actionSheetDatePicker showActionSheetPicker];
-    [_actionSheetDatePicker pressDoneButton];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [NSThread sleepForTimeInterval:0.5f];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [_actionSheetDatePicker pressDoneButton];
+        });
+    });
 
     XCTAssertNotNil(_actionSheetDatePicker);
 }
@@ -150,12 +195,17 @@ - (void)testPickerCountDownTimerModeValueWithBlock
 {
     _actionSheetDatePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"Test" datePickerMode:UIDatePickerModeCountDownTimer selectedDate:nil doneBlock:^(ActionSheetDatePicker *picker, id selectedDate, id origin) {
         XCTAssertEqualObjects(selectedDate, @(countdownTestInt));
-    } cancelBlock:nil origin:origin];
+        XCTAssertEqualObjects(@(picker.countDownDuration), @(countdownTestInt));
+    }                                                         cancelBlock:nil origin:origin];
 
     _actionSheetDatePicker.countDownDuration = countdownTestInt;
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [NSThread sleepForTimeInterval:0.5f];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [_actionSheetDatePicker pressDoneButton];
+        });
+    });
     [_actionSheetDatePicker showActionSheetPicker];
-    UIDatePicker *picker = (UIDatePicker *)_actionSheetDatePicker.pickerView;
-    [_actionSheetDatePicker pressDoneButton];
 
     XCTAssertNotNil(_actionSheetDatePicker);
 }

ObjC-Example/ActionSheetPicker.xcodeproj/project.pbxproj

@@ -74,8 +74,7 @@
 		1C9444BE197B1C2F005F495B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1C9444C2197B1C2F005F495B /* ActionSheetPicker Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ActionSheetPicker Tests-Prefix.pch"; sourceTree = "<group>"; };
 		1C9444C8197B1C75005F495B /* ActionSheetCustomPickerTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActionSheetCustomPickerTestCase.m; sourceTree = "<group>"; };
-		1CA808AD1A25D01A004252BA /* CoreActionSheetPicker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreActionSheetPicker.framework; path = "../CoreActionSheetPicker/build/Debug-iphoneos/CoreActionSheetPicker.framework"; sourceTree = "<group>"; };
-		1CA808AF1A25D0D1004252BA /* CoreActionSheetPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = CoreActionSheetPicker.framework; path = "/Users/petrkorolev/Library/Developer/Xcode/DerivedData/Example-heqowupkotascefopnknxqwrfsgq/Build/Products/Debug-iphoneos/CoreActionSheetPicker.framework"; sourceTree = "<absolute>"; };
+		1CA808AF1A25D0D1004252BA /* CoreActionSheetPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreActionSheetPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1CA808B31A25DD6A004252BA /* CoreActionSheetPicker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CoreActionSheetPicker.framework; sourceTree = "<group>"; };
 		1CD15A2F192C7A0A00B28881 /* ActionSheetPicker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ActionSheetPicker.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1CFCACFC1980FA320056A594 /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = "<group>"; };
@@ -212,7 +211,6 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				1CA808AD1A25D01A004252BA /* CoreActionSheetPicker.framework */,
 				1CA808B31A25DD6A004252BA /* CoreActionSheetPicker.framework */,
 				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
 				1D30AB110D05D00D00671497 /* Foundation.framework */,

ObjC-Example/Example/Classes/ActionSheetPickerViewController.h

@@ -35,6 +35,7 @@
 @property (nonatomic, strong) IBOutlet UITextField *animalTextField;
 @property (nonatomic, strong) IBOutlet UITextField *dateTextField;
 @property (nonatomic, strong) IBOutlet UITextField *timeTextField;
+@property (strong, nonatomic) IBOutlet UITextField *counDownTextField;
 
 @property (nonatomic, strong) NSArray *animals;
 @property (nonatomic, assign) NSInteger selectedIndex;

ObjC-Example/Example/Classes/ActionSheetPickerViewController.m

@@ -87,35 +87,58 @@ - (IBAction)selectALocale:(UIControl *)sender {
         NSLog(@"Locale Picker Canceled");
     };
     ActionSheetLocalePicker *picker = [[ActionSheetLocalePicker alloc] initWithTitle:@"Select Locale:" initialSelection:[[NSTimeZone alloc] initWithName:@"Antarctica/McMurdo"] doneBlock:done cancelBlock:cancel origin:sender];
-    
+
     [picker addCustomButtonWithTitle:@"My locale" value:[NSTimeZone localTimeZone]];
     __weak UIControl *weakSender = sender;
     [picker addCustomButtonWithTitle:@"Hide" actionBlock:^{
         if ([weakSender respondsToSelector:@selector(setText:)]) {
             [weakSender performSelector:@selector(setText:) withObject:[NSTimeZone localTimeZone].name];
         }
     }];
-    
+
     picker.hideCancel = YES;
     [picker showActionSheetPicker];
 }
 
 
 
 - (IBAction)selectADate:(UIControl *)sender {
-    _actionSheetPicker = [[ActionSheetDatePicker alloc] initWithTitle:@"" datePickerMode:UIDatePickerModeDate selectedDate:self.selectedDate target:self action:@selector(dateWasSelected:element:) origin:sender];
+    _actionSheetPicker = [[ActionSheetDatePicker alloc] initWithTitle:@"" datePickerMode:UIDatePickerModeDate selectedDate:self.selectedDate minimumDate:nil maximumDate:nil target:self action:@selector(dateWasSelected:element:) origin:sender];
     [self.actionSheetPicker addCustomButtonWithTitle:@"Today" value:[NSDate date]];
-    [self.actionSheetPicker addCustomButtonWithTitle:@"Yesterday" value:[[NSDate date] TC_dateByAddingCalendarUnits:NSDayCalendarUnit amount:-1]];
+    [self.actionSheetPicker addCustomButtonWithTitle:@"Yesterday" value:[[NSDate date] TC_dateByAddingCalendarUnits:NSCalendarUnitDay amount:-1]];
+    self.actionSheetPicker.hideCancel = YES;
+    [self.actionSheetPicker showActionSheetPicker];
+}
+
+- (IBAction)selectACountdown:(UIControl *)sender {
+
+    _actionSheetPicker = [[ActionSheetDatePicker alloc] initWithTitle:@""
+                                                       datePickerMode:UIDatePickerModeCountDownTimer
+                                                         selectedDate:nil
+                                                            doneBlock:^(ActionSheetDatePicker *picker, id selectedDate, id origin) {
+
+                                                                NSLog(@"selectedDate: %@", selectedDate);
+                                                                self.counDownTextField.text = [selectedDate stringValue];
+                                                                NSLog(@"picker.countDownDuration, %f", picker.countDownDuration);
+                                                                self.counDownTextField.text = [NSString stringWithFormat:@"%f", picker.countDownDuration];
+
+                                                            } cancelBlock:^(ActionSheetDatePicker *picker) {
+
+                                                                NSLog(@"Cancel clicked");
+
+                                                            } origin:sender];
+
+    [(ActionSheetDatePicker *) _actionSheetPicker setCountDownDuration:120];
     self.actionSheetPicker.hideCancel = YES;
     [self.actionSheetPicker showActionSheetPicker];
 }
 
 
 
 -(IBAction)selectATime:(id)sender {
-    
-   
-    
+
+
+
     NSInteger minuteInterval = 5;
     //clamp date
     NSInteger referenceTimeInterval = (NSInteger)[self.selectedTime timeIntervalSinceReferenceDate];
@@ -124,9 +147,9 @@ -(IBAction)selectATime:(id)sender {
     if(remainingSeconds>((minuteInterval*60)/2)) {/// round up
         timeRoundedTo5Minutes = referenceTimeInterval +((minuteInterval*60)-remainingSeconds);
     }
-    
+
     self.selectedTime = [NSDate dateWithTimeIntervalSinceReferenceDate:(NSTimeInterval)timeRoundedTo5Minutes];
-    
+
     ActionSheetDatePicker *datePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"Select a time" datePickerMode:UIDatePickerModeTime selectedDate:self.selectedTime target:self action:@selector(timeWasSelected:element:) origin:sender];
     datePicker.minuteInterval = minuteInterval;
     [datePicker addCustomButtonWithTitle:@"value" value:[NSDate date]];
@@ -147,14 +170,14 @@ - (IBAction)selectAMeasurement:(UIControl *)sender {
 }
 
 - (IBAction)selectAMusicalScale:(UIControl *)sender {
-    
+
     ActionSheetPickerCustomPickerDelegate *delg = [[ActionSheetPickerCustomPickerDelegate alloc] init];
-    
+
     NSNumber *yass1 = @1;
     NSNumber *yass2 = @2;
-    
+
     NSArray *initialSelections = @[yass1, yass2];
-    
+
     [ActionSheetCustomPicker showPickerWithTitle:@"Select Key & Scale" delegate:delg showCancelButton:NO origin:sender
                                initialSelections:initialSelections];
 }
@@ -225,21 +248,26 @@ - (UIFont *)getRandomFont
 
 - (void)animalWasSelected:(NSNumber *)selectedIndex element:(id)element {
     self.selectedIndex = [selectedIndex intValue];
-    
+
     //may have originated from textField or barButtonItem, use an IBOutlet instead of element
     self.animalTextField.text = (self.animals)[(NSUInteger) self.selectedIndex];
 }
 
 - (void)dateWasSelected:(NSDate *)selectedDate element:(id)element {
     self.selectedDate = selectedDate;
-    
+
     //may have originated from textField or barButtonItem, use an IBOutlet instead of element
     self.dateTextField.text = [self.selectedDate description];
 }
 
+- (void)countDownWasSelected:(NSNumber *)selectedDate element:(id)element {
+    //may have originated from textField or barButtonItem, use an IBOutlet instead of element
+    self.counDownTextField.text = selectedDate.stringValue;
+}
+
 -(void)timeWasSelected:(NSDate *)selectedTime element:(id)element {
     self.selectedTime = selectedTime;
-    
+
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:@"h:mm a"];
     self.timeTextField.text = [dateFormatter stringFromDate:selectedTime];

ObjC-Example/Example/Classes/TestTableViewController.m

@@ -45,7 +45,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 //    };
 //    NSArray *colors = @[@"Red", @"Green", @"Blue", @"Orange"];
 //    [ActionSheetStringPicker showPickerWithTitle:@"Select a Block" rows:colors initialSelection:0 doneBlock:done cancelBlock:cancel origin:sender];
-    ActionSheetDatePicker *datePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"Select a time" datePickerMode:UIDatePickerModeTime selectedDate:[NSDate date] target:self action:@selector(timeWasSelected:element:) origin:sender];
+    ActionSheetDatePicker *datePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"Select a time" datePickerMode:UIDatePickerModeTime selectedDate:[NSDate date] minimumDate:nil maximumDate:nil target:self action:@selector(timeWasSelected:element:) origin:sender];
     datePicker.minuteInterval = 5;
     [datePicker showActionSheetPicker];
 }