Merge branch 'develop'

Author: younatics

CHANGELOG.md

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'YNExpandableCell'
-  s.version          = '1.0.1'
+  s.version          = '1.1.0'
   s.summary          = 'Easiest way to expand and collapse cell for iOS with Swift 3'
 
   s.description      = <<-DESC
@@ -21,8 +21,8 @@ Easiest usage of expandable & collapsible cell for iOS, written in Swift 3. You
   s.author           = { "Seungyoun Yi" => "younatics@gmail.com" }
 
   s.source           = { :git => 'https://github.com/younatics/YNExpandableCell.git', :tag => s.version.to_s }
-  s.source_files     = 'YNExpandableCell/YNExpandableCell/*.swift'
-  s.resources        = "YNExpandableCell/YNExpandableCell/*.xcassets"
+  s.source_files     = 'YNExpandableCell/*.swift'
+  s.resources        = "YNExpandableCell/*.xcassets"
 
   s.ios.deployment_target = '8.0'
 

YNExpandableCell.podspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,8 +14,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1917E1B21E73831900322999"
-               BuildableName = "YNExpandableCell.app"
+               BlueprintIdentifier = "19FE32571EA7BC9500A4DB5E"
+               BuildableName = "YNExpandableCell.framework"
                BlueprintName = "YNExpandableCell"
                ReferencedContainer = "container:YNExpandableCell.xcodeproj">
             </BuildableReference>
@@ -28,26 +28,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1917E1C61E73831A00322999"
-               BuildableName = "YNExpandableCellUITests.xctest"
-               BlueprintName = "YNExpandableCellUITests"
-               ReferencedContainer = "container:YNExpandableCell.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1917E1B21E73831900322999"
-            BuildableName = "YNExpandableCell.app"
-            BlueprintName = "YNExpandableCell"
-            ReferencedContainer = "container:YNExpandableCell.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -61,16 +42,15 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1917E1B21E73831900322999"
-            BuildableName = "YNExpandableCell.app"
+            BlueprintIdentifier = "19FE32571EA7BC9500A4DB5E"
+            BuildableName = "YNExpandableCell.framework"
             BlueprintName = "YNExpandableCell"
             ReferencedContainer = "container:YNExpandableCell.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -80,16 +60,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1917E1B21E73831900322999"
-            BuildableName = "YNExpandableCell.app"
+            BlueprintIdentifier = "19FE32571EA7BC9500A4DB5E"
+            BuildableName = "YNExpandableCell.framework"
             BlueprintName = "YNExpandableCell"
             ReferencedContainer = "container:YNExpandableCell.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

YNExpandableCell.xcodeproj/project.pbxproj

@@ -13,10 +13,12 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
 </dict>
 </plist>

YNExpandableCell.xcodeproj/xcshareddata/xcschemes/YNExpandableCell.xcscheme

@@ -0,0 +1,19 @@
+//
+//  YNExpandableCell.h
+//  YNExpandableCell
+//
+//  Created by YiSeungyoun on 2017. 4. 20..
+//  Copyright © 2017년 SeungyounYi. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for YNExpandableCell.
+FOUNDATION_EXPORT double YNExpandableCellVersionNumber;
+
+//! Project version string for YNExpandableCell.
+FOUNDATION_EXPORT const unsigned char YNExpandableCellVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <YNExpandableCell/PublicHeader.h>
+
+

YNExpandableCellUITests/Info.plist renamed to YNExpandableCell/Info.plist

@@ -42,9 +42,11 @@ open class YNExpandableCell: UITableViewCell {
         let height = self.frame.size.height
 
         self.normalCustomAccessoryType = UIImageView(frame: CGRect(x: width - 46, y: (height-26)/2, width: 26, height: 26))
-        self.normalCustomAccessoryType.image = UIImage(named: "yn_nor")
+        let yn_nor = UIImage(named: "yn_nor", in: Bundle(for: YNExpandableCell.self), compatibleWith: nil)
+        self.normalCustomAccessoryType.image = yn_nor
         self.selectedCustomAccessoryType = UIImageView(frame: CGRect(x: width - 46, y: (height-26)/2, width: 26, height: 26))
-        self.selectedCustomAccessoryType.image = UIImage(named: "yn_sel")
+        let yn_sel = UIImage(named: "yn_sel", in: Bundle(for: YNExpandableCell.self), compatibleWith: nil)
+        self.selectedCustomAccessoryType.image = yn_sel
         self.selectedCustomAccessoryType.isHidden = true
 
         self.contentView.addSubview(self.normalCustomAccessoryType)

YNExpandableCell/YNExpandableCell.h

@@ -9,6 +9,6 @@
 import UIKit
 
 open class YNTableViewCell: NSObject {
-    var cell: UITableViewCell?
-    var height: CGFloat?
+    open var cell: UITableViewCell?
+    open var height: CGFloat?
 }

YNExpandableCell/YNExpandableCell/YNExpandableCell.swift renamed to YNExpandableCell/YNExpandableCell.swift

@@ -50,7 +50,7 @@ public protocol YNTableViewDelegate: UITableViewDelegate, UITableViewDataSource
 
 }
 
-extension YNTableViewDelegate {
+public extension YNTableViewDelegate {
     /**
      Determine expandable cell in this view. This method is all that you have to do
 

YNExpandableCell/YNExpandableCell/YNExpandableCell.xcassets/Contents.json renamed to YNExpandableCell/YNExpandableCell.xcassets/Contents.json

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="cFC-yF-mMG">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="cFC-yF-mMG">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--YNExpandableCell-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="YNExpandableCell" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="YNExpandableCellDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="RKJ-dx-yKz" customClass="YNTableView" customModule="YNExpandableCell" customModuleProvider="target">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="RKJ-dx-yKz" customClass="YNTableView" customModule="YNExpandableCell">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </tableView>
@@ -41,7 +41,7 @@
                     <connections>
                         <outlet property="collapseAllButton" destination="7NL-OJ-is7" id="agC-dj-rE8"/>
                         <outlet property="expandAllButton" destination="MNE-l1-Syq" id="5Id-IX-clF"/>
-                        <outlet property="ynTableView" destination="RKJ-dx-yKz" id="4f5-YO-k8j"/>
+                        <outlet property="ynTableView" destination="RKJ-dx-yKz" id="OU8-eG-vw6"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

YNExpandableCell/YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/Contents.json renamed to YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/Contents.json

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import YNExpandableCell
 
 class ViewController: UIViewController, YNTableViewDelegate {
     @IBOutlet var ynTableView: YNTableView!

YNExpandableCell/YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/filter_type_more_nor.png renamed to YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/filter_type_more_nor.png

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <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"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="YNExpandableCellEx" rowHeight="44" id="hBf-az-gPj" customClass="YNExpandableCellEx" customModule="YNExpandableCell" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="YNExpandableCellEx" rowHeight="44" id="hBf-az-gPj" customClass="YNExpandableCellEx" customModule="YNExpandableCellDemo" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hBf-az-gPj" id="Cxz-3t-fOJ">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- YNExpandable First Cell" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="euj-pS-oe3">
@@ -35,7 +35,7 @@
                 </constraints>
             </tableViewCellContentView>
             <connections>
-                <outlet property="titleLabel" destination="euj-pS-oe3" id="akj-x7-UCT"/>
+                <outlet property="titleLabel" destination="euj-pS-oe3" id="X9F-sc-7I2"/>
             </connections>
             <point key="canvasLocation" x="-219.5" y="-169"/>
         </tableViewCell>

YNExpandableCell/YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/filter_type_more_nor@2x.png renamed to YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/filter_type_more_nor@2x.png

@@ -6,7 +6,7 @@
 //  Copyright © 2017년 SeungyounYi. All rights reserved.
 //
 
-import Foundation
+import YNExpandableCell
 import UIKit
 
 class YNExpandableCellEx: YNExpandableCell {

YNExpandableCell/YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/filter_type_more_nor@3x.png renamed to YNExpandableCell/YNExpandableCell.xcassets/yn_nor.imageset/filter_type_more_nor@3x.png

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <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"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" reuseIdentifier="YNSegmentCell" rowHeight="160" id="Ubh-r5-TR7" customClass="YNSegmentCell" customModule="YNExpandableCell" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" reuseIdentifier="YNSegmentCell" rowHeight="160" id="Ubh-r5-TR7" customClass="YNSegmentCell" customModule="YNExpandableCellDemo" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ubh-r5-TR7" id="PTx-s7-jAs">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="159.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customize Segment Control" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T7Q-LX-wum">

YNExpandableCell/YNExpandableCell/YNExpandableCell.xcassets/yn_sel.imageset/Contents.json renamed to YNExpandableCell/YNExpandableCell.xcassets/yn_sel.imageset/Contents.json

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <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"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="YNSliderCell" rowHeight="142" id="Jnr-ol-dVW" customClass="YNSliderCell" customModule="YNExpandableCell" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="YNSliderCell" rowHeight="142" id="Jnr-ol-dVW" customClass="YNSliderCell" customModule="YNExpandableCellDemo" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="142"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Jnr-ol-dVW" id="Fo5-0b-JZe">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="141.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="142"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tOU-ef-pBx">