respond to PR

React/Views/RCTSegmentedControl.m

@@ -10,44 +10,43 @@
 #import "UIView+React.h"
 #import "RCTEventDispatcher.h"
 
-
 @implementation RCTSegmentedControl
 {
   RCTEventDispatcher *_eventDispatcher;
 }
 
 - (id)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
 {
-  if (self = [super initWithFrame:CGRectZero]) {
+  if ((self = [super initWithFrame:CGRectZero])) {
     _eventDispatcher = eventDispatcher;
-
-    [self addTarget:self
-                         action:@selector(onChange:)
-               forControlEvents:UIControlEventValueChanged];
-
+    [self addTarget:self action:@selector(onChange:) forControlEvents:UIControlEventValueChanged];
   }
   return self;
 }
 
 
 - (void)setValuesAndSelectedValue:(NSDictionary *)valuesAndSelectedValue
 {
-  NSArray *values = valuesAndSelectedValue[@"values"];
   [self removeAllSegments];
-  for (int i = 0; i < values.count; i++) {
-    [self insertSegmentWithTitle:values[i] atIndex:i animated:NO];
+
+  NSArray *values = valuesAndSelectedValue[@"values"];
+  NSUInteger insertAtIndex = 0;
+  for (NSString *value in values) {
+    [self insertSegmentWithTitle:value atIndex:insertAtIndex animated:NO];
+    insertAtIndex += 1;
   }
 
   NSString *selectedValue = valuesAndSelectedValue[@"selectedValue"];
-  NSInteger segmentIndex = -1;
-  for (int i = 0; i < self.numberOfSegments; i++) {
+  NSUInteger selectedSegmentIndex = NSNotFound;
+  for (NSUInteger i = 0; i < self.numberOfSegments; i++) {
     NSString *segmentValue = [self titleForSegmentAtIndex:i];
     if ([segmentValue isEqualToString:selectedValue]) {
-      segmentIndex = i;
+      selectedSegmentIndex = i;
+      break;
     }
   }
-  if (segmentIndex != -1) {
-    [self setSelectedSegmentIndex:segmentIndex];
+  if (selectedSegmentIndex != NSNotFound) {
+    [self setSelectedSegmentIndex:selectedSegmentIndex];
   }
 }