diff --git a/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift b/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift index f35b787..1f8f4b4 100644 --- a/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift +++ b/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift @@ -217,6 +217,7 @@ class PageControlExampleViewController: UIViewController,UITableViewDataSource,U public func pagerView(_ pagerView: FSPagerView, cellForItemAt index: Int) -> FSPagerViewCell { let cell = pagerView.dequeueReusableCell(withReuseIdentifier: "cell", at: index) cell.imageView?.image = UIImage(named: self.imageNames[index]) + cell.imageView?.contentMode = .scaleAspectFill return cell } diff --git a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m index 271b3a5..44543ab 100644 --- a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m +++ b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m @@ -152,6 +152,7 @@ - (FSPagerViewCell *)pagerView:(FSPagerView *)pagerView cellForItemAtIndex:(NSInteger)index { FSPagerViewCell *cell = [pagerView dequeueReusableCellWithReuseIdentifier:@"cell" atIndex:index]; + cell.imageView.contentMode = UIViewContentModeScaleAspectFill; cell.imageView.image = [UIImage imageNamed:self.imageNames[index]]; return cell; } diff --git a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m index a54dce3..23d017d 100644 --- a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m +++ b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m @@ -28,7 +28,7 @@ { [super viewDidLoad]; self.imageNames = @[@"1_1.jpg",@"1_2.jpg",@"1_3.jpg",@"1_4.jpg",@"1_5.jpg",@"1_6.jpg",@"1_7.jpg"]; - self.transformerNames = @[@"cross fading", @"zoom out", @"depth", @"linear", @"overlap", @"ferris wheel", @"inverted ferris wheel", @"coverflow"]; + self.transformerNames = @[@"cross fading", @"zoom out", @"depth", @"linear", @"overlap", @"ferris wheel", @"inverted ferris wheel", @"coverflow", @"cubic"]; [self.pagerView registerClass:[FSPagerViewCell class] forCellWithReuseIdentifier:@"cell"]; self.typeIndex = 0; } @@ -134,6 +134,10 @@ type = FSPagerViewTransformerTypeCoverFlow; break; } + case 8: { + type = FSPagerViewTransformerTypeCubic; + break; + } default: break; } @@ -160,6 +164,11 @@ self.pagerView.itemSize = CGSizeMake(220, 170); break; } + case FSPagerViewTransformerTypeCubic: { + CGAffineTransform transform = CGAffineTransformMakeScale(0.9, 0.9); + self.pagerView.itemSize = CGSizeApplyAffineTransform(self.pagerView.frame.size, transform); + break; + } default: break; } diff --git a/README-OBJECTIVE-C.md b/README-OBJECTIVE-C.md index 41460a9..df1b571 100644 --- a/README-OBJECTIVE-C.md +++ b/README-OBJECTIVE-C.md @@ -145,6 +145,14 @@ pagerView.transformer = [[FSPagerViewTransformer alloc] initWithType:FSPagerView ``` --- +|Cubic| +|------| +| ![9](https://cloud.githubusercontent.com/assets/5186464/23461598/8875080c-fec5-11e6-8db6-6d8864acfcc1.gif) | +```swift +pagerView.transformer = [[FSPagerViewTransformer alloc] initWithType:FSPagerViewTransformerTypeCubic]; +``` +--- + > Customize your own transformer by subclassing`FSPagerViewTransformer.` diff --git a/README.md b/README.md index 9eae526..87e6624 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,15 @@ pagerView.transformer = FSPagerViewTransformer(type: .coverFlow) ``` --- +|Cubic| +|------| +| ![9](https://cloud.githubusercontent.com/assets/5186464/23461598/8875080c-fec5-11e6-8db6-6d8864acfcc1.gif) | +```swift +pagerView.transformer = FSPagerViewTransformer(type: .cubic) +``` +--- + + > Customize your own transformer by subclassing`FSPagerViewTransformer.` diff --git a/Sources/FSPagerViewCell.swift b/Sources/FSPagerViewCell.swift index d331786..946eee2 100644 --- a/Sources/FSPagerViewCell.swift +++ b/Sources/FSPagerViewCell.swift @@ -42,8 +42,8 @@ open class FSPagerViewCell: UICollectionViewCell { return imageView } - internal weak var _textLabel: UILabel? - internal weak var _imageView: UIImageView? + fileprivate weak var _textLabel: UILabel? + fileprivate weak var _imageView: UIImageView? fileprivate let kvoContext = UnsafeMutableRawPointer(bitPattern: 0) fileprivate let selectionColor = UIColor(white: 0.2, alpha: 0.2)