Parametrizes arrays which allows getting rid of annoying warning in swift code using HMSegmentedControl with images. (#268)

Author: valeriyvan

HMSegmentedControl/HMSegmentedControl.h

@@ -51,9 +51,9 @@ typedef NS_ENUM(NSInteger, HMSegmentedControlType) {
 
 @interface HMSegmentedControl : UIControl
 
-@property (nonatomic, strong) NSArray *sectionTitles;
-@property (nonatomic, strong) NSArray *sectionImages;
-@property (nonatomic, strong) NSArray *sectionSelectedImages;
+@property (nonatomic, strong) NSArray<NSString *> *sectionTitles;
+@property (nonatomic, strong) NSArray<UIImage *> *sectionImages;
+@property (nonatomic, strong) NSArray<UIImage *> *sectionSelectedImages;
 
 /**
  Provide a block to be executed when selected index is changed.
@@ -228,9 +228,9 @@ typedef NS_ENUM(NSInteger, HMSegmentedControlType) {
  */
 @property (nonatomic) BOOL shouldAnimateUserSelection;
 
-- (id)initWithSectionTitles:(NSArray *)sectiontitles;
-- (id)initWithSectionImages:(NSArray *)sectionImages sectionSelectedImages:(NSArray *)sectionSelectedImages;
-- (instancetype)initWithSectionImages:(NSArray *)sectionImages sectionSelectedImages:(NSArray *)sectionSelectedImages titlesForSections:(NSArray *)sectiontitles;
+- (id)initWithSectionTitles:(NSArray<NSString *> *)sectiontitles;
+- (id)initWithSectionImages:(NSArray<UIImage *> *)sectionImages sectionSelectedImages:(NSArray<UIImage *> *)sectionSelectedImages;
+- (instancetype)initWithSectionImages:(NSArray<UIImage *> *)sectionImages sectionSelectedImages:(NSArray<UIImage *> *)sectionSelectedImages titlesForSections:(NSArray<NSString *> *)sectiontitles;
 - (void)setSelectedSegmentIndex:(NSUInteger)index animated:(BOOL)animated;
 - (void)setIndexChangeBlock:(IndexChangeBlock)indexChangeBlock;
 - (void)setTitleFormatter:(HMTitleFormatterBlock)titleFormatter;

HMSegmentedControl/HMSegmentedControl.m

@@ -19,30 +19,30 @@ @interface HMSegmentedControl ()
 @property (nonatomic, strong) CALayer *selectionIndicatorBoxLayer;
 @property (nonatomic, strong) CALayer *selectionIndicatorArrowLayer;
 @property (nonatomic, readwrite) CGFloat segmentWidth;
-@property (nonatomic, readwrite) NSArray *segmentWidthsArray;
+@property (nonatomic, readwrite) NSArray<NSNumber *> *segmentWidthsArray;
 @property (nonatomic, strong) HMScrollView *scrollView;
 
 @end
 
 @implementation HMScrollView
 
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     if (!self.dragging) {
         [self.nextResponder touchesBegan:touches withEvent:event];
     } else {
         [super touchesBegan:touches withEvent:event];
     }
 }
 
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event{
+- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
     if (!self.dragging) {
         [self.nextResponder touchesMoved:touches withEvent:event];
     } else{
         [super touchesMoved:touches withEvent:event];
     }
 }
 
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     if (!self.dragging) {
         [self.nextResponder touchesEnded:touches withEvent:event];
     } else {
@@ -72,7 +72,7 @@ - (id)initWithFrame:(CGRect)frame {
     return self;
 }
 
-- (id)initWithSectionTitles:(NSArray *)sectiontitles {
+- (id)initWithSectionTitles:(NSArray<NSString *> *)sectiontitles {
     self = [super initWithFrame:CGRectZero];
 
     if (self) {
@@ -84,7 +84,7 @@ - (id)initWithSectionTitles:(NSArray *)sectiontitles {
     return self;
 }
 
-- (id)initWithSectionImages:(NSArray*)sectionImages sectionSelectedImages:(NSArray*)sectionSelectedImages {
+- (id)initWithSectionImages:(NSArray<UIImage *> *)sectionImages sectionSelectedImages:(NSArray<UIImage *> *)sectionSelectedImages {
     self = [super initWithFrame:CGRectZero];
 
     if (self) {
@@ -97,14 +97,14 @@ - (id)initWithSectionImages:(NSArray*)sectionImages sectionSelectedImages:(NSArr
     return self;
 }
 
-- (instancetype)initWithSectionImages:(NSArray *)sectionImages sectionSelectedImages:(NSArray *)sectionSelectedImages titlesForSections:(NSArray *)sectiontitles {
+- (instancetype)initWithSectionImages:(NSArray<UIImage *> *)sectionImages sectionSelectedImages:(NSArray<UIImage *> *)sectionSelectedImages titlesForSections:(NSArray<NSString *> *)sectiontitles {
 	self = [super initWithFrame:CGRectZero];
 
     if (self) {
         [self commonInit];
 
 		if (sectionImages.count != sectiontitles.count) {
-			[NSException raise:NSRangeException format:@"***%s: Images bounds (%ld) Dont match Title bounds (%ld)", sel_getName(_cmd), (unsigned long)sectionImages.count, (unsigned long)sectiontitles.count];
+			[NSException raise:NSRangeException format:@"***%s: Images bounds (%ld) Don't match Title bounds (%ld)", sel_getName(_cmd), (unsigned long)sectionImages.count, (unsigned long)sectiontitles.count];
         }
 
         self.sectionImages = sectionImages;
@@ -174,14 +174,14 @@ - (void)setFrame:(CGRect)frame {
     [self updateSegmentsRects];
 }
 
-- (void)setSectionTitles:(NSArray *)sectionTitles {
+- (void)setSectionTitles:(NSArray<NSString *> *)sectionTitles {
     _sectionTitles = sectionTitles;
 
     [self setNeedsLayout];
     [self setNeedsDisplay];
 }
 
-- (void)setSectionImages:(NSArray *)sectionImages {
+- (void)setSectionImages:(NSArray<UIImage *> *)sectionImages {
     _sectionImages = sectionImages;
 
     [self setNeedsLayout];
@@ -695,7 +695,7 @@ - (void)willMoveToSuperview:(UIView *)newSuperview {
 
 #pragma mark - Touch
 
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     UITouch *touch = [touches anyObject];
     CGPoint touchLocation = [touch locationInView:self];
 

HMSegmentedControlExample/ViewController.m

@@ -54,12 +54,12 @@ - (void)viewDidLoad {
 
 
     // Segmented control with images
-    NSArray *images = @[[UIImage imageNamed:@"1"],
+    NSArray<UIImage *> *images = @[[UIImage imageNamed:@"1"],
                         [UIImage imageNamed:@"2"],
                         [UIImage imageNamed:@"3"],
                         [UIImage imageNamed:@"4"]];
 
-    NSArray *selectedImages = @[[UIImage imageNamed:@"1-selected"],
+    NSArray<UIImage *> *selectedImages = @[[UIImage imageNamed:@"1-selected"],
                                 [UIImage imageNamed:@"2-selected"],
                                 [UIImage imageNamed:@"3-selected"],
                                 [UIImage imageNamed:@"4-selected"]];