Skip to content

Added flag to init #4

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
Briahas wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added flag to init #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dec867e
ADDED width counting flag
NixDeveloper Oct 29, 2018
ca8025b
FIX typo
NixDeveloper Oct 29, 2018
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 DSCircularCollectionView/Classes/DSCircularLayout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

@property (nonatomic, assign) BOOL rotateItems;

-(void)initWithCentre:(CGPoint)centre radius:(CGFloat)radius itemSize:(CGSize)itemSize andAngularSpacing:(CGFloat)angularSpacing;
-(void)initWithCentre:(CGPoint)centre radius:(CGFloat)radius itemSize:(CGSize)itemSize andAngularSpacing:(CGFloat)angularSpacing isCountingWidth:(BOOL)isCountingWidth;
Copy link
Copy Markdown
Owner

@DoddaSrinivasan DoddaSrinivasan Oct 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you leave the previous init as is and add this as another init so that the existing users can still be supported. Also, make sure you set isCountingWidth to NO in the older init implementation.


-(void)setStartAngle:(CGFloat)startAngle endAngle:(CGFloat)endAngle;

Expand Down
12 changes: 10 additions & 2 deletions DSCircularCollectionView/Classes/DSCircularLayout.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ @implementation DSCircularLayout{

CGFloat _startAngle;
CGFloat _endAngle;

BOOL _isCountingWidth;
}

- (id)init {
Expand All @@ -28,11 +30,12 @@ - (id)init {
return self;
}

-(void)initWithCentre:(CGPoint)centre radius:(CGFloat)radius itemSize:(CGSize)itemSize andAngularSpacing:(CGFloat)angularSpacing{
-(void)initWithCentre:(CGPoint)centre radius:(CGFloat)radius itemSize:(CGSize)itemSize andAngularSpacing:(CGFloat)angularSpacing isCountingWidth:(BOOL)isCountingWidth {
_centre = centre;
_radius = radius;
_itemSize = itemSize;
_angularSpacing = angularSpacing;
_isCountingWidth = isCountingWidth;
}

-(void)setStartAngle:(CGFloat)startAngle endAngle:(CGFloat)endAngle{
Expand All @@ -50,7 +53,12 @@ -(void)prepareLayout{
[super prepareLayout];
cellCount = [self.collectionView numberOfItemsInSection:0];
circumference = ABS(_startAngle - _endAngle)*_radius;
maxNoOfCellsInCircle = circumference/(MAX(_itemSize.width, _itemSize.height) + _angularSpacing/2);

if (_isCountingWidth) {
maxNoOfCellsInCircle = circumference/(MAX(_itemSize.width, _itemSize.height) + _angularSpacing/2);
} else {
maxNoOfCellsInCircle = circumference/(_itemSize.height + _angularSpacing/2);
}
angleOfEachItem = ABS(_startAngle - _endAngle)/maxNoOfCellsInCircle;
}

Expand Down