Skip to content

Commit

Permalink
Updated sample to support new design
Browse files Browse the repository at this point in the history
  • Loading branch information
@TimCinel
TimCinel committed Nov 13, 2011
1 parent 4745016 commit 3df6407
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 29 deletions.
0 Pickers/ActionSheetPicker.h → ActionSheetPicker.h
View file
File renamed without changes.
0 Pickers/ActionSheetPicker.m → ActionSheetPicker.m
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Pickers/DatePicker.h → Pickers/ActionSheetDatePicker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#import "ActionSheetPicker.h"

@interface DatePicker : ActionSheetPicker
@interface ActionSheetDatePicker : ActionSheetPicker

+ (id)showPickerWithTitle:(NSString *)title
datePickerMode:(UIDatePickerMode)datePickerMode selectedDate:(NSDate *)selectedDate
Expand Down
8 changes: 4 additions & 4 deletions Pickers/DatePicker.m → Pickers/ActionSheetDatePicker.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@
//


#import "DatePicker.h"
#import "ActionSheetDatePicker.h"

@interface DatePicker()
@interface ActionSheetDatePicker()
@property (nonatomic, assign) UIDatePickerMode datePickerMode;
@property (nonatomic, retain) NSDate *selectedDate;
@end

@implementation DatePicker
@implementation ActionSheetDatePicker
@synthesize selectedDate = _selectedDate;
@synthesize datePickerMode = _datePickerMode;

+ (id)showPickerWithTitle:(NSString *)title
datePickerMode:(UIDatePickerMode)datePickerMode selectedDate:(NSDate *)selectedDate
delegate:(id)delegate onSuccess:(SEL)action origin:(id)origin {
DatePicker *picker = [[[DatePicker alloc] initWithTitle:title
ActionSheetDatePicker *picker = [[[ActionSheetDatePicker alloc] initWithTitle:title
datePickerMode:datePickerMode selectedDate:selectedDate
delegate:delegate onSuccess:action origin:origin] autorelease];
[picker showActionPicker];
Expand Down
2 changes: 1 addition & 1 deletion Pickers/DistancePicker.h → Pickers/ActionSheetDistancePicker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#import "ActionSheetPicker.h"
#import "DistancePickerView.h"

@interface DistancePicker : ActionSheetPicker
@interface ActionSheetDistancePicker : ActionSheetPicker

+ (id)showPickerWithTitle:(NSString *)title
bigUnitString:(NSString *)bigUnitString bigUnitMax:(NSInteger)bigUnitMax selectedBigUnit:(NSInteger)selectedBigUnit
Expand Down
9 changes: 5 additions & 4 deletions Pickers/DistancePicker.m → Pickers/ActionSheetDistancePicker.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//

#import "DistancePicker.h"
#import "ActionSheetDistancePicker.h"

#import <objc/message.h>

@interface DistancePicker()
@interface ActionSheetDistancePicker()
@property (nonatomic, retain) NSString *bigUnitString;
@property (nonatomic, assign) NSInteger selectedBigUnit;
@property (nonatomic, assign) NSInteger bigUnitMax;
Expand All @@ -39,7 +40,7 @@ @interface DistancePicker()
@property (nonatomic, assign) NSInteger smallUnitDigits;
@end

@implementation DistancePicker
@implementation ActionSheetDistancePicker
@synthesize bigUnitString = _bigUnitString;
@synthesize bigUnitMax = _bigUnitMax;
@synthesize bigUnitDigits = _bigUnitDigits;
Expand All @@ -53,7 +54,7 @@ + (id)showPickerWithTitle:(NSString *)title
bigUnitString:(NSString *)bigUnitString bigUnitMax:(NSInteger)bigUnitMax selectedBigUnit:(NSInteger)selectedBigUnit
smallUnitString:(NSString*)smallUnitString smallUnitMax:(NSInteger)smallUnitMax selectedSmallUnit:(NSInteger)selectedSmallUnit
delegate:(id)delegate onSuccess:(SEL)action origin:(id)origin {
DistancePicker *picker = [[[DistancePicker alloc] initWithTitle:title
ActionSheetDistancePicker *picker = [[[ActionSheetDistancePicker alloc] initWithTitle:title
bigUnitString:bigUnitString bigUnitMax:bigUnitMax selectedBigUnit:selectedBigUnit
smallUnitString:smallUnitString smallUnitMax:smallUnitMax selectedSmallUnit:selectedSmallUnit
delegate:delegate onSuccess:action origin:origin] autorelease];
Expand Down
0 Sample/Classes/DistancePickerView.h → Pickers/DistancePickerView.h
View file
File renamed without changes.
0 Sample/Classes/DistancePickerView.m → Pickers/DistancePickerView.m
View file
File renamed without changes.
52 changes: 40 additions & 12 deletions Sample/ActionSheetPicker.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
20AED8DC13FB2E7400AECDE7 /* DistancePickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 20AED8DB13FB2E7400AECDE7 /* DistancePickerView.m */; };
2237C38B146FBABC00C74831 /* ActionSheetDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 2237C388146FBABC00C74831 /* ActionSheetDatePicker.m */; };
2237C38C146FBABC00C74831 /* ActionSheetDistancePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 2237C38A146FBABC00C74831 /* ActionSheetDistancePicker.m */; };
2237C38F146FBAF800C74831 /* ActionSheetPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 2237C38E146FBAF800C74831 /* ActionSheetPicker.m */; };
2237C392146FBC3000C74831 /* DistancePickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2237C391146FBC3000C74831 /* DistancePickerView.m */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
2899E5220DE3E06400AC0155 /* ActionSheetPickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2899E5210DE3E06400AC0155 /* ActionSheetPickerViewController.xib */; };
28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
28D7ACF80DDB3853001CB0EB /* ActionSheetPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* ActionSheetPickerViewController.m */; };
52CFA62313A4D6FA0022667F /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52CFA62213A4D6FA0022667F /* MainWindow-iPad.xib */; };
52FDE22813A51D2600D8D2C0 /* ActionSheetPickerViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52FDE22713A51D2600D8D2C0 /* ActionSheetPickerViewController-iPad.xib */; };
8B2B30A9130EF13700B90F79 /* ActionSheetPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B2B30A8130EF13700B90F79 /* ActionSheetPicker.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -27,8 +29,14 @@
1D3623250D0F684500981E51 /* ActionSheetPickerAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActionSheetPickerAppDelegate.m; sourceTree = "<group>"; };
1D6058910D05DD3D006BFB54 /* ActionSheetPicker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ActionSheetPicker.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
20AED8DA13FB2E7300AECDE7 /* DistancePickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DistancePickerView.h; sourceTree = "<group>"; };
20AED8DB13FB2E7400AECDE7 /* DistancePickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DistancePickerView.m; sourceTree = "<group>"; };
2237C387146FBABC00C74831 /* ActionSheetDatePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionSheetDatePicker.h; path = ../../Pickers/ActionSheetDatePicker.h; sourceTree = "<group>"; };
2237C388146FBABC00C74831 /* ActionSheetDatePicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionSheetDatePicker.m; path = ../../Pickers/ActionSheetDatePicker.m; sourceTree = "<group>"; };
2237C389146FBABC00C74831 /* ActionSheetDistancePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionSheetDistancePicker.h; path = ../../Pickers/ActionSheetDistancePicker.h; sourceTree = "<group>"; };
2237C38A146FBABC00C74831 /* ActionSheetDistancePicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionSheetDistancePicker.m; path = ../../Pickers/ActionSheetDistancePicker.m; sourceTree = "<group>"; };
2237C38D146FBAF800C74831 /* ActionSheetPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionSheetPicker.h; path = ../../ActionSheetPicker.h; sourceTree = "<group>"; };
2237C38E146FBAF800C74831 /* ActionSheetPicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionSheetPicker.m; path = ../../ActionSheetPicker.m; sourceTree = "<group>"; };
2237C390146FBC3000C74831 /* DistancePickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DistancePickerView.h; path = ../../Pickers/DistancePickerView.h; sourceTree = "<group>"; };
2237C391146FBC3000C74831 /* DistancePickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DistancePickerView.m; path = ../../Pickers/DistancePickerView.m; sourceTree = "<group>"; };
288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
2899E5210DE3E06400AC0155 /* ActionSheetPickerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ActionSheetPickerViewController.xib; sourceTree = "<group>"; };
28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
Expand All @@ -38,8 +46,6 @@
32CA4F630368D1EE00C91783 /* ActionSheetPicker_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActionSheetPicker_Prefix.pch; sourceTree = "<group>"; };
52CFA62213A4D6FA0022667F /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "iPad/MainWindow-iPad.xib"; sourceTree = "<group>"; };
52FDE22713A51D2600D8D2C0 /* ActionSheetPickerViewController-iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "ActionSheetPickerViewController-iPad.xib"; sourceTree = "<group>"; };
8B2B30A7130EF13700B90F79 /* ActionSheetPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionSheetPicker.h; path = ../ActionSheetPicker.h; sourceTree = SOURCE_ROOT; };
8B2B30A8130EF13700B90F79 /* ActionSheetPicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionSheetPicker.m; path = ../ActionSheetPicker.m; sourceTree = SOURCE_ROOT; };
8D1107310486CEB800E47090 /* ActionSheetPicker-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ActionSheetPicker-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -60,10 +66,7 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
20AED8DA13FB2E7300AECDE7 /* DistancePickerView.h */,
20AED8DB13FB2E7400AECDE7 /* DistancePickerView.m */,
8B2B30A7130EF13700B90F79 /* ActionSheetPicker.h */,
8B2B30A8130EF13700B90F79 /* ActionSheetPicker.m */,
2237C394146FC09B00C74831 /* ActionSheetPicker */,
1D3623240D0F684500981E51 /* ActionSheetPickerAppDelegate.h */,
1D3623250D0F684500981E51 /* ActionSheetPickerAppDelegate.m */,
28D7ACF60DDB3853001CB0EB /* ActionSheetPickerViewController.h */,
Expand All @@ -80,6 +83,29 @@
name = Products;
sourceTree = "<group>";
};
2237C393146FC07400C74831 /* Pickers */ = {
isa = PBXGroup;
children = (
2237C387146FBABC00C74831 /* ActionSheetDatePicker.h */,
2237C388146FBABC00C74831 /* ActionSheetDatePicker.m */,
2237C389146FBABC00C74831 /* ActionSheetDistancePicker.h */,
2237C38A146FBABC00C74831 /* ActionSheetDistancePicker.m */,
2237C390146FBC3000C74831 /* DistancePickerView.h */,
2237C391146FBC3000C74831 /* DistancePickerView.m */,
);
name = Pickers;
sourceTree = "<group>";
};
2237C394146FC09B00C74831 /* ActionSheetPicker */ = {
isa = PBXGroup;
children = (
2237C38D146FBAF800C74831 /* ActionSheetPicker.h */,
2237C38E146FBAF800C74831 /* ActionSheetPicker.m */,
2237C393146FC07400C74831 /* Pickers */,
);
name = ActionSheetPicker;
sourceTree = "<group>";
};
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -200,8 +226,10 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
1D3623260D0F684500981E51 /* ActionSheetPickerAppDelegate.m in Sources */,
28D7ACF80DDB3853001CB0EB /* ActionSheetPickerViewController.m in Sources */,
8B2B30A9130EF13700B90F79 /* ActionSheetPicker.m in Sources */,
20AED8DC13FB2E7400AECDE7 /* DistancePickerView.m in Sources */,
2237C38B146FBABC00C74831 /* ActionSheetDatePicker.m in Sources */,
2237C38C146FBABC00C74831 /* ActionSheetDistancePicker.m in Sources */,
2237C38F146FBAF800C74831 /* ActionSheetPicker.m in Sources */,
2237C392146FBC3000C74831 /* DistancePickerView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
14 changes: 7 additions & 7 deletions Sample/Classes/ActionSheetPickerViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

#import "ActionSheetPickerViewController.h"
#import "ActionSheetPicker.h"
#import "DistancePicker.h"
#import "DatePicker.h"
#import "ActionSheetDistancePicker.h"
#import "ActionSheetDatePicker.h"

@implementation ActionSheetPickerViewController

Expand Down Expand Up @@ -62,7 +62,7 @@ - (IBAction)selectAnItem:(UIControl *)sender {
}

- (IBAction)selectADate:(UIControl *)sender {
self.actionSheetPicker = [DatePicker showPickerWithTitle:@"Select Date"
self.actionSheetPicker = [ActionSheetDatePicker showPickerWithTitle:@"Select Date"
datePickerMode:UIDatePickerModeDate selectedDate:self.selectedDate?:[NSDate date]
delegate:self onSuccess:@selector(dateWasSelected::) origin:sender];
}
Expand All @@ -82,10 +82,10 @@ - (IBAction)dateButtonTapped:(UIBarButtonItem *)sender {
}

- (IBAction)selectAMeasurement:(UIControl *)sender {
self.actionSheetPicker = [DistancePicker showPickerWithTitle:@"Select Length"
bigUnitString:@"m" bigUnitMax:330 selectedBigUnit:self.selectedBigUnit
smallUnitString:@"cm" smallUnitMax:99 selectedSmallUnit:self.selectedSmallUnit
delegate:self onSuccess:@selector(measurementWasSelected:::) origin:sender];
self.actionSheetPicker = [ActionSheetDistancePicker showPickerWithTitle:@"Select Length"
bigUnitString:@"m" bigUnitMax:330 selectedBigUnit:self.selectedBigUnit
smallUnitString:@"cm" smallUnitMax:99 selectedSmallUnit:self.selectedSmallUnit
delegate:self onSuccess:@selector(measurementWasSelected:::) origin:sender];
}

#pragma mark -
Expand Down

0 comments on commit 3df6407

Please sign in to comment.