diff --git a/FSPageViewExample-Swift/FSPagerViewExample.xcodeproj/project.pbxproj b/FSPageViewExample-Swift/FSPagerViewExample.xcodeproj/project.pbxproj index 80af4f5..018ccd4 100644 --- a/FSPageViewExample-Swift/FSPagerViewExample.xcodeproj/project.pbxproj +++ b/FSPageViewExample-Swift/FSPagerViewExample.xcodeproj/project.pbxproj @@ -24,20 +24,12 @@ F9C694361E40C583007084B6 /* TransformerExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9C6942E1E40C583007084B6 /* TransformerExampleViewController.swift */; }; F9C6945A1E40C720007084B6 /* FSPagerViewExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9C694591E40C720007084B6 /* FSPagerViewExampleUITests.swift */; }; F9C694711E40C8DA007084B6 /* 1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694621E40C8DA007084B6 /* 1.jpg */; }; - F9C694721E40C8DA007084B6 /* 1_1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694631E40C8DA007084B6 /* 1_1.jpg */; }; - F9C694731E40C8DA007084B6 /* 1_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694641E40C8DA007084B6 /* 1_2.jpg */; }; - F9C694741E40C8DA007084B6 /* 1_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694651E40C8DA007084B6 /* 1_3.jpg */; }; - F9C694751E40C8DA007084B6 /* 1_4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694661E40C8DA007084B6 /* 1_4.jpg */; }; - F9C694761E40C8DA007084B6 /* 1_5.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694671E40C8DA007084B6 /* 1_5.jpg */; }; - F9C694771E40C8DA007084B6 /* 1_6.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694681E40C8DA007084B6 /* 1_6.jpg */; }; - F9C694781E40C8DA007084B6 /* 1_7.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694691E40C8DA007084B6 /* 1_7.jpg */; }; F9C694791E40C8DA007084B6 /* 2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C6946A1E40C8DA007084B6 /* 2.jpg */; }; F9C6947A1E40C8DA007084B6 /* 3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C6946B1E40C8DA007084B6 /* 3.jpg */; }; F9C6947B1E40C8DA007084B6 /* 4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C6946C1E40C8DA007084B6 /* 4.jpg */; }; F9C6947C1E40C8DA007084B6 /* 5.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C6946D1E40C8DA007084B6 /* 5.jpg */; }; F9C6947D1E40C8DA007084B6 /* 6.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C6946E1E40C8DA007084B6 /* 6.jpg */; }; F9C6947E1E40C8DA007084B6 /* 7.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C6946F1E40C8DA007084B6 /* 7.jpg */; }; - F9C6947F1E40C8DA007084B6 /* background.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9C694701E40C8DA007084B6 /* background.jpg */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -71,20 +63,12 @@ F9C694591E40C720007084B6 /* FSPagerViewExampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FSPagerViewExampleUITests.swift; sourceTree = ""; }; F9C6945B1E40C720007084B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F9C694621E40C8DA007084B6 /* 1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1.jpg; sourceTree = ""; }; - F9C694631E40C8DA007084B6 /* 1_1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_1.jpg; sourceTree = ""; }; - F9C694641E40C8DA007084B6 /* 1_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_2.jpg; sourceTree = ""; }; - F9C694651E40C8DA007084B6 /* 1_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_3.jpg; sourceTree = ""; }; - F9C694661E40C8DA007084B6 /* 1_4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_4.jpg; sourceTree = ""; }; - F9C694671E40C8DA007084B6 /* 1_5.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_5.jpg; sourceTree = ""; }; - F9C694681E40C8DA007084B6 /* 1_6.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_6.jpg; sourceTree = ""; }; - F9C694691E40C8DA007084B6 /* 1_7.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_7.jpg; sourceTree = ""; }; F9C6946A1E40C8DA007084B6 /* 2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 2.jpg; sourceTree = ""; }; F9C6946B1E40C8DA007084B6 /* 3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 3.jpg; sourceTree = ""; }; F9C6946C1E40C8DA007084B6 /* 4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 4.jpg; sourceTree = ""; }; F9C6946D1E40C8DA007084B6 /* 5.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 5.jpg; sourceTree = ""; }; F9C6946E1E40C8DA007084B6 /* 6.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 6.jpg; sourceTree = ""; }; F9C6946F1E40C8DA007084B6 /* 7.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 7.jpg; sourceTree = ""; }; - F9C694701E40C8DA007084B6 /* background.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = background.jpg; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -184,20 +168,12 @@ isa = PBXGroup; children = ( F9C694621E40C8DA007084B6 /* 1.jpg */, - F9C694631E40C8DA007084B6 /* 1_1.jpg */, - F9C694641E40C8DA007084B6 /* 1_2.jpg */, - F9C694651E40C8DA007084B6 /* 1_3.jpg */, - F9C694661E40C8DA007084B6 /* 1_4.jpg */, - F9C694671E40C8DA007084B6 /* 1_5.jpg */, - F9C694681E40C8DA007084B6 /* 1_6.jpg */, - F9C694691E40C8DA007084B6 /* 1_7.jpg */, F9C6946A1E40C8DA007084B6 /* 2.jpg */, F9C6946B1E40C8DA007084B6 /* 3.jpg */, F9C6946C1E40C8DA007084B6 /* 4.jpg */, F9C6946D1E40C8DA007084B6 /* 5.jpg */, F9C6946E1E40C8DA007084B6 /* 6.jpg */, F9C6946F1E40C8DA007084B6 /* 7.jpg */, - F9C694701E40C8DA007084B6 /* background.jpg */, ); name = Resources; path = ../../Resources; @@ -288,24 +264,16 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - F9C694751E40C8DA007084B6 /* 1_4.jpg in Resources */, F9C694321E40C583007084B6 /* Main.storyboard in Resources */, - F9C694741E40C8DA007084B6 /* 1_3.jpg in Resources */, F9C6947B1E40C8DA007084B6 /* 4.jpg in Resources */, - F9C694731E40C8DA007084B6 /* 1_2.jpg in Resources */, F9C694301E40C583007084B6 /* Assets.xcassets in Resources */, F9C6947A1E40C8DA007084B6 /* 3.jpg in Resources */, - F9C694721E40C8DA007084B6 /* 1_1.jpg in Resources */, F9C6947D1E40C8DA007084B6 /* 6.jpg in Resources */, F9C6947C1E40C8DA007084B6 /* 5.jpg in Resources */, - F9C694761E40C8DA007084B6 /* 1_5.jpg in Resources */, F9C694311E40C583007084B6 /* LaunchScreen.storyboard in Resources */, F9C694791E40C8DA007084B6 /* 2.jpg in Resources */, - F9C694781E40C8DA007084B6 /* 1_7.jpg in Resources */, F9C6947E1E40C8DA007084B6 /* 7.jpg in Resources */, F9C694711E40C8DA007084B6 /* 1.jpg in Resources */, - F9C6947F1E40C8DA007084B6 /* background.jpg in Resources */, - F9C694771E40C8DA007084B6 /* 1_6.jpg in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/FSPageViewExample-Swift/FSPagerViewExample/BasicExampleViewController.swift b/FSPageViewExample-Swift/FSPagerViewExample/BasicExampleViewController.swift index 753326e..828d514 100644 --- a/FSPageViewExample-Swift/FSPagerViewExample/BasicExampleViewController.swift +++ b/FSPageViewExample-Swift/FSPagerViewExample/BasicExampleViewController.swift @@ -137,6 +137,8 @@ class BasicExampleViewController: UIViewController,UITableViewDataSource,UITable 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 + cell.imageView?.clipsToBounds = true cell.textLabel?.text = index.description+index.description return cell } diff --git a/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift b/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift index f35b787..195b92e 100644 --- a/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift +++ b/FSPageViewExample-Swift/FSPagerViewExample/PageControlExampleViewController.swift @@ -10,7 +10,7 @@ import UIKit class PageControlExampleViewController: UIViewController,UITableViewDataSource,UITableViewDelegate,FSPagerViewDataSource,FSPagerViewDelegate { - fileprivate let imageNames = ["1_1.jpg","1_2.jpg","1_3.jpg","1_4.jpg","1_5.jpg","1_6.jpg","1_7.jpg"] + fileprivate let imageNames = ["1.jpg","2.jpg","3.jpg","4.jpg","5.jpg","6.jpg","7.jpg"] fileprivate let pageControlStyles = ["Default", "Ring", "UIImage", "UIBezierPath - Star", "UIBezierPath - Heart"] fileprivate let pageControlAlignments = ["Right", "Center", "Left"] fileprivate let sectionTitles = ["Style", "Item Spacing", "Interitem Spacing", "Horizontal Alignment"] diff --git a/FSPageViewExample-Swift/FSPagerViewExample/TransformerExampleViewController.swift b/FSPageViewExample-Swift/FSPagerViewExample/TransformerExampleViewController.swift index 5c05624..c66ae0c 100644 --- a/FSPageViewExample-Swift/FSPagerViewExample/TransformerExampleViewController.swift +++ b/FSPageViewExample-Swift/FSPagerViewExample/TransformerExampleViewController.swift @@ -10,7 +10,7 @@ import UIKit class TransformerExampleViewController: UIViewController,FSPagerViewDataSource,FSPagerViewDelegate, UITableViewDataSource,UITableViewDelegate { - fileprivate let imageNames = ["1_1.jpg","1_2.jpg","1_3.jpg","1_4.jpg","1_5.jpg","1_6.jpg","1_7.jpg"] + fileprivate let imageNames = ["1.jpg","2.jpg","3.jpg","4.jpg","5.jpg","6.jpg","7.jpg"] fileprivate let transformerNames = ["cross fading", "zoom out", "depth", "linear", "overlap", "ferris wheel", "inverted ferris wheel", "coverflow"] fileprivate let transformerTypes: [FSPagerViewTransformerType] = [.crossFading, .zoomOut, diff --git a/FSPagerViewExample-Objc/FSPagerViewExample-Objc.xcodeproj/project.pbxproj b/FSPagerViewExample-Objc/FSPagerViewExample-Objc.xcodeproj/project.pbxproj index 98c1418..fddf1eb 100644 --- a/FSPagerViewExample-Objc/FSPagerViewExample-Objc.xcodeproj/project.pbxproj +++ b/FSPagerViewExample-Objc/FSPagerViewExample-Objc.xcodeproj/project.pbxproj @@ -8,20 +8,13 @@ /* Begin PBXBuildFile section */ F908BC411E35AAE4002B2F51 /* 1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC321E35AAE4002B2F51 /* 1.jpg */; }; - F908BC421E35AAE4002B2F51 /* 1_1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC331E35AAE4002B2F51 /* 1_1.jpg */; }; - F908BC431E35AAE4002B2F51 /* 1_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC341E35AAE4002B2F51 /* 1_2.jpg */; }; - F908BC441E35AAE4002B2F51 /* 1_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC351E35AAE4002B2F51 /* 1_3.jpg */; }; - F908BC451E35AAE4002B2F51 /* 1_4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC361E35AAE4002B2F51 /* 1_4.jpg */; }; - F908BC461E35AAE4002B2F51 /* 1_5.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC371E35AAE4002B2F51 /* 1_5.jpg */; }; - F908BC471E35AAE4002B2F51 /* 1_6.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC381E35AAE4002B2F51 /* 1_6.jpg */; }; - F908BC481E35AAE4002B2F51 /* 1_7.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC391E35AAE4002B2F51 /* 1_7.jpg */; }; F908BC491E35AAE4002B2F51 /* 2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC3A1E35AAE4002B2F51 /* 2.jpg */; }; F908BC4A1E35AAE4002B2F51 /* 3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC3B1E35AAE4002B2F51 /* 3.jpg */; }; F908BC4B1E35AAE4002B2F51 /* 4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC3C1E35AAE4002B2F51 /* 4.jpg */; }; F908BC4C1E35AAE4002B2F51 /* 5.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC3D1E35AAE4002B2F51 /* 5.jpg */; }; F908BC4D1E35AAE4002B2F51 /* 6.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC3E1E35AAE4002B2F51 /* 6.jpg */; }; F908BC4E1E35AAE4002B2F51 /* 7.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC3F1E35AAE4002B2F51 /* 7.jpg */; }; - F908BC4F1E35AAE4002B2F51 /* background.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F908BC401E35AAE4002B2F51 /* background.jpg */; }; + F908F18D1E6EB621003F8440 /* FSPagerViewLayoutAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = F908F18C1E6EB621003F8440 /* FSPagerViewLayoutAttributes.swift */; }; F93F5E141E319AE8006B7082 /* PageControlExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F93F5E131E319AE8006B7082 /* PageControlExampleViewController.m */; }; F9580B641E5D997200C5B267 /* FSPageControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9580B5E1E5D997200C5B267 /* FSPageControl.swift */; }; F9580B651E5D997200C5B267 /* FSPagerCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9580B5F1E5D997200C5B267 /* FSPagerCollectionView.swift */; }; @@ -51,20 +44,13 @@ /* Begin PBXFileReference section */ F908BC321E35AAE4002B2F51 /* 1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1.jpg; sourceTree = ""; }; - F908BC331E35AAE4002B2F51 /* 1_1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_1.jpg; sourceTree = ""; }; - F908BC341E35AAE4002B2F51 /* 1_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_2.jpg; sourceTree = ""; }; - F908BC351E35AAE4002B2F51 /* 1_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_3.jpg; sourceTree = ""; }; - F908BC361E35AAE4002B2F51 /* 1_4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_4.jpg; sourceTree = ""; }; - F908BC371E35AAE4002B2F51 /* 1_5.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_5.jpg; sourceTree = ""; }; - F908BC381E35AAE4002B2F51 /* 1_6.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_6.jpg; sourceTree = ""; }; - F908BC391E35AAE4002B2F51 /* 1_7.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1_7.jpg; sourceTree = ""; }; F908BC3A1E35AAE4002B2F51 /* 2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 2.jpg; sourceTree = ""; }; F908BC3B1E35AAE4002B2F51 /* 3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 3.jpg; sourceTree = ""; }; F908BC3C1E35AAE4002B2F51 /* 4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 4.jpg; sourceTree = ""; }; F908BC3D1E35AAE4002B2F51 /* 5.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 5.jpg; sourceTree = ""; }; F908BC3E1E35AAE4002B2F51 /* 6.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 6.jpg; sourceTree = ""; }; F908BC3F1E35AAE4002B2F51 /* 7.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 7.jpg; sourceTree = ""; }; - F908BC401E35AAE4002B2F51 /* background.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = background.jpg; sourceTree = ""; }; + F908F18C1E6EB621003F8440 /* FSPagerViewLayoutAttributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FSPagerViewLayoutAttributes.swift; sourceTree = ""; }; F93F5E121E319AE8006B7082 /* PageControlExampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageControlExampleViewController.h; sourceTree = ""; }; F93F5E131E319AE8006B7082 /* PageControlExampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PageControlExampleViewController.m; sourceTree = ""; }; F9580B5E1E5D997200C5B267 /* FSPageControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FSPageControl.swift; sourceTree = ""; }; @@ -112,20 +98,12 @@ isa = PBXGroup; children = ( F908BC321E35AAE4002B2F51 /* 1.jpg */, - F908BC331E35AAE4002B2F51 /* 1_1.jpg */, - F908BC341E35AAE4002B2F51 /* 1_2.jpg */, - F908BC351E35AAE4002B2F51 /* 1_3.jpg */, - F908BC361E35AAE4002B2F51 /* 1_4.jpg */, - F908BC371E35AAE4002B2F51 /* 1_5.jpg */, - F908BC381E35AAE4002B2F51 /* 1_6.jpg */, - F908BC391E35AAE4002B2F51 /* 1_7.jpg */, F908BC3A1E35AAE4002B2F51 /* 2.jpg */, F908BC3B1E35AAE4002B2F51 /* 3.jpg */, F908BC3C1E35AAE4002B2F51 /* 4.jpg */, F908BC3D1E35AAE4002B2F51 /* 5.jpg */, F908BC3E1E35AAE4002B2F51 /* 6.jpg */, F908BC3F1E35AAE4002B2F51 /* 7.jpg */, - F908BC401E35AAE4002B2F51 /* background.jpg */, ); name = Resources; path = ../../Resources; @@ -140,6 +118,7 @@ F9580B611E5D997200C5B267 /* FSPagerViewCell.swift */, F9580B621E5D997200C5B267 /* FSPageViewLayout.swift */, F9580B631E5D997200C5B267 /* FSPageViewTransformer.swift */, + F908F18C1E6EB621003F8440 /* FSPagerViewLayoutAttributes.swift */, ); name = Sources; path = ../Sources; @@ -318,21 +297,13 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - F908BC441E35AAE4002B2F51 /* 1_3.jpg in Resources */, - F908BC481E35AAE4002B2F51 /* 1_7.jpg in Resources */, - F908BC431E35AAE4002B2F51 /* 1_2.jpg in Resources */, - F908BC451E35AAE4002B2F51 /* 1_4.jpg in Resources */, F908BC4A1E35AAE4002B2F51 /* 3.jpg in Resources */, - F908BC461E35AAE4002B2F51 /* 1_5.jpg in Resources */, F908BC4C1E35AAE4002B2F51 /* 5.jpg in Resources */, F9EC372C1E304A830022B6D6 /* LaunchScreen.storyboard in Resources */, F908BC491E35AAE4002B2F51 /* 2.jpg in Resources */, - F908BC4F1E35AAE4002B2F51 /* background.jpg in Resources */, F908BC4B1E35AAE4002B2F51 /* 4.jpg in Resources */, F908BC4E1E35AAE4002B2F51 /* 7.jpg in Resources */, F908BC4D1E35AAE4002B2F51 /* 6.jpg in Resources */, - F908BC421E35AAE4002B2F51 /* 1_1.jpg in Resources */, - F908BC471E35AAE4002B2F51 /* 1_6.jpg in Resources */, F908BC411E35AAE4002B2F51 /* 1.jpg in Resources */, F9EC37291E304A830022B6D6 /* Assets.xcassets in Resources */, F9EC37271E304A830022B6D6 /* Main.storyboard in Resources */, @@ -358,6 +329,7 @@ F9580B641E5D997200C5B267 /* FSPageControl.swift in Sources */, F9580B681E5D997200C5B267 /* FSPageViewLayout.swift in Sources */, F9EC37211E304A830022B6D6 /* AppDelegate.m in Sources */, + F908F18D1E6EB621003F8440 /* FSPagerViewLayoutAttributes.swift in Sources */, F9580B651E5D997200C5B267 /* FSPagerCollectionView.swift in Sources */, F9580B691E5D997200C5B267 /* FSPageViewTransformer.swift in Sources */, F9F00A901E310FF600790735 /* TransformerExampleViewController.m in Sources */, diff --git a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/BasicExampleViewController.m b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/BasicExampleViewController.m index 4af723f..18c6bbe 100644 --- a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/BasicExampleViewController.m +++ b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/BasicExampleViewController.m @@ -153,6 +153,8 @@ { FSPagerViewCell *cell = [pagerView dequeueReusableCellWithReuseIdentifier:@"cell" atIndex:index]; cell.imageView.image = [UIImage imageNamed:self.imageNames[index]]; + cell.imageView.contentMode = UIViewContentModeScaleAspectFill; + cell.imageView.clipsToBounds = YES; cell.textLabel.text = [NSString stringWithFormat:@"%@%@",@(index),@(index)]; return cell; } diff --git a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m index 271b3a5..4328277 100644 --- a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m +++ b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/PageControlExampleViewController.m @@ -39,7 +39,7 @@ - (void)viewDidLoad { [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.imageNames = @[@"1.jpg", @"2.jpg", @"3.jpg", @"4.jpg", @"5.jpg", @"6.jpg", @"7.jpg"]; self.pageControlStyles = @[@"Default", @"Ring", @"UIImage", @"UIBezierPath - Star", @"UIBezierPath - Heart"]; self.pageControlAlignments = @[@"Right", @"Center", @"Left"]; self.sectionTitles = @[@"Style", @"Item Spacing", @"Interitem Spacing", @"Horizontal Alignment"]; diff --git a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m index a54dce3..e483fac 100644 --- a/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m +++ b/FSPagerViewExample-Objc/FSPagerViewExample-Objc/TransformerExampleViewController.m @@ -27,9 +27,11 @@ - (void)viewDidLoad { [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.imageNames = @[@"1.jpg", @"2.jpg", @"3.jpg", @"4.jpg", @"5.jpg", @"6.jpg", @"7.jpg"]; self.transformerNames = @[@"cross fading", @"zoom out", @"depth", @"linear", @"overlap", @"ferris wheel", @"inverted ferris wheel", @"coverflow"]; + [self.pagerView registerClass:[FSPagerViewCell class] forCellWithReuseIdentifier:@"cell"]; + self.pagerView.isInfinite = YES; self.typeIndex = 0; } diff --git a/Resources/1.jpg b/Resources/1.jpg index 1c4c56c..02e0d94 100644 Binary files a/Resources/1.jpg and b/Resources/1.jpg differ diff --git a/Resources/1_1.jpg b/Resources/1_1.jpg deleted file mode 100644 index 0fd3ef6..0000000 Binary files a/Resources/1_1.jpg and /dev/null differ diff --git a/Resources/1_2.jpg b/Resources/1_2.jpg deleted file mode 100644 index 9c2e3a7..0000000 Binary files a/Resources/1_2.jpg and /dev/null differ diff --git a/Resources/1_3.jpg b/Resources/1_3.jpg deleted file mode 100644 index 63de204..0000000 Binary files a/Resources/1_3.jpg and /dev/null differ diff --git a/Resources/1_4.jpg b/Resources/1_4.jpg deleted file mode 100644 index 49ef488..0000000 Binary files a/Resources/1_4.jpg and /dev/null differ diff --git a/Resources/1_5.jpg b/Resources/1_5.jpg deleted file mode 100644 index 02e0d94..0000000 Binary files a/Resources/1_5.jpg and /dev/null differ diff --git a/Resources/1_6.jpg b/Resources/1_6.jpg deleted file mode 100644 index 84df575..0000000 Binary files a/Resources/1_6.jpg and /dev/null differ diff --git a/Resources/1_7.jpg b/Resources/1_7.jpg deleted file mode 100644 index 48bcaff..0000000 Binary files a/Resources/1_7.jpg and /dev/null differ diff --git a/Resources/3.jpg b/Resources/3.jpg index 50fca81..63de204 100644 Binary files a/Resources/3.jpg and b/Resources/3.jpg differ diff --git a/Resources/5.jpg b/Resources/5.jpg index e4b3c2d..49ef488 100644 Binary files a/Resources/5.jpg and b/Resources/5.jpg differ diff --git a/Resources/background.jpg b/Resources/background.jpg deleted file mode 100644 index 740f0b3..0000000 Binary files a/Resources/background.jpg and /dev/null differ