Small changed

1.3.1

Example/Example/MainViewController.swift

@@ -10,18 +10,30 @@ import UIKit
 import InfiniteCollectionView
 
 final class MainViewController: UIViewController {
-    var patterns = ["pattern1", "pattern2"]
-    let identifier = "tableViewCell"
-    var cellHeight: CGFloat {
-        return (UIScreen.main.bounds.height - 64) / CGFloat(patterns.count)
+    enum Pattern: Int, CustomStringConvertible {
+        case pattern1
+        case pattern2
+        static var count: Int { return 2 }
+        var description: String {
+            switch self {
+            case .pattern1: return "pattern1"
+            case .pattern2: return "pattern2"
+            }
+        }
+    }
+    fileprivate let identifier = "tableViewCell"
+    fileprivate var cellHeight: CGFloat {
+        return (UIScreen.main.bounds.height - 64) / CGFloat(Pattern.count)
     }
     @IBOutlet weak var tableView: UITableView! {
         didSet {
             tableView.delegate = self
             tableView.dataSource = self
-            tableView.register(UITableViewCell.self, forCellReuseIdentifier: identifier)
             tableView.rowHeight = cellHeight
             tableView.estimatedRowHeight = cellHeight
+            tableView.separatorInset = .zero
+            tableView.layoutMargins = .zero
+            tableView.register(UITableViewCell.self, forCellReuseIdentifier: identifier)
         }
     }
     override func viewWillAppear(_ animated: Bool) {
@@ -34,25 +46,25 @@ final class MainViewController: UIViewController {
 // MARK: - UITableViewDelegate, UITableViewDataSource
 extension MainViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return patterns.count
+        return Pattern.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: identifier)!
-        cell.textLabel?.text = patterns[indexPath.row]
+        let pattern = Pattern(rawValue: indexPath.row)
+        cell.textLabel?.text = pattern?.description
         cell.textLabel?.textAlignment = .center
         cell.textLabel?.font = UIFont.boldSystemFont(ofSize: 24)
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        switch indexPath.row {
-        case 0:
+        guard let pattern = Pattern(rawValue: indexPath.row) else { return }
+        switch pattern {
+        case .pattern1:
             let controller = Pattern1ViewController.createFromStoryboard()
             navigationController?.pushViewController(controller, animated: true)
-        case 1:
+        case .pattern2:
             let controller = Pattern2ViewController.createFromStoryboard()
             navigationController?.pushViewController(controller, animated: true)
-        default:
-            break
         }
     }
 }

InfiniteCollectionView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "InfiniteCollectionView"
-  s.version      = "1.2.1"
+  s.version      = "1.3.1"
   s.summary      = "Infinite Scrolling Using UICollectionView."
   s.homepage     = "https://github.com/hryk224/InfiniteCollectionView"
   s.screenshots  = "https://github.com/hryk224/InfiniteCollectionView/wiki/images/sample1.gif"
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.author             = { "hyyk224" => "hryk224@gmail.com" }
   s.platform     = :ios, "8.0"
   s.source       = { :git => "https://github.com/hryk224/InfiniteCollectionView.git", :tag => "#{s.version}" }
-  s.source_files  = "InfiniteCollectionView/*.{h,swift}"
+  s.source_files  = "Sources/*.{h,swift}"
   s.frameworks = "UIKit"
   s.requires_arc = true
 end

InfiniteCollectionView.xcodeproj/InfiniteCollectionViewTests_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

InfiniteCollectionView.xcodeproj/InfiniteCollectionView_Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

InfiniteCollectionView.xcodeproj/project.pbxproj

@@ -7,21 +7,20 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		935BD7281CE2702D00E5FDF7 /* InfiniteCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 935BD7261CE2702D00E5FDF7 /* InfiniteCollectionView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		935BD7291CE2702D00E5FDF7 /* InfiniteCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 935BD7271CE2702D00E5FDF7 /* InfiniteCollectionView.swift */; };
+		OBJ_22 /* InfiniteCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* InfiniteCollectionView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		935BD7001CE26F3B00E5FDF7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		935BD70D1CE26F8E00E5FDF7 /* InfiniteCollectionView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = InfiniteCollectionView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		935BD7261CE2702D00E5FDF7 /* InfiniteCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfiniteCollectionView.h; sourceTree = "<group>"; };
-		935BD7271CE2702D00E5FDF7 /* InfiniteCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InfiniteCollectionView.swift; sourceTree = "<group>"; };
+		93CB2E361E563B85000DC0C1 /* InfiniteCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfiniteCollectionView.h; sourceTree = "<group>"; };
+		OBJ_15 /* InfiniteCollectionView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = InfiniteCollectionView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
+		OBJ_9 /* InfiniteCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfiniteCollectionView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		935BD7091CE26F8E00E5FDF7 /* Frameworks */ = {
+		OBJ_23 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 0;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -29,54 +28,50 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		935BD6E81CE26F3B00E5FDF7 = {
+		OBJ_14 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				935BD6F31CE26F3B00E5FDF7 /* InfiniteCollectionView */,
-				935BD6F21CE26F3B00E5FDF7 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		935BD6F21CE26F3B00E5FDF7 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				935BD70D1CE26F8E00E5FDF7 /* InfiniteCollectionView.framework */,
+				OBJ_15 /* InfiniteCollectionView.framework */,
 			);
 			name = Products;
-			sourceTree = "<group>";
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		935BD6F31CE26F3B00E5FDF7 /* InfiniteCollectionView */ = {
+		OBJ_5 = {
 			isa = PBXGroup;
 			children = (
-				935BD7261CE2702D00E5FDF7 /* InfiniteCollectionView.h */,
-				935BD7271CE2702D00E5FDF7 /* InfiniteCollectionView.swift */,
-				935BD7001CE26F3B00E5FDF7 /* Info.plist */,
+				OBJ_6 /* Package.swift */,
+				OBJ_7 /* Sources */,
+				OBJ_14 /* Products */,
 			);
-			path = InfiniteCollectionView;
 			sourceTree = "<group>";
 		};
+		OBJ_7 /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				OBJ_8 /* InfiniteCollectionView */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		OBJ_8 /* InfiniteCollectionView */ = {
+			isa = PBXGroup;
+			children = (
+				OBJ_9 /* InfiniteCollectionView.swift */,
+				93CB2E361E563B85000DC0C1 /* InfiniteCollectionView.h */,
+			);
+			name = InfiniteCollectionView;
+			path = Sources;
+			sourceTree = SOURCE_ROOT;
+		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-		935BD70A1CE26F8E00E5FDF7 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				935BD7281CE2702D00E5FDF7 /* InfiniteCollectionView.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
-		935BD70C1CE26F8E00E5FDF7 /* InfiniteCollectionView */ = {
+		OBJ_17 /* InfiniteCollectionView */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 935BD7121CE26F8E00E5FDF7 /* Build configuration list for PBXNativeTarget "InfiniteCollectionView" */;
+			buildConfigurationList = OBJ_18 /* Build configuration list for PBXNativeTarget "InfiniteCollectionView" */;
 			buildPhases = (
-				935BD7081CE26F8E00E5FDF7 /* Sources */,
-				935BD7091CE26F8E00E5FDF7 /* Frameworks */,
-				935BD70A1CE26F8E00E5FDF7 /* Headers */,
-				935BD70B1CE26F8E00E5FDF7 /* Resources */,
+				OBJ_21 /* Sources */,
+				OBJ_23 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -84,222 +79,152 @@
 			);
 			name = InfiniteCollectionView;
 			productName = InfiniteCollectionView;
-			productReference = 935BD70D1CE26F8E00E5FDF7 /* InfiniteCollectionView.framework */;
+			productReference = OBJ_15 /* InfiniteCollectionView.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
-		935BD6E91CE26F3B00E5FDF7 /* Project object */ = {
+		OBJ_1 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
-				ORGANIZATIONNAME = "hiroyuki yoshida";
-				TargetAttributes = {
-					935BD70C1CE26F8E00E5FDF7 = {
-						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0800;
-					};
-				};
+				LastUpgradeCheck = 9999;
 			};
-			buildConfigurationList = 935BD6EC1CE26F3B00E5FDF7 /* Build configuration list for PBXProject "InfiniteCollectionView" */;
+			buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "InfiniteCollectionView" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
-				Base,
 			);
-			mainGroup = 935BD6E81CE26F3B00E5FDF7;
-			productRefGroup = 935BD6F21CE26F3B00E5FDF7 /* Products */;
+			mainGroup = OBJ_5;
+			productRefGroup = OBJ_14 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				935BD70C1CE26F8E00E5FDF7 /* InfiniteCollectionView */,
+				OBJ_17 /* InfiniteCollectionView */,
 			);
 		};
 /* End PBXProject section */
 
-/* Begin PBXResourcesBuildPhase section */
-		935BD70B1CE26F8E00E5FDF7 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
-		935BD7081CE26F8E00E5FDF7 /* Sources */ = {
+		OBJ_21 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 0;
 			files = (
-				935BD7291CE2702D00E5FDF7 /* InfiniteCollectionView.swift in Sources */,
+				OBJ_22 /* InfiniteCollectionView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
-		935BD7011CE26F3B00E5FDF7 /* Debug */ = {
+		OBJ_19 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
+				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
+					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
 				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				HEADER_SEARCH_PATHS = "$(inherited)";
+				INFOPLIST_FILE = InfiniteCollectionView.xcodeproj/InfiniteCollectionView_Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
+				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_SWIFT_FLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = InfiniteCollectionView;
+				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				TARGET_NAME = InfiniteCollectionView;
 			};
 			name = Debug;
 		};
-		935BD7021CE26F3B00E5FDF7 /* Release */ = {
+		OBJ_20 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				VALIDATE_PRODUCT = YES;
+				ENABLE_TESTABILITY = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
+				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
+				INFOPLIST_FILE = InfiniteCollectionView.xcodeproj/InfiniteCollectionView_Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
+				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_SWIFT_FLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = InfiniteCollectionView;
+				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				TARGET_NAME = InfiniteCollectionView;
 			};
 			name = Release;
 		};
-		935BD7131CE26F8E00E5FDF7 /* Debug */ = {
+		OBJ_3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = InfiniteCollectionView/Info.plist;
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = io.github.hryk224.InfiniteCollectionView;
+				ENABLE_NS_ASSERTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_SWIFT_FLAGS = "-DXcode";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
+				USE_HEADERMAP = NO;
 			};
 			name = Debug;
 		};
-		935BD7141CE26F8E00E5FDF7 /* Release */ = {
+		OBJ_4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = InfiniteCollectionView/Info.plist;
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = io.github.hryk224.InfiniteCollectionView;
+				GCC_OPTIMIZATION_LEVEL = s;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				OTHER_SWIFT_FLAGS = "-DXcode";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
+				USE_HEADERMAP = NO;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		935BD6EC1CE26F3B00E5FDF7 /* Build configuration list for PBXProject "InfiniteCollectionView" */ = {
+		OBJ_18 /* Build configuration list for PBXNativeTarget "InfiniteCollectionView" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				935BD7011CE26F3B00E5FDF7 /* Debug */,
-				935BD7021CE26F3B00E5FDF7 /* Release */,
+				OBJ_19 /* Debug */,
+				OBJ_20 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = Debug;
 		};
-		935BD7121CE26F8E00E5FDF7 /* Build configuration list for PBXNativeTarget "InfiniteCollectionView" */ = {
+		OBJ_2 /* Build configuration list for PBXProject "InfiniteCollectionView" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				935BD7131CE26F8E00E5FDF7 /* Debug */,
-				935BD7141CE26F8E00E5FDF7 /* Release */,
+				OBJ_3 /* Debug */,
+				OBJ_4 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = Debug;
 		};
 /* End XCConfigurationList section */
 	};
-	rootObject = 935BD6E91CE26F3B00E5FDF7 /* Project object */;
+	rootObject = OBJ_1 /* Project object */;
 }

InfiniteCollectionView.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:InfiniteCollectionView.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

InfiniteCollectionView.xcodeproj/xcshareddata/xcschemes/InfiniteCollectionView.xcscheme

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "9999"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "OBJ_17"
+               BuildableName = "InfiniteCollectionView.framework"
+               BlueprintName = "InfiniteCollectionView"
+               ReferencedContainer = "container:InfiniteCollectionView.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "OBJ_24"
+               BuildableName = "InfiniteCollectionViewTests.xctest"
+               BlueprintName = "InfiniteCollectionViewTests"
+               ReferencedContainer = "container:InfiniteCollectionView.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "OBJ_17"
+            BuildableName = "InfiniteCollectionView.framework"
+            BlueprintName = "InfiniteCollectionView"
+            ReferencedContainer = "container:InfiniteCollectionView.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

InfiniteCollectionView.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>SchemeUserState</key>
+  <dict>
+    <key>InfiniteCollectionView.xcscheme</key>
+    <dict></dict>
+  </dict>
+  <key>SuppressBuildableAutocreation</key>
+  <dict></dict>
+</dict>
+</plist>

Package.swift

@@ -0,0 +1,9 @@
+import PackageDescription
+
+let package = Package(
+    name: "InfiniteCollectionView",
+    targets: [],
+    dependencies: [
+        .Package(url: "https://github.com/hryk224/InfiniteCollectionView", majorVersion: 1),
+        ]
+)

Sources/InfiniteCollectionView.swift

@@ -27,15 +27,14 @@ import UIKit
 }
 
 open class InfiniteCollectionView: UICollectionView {
-    fileprivate typealias Me = InfiniteCollectionView
-    fileprivate static let dummyCount: Int = 3
-    fileprivate static let defaultIdentifier = "Cell"
     open weak var infiniteDataSource: InfiniteCollectionViewDataSource?
     open weak var infiniteDelegate: InfiniteCollectionViewDelegate?
-    fileprivate var indexOffset: Int = 0
-    fileprivate var pageIndex = 0
     @available(*, deprecated, message: "It becomes unnecessary because it uses UICollectionViewFlowLayout.")
     open var cellWidth: CGFloat?
+    fileprivate let dummyCount: Int = 3
+    fileprivate let defaultIdentifier = "Cell"
+    fileprivate var indexOffset: Int = 0
+    fileprivate var pageIndex = 0
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         configure()
@@ -50,6 +49,25 @@ open class InfiniteCollectionView: UICollectionView {
     open func rotate(_ notification: Notification) {
         setContentOffset(CGPoint(x: CGFloat(pageIndex + indexOffset) * itemWidth, y: contentOffset.y), animated: false)
     }
+    open override func selectItem(at indexPath: IndexPath?, animated: Bool, scrollPosition: UICollectionViewScrollPosition) {
+        guard let indexPath = indexPath else { return }
+        // Correct the input IndexPath
+        let correctedIndexPath = IndexPath(row: correctedIndex(indexPath.item + indexOffset), section: 0)
+        // Get the currently visible cell(s) - assumes a cell is visible
+        guard let visibleCell = self.visibleCells.first else {
+            return
+        }
+        // Index path of the cell - does not consider multiple cells on the screen at the same time
+        guard let visibleIndexPath =  self.indexPath(for: visibleCell) else {
+            return
+        }
+        let testIndexPath = IndexPath(row: correctedIndex(visibleIndexPath.item), section: 0)
+        guard correctedIndexPath != testIndexPath else {
+            return // Do not re-select the same cell
+        }
+        // Call supercase to select the correct IndexPath
+        super.selectItem(at: correctedIndexPath, animated: animated, scrollPosition: scrollPosition)
+    }
 }
 
 // MARK: - private
@@ -65,7 +83,7 @@ private extension InfiniteCollectionView {
     func configure() {
         delegate = self
         dataSource = self
-        register(UICollectionViewCell.self, forCellWithReuseIdentifier: Me.defaultIdentifier)
+        register(UICollectionViewCell.self, forCellWithReuseIdentifier: defaultIdentifier)
         NotificationCenter.default.addObserver(self, selector: #selector(InfiniteCollectionView.rotate(_:)), name: .UIDeviceOrientationDidChange, object: nil)
     }
     func centerIfNeeded(_ scrollView: UIScrollView) {
@@ -81,7 +99,8 @@ private extension InfiniteCollectionView {
             } else {
                 contentOffset = CGPoint(x: centerX + offsetCorrection, y: currentOffset.y)
             }
-            shiftContentArray(correctedIndex(shiftCells))
+            let offset = correctedIndex(shiftCells)
+            indexOffset += offset
             reloadData()
         }
         let centerPoint = CGPoint(x: scrollView.frame.size.width / 2 + scrollView.contentOffset.x, y: scrollView.frame.size.height / 2 + scrollView.contentOffset.y)
@@ -89,9 +108,6 @@ private extension InfiniteCollectionView {
         pageIndex = correctedIndex(indexPath.item - indexOffset)
         infiniteDelegate?.scrollView?(scrollView, pageIndex: pageIndex)
     }
-    func shiftContentArray(_ offset: Int) {
-        indexOffset += offset
-    }
     func correctedIndex(_ indexToCorrect: Int) -> Int {
         guard let numberOfItems = infiniteDataSource?.number(ofItems: self) else { return 0 }
         if numberOfItems > indexToCorrect && indexToCorrect >= 0 {
@@ -108,13 +124,13 @@ private extension InfiniteCollectionView {
 extension InfiniteCollectionView: UICollectionViewDataSource {
     public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         let numberOfItems = infiniteDataSource?.number(ofItems: collectionView) ?? 0
-        return Me.dummyCount * numberOfItems
+        return dummyCount * numberOfItems
     }
     public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        if let maybeCell = infiniteDataSource?.collectionView(collectionView, dequeueForItemAt: indexPath, cellForItemAt: IndexPath(item: correctedIndex(indexPath.item - indexOffset), section: 0)) {
-            return maybeCell
+        guard let cell = infiniteDataSource?.collectionView(collectionView, dequeueForItemAt: indexPath, cellForItemAt: IndexPath(item: correctedIndex(indexPath.item - indexOffset), section: 0)) else {
+            return collectionView.dequeueReusableCell(withReuseIdentifier: defaultIdentifier, for: indexPath)
         }
-        return collectionView.dequeueReusableCell(withReuseIdentifier: Me.defaultIdentifier, for: indexPath)
+        return cell
     }
 }