development: initial rework of CollectionView

Sources/iOS/CollectionViewController.swift

+/*
+ * Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *	*	Redistributions of source code must retain the above copyright notice, this
+ *		list of conditions and the following disclaimer.
+ *
+ *	*	Redistributions in binary form must reproduce the above copyright notice,
+ *		this list of conditions and the following disclaimer in the documentation
+ *		and/or other materials provided with the distribution.
+ *
+ *	*	Neither the name of CosmicMind nor the names of its
+ *		contributors may be used to endorse or promote products derived from
+ *		this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import UIKit
+
+public protocol CollectionViewDelegate: UICollectionViewDelegate {}
+
+public protocol CollectionViewDataSource: UICollectionViewDataSource {
+    /**
+     Retrieves the data source items for the collectionView.
+     - Returns: An Array of CollectionViewDataSourceItem objects.
+     */
+    var dataSourceItems: [CollectionViewDataSourceItem] { get }
+}
+
+extension UIViewController {
+    /**
+     A convenience property that provides access to the CollectionViewController.
+     This is the recommended method of accessing the CollectionViewController
+     through child UIViewControllers.
+     */
+    public var collectionViewController: CollectionViewController? {
+        var viewController: UIViewController? = self
+        while nil != viewController {
+            if viewController is CollectionViewController {
+                return viewController as? CollectionViewController
+            }
+            viewController = viewController?.parent
+        }
+        return nil
+    }
+}
+
+open class CollectionViewController: UIViewController {
+    /// A reference to a Reminder.
+    open let collectionView = CollectionView()
+    
+    open var dataSourceItems = [CollectionViewDataSourceItem]()
+    
+    open override func viewDidLoad() {
+        super.viewDidLoad()
+        prepare()
+    }
+    
+    /**
+     Prepares the view instance when intialized. When subclassing,
+     it is recommended to override the prepareView method
+     to initialize property values and other setup operations.
+     The super.prepareView method should always be called immediately
+     when subclassing.
+     */
+    open func prepare() {
+        view.clipsToBounds = true
+        view.backgroundColor = Color.white
+        view.contentScaleFactor = Screen.scale
+        prepareCollectionView()
+    }
+}
+
+extension CollectionViewController {
+    /// Prepares the collectionView.
+    fileprivate func prepareCollectionView() {
+        collectionView.delegate = self
+        collectionView.dataSource = self
+        view.layout(collectionView).edges()
+    }
+}
+
+extension CollectionViewController: CollectionViewDelegate {}
+extension CollectionViewController: CollectionViewDataSource {
+    @objc
+    open func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+    
+    @objc
+    open func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return dataSourceItems.count
+    }
+
+    @objc
+    open func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        return UICollectionViewCell()
+    }
+}

Sources/iOS/CollectionViewDataSource.swift

-/*
- * Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *	*	Redistributions of source code must retain the above copyright notice, this
- *		list of conditions and the following disclaimer.
- *
- *	*	Redistributions in binary form must reproduce the above copyright notice,
- *		this list of conditions and the following disclaimer in the documentation
- *		and/or other materials provided with the distribution.
- *
- *	*	Neither the name of CosmicMind nor the names of its
- *		contributors may be used to endorse or promote products derived from
- *		this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import UIKit
-
-public protocol CollectionViewDataSource: UICollectionViewDataSource {
-	/**
-     Retrieves the data source items for the collectionView.
-     - Returns: An Array of CollectionDataSourceItem objects.
-     */
-    var dataSourceItems: [CollectionDataSourceItem] { get }
-}

Sources/iOS/CollectionDataSourceItem.swift → Sources/iOS/CollectionViewDataSourceItem.swift

@@ -30,7 +30,7 @@
 
 
 import UIKit
 import UIKit
 
 
-public struct CollectionDataSourceItem {
+public struct CollectionViewDataSourceItem {
 	/// Stores an the data for the item.
 	/// Stores an the data for the item.
 	public var data: Any?
 	public var data: Any?
 	
 	

Sources/iOS/CollectionViewDelegate.swift

-/*
- * Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *	*	Redistributions of source code must retain the above copyright notice, this
- *		list of conditions and the following disclaimer.
- *
- *	*	Redistributions in binary form must reproduce the above copyright notice,
- *		this list of conditions and the following disclaimer in the documentation
- *		and/or other materials provided with the distribution.
- *
- *	*	Neither the name of CosmicMind nor the names of its
- *		contributors may be used to endorse or promote products derived from
- *		this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import UIKit
-
-public protocol CollectionViewDelegate: UICollectionViewDelegate {}

Sources/iOS/CollectionViewLayout.swift

@@ -32,7 +32,7 @@ import UIKit
 
 
 open class CollectionViewLayout: UICollectionViewLayout {
 open class CollectionViewLayout: UICollectionViewLayout {
 	/// Used to calculate the dimensions of the cells.
 	/// Used to calculate the dimensions of the cells.
-	internal var offset = CGPoint.zero
+	open var offset = CGPoint.zero
 	
 	
 	/// The size of items.
 	/// The size of items.
 	open var itemSize = CGSize.zero
 	open var itemSize = CGSize.zero
@@ -48,13 +48,13 @@ open class CollectionViewLayout: UICollectionViewLayout {
 	open var contentEdgeInsets = EdgeInsets.zero
 	open var contentEdgeInsets = EdgeInsets.zero
 	
 	
 	/// Size of the content.
 	/// Size of the content.
-	open internal(set) var contentSize = CGSize.zero
+	open fileprivate(set) var contentSize = CGSize.zero
 	
 	
 	/// Layout attribute items.
 	/// Layout attribute items.
-	open internal(set) lazy var layoutItems = [(UICollectionViewLayoutAttributes, NSIndexPath)]()
+	open fileprivate(set) lazy var layoutItems = [(UICollectionViewLayoutAttributes, NSIndexPath)]()
 	
 	
 	/// Cell data source items.
 	/// Cell data source items.
-	open internal(set) var dataSourceItems: [CollectionDataSourceItem]?
+	open fileprivate(set) var dataSourceItems: [CollectionViewDataSourceItem]?
 	
 	
 	/// Scroll direction.
 	/// Scroll direction.
 	open var scrollDirection = UICollectionViewScrollDirection.vertical
 	open var scrollDirection = UICollectionViewScrollDirection.vertical
@@ -129,7 +129,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
 		return proposedContentOffset
 		return proposedContentOffset
 	}
 	}
 	
 	
-	private func prepareLayoutForItems(dataSourceItems: [CollectionDataSourceItem]) {
+	fileprivate func prepareLayoutForItems(dataSourceItems: [CollectionViewDataSourceItem]) {
 		self.dataSourceItems = dataSourceItems
 		self.dataSourceItems = dataSourceItems
 		layoutItems.removeAll()
 		layoutItems.removeAll()