opensourceios
diff --git a/‎Coding_iOS/Controllers/ResetLabelViewController.m‎
Lines changed: 21 additions & 13 deletions b/‎Coding_iOS/Controllers/ResetLabelViewController.m‎
Lines changed: 21 additions & 13 deletions
diff --git a/‎Coding_iOS/Views/Cell/ResetLabelCell.h‎
Lines changed: 1 addition & 0 deletions b/‎Coding_iOS/Views/Cell/ResetLabelCell.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Coding_iOS/Views/Cell/ResetLabelCell.m‎
Lines changed: 9 additions & 1 deletion b/‎Coding_iOS/Views/Cell/ResetLabelCell.m‎
Lines changed: 9 additions & 1 deletion
@@ -11,13 +11,13 @@
 #import "TPKeyboardAvoidingTableView.h"
 #import "Coding_NetAPIManager.h"
 #import "ProjectTag.h"
+#import "EditColorViewController.h"
 
 #define kCellIdentifier_ResetLabelCell @"ResetLabelCell"
 
 @interface ResetLabelViewController () <UITableViewDataSource, UITableViewDelegate, UITextFieldDelegate>
-{
-    NSString *_tempStr;
-}
+@property (strong, nonatomic) NSString *tempStr;
+
 @property (strong, nonatomic) TPKeyboardAvoidingTableView *myTableView;
 
 @property (nonatomic, weak) UITextField *mCurrentTextField;
@@ -29,12 +29,9 @@ @implementation ResetLabelViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    self.title = @"重命名标签";
-    self.navigationController.title = @"重命名标签";
-    
+    self.title = @"编辑标签";
     self.navigationItem.leftBarButtonItem = [UIBarButtonItem itemWithBtnTitle:@"取消" target:self action:@selector(cancelBtnClick)];
     self.navigationItem.rightBarButtonItem = [UIBarButtonItem itemWithBtnTitle:@"完成" target:self action:@selector(okBtnClick)];
-    self.navigationItem.rightBarButtonItem.enabled = FALSE;
 
     self.view.backgroundColor = kColorTableSectionBg;
 
@@ -53,6 +50,12 @@ - (void)viewDidLoad {
     });
 }
 
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    _tempStr = _ptLabel.name;
+    [_myTableView reloadData];
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -100,8 +103,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
     cell.labelField.delegate = self;
     [cell.labelField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
+    [cell.colorBtn addTarget:self action:@selector(colorBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     cell.backgroundColor = kColorTableBG;
     cell.labelField.text = _ptLabel.name;
+    cell.colorBtn.backgroundColor = [UIColor colorWithHexString:[_ptLabel.color stringByReplacingOccurrencesOfString:@"#" withString:@"0x"]];
     return cell;
 }
 
@@ -116,6 +121,13 @@ - (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(NSInde
     return FALSE;
 }
 
+#pragma mark - color
+- (void)colorBtnClick:(UIButton *)sender{
+    EditColorViewController *vc = [EditColorViewController new];
+    vc.curTag = _ptLabel;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 #pragma mark - UITextFieldDelegate
 - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
 {
@@ -134,12 +146,8 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
 
 - (void)textFieldDidChange:(UITextField *)textField
 {
-    _tempStr = textField.text;
-    if (_tempStr.length > 0) {
-        self.navigationItem.rightBarButtonItem.enabled = [_tempStr isEqualToString:_ptLabel.name] ? FALSE : TRUE;
-    } else {
-        self.navigationItem.rightBarButtonItem.enabled = FALSE;
-    }
+    self.tempStr = textField.text;
+    self.navigationItem.rightBarButtonItem.enabled = _tempStr.length > 0;;
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 
@@ -11,6 +11,7 @@
 @interface ResetLabelCell : UITableViewCell
 
 @property (strong, nonatomic) UITextField *labelField;
+@property (strong, nonatomic) UIButton *colorBtn;
 
 + (CGFloat)cellHeight;
 
 
@@ -17,11 +17,19 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         self.accessoryType = UITableViewCellAccessoryNone;
         self.backgroundColor = [UIColor clearColor];
         // Initialization code
+        if (!_colorBtn) {
+            _colorBtn = [[UIButton alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 7, 30, 30)];
+            _colorBtn.layer.masksToBounds = YES;
+            _colorBtn.layer.cornerRadius = 4;
+            [_colorBtn setImage:[UIImage imageNamed:@"tag_button_editColor"] forState:UIControlStateNormal];
+            [self.contentView addSubview:_colorBtn];
+        }
         if (!_labelField) {
-            _labelField = [[UITextField alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 0, (kScreen_Width - kPaddingLeftWidth * 2), 44)];
+            _labelField = [[UITextField alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_colorBtn.frame) + 10, 0, (kScreen_Width - kPaddingLeftWidth - CGRectGetMaxX(_colorBtn.frame) - 10), 44)];
             _labelField.textColor = [UIColor colorWithHexString:@"0x222222"];
             _labelField.font = [UIFont systemFontOfSize:16];
             _labelField.clearButtonMode = UITextFieldViewModeWhileEditing;
+            _labelField.placeholder = @"输入标签名称";
             [self.contentView addSubview:_labelField];
         }
     }