Implemented feedback

Author: Vortec4800

Classes/BEMCheckBox.m

@@ -132,7 +132,6 @@ - (void)_setOn:(BOOL)on animated:(BOOL)animated notifyGroup:(BOOL)notifyGroup {
         }
     }
 
-    // Notify our group if we have one that something has changed
     if(notifyGroup){
         [self.group _checkBoxSelectionChanged:self];
     }

Classes/BEMCheckBoxGroup.h

@@ -6,15 +6,15 @@
 //  Copyright © 2016 Boris Emorine. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @class BEMCheckBox;
 
 @interface BEMCheckBoxGroup : NSObject
 
 /** An array of check boxes in this group.
  */
-@property (nonatomic, strong, nonnull, readonly) NSArray<BEMCheckBox *> *checkBoxes;
+@property (nonatomic, strong, nonnull, readonly) NSOrderedSet<BEMCheckBox *> *checkBoxes;
 
 /** The currently selected check box. Only can be nil if mustHaveSelection is NO. Setting this value will cause the other check boxes to deselect automatically.
  */

Classes/BEMCheckBoxGroup.m

@@ -11,7 +11,7 @@
 
 @interface BEMCheckBoxGroup ()
 
-@property (nonatomic, strong, nonnull) NSArray<BEMCheckBox *> *checkBoxes;
+@property (nonatomic, strong, nonnull) NSOrderedSet<BEMCheckBox *> *checkBoxes;
 
 @end
 
@@ -31,7 +31,7 @@ - (instancetype)init {
     self = [super init];
     if (self) {
         _mustHaveSelection = NO;
-        _checkBoxes = @[];
+        _checkBoxes = [NSOrderedSet orderedSet];
     }
     return self;
 }
@@ -46,14 +46,15 @@ + (nonnull instancetype)groupWithCheckBoxes:(nullable NSArray<BEMCheckBox *> *)c
 }
 
 - (void)addCheckBoxToGroup:(nonnull BEMCheckBox *)checkBox {
-    if ([checkBox group]) {
-        // Already has a group, remove first
-        [[checkBox group] removeCheckBoxFromGroup:checkBox];
+    if (checkBox.group) {
+        [checkBox.group removeCheckBoxFromGroup:checkBox];
     }
 
     [checkBox _setOn:NO animated:NO notifyGroup:NO];
-    [checkBox setGroup:self];
-    self.checkBoxes = [self.checkBoxes arrayByAddingObject:checkBox];
+    checkBox.group = self;
+    NSMutableOrderedSet *mutableBoxes = [self.checkBoxes mutableCopy];
+    [mutableBoxes addObject:checkBox];
+    self.checkBoxes = [NSOrderedSet orderedSetWithOrderedSet:mutableBoxes];
 }
 
 - (void)removeCheckBoxFromGroup:(nonnull BEMCheckBox *)checkBox {
@@ -62,42 +63,46 @@ - (void)removeCheckBoxFromGroup:(nonnull BEMCheckBox *)checkBox {
         return;
     }
 
-    [checkBox setGroup:nil];
-    NSMutableArray *mutableBoxes = [self.checkBoxes mutableCopy];
+    checkBox.group = nil;
+    NSMutableOrderedSet *mutableBoxes = [self.checkBoxes mutableCopy];
     [mutableBoxes removeObject:checkBox];
-    self.checkBoxes = [NSArray arrayWithArray:mutableBoxes];
+    self.checkBoxes = [NSOrderedSet orderedSetWithOrderedSet:mutableBoxes];
 }
 
+#pragma mark Getters
+
 - (BEMCheckBox *)selectedCheckBox {
-    BEMCheckBox *checkbox = nil;
-    for (BEMCheckBox *b in self.checkBoxes) {
-        if([b on]){
-            checkbox = b;
+    BEMCheckBox *selected = nil;
+    for (BEMCheckBox *checkBox in self.checkBoxes) {
+        if(checkBox.on){
+            selected = checkBox;
             break;
         }
     }
 
-    return checkbox;
+    return selected;
 }
 
+#pragma mark Setters
+
 - (void)setSelectedCheckBox:(BEMCheckBox *)selectedCheckBox {
     if (selectedCheckBox) {
         for (BEMCheckBox *checkBox in self.checkBoxes) {
             BOOL shouldBeOn = (checkBox == selectedCheckBox);
-            if([checkBox on] != shouldBeOn){
+            if(checkBox.on != shouldBeOn){
                 [checkBox _setOn:shouldBeOn animated:YES notifyGroup:NO];
             }
         }
     } else {
         // Selection is nil
         if(self.mustHaveSelection && [self.checkBoxes count] > 0){
             // We must have a selected checkbox, so re-call this method with the first checkbox
-            [self setSelectedCheckBox:[self.checkBoxes firstObject]];
+            self.selectedCheckBox = [self.checkBoxes firstObject];
         } else {
-            for (BEMCheckBox *b in self.checkBoxes) {
+            for (BEMCheckBox *checkBox in self.checkBoxes) {
                 BOOL shouldBeOn = NO;
-                if([b on] != shouldBeOn){
-                    [b _setOn:shouldBeOn animated:YES notifyGroup:NO];
+                if(checkBox.on != shouldBeOn){
+                    [checkBox _setOn:shouldBeOn animated:YES notifyGroup:NO];
                 }
             }
         }
@@ -109,7 +114,7 @@ - (void)setMustHaveSelection:(BOOL)mustHaveSelection {
 
     // If it must have a selection and we currently don't, select the first box
     if (mustHaveSelection && !self.selectedCheckBox) {
-        [self setSelectedCheckBox:[self.checkBoxes firstObject]];
+        self.selectedCheckBox = [self.checkBoxes firstObject];
     }
 }
 
@@ -118,10 +123,10 @@ - (void)setMustHaveSelection:(BOOL)mustHaveSelection {
 - (void)_checkBoxSelectionChanged:(BEMCheckBox *)checkBox {
     if ([checkBox on]) {
         // Change selected checkbox to this one
-        [self setSelectedCheckBox:checkBox];
+        self.selectedCheckBox = checkBox;
     } else if(checkBox == self.selectedCheckBox) {
         // Selected checkbox was this one, clear it
-        [self setSelectedCheckBox:nil];
+        self.selectedCheckBox = nil;
     }
 }