Removed/renamed duplicated class properties to fix warnings.

romaonthego · Apr 26, 2016 · 48b16f0 · 48b16f0
1 parent aa50522
commit 48b16f0
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 29 deletions.
diff --git a/RETableViewManager/Cells/RETableViewNumberCell.m b/RETableViewManager/Cells/RETableViewNumberCell.m
@@ -28,7 +28,7 @@
 
 @interface RETableViewNumberCell ()
 
-@property (strong, readwrite, nonatomic) REFormattedNumberField *textField;
+@property (strong, readwrite, nonatomic) REFormattedNumberField *textFieldNumber;
 
 @property (assign, readwrite, nonatomic) BOOL enabled;
 
@@ -58,26 +58,26 @@ - (void)cellDidLoad
     self.selectionStyle = UITableViewCellSelectionStyleNone;
     self.textLabel.backgroundColor = [UIColor clearColor];
 
-    self.textField = [[REFormattedNumberField alloc] initWithFrame:CGRectZero];
-    self.textField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
-    self.textField.inputAccessoryView = self.actionBar;
-    self.textField.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    self.textField.delegate = self;
-    [self.textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
-    [self.contentView addSubview:self.textField];
+    self.textFieldNumber = [[REFormattedNumberField alloc] initWithFrame:CGRectZero];
+    self.textFieldNumber.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
+    self.textFieldNumber.inputAccessoryView = self.actionBar;
+    self.textFieldNumber.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+    self.textFieldNumber.delegate = self;
+    [self.textFieldNumber addTarget:self action:@selector(textFieldNumberDidChange:) forControlEvents:UIControlEventEditingChanged];
+    [self.contentView addSubview:self.textFieldNumber];
 }
 
 - (void)cellWillAppear
 {
     [super cellWillAppear];
 
     self.textLabel.text = self.item.title.length == 0 ? @" " : self.item.title;
-    self.textField.text = [self.item.value re_stringWithNumberFormat:self.item.format];
-    self.textField.placeholder = self.item.placeholder;
-    self.textField.format = self.item.format;
-    self.textField.font = [UIFont systemFontOfSize:17];
-    self.textField.keyboardAppearance = self.item.keyboardAppearance;
-    self.textField.keyboardType = UIKeyboardTypeNumberPad;
+    self.textFieldNumber.text = [self.item.value re_stringWithNumberFormat:self.item.format];
+    self.textFieldNumber.placeholder = self.item.placeholder;
+    self.textFieldNumber.format = self.item.format;
+    self.textFieldNumber.font = [UIFont systemFontOfSize:17];
+    self.textFieldNumber.keyboardAppearance = self.item.keyboardAppearance;
+    self.textFieldNumber.keyboardType = UIKeyboardTypeNumberPad;
 
     self.enabled = self.item.enabled;
 }
@@ -109,7 +109,7 @@ - (void)setEnabled:(BOOL)enabled {
     self.userInteractionEnabled = _enabled;
 
     self.textLabel.enabled = _enabled;
-    self.textField.enabled = _enabled;
+    self.textFieldNumber.enabled = _enabled;
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
@@ -124,13 +124,13 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 #pragma mark -
 #pragma mark Handle events
 
-- (void)textFieldDidChange:(REFormattedNumberField *)textField
+- (void)textFieldNumberDidChange:(REFormattedNumberField *)textField
 {
     self.item.value = textField.unformattedText;
     if (self.item.onChange)
         self.item.onChange(self.item);
 }
-- (void)textFieldDidEndEditing:(UITextField *)textField{
+- (void)textFieldNumberDidEndEditing:(UITextField *)textField{
     if (self.item.onEndEditing)
         self.item.onEndEditing(self.item);
 }

diff --git a/RETableViewManager/Items/RELongTextItem.h b/RETableViewManager/Items/RELongTextItem.h
@@ -29,10 +29,6 @@
 
 @property (strong, readwrite, nonatomic) UIColor *placeholderColor;
 @property (assign, readwrite, nonatomic) BOOL editable;
-@property (copy, readwrite, nonatomic) void (^onBeginEditing)(RELongTextItem *item);
-@property (copy, readwrite, nonatomic) void (^onEndEditing)(RELongTextItem *item);
-@property (copy, readwrite, nonatomic) void (^onChange)(RETextItem *item);
-@property (copy, readwrite, nonatomic) void (^onReturn)(RELongTextItem *item);
 
 + (instancetype)itemWithValue:(NSString *)value placeholder:(NSString *)placeholder;
 - (id)initWithValue:(NSString *)value placeholder:(NSString *)placeholder;

diff --git a/RETableViewManager/Items/RENumberItem.h b/RETableViewManager/Items/RENumberItem.h
@@ -28,7 +28,6 @@
 @interface RENumberItem : RETextItem
 
 @property (copy, readwrite, nonatomic) NSString *format;
-@property (copy, readwrite, nonatomic) void (^onEndEditing)(RENumberItem *item);
 
 + (instancetype)itemWithTitle:(NSString *)title value:(NSString *)value placeholder:(NSString *)placeholder format:(NSString *)format;
 - (id)initWithTitle:(NSString *)title value:(NSString *)value placeholder:(NSString *)placeholder format:(NSString *)format;

diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/ListImageCell.h b/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/ListImageCell.h
@@ -12,6 +12,6 @@
 @interface ListImageCell : RETableViewCell
 
 @property (strong, readonly, nonatomic) UIImageView *pictureView;
-@property (strong, readwrite, nonatomic) ListImageItem *item;
+@property (strong, readwrite, nonatomic) ListImageItem *imageItem;
 
 @end
diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/ListImageCell.m b/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/ListImageCell.m
@@ -32,7 +32,7 @@ - (void)cellDidLoad
 - (void)cellWillAppear
 {
     [super cellWillAppear];
-    [self.pictureView setImage:[UIImage imageNamed:self.item.imageName]];
+    [self.pictureView setImage:[UIImage imageNamed:self.imageItem.imageName]];
 }
 
 - (void)cellDidDisappear

diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/MultilineTextCell.h b/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/MultilineTextCell.h
@@ -11,7 +11,7 @@
 
 @interface MultilineTextCell : RETableViewCell
 
-@property (strong, readwrite, nonatomic) MultilineTextItem *item;
+@property (strong, readwrite, nonatomic) MultilineTextItem *textItem;
 @property (strong, readonly, nonatomic) UILabel *multilineLabel;
 
 @end
diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/MultilineTextCell.m b/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/MultilineTextCell.m
@@ -45,7 +45,7 @@ - (void)cellWillAppear
     [super cellWillAppear];
     self.selectionStyle = UITableViewCellSelectionStyleNone;
     self.textLabel.text = @"";
-    self.multilineLabel.text = self.item.title;
+    self.multilineLabel.text = self.textItem.title;
 }
 
 - (void)layoutSubviews
@@ -56,7 +56,7 @@ - (void)layoutSubviews
     if (self.section.style.contentViewMargin <= 0)
         horizontalMargin += 5.0;
 
-    CGRect frame = CGRectMake(0, 0, CGRectGetWidth(self.contentView.bounds), [MultilineTextCell heightWithItem:self.item tableViewManager:self.tableViewManager]);
+    CGRect frame = CGRectMake(0, 0, CGRectGetWidth(self.contentView.bounds), [MultilineTextCell heightWithItem:self.textItem tableViewManager:self.tableViewManager]);
     frame = CGRectInset(frame, horizontalMargin, kVerticalMargin);
 
     self.multilineLabel.frame = frame;

diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/XIBTestCell.h b/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/XIBTestCell.h
@@ -12,6 +12,6 @@
 @interface XIBTestCell : RETableViewCell
 
 @property (strong, readwrite, nonatomic) IBOutlet UILabel *testLabel;
-@property (strong, readwrite, nonatomic) XIBTestItem *item;
+@property (strong, readwrite, nonatomic) XIBTestItem *testItem;
 
 @end
diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/XIBTestCell.m b/RETableViewManagerExample/RETableViewManagerExample/Classes/Views/XIBTestCell.m
@@ -14,7 +14,7 @@ - (void)cellWillAppear
 {
     [super cellWillAppear];
     self.textLabel.text = @"";
-    self.testLabel.text = self.item.title;
+    self.testLabel.text = self.testItem.title;
 }
 
 @end