Merge branch 'CollectionViewContentViewKey'

Author: kostassite

Sources/Models/Views/ScrollViews/CollectionView.swift

@@ -288,7 +288,11 @@ public struct CollectionViewCell: IBDecodable, ViewProtocol, IBIdentifiable, IBR
                 case .isAmbiguous: return "ambiguous"
                 case .isHidden: return "hidden"
                 case ._subviews: return "subview"
-                case .contentView: return "view"
+                case .contentView:
+                    if xml.childrenElements.contains(where: {$0.elementName == "collectionViewCellContentView"}) {
+                        return "collectionViewCellContentView"
+                    }
+                    return "view"
                 default: return key.stringValue
                 }
             }()

Tests/IBDecodableTests/Tests.swift

@@ -392,6 +392,24 @@ class Tests: XCTestCase {
         }
     }
 
+    func testCollectionViewCellContentView_WithNewCollectionViewCellContentView() {
+        let url = self.url(forResource: "CollectionViewCellWithContentView", withExtension: "xib")
+        do {
+            let file = try XibFile(url: url)
+            let rootView = file.document.views?.first?.view
+            XCTAssertNotNil(rootView, "There should be a root view")
+            XCTAssertEqual(rootView?.elementClass, "UICollectionViewCell")
+
+            guard let cell = rootView as? CollectionViewCell else {
+                XCTFail("The root view should be a collection view cell")
+                return
+            }
+            XCTAssertEqual(cell.contentView.key, "contentView")
+        } catch {
+            XCTFail("\(error)  \(url)")
+        }
+    }
+    
     func testCollectionReusableView() {
         let url = self.url(forResource: "CollectionReusableView", withExtension: "xib")
         do {

Tests/Resources/CollectionViewCellWithContentView.xib

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="collection view cell content view" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Mb7-D0-dPa">
+            <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="YwU-He-qVe">
+                <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </collectionViewCellContentView>
+            <point key="canvasLocation" x="-274" y="-132"/>
+        </collectionViewCell>
+    </objects>
+</document>