Merge branch 'master' of https://github.com/danielgindi/Charts

* 'master' of https://github.com/danielgindi/Charts: Refactors -[tableView:cellForRowAtIndexPath:] (ChartsOrg#3326)
FreddyZeng · Mar 14, 2018 · 1ff4668 · 1ff4668
2 parents 8b4d125 + 695979e
commit 1ff4668
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/ChartsDemo/Objective-C/DemoBaseViewController.m b/ChartsDemo/Objective-C/DemoBaseViewController.m
@@ -170,7 +170,8 @@ - (IBAction)optionsButtonTapped:(id)sender
     _optionsTableView.backgroundColor = [UIColor colorWithWhite:0.f alpha:0.9f];
     _optionsTableView.delegate = self;
     _optionsTableView.dataSource = self;
-
+    [_optionsTableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"];
+
     _optionsTableView.translatesAutoresizingMaskIntoConstraints = NO;
 
     NSMutableArray *constraints = [[NSMutableArray alloc] init];
@@ -224,23 +225,14 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (tableView == _optionsTableView)
-    {
-        UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell"];
-        if (!cell)
-        {
-            cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"Cell"];
-            cell.backgroundView = nil;
-            cell.backgroundColor = UIColor.clearColor;
-            cell.textLabel.textColor = UIColor.whiteColor;
-        }
-
-        cell.textLabel.text = self.options[indexPath.row][@"label"];
-
-        return cell;
-    }
-
-    return nil;
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
+    cell.backgroundView = nil;
+    cell.backgroundColor = UIColor.clearColor;
+    cell.textLabel.textColor = UIColor.whiteColor;
+
+    cell.textLabel.text = self.options[indexPath.row][@"label"];
+
+    return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath