From b7abf6aeefa8609cc148fcdf6bd78f40293e1109 Mon Sep 17 00:00:00 2001 From: Roman Efimov Date: Fri, 4 Oct 2013 09:57:26 -0500 Subject: [PATCH] Rename segment -> segmented, reference #82 --- ...gmentCell.h => RETableViewSegmentedCell.h} | 8 +++---- ...gmentCell.m => RETableViewSegmentedCell.m} | 8 +++---- .../{RESegmentItem.h => RESegmentedItem.h} | 14 +++++------ .../{RESegmentItem.m => RESegmentedItem.m} | 14 +++++------ RETableViewManager/RETableViewManager.h | 2 +- RETableViewManager/RETableViewManager.m | 2 +- .../project.pbxproj | 24 +++++++++---------- .../Controllers/ControlsViewController.m | 8 +++---- 8 files changed, 40 insertions(+), 40 deletions(-) rename RETableViewManager/Cells/{RETableViewSegmentCell.h => RETableViewSegmentedCell.h} (88%) rename RETableViewManager/Cells/{RETableViewSegmentCell.m => RETableViewSegmentedCell.m} (96%) rename RETableViewManager/Items/{RESegmentItem.h => RESegmentedItem.h} (82%) rename RETableViewManager/Items/{RESegmentItem.m => RESegmentedItem.m} (86%) diff --git a/RETableViewManager/Cells/RETableViewSegmentCell.h b/RETableViewManager/Cells/RETableViewSegmentedCell.h similarity index 88% rename from RETableViewManager/Cells/RETableViewSegmentCell.h rename to RETableViewManager/Cells/RETableViewSegmentedCell.h index 82ab47d..3a1fb84 100644 --- a/RETableViewManager/Cells/RETableViewSegmentCell.h +++ b/RETableViewManager/Cells/RETableViewSegmentedCell.h @@ -1,5 +1,5 @@ // -// RETableViewSegmentCell.h +// RETableViewSegmentedCell.h // RETableViewManager // // Copyright (c) 2013 Dmitry Shmidt (https://github.com/shmidt) @@ -25,11 +25,11 @@ // #import "RETableViewCell.h" -#import "RESegmentItem.h" +#import "RESegmentedItem.h" -@interface RETableViewSegmentCell : RETableViewCell +@interface RETableViewSegmentedCell : RETableViewCell @property (strong, readonly, nonatomic) UISegmentedControl *segmentedControl; -@property (strong, readwrite, nonatomic) RESegmentItem *item; +@property (strong, readwrite, nonatomic) RESegmentedItem *item; @end diff --git a/RETableViewManager/Cells/RETableViewSegmentCell.m b/RETableViewManager/Cells/RETableViewSegmentedCell.m similarity index 96% rename from RETableViewManager/Cells/RETableViewSegmentCell.m rename to RETableViewManager/Cells/RETableViewSegmentedCell.m index ef76bfc..bbdbc0f 100644 --- a/RETableViewManager/Cells/RETableViewSegmentCell.m +++ b/RETableViewManager/Cells/RETableViewSegmentedCell.m @@ -1,5 +1,5 @@ // -// RETableViewSegmentCell.m +// RETableViewSegmentedCell.m // RETableViewManager // // Copyright (c) 2013 Dmitry Shmidt (https://github.com/shmidt) @@ -24,16 +24,16 @@ // THE SOFTWARE. // -#import "RETableViewSegmentCell.h" +#import "RETableViewSegmentedCell.h" #import "RETableViewManager.h" -@interface RETableViewSegmentCell () +@interface RETableViewSegmentedCell () @property (strong, readwrite, nonatomic) UISegmentedControl *segmentedControl; @end -@implementation RETableViewSegmentCell +@implementation RETableViewSegmentedCell #pragma mark - #pragma mark Lifecycle diff --git a/RETableViewManager/Items/RESegmentItem.h b/RETableViewManager/Items/RESegmentedItem.h similarity index 82% rename from RETableViewManager/Items/RESegmentItem.h rename to RETableViewManager/Items/RESegmentedItem.h index bc84c73..b339578 100644 --- a/RETableViewManager/Items/RESegmentItem.h +++ b/RETableViewManager/Items/RESegmentedItem.h @@ -1,5 +1,5 @@ // -// RESegmentItem.h +// RESegmentedItem.h // RETableViewManager // // Copyright (c) 2013 Dmitry Shmidt (https://github.com/shmidt) @@ -26,23 +26,23 @@ #import "RETableViewItem.h" -@interface RESegmentItem : RETableViewItem +@interface RESegmentedItem : RETableViewItem @property (assign, readwrite, nonatomic) NSInteger value; @property (copy, readwrite, nonatomic) NSArray *titles; @property (copy, readwrite, nonatomic) NSArray *images; -@property (copy, readwrite, nonatomic) void (^switchValueChangeHandler)(RESegmentItem *item); +@property (copy, readwrite, nonatomic) void (^switchValueChangeHandler)(RESegmentedItem *item); -+ (instancetype)itemWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler; ++ (instancetype)itemWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler; + (instancetype)itemWithTitles:(NSArray *)titles value:(NSInteger)value; -- (id)initWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler; +- (id)initWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler; - (id)initWithTitles:(NSArray *)titles value:(NSInteger)value; -+ (instancetype)itemWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler; ++ (instancetype)itemWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler; + (instancetype)itemWithImages:(NSArray *)images value:(NSInteger)value; -- (id)initWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler; +- (id)initWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler; - (id)initWithImages:(NSArray *)images value:(NSInteger)value; @end \ No newline at end of file diff --git a/RETableViewManager/Items/RESegmentItem.m b/RETableViewManager/Items/RESegmentedItem.m similarity index 86% rename from RETableViewManager/Items/RESegmentItem.m rename to RETableViewManager/Items/RESegmentedItem.m index 8388d87..b65ed42 100644 --- a/RETableViewManager/Items/RESegmentItem.m +++ b/RETableViewManager/Items/RESegmentedItem.m @@ -1,5 +1,5 @@ // -// RESegmentItem.m +// RESegmentedItem.m // RETableViewManager // // Copyright (c) 2013 Dmitry Shmidt (https://github.com/shmidt) @@ -24,16 +24,16 @@ // THE SOFTWARE. // -#import "RESegmentItem.h" +#import "RESegmentedItem.h" -@implementation RESegmentItem +@implementation RESegmentedItem + (instancetype)itemWithTitles:(NSArray *)titles value:(NSInteger)value { return [[self alloc] initWithTitles:titles value:value]; } -+ (instancetype)itemWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler ++ (instancetype)itemWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler { return [[self alloc] initWithTitles:titles value:value switchValueChangeHandler:switchValueChangeHandler]; } @@ -43,7 +43,7 @@ return [self initWithTitles:titles value:value switchValueChangeHandler:nil]; } -- (id)initWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler +- (id)initWithTitles:(NSArray *)titles value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler { self = [super init]; if (!self) @@ -61,7 +61,7 @@ return [[self alloc] initWithImages:images value:value]; } -+ (instancetype)itemWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler ++ (instancetype)itemWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler { return [[self alloc] initWithImages:images value:value switchValueChangeHandler:switchValueChangeHandler]; } @@ -71,7 +71,7 @@ return [self initWithImages:images value:value switchValueChangeHandler:nil]; } -- (id)initWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentItem *item))switchValueChangeHandler +- (id)initWithImages:(NSArray *)images value:(NSInteger)value switchValueChangeHandler:(void(^)(RESegmentedItem *item))switchValueChangeHandler { self = [super init]; if (!self) diff --git a/RETableViewManager/RETableViewManager.h b/RETableViewManager/RETableViewManager.h index d098ee6..edf018e 100644 --- a/RETableViewManager/RETableViewManager.h +++ b/RETableViewManager/RETableViewManager.h @@ -48,7 +48,7 @@ #import "REDateTimeItem.h" #import "REMultipleChoiceItem.h" #import "REPickerItem.h" -#import "RESegmentItem.h" +#import "RESegmentedItem.h" @protocol RETableViewManagerDelegate; diff --git a/RETableViewManager/RETableViewManager.m b/RETableViewManager/RETableViewManager.m index 5f916f9..00b58be 100755 --- a/RETableViewManager/RETableViewManager.m +++ b/RETableViewManager/RETableViewManager.m @@ -97,7 +97,7 @@ self[@"RECreditCardItem"] = @"RETableViewCreditCardCell"; self[@"REMultipleChoiceItem"] = @"RETableViewOptionCell"; self[@"REPickerItem"] = @"RETableViewPickerCell"; - self[@"RESegmentItem"] = @"RETableViewSegmentCell"; + self[@"RESegmentedItem"] = @"RETableViewSegmentedCell"; } - (void)registerClass:(NSString *)objectClass forCellWithReuseIdentifier:(NSString *)identifier diff --git a/RETableViewManagerExample/RETableViewManagerExample.xcodeproj/project.pbxproj b/RETableViewManagerExample/RETableViewManagerExample.xcodeproj/project.pbxproj index acd6762..943e3f8 100644 --- a/RETableViewManagerExample/RETableViewManagerExample.xcodeproj/project.pbxproj +++ b/RETableViewManagerExample/RETableViewManagerExample.xcodeproj/project.pbxproj @@ -66,8 +66,8 @@ 30DB067A16E934AD006C9530 /* RETableViewSection.m in Sources */ = {isa = PBXBuildFile; fileRef = 30DB066916E934AD006C9530 /* RETableViewSection.m */; }; 30DBFA9117FC827D0099ACA5 /* REPickerItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 30DBFA9017FC827D0099ACA5 /* REPickerItem.m */; }; 30DBFA9417FC84380099ACA5 /* RETableViewPickerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 30DBFA9317FC84380099ACA5 /* RETableViewPickerCell.m */; }; - 30DBFA9717FCB71B0099ACA5 /* RESegmentItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 30DBFA9617FCB71B0099ACA5 /* RESegmentItem.m */; }; - 30DBFA9A17FCB7230099ACA5 /* RETableViewSegmentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 30DBFA9917FCB7230099ACA5 /* RETableViewSegmentCell.m */; }; + 30DBFA9717FCB71B0099ACA5 /* RESegmentedItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 30DBFA9617FCB71B0099ACA5 /* RESegmentedItem.m */; }; + 30DBFA9A17FCB7230099ACA5 /* RETableViewSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 30DBFA9917FCB7230099ACA5 /* RETableViewSegmentedCell.m */; }; 30E16A48171A103400F7C258 /* EditingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 30E16A47171A103300F7C258 /* EditingViewController.m */; }; 30E5F50C17BBD163005CF1FE /* IndexedListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 30E5F50B17BBD163005CF1FE /* IndexedListViewController.m */; }; 30EF93B316E039B800B84981 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 30EF93B216E039B800B84981 /* UIKit.framework */; }; @@ -193,10 +193,10 @@ 30DBFA9017FC827D0099ACA5 /* REPickerItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = REPickerItem.m; sourceTree = ""; }; 30DBFA9217FC84380099ACA5 /* RETableViewPickerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RETableViewPickerCell.h; sourceTree = ""; }; 30DBFA9317FC84380099ACA5 /* RETableViewPickerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RETableViewPickerCell.m; sourceTree = ""; }; - 30DBFA9517FCB71B0099ACA5 /* RESegmentItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RESegmentItem.h; sourceTree = ""; }; - 30DBFA9617FCB71B0099ACA5 /* RESegmentItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RESegmentItem.m; sourceTree = ""; }; - 30DBFA9817FCB7230099ACA5 /* RETableViewSegmentCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RETableViewSegmentCell.h; sourceTree = ""; }; - 30DBFA9917FCB7230099ACA5 /* RETableViewSegmentCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RETableViewSegmentCell.m; sourceTree = ""; }; + 30DBFA9517FCB71B0099ACA5 /* RESegmentedItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RESegmentedItem.h; sourceTree = ""; }; + 30DBFA9617FCB71B0099ACA5 /* RESegmentedItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RESegmentedItem.m; sourceTree = ""; }; + 30DBFA9817FCB7230099ACA5 /* RETableViewSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RETableViewSegmentedCell.h; sourceTree = ""; }; + 30DBFA9917FCB7230099ACA5 /* RETableViewSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RETableViewSegmentedCell.m; sourceTree = ""; }; 30E16A46171A103300F7C258 /* EditingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingViewController.h; sourceTree = ""; }; 30E16A47171A103300F7C258 /* EditingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditingViewController.m; sourceTree = ""; }; 30E5F50A17BBD163005CF1FE /* IndexedListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexedListViewController.h; sourceTree = ""; }; @@ -366,8 +366,8 @@ 30DB064716E934AD006C9530 /* Cells */ = { isa = PBXGroup; children = ( - 30DBFA9817FCB7230099ACA5 /* RETableViewSegmentCell.h */, - 30DBFA9917FCB7230099ACA5 /* RETableViewSegmentCell.m */, + 30DBFA9817FCB7230099ACA5 /* RETableViewSegmentedCell.h */, + 30DBFA9917FCB7230099ACA5 /* RETableViewSegmentedCell.m */, 30DB064816E934AD006C9530 /* RETableViewBoolCell.h */, 30DB064916E934AD006C9530 /* RETableViewBoolCell.m */, 30DB064A16E934AD006C9530 /* RETableViewCreditCardCell.h */, @@ -393,8 +393,8 @@ 30DB065216E934AD006C9530 /* Items */ = { isa = PBXGroup; children = ( - 30DBFA9517FCB71B0099ACA5 /* RESegmentItem.h */, - 30DBFA9617FCB71B0099ACA5 /* RESegmentItem.m */, + 30DBFA9517FCB71B0099ACA5 /* RESegmentedItem.h */, + 30DBFA9617FCB71B0099ACA5 /* RESegmentedItem.m */, 30DB065316E934AD006C9530 /* REBoolItem.h */, 30DB065416E934AD006C9530 /* REBoolItem.m */, 30DB065516E934AD006C9530 /* RECreditCardItem.h */, @@ -620,12 +620,12 @@ 30EF93BF16E039B800B84981 /* main.m in Sources */, 30EF93C316E039B800B84981 /* AppDelegate.m in Sources */, 30DB066A16E934AD006C9530 /* RETableViewBoolCell.m in Sources */, - 30DBFA9717FCB71B0099ACA5 /* RESegmentItem.m in Sources */, + 30DBFA9717FCB71B0099ACA5 /* RESegmentedItem.m in Sources */, 30DB066B16E934AD006C9530 /* RETableViewCreditCardCell.m in Sources */, 30DB066E16E934AD006C9530 /* RETableViewTextCell.m in Sources */, 30DB066F16E934AD006C9530 /* REBoolItem.m in Sources */, 30BB805817E0D8A400AD0861 /* MultilineTextCell.m in Sources */, - 30DBFA9A17FCB7230099ACA5 /* RETableViewSegmentCell.m in Sources */, + 30DBFA9A17FCB7230099ACA5 /* RETableViewSegmentedCell.m in Sources */, 30DB067016E934AD006C9530 /* RECreditCardItem.m in Sources */, 30DB067116E934AD006C9530 /* RENumberItem.m in Sources */, 30DB067316E934AD006C9530 /* RETextItem.m in Sources */, diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/ControlsViewController.m b/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/ControlsViewController.m index 63ddd21..6978151 100644 --- a/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/ControlsViewController.m +++ b/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/ControlsViewController.m @@ -30,8 +30,8 @@ @property (strong, readwrite, nonatomic) RELongTextItem *longTextItem; @property (strong, readwrite, nonatomic) RECreditCardItem *creditCardItem; @property (strong, readwrite, nonatomic) REPickerItem *pickerItem; -@property (strong, readwrite, nonatomic) RESegmentItem *segmentItem; -@property (strong, readwrite, nonatomic) RESegmentItem *segmentItem2; +@property (strong, readwrite, nonatomic) RESegmentedItem *segmentItem; +@property (strong, readwrite, nonatomic) RESegmentedItem *segmentItem2; @end @@ -97,10 +97,10 @@ self.boolItem = [REBoolItem itemWithTitle:@"Bool item" value:YES switchValueChangeHandler:^(REBoolItem *item) { NSLog(@"Value: %@", item.value ? @"YES" : @"NO"); }]; - self.segmentItem = [RESegmentItem itemWithTitles:@[@"One", @"Two"] value:1 switchValueChangeHandler:^(RESegmentItem *item) { + self.segmentItem = [RESegmentedItem itemWithTitles:@[@"One", @"Two"] value:1 switchValueChangeHandler:^(RESegmentedItem *item) { NSLog(@"Value: %i", item.value); }]; - self.segmentItem2 = [RESegmentItem itemWithImages:@[[UIImage imageNamed:@"Heart"], [UIImage imageNamed:@"Heart_Highlighted"]] value:0 switchValueChangeHandler:^(RESegmentItem *item) { + self.segmentItem2 = [RESegmentedItem itemWithImages:@[[UIImage imageNamed:@"Heart"], [UIImage imageNamed:@"Heart_Highlighted"]] value:0 switchValueChangeHandler:^(RESegmentedItem *item) { NSLog(@"Value: %i", item.value); }]; self.floatItem = [REFloatItem itemWithTitle:@"Float item" value:0.3 sliderValueChangeHandler:^(REFloatItem *item) {