Skip to content

Fixed warnings from iOS7 & 8 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed warnings from iOS7 & 8 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e68e146
Fixed changing page via. tap
augard Mar 5, 2014
2d97b30
Fixed compiler warnings
augard Mar 5, 2014
2cc2c7f
Fixed warnings for iOS 7/8
augard Aug 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion StyledPageControlDemo/PageControlDemo/StyledPageControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
33 changes: 13 additions & 20 deletions StyledPageControlDemo/PageControlDemo/StyledPageControl.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

}
Expand All @@ -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];
Expand Down Expand Up @@ -276,8 +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]);
[pageNumber drawInRect:CGRectMake(x,(self.frame.size.height-_currentPageDiameter)/2-1,_currentPageDiameter,_currentPageDiameter) withFont:[UIFont systemFontOfSize:_currentPageDiameter-2] lineBreakMode:UILineBreakModeCharacterWrap alignment:UITextAlignmentCenter];

NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
[paragraphStyle setLineBreakMode:NSLineBreakByCharWrapping];
[paragraphStyle setAlignment:NSTextAlignmentCenter];

[pageNumber drawInRect:CGRectMake(x,(self.frame.size.height-_currentPageDiameter)/2-1,_currentPageDiameter,_currentPageDiameter)
withAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:_currentPageDiameter-2],
NSParagraphStyleAttributeName: paragraphStyle,
NSForegroundColorAttributeName: [UIColor whiteColor]}];
}
else
{
Expand Down Expand Up @@ -340,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];
Expand Down