From e68e1463fc02d99f9ab74109b7ace60961ad2097 Mon Sep 17 00:00:00 2001
From: Lukas Foldyna <lukas.foldyna@arat.cz>
Date: Wed, 5 Mar 2014 16:56:00 +0100
Subject: [PATCH 1/3] Fixed changing page via. tap

---
 .../PageControlDemo/StyledPageControl.m        | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/StyledPageControlDemo/PageControlDemo/StyledPageControl.m b/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
index f83af7c..deb9c52 100644
--- a/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
+++ b/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
@@ -79,14 +79,7 @@ - (void)onTapped:(UITapGestureRecognizer*)gesture
         // move left
         if (self.currentPage>0)
         {
-            if (touchPoint.x <= 22)
-            {
-                self.currentPage = 0;
-            }
-            else
-            {
-                self.currentPage -= 1;
-            }
+            self.currentPage -= 1;
         }
         
     }
@@ -95,14 +88,7 @@ - (void)onTapped:(UITapGestureRecognizer*)gesture
         // move right
         if (self.currentPage<self.numberOfPages-1)
         {
-            if (touchPoint.x >= (CGRectGetWidth(self.bounds) - 22))
-            {
-                self.currentPage = self.numberOfPages-1;
-            }
-            else
-            {
-                self.currentPage += 1;
-            }
+            self.currentPage += 1;
         }
     }
     [self setNeedsDisplay];

From 2d97b3056234bb314ab728b8eb18389fb9c49ef9 Mon Sep 17 00:00:00 2001
From: Lukas Foldyna <lukas.foldyna@arat.cz>
Date: Wed, 5 Mar 2014 17:01:50 +0100
Subject: [PATCH 2/3] Fixed compiler warnings

---
 StyledPageControlDemo/PageControlDemo/StyledPageControl.m | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/StyledPageControlDemo/PageControlDemo/StyledPageControl.m b/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
index deb9c52..326fc0b 100644
--- a/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
+++ b/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
@@ -263,7 +263,10 @@ - (void)drawRect:(CGRect)rect
             
                 NSString *pageNumber = [NSString stringWithFormat:@"%i", i+1];
                 CGContextSetFillColorWithColor(myContext, [[UIColor whiteColor] CGColor]);
-                [pageNumber drawInRect:CGRectMake(x,(self.frame.size.height-_currentPageDiameter)/2-1,_currentPageDiameter,_currentPageDiameter) withFont:[UIFont systemFontOfSize:_currentPageDiameter-2] lineBreakMode:UILineBreakModeCharacterWrap alignment:UITextAlignmentCenter];
+                [pageNumber drawInRect:CGRectMake(x,(self.frame.size.height-_currentPageDiameter)/2-1,_currentPageDiameter,_currentPageDiameter)
+                              withFont:[UIFont systemFontOfSize:_currentPageDiameter-2]
+                         lineBreakMode:NSLineBreakByCharWrapping
+                             alignment:NSTextAlignmentCenter];
             }
             else
             {

From 2cc2c7f8fede66c089442428fcec647efc88b1fc Mon Sep 17 00:00:00 2001
From: Lukas Foldyna <lukas.foldyna@arat.cz>
Date: Fri, 15 Aug 2014 16:32:36 +0200
Subject: [PATCH 3/3] Fixed warnings for iOS 7/8

---
 .../PageControlDemo/StyledPageControl.h          |  2 +-
 .../PageControlDemo/StyledPageControl.m          | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/StyledPageControlDemo/PageControlDemo/StyledPageControl.h b/StyledPageControlDemo/PageControlDemo/StyledPageControl.h
index 084ee9c..507e7f4 100644
--- a/StyledPageControlDemo/PageControlDemo/StyledPageControl.h
+++ b/StyledPageControlDemo/PageControlDemo/StyledPageControl.h
@@ -49,7 +49,7 @@ typedef enum
 @interface StyledPageControl : UIControl
 @property (nonatomic) UIColor *coreNormalColor, *coreSelectedColor;
 @property (nonatomic) UIColor *strokeNormalColor, *strokeSelectedColor;
-@property (nonatomic, assign) int currentPage, numberOfPages;
+@property (nonatomic, assign) NSInteger currentPage, numberOfPages;
 @property (nonatomic, assign) BOOL hidesForSinglePage;
 @property (nonatomic, assign) PageControlStyle pageControlStyle;
 @property (nonatomic, assign) int strokeWidth, diameter, gapWidth;
diff --git a/StyledPageControlDemo/PageControlDemo/StyledPageControl.m b/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
index 326fc0b..fcbdf81 100644
--- a/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
+++ b/StyledPageControlDemo/PageControlDemo/StyledPageControl.m
@@ -262,11 +262,15 @@ - (void)drawRect:(CGRect)rect
                 CGContextStrokeEllipseInRect(myContext, CGRectMake(x,(self.frame.size.height-_currentPageDiameter)/2,_currentPageDiameter,_currentPageDiameter));
             
                 NSString *pageNumber = [NSString stringWithFormat:@"%i", i+1];
-                CGContextSetFillColorWithColor(myContext, [[UIColor whiteColor] CGColor]);
+
+                NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+                [paragraphStyle setLineBreakMode:NSLineBreakByCharWrapping];
+                [paragraphStyle setAlignment:NSTextAlignmentCenter];                
+
                 [pageNumber drawInRect:CGRectMake(x,(self.frame.size.height-_currentPageDiameter)/2-1,_currentPageDiameter,_currentPageDiameter)
-                              withFont:[UIFont systemFontOfSize:_currentPageDiameter-2]
-                         lineBreakMode:NSLineBreakByCharWrapping
-                             alignment:NSTextAlignmentCenter];
+                        withAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:_currentPageDiameter-2],
+                                         NSParagraphStyleAttributeName: paragraphStyle,
+                                         NSForegroundColorAttributeName: [UIColor whiteColor]}];
             }
             else
             {
@@ -329,13 +333,13 @@ - (void)setPageControlStyle:(PageControlStyle)style
     [self setNeedsDisplay];
 }
 
-- (void)setCurrentPage:(int)page
+- (void)setCurrentPage:(NSInteger)page
 {
     _currentPage = page;
     [self setNeedsDisplay];
 }
 
-- (void)setNumberOfPages:(int)numOfPages
+- (void)setNumberOfPages:(NSInteger)numOfPages
 {
     _numberOfPages = numOfPages;
     [self setNeedsDisplay];