Merge pull request #159 from PeterStaev/fix-overridable-objc-method

mark method with dynamic so it can be inherited in objc

.swift-version

@@ -1 +1 @@
-4.0
+4.2

.travis.yml

@@ -1,11 +1,9 @@
-osx_image: xcode9.2
+osx_image: xcode10.2
 language: objective-c
 
 xcode_project: FoldingCell/FoldingCell.xcodeproj
 xcode_scheme: FoldingCell
-xcode_sdk: iphonesimulator11.2
-
-# SWIFT_VERSION: 4.0
+xcode_sdk: iphonesimulator12.2
 
 # whitelist
 branches:

FoldingCell.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FoldingCell'
-  s.version      = '3.1.5'
+  s.version      = '5.0.0'
   s.summary      = 'UITableViewCell with folding animation.'
   s.homepage     = 'https://github.com/Ramotion/folding-cell'
   s.license      = 'MIT'

FoldingCell/FoldingCell.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		5A0E1C3021414940006A0374 /* FoldingCellDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A0E1C2F21414940006A0374 /* FoldingCellDemoTests.swift */; };
+		5A1225D821B65E8E005BBB26 /* RotationViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A1225D721B65E8E005BBB26 /* RotationViewTests.swift */; };
 		8499D8881D0054A8004B5B37 /* FoldingCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 8499D8871D0054A8004B5B37 /* FoldingCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9D57F31F1EDC7A6F0004599F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D57F31E1EDC7A6F0004599F /* AppDelegate.swift */; };
 		9D57F3241EDC7A6F0004599F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9D57F3221EDC7A6F0004599F /* Main.storyboard */; };
@@ -81,6 +82,7 @@
 		5A0E1C2D21414940006A0374 /* FoldingCellDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FoldingCellDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		5A0E1C2F21414940006A0374 /* FoldingCellDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FoldingCellDemoTests.swift; sourceTree = "<group>"; };
 		5A0E1C3121414940006A0374 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		5A1225D721B65E8E005BBB26 /* RotationViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RotationViewTests.swift; sourceTree = "<group>"; };
 		8499D8851D0054A8004B5B37 /* FoldingCell.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FoldingCell.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8499D8871D0054A8004B5B37 /* FoldingCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FoldingCell.h; sourceTree = "<group>"; };
 		8499D8891D0054A8004B5B37 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -144,6 +146,7 @@
 			children = (
 				5A0E1C2F21414940006A0374 /* FoldingCellDemoTests.swift */,
 				5A0E1C3121414940006A0374 /* Info.plist */,
+				5A1225D721B65E8E005BBB26 /* RotationViewTests.swift */,
 			);
 			path = FoldingCellDemoTests;
 			sourceTree = "<group>";
@@ -313,24 +316,24 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0940;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Alex K.";
 				TargetAttributes = {
 					5A0E1C2C21414940006A0374 = {
 						CreatedOnToolsVersion = 9.4;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 9D57F31B1EDC7A6F0004599F;
 					};
 					8499D8841D0054A8004B5B37 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = LEAZS7L33U;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 					9D57F31B1EDC7A6F0004599F = {
 						CreatedOnToolsVersion = 8.3.2;
 						DevelopmentTeam = 34MUF9YXTA;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					9DAA51531EDDBAD700DFC539 = {
@@ -342,7 +345,7 @@
 			};
 			buildConfigurationList = 847A57FF1C294F750028FB84 /* Build configuration list for PBXProject "FoldingCell" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -403,6 +406,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5A1225D821B65E8E005BBB26 /* RotationViewTests.swift in Sources */,
 				5A0E1C3021414940006A0374 /* FoldingCellDemoTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -509,7 +513,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.FoldingCellDemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FoldingCell-Demo.app/FoldingCell-Demo";
 			};
@@ -532,7 +536,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.FoldingCellDemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FoldingCell-Demo.app/FoldingCell-Demo";
 			};
@@ -542,6 +546,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -584,7 +589,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -596,6 +601,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -632,7 +638,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -661,7 +667,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -688,7 +694,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.FoldingCell;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -713,7 +719,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -734,7 +740,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "ramotion.com.FoldingCell-Demo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

FoldingCell/FoldingCell.xcodeproj/xcshareddata/xcschemes/FoldingCell.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,7 +28,26 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5A0E1C2C21414940006A0374"
+               BuildableName = "FoldingCellDemoTests.xctest"
+               BlueprintName = "FoldingCellDemoTests"
+               ReferencedContainer = "container:FoldingCell.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8499D8841D0054A8004B5B37"
+            BuildableName = "FoldingCell.framework"
+            BlueprintName = "FoldingCell"
+            ReferencedContainer = "container:FoldingCell.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>

FoldingCell/FoldingCell/FoldingCell.swift

@@ -26,6 +26,8 @@ import UIKit
 /// UITableViewCell with folding animation
 open class FoldingCell: UITableViewCell {
     
+    @objc open var isUnfolded = false
+    
     /// UIView is displayed when cell open
     @IBOutlet open var containerView: UIView!
     @IBOutlet open var containerViewTop: NSLayoutConstraint!
@@ -76,7 +78,7 @@ open class FoldingCell: UITableViewCell {
     
     // MARK: configure
     
-    func configureDefaultState() {
+    private func configureDefaultState() {
         
         guard let foregroundViewTop = self.foregroundViewTop,
             let containerViewTop = self.containerViewTop else {
@@ -96,7 +98,7 @@ open class FoldingCell: UITableViewCell {
         contentView.bringSubviewToFront(foregroundView)
     }
     
-    func createAnimationItemView() -> [RotatedView] {
+    private func createAnimationItemView() -> [RotatedView] {
         
         var items = [RotatedView]()
         items.append(foregroundView)
@@ -121,18 +123,16 @@ open class FoldingCell: UITableViewCell {
         
         if animationType == .open {
             animationView?.subviews
+                .lazy
                 .compactMap { $0 as? RotatedView }
                 .forEach { $0.alpha = 0 }
         } else {
             animationView?.subviews
+                .lazy
                 .compactMap { $0 as? RotatedView }
                 .forEach {
-                    if animationType == .open {
-                        $0.alpha = 0
-                    } else {
-                        $0.alpha = 1
-                        $0.backView?.alpha = 0
-                    }
+                    $0.alpha = animationType == .open ? 0 : 1
+                    if animationType != .open { $0.backView?.alpha = 0 }
             }
         }
     }
@@ -277,11 +277,9 @@ open class FoldingCell: UITableViewCell {
         return animationView?.alpha == 1 ? true : false
     }
     
-    @objc open var isUnfolded = false
-    
     // MARK: Animations
     
-    @objc open func animationDuration(_ itemIndex: NSInteger, type: AnimationType) -> TimeInterval {
+    @objc open dynamic func animationDuration(_ itemIndex: NSInteger, type: AnimationType) -> TimeInterval {
         return type == .close ? durationsForCollapsedState[itemIndex] : durationsForExpandedState[itemIndex]
     }
     
@@ -298,7 +296,7 @@ open class FoldingCell: UITableViewCell {
         return durations
     }
     
-    public func openAnimation(_ completion: (() -> Void)?) {
+    func openAnimation(_ completion: (() -> Void)?) {
         isUnfolded = true
         removeImageItemsFromAnimationView()
         addImageItemsToAnimationView()
@@ -345,7 +343,7 @@ open class FoldingCell: UITableViewCell {
         }
     }
     
-    public func closeAnimation(_ completion: (() -> Void)?) {
+    func closeAnimation(_ completion: (() -> Void)?) {
         isUnfolded = false
         removeImageItemsFromAnimationView()
         addImageItemsToAnimationView()
@@ -402,7 +400,7 @@ open class FoldingCell: UITableViewCell {
 
 open class RotatedView: UIView {
     
-    fileprivate enum Const {
+    private enum Const {
         static let rotationX = "rotation.x"
         static let transformRotationX = "transform.rotation.x"
     }

FoldingCell/FoldingCellDemoTests/FoldingCellDemoTests.swift

@@ -1,11 +1,3 @@
-//
-//  FoldingCellDemoTests.swift
-//  FoldingCellDemoTests
-//
-//  Created by Alex K on 06/09/2018.
-//  Copyright © 2018 Alex K. All rights reserved.
-//
-
 import XCTest
 import UIKit
 @testable import FoldingCell
@@ -24,12 +16,15 @@ class FoldingCellDemoTests: XCTestCase {
         foldingCell = vc.tableView.dequeueReusableCell(withIdentifier: "FoldingCell", for: IndexPath(row: 0, section: 0)) as? FoldingCell
     }
     
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
     func testCreateFoldingCell() {
         XCTAssertNotNil(foldingCell)
     }
+    
+    func testUnfold() {
+        XCTAssertEqual(foldingCell.isUnfolded, false)
+        foldingCell.unfold(true)
+        XCTAssertEqual(foldingCell.isUnfolded, true)
+        foldingCell.unfold(false)
+        XCTAssertEqual(foldingCell.isUnfolded, false)
+    }
 }

FoldingCell/FoldingCellDemoTests/RotationViewTests.swift

@@ -0,0 +1,37 @@
+import XCTest
+import UIKit
+@testable import FoldingCell
+
+class RotationViewTests: XCTestCase {
+
+    var rotationView: RotatedView!
+    override func setUp() {
+        
+        rotationView = RotatedView()
+    }
+
+    func testCreateRotationView() {
+        XCTAssertNotNil(rotationView)
+    }
+    
+    func testAddBackView() {
+        XCTAssertNil(rotationView.backView)
+        let color = UIColor.red
+        rotationView.addBackView(100, color: color)
+        
+        XCTAssertNotNil(rotationView.backView)
+        XCTAssertEqual(rotationView.backView?.backgroundColor, color)
+    }
+    
+    func testRotateX() {
+        let key = "layer.transform.rotation.x"
+        let startX = (rotationView.value(forKeyPath: key) as? NSNumber)?.floatValue
+        XCTAssertEqual(startX, 0)
+
+        let angel: CGFloat = 0.5
+        rotationView.rotatedX(angel)
+        let x = (rotationView.value(forKeyPath: key) as? NSNumber)?.floatValue
+
+        XCTAssertEqual(x, Float(angel))
+    }
+}

README.md

@@ -1,35 +1,42 @@
-![header](./header.png)
-<img src="https://github.com/Ramotion/folding-cell/blob/master/Screenshots/foldingCell.gif" width="600" height="450" /></a>
-<br><br/>
+<img src="https://github.com/Ramotion/folding-cell/blob/master/header.png">
+
+<a href="https://github.com/Ramotion/folding-cell">
+<img align="left" src="https://github.com/Ramotion/folding-cell/blob/master/Screenshots/foldingCell.gif" width="480" height="360" /></a>
+
+<p><h1 align="left">FOLDING CELL</h1></p>
+
+<h4>Expanding content cell with animation inspired by folding paper card material design.</h4>
+
+
+___
+
+
+
+<p><h6>We specialize in the designing and coding of custom UI for Mobile Apps and Websites.</h6>
+<a href="https://dev.ramotion.com?utm_source=gthb&utm_medium=repo&utm_campaign=folding-cell">
+<img src="https://github.com/ramotion/gliding-collection/raw/master/contact_our_team@2x.png" width="187" height="34"></a>
+</p>
+<p><h6>Stay tuned for the latest updates:</h6>
+<a href="https://goo.gl/rPFpid" >
+<img src="https://i.imgur.com/ziSqeSo.png/" width="156" height="28"></a></p>
+<h6><a href="https://store.ramotion.com/product/iphone-x-clay-mockups?utm_source=gthb&utm_medium=special&utm_campaign=folding-cell#demo">Get Free Mockup For your project →</a></h6>
+
+</br>
 
-# FoldingCell
 [![CocoaPods](https://img.shields.io/cocoapods/p/FoldingCell.svg)](https://cocoapods.org/pods/FoldingCell)
 [![CocoaPods](https://img.shields.io/cocoapods/v/FoldingCell.svg)](http://cocoapods.org/pods/FoldingCell)
 [![Twitter](https://img.shields.io/badge/Twitter-@Ramotion-blue.svg?style=flat)](http://twitter.com/Ramotion)
 [![Travis](https://img.shields.io/travis/Ramotion/folding-cell.svg)](https://travis-ci.org/Ramotion/folding-cell)
 [![codebeat badge](https://codebeat.co/badges/6f67da5d-c416-4bac-9fb7-c2dc938feedc)](https://codebeat.co/projects/github-com-ramotion-folding-cell)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![Swift 4.0](https://img.shields.io/badge/Swift-4.0-green.svg?style=flat)](https://developer.apple.com/swift/)
+[![Swift 4.0](https://img.shields.io/badge/Swift-5.0-green.svg?style=flat)](https://developer.apple.com/swift/)
 [![Analytics](https://ga-beacon.appspot.com/UA-84973210-1/ramotion/folding-cell)](https://github.com/igrigorik/ga-beacon)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://paypal.me/Ramotion)
 
-# Check this library on other platforms:
-<a href="https://github.com/Ramotion/folding-cell-android">
-<img src="https://github.com/ramotion/navigation-stack/raw/master/Android_Java@2x.png" width="178" height="81"></a>
-
-**Looking for developers for your project?**<br>
-This project is maintained by Ramotion, Inc. We specialize in the designing and coding of custom UI for Mobile Apps and Websites.
-
-<a href="mailto:alex.a@ramotion.com?subject=Project%20inquiry%20from%20Github">
-<img src="https://github.com/ramotion/gliding-collection/raw/master/contact_our_team@2x.png" width="187" height="34"></a> <br>
-
-
-The [iPhone mockup](https://store.ramotion.com/product/iphone-x-clay-mockups?utm_source=gthb&utm_medium=special&utm_campaign=folding-cell) available [here](https://store.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=folding-cell).
-
 ## Requirements
 
 - iOS 8.0+
-- Xcode 9.0+
+- Xcode 10.2
 
 ## Installation
 
@@ -42,7 +49,6 @@ pod 'FoldingCell'
 or [Carthage](https://github.com/Carthage/Carthage) users can simply add Mantle to their `Cartfile`:
 ```
 github "Ramotion/folding-cell"
-
 ```
 
 or just drag and drop FoldingCell.swift file to your project
@@ -156,24 +162,25 @@ fileprivate struct C {
 Create foregroundView and containerView from code (steps 2 - 3) look example:
 [Folding-cell-programmatically](https://github.com/ober01/Folding-cell-programmatically)
 
-## Licence
+## 🗂 Check this library on other language:
+<a href="https://github.com/Ramotion/folding-cell-android">
+<img src="https://github.com/ramotion/navigation-stack/raw/master/Android_Java@2x.png" width="178" height="81"></a>
+
+
+## 📄 License
 
 Folding cell is released under the MIT license.
 See [LICENSE](./LICENSE) for details.
 
 This library is a part of a <a href="https://github.com/Ramotion/swift-ui-animation-components-and-libraries"><b>selection of our best UI open-source projects.</b></a>
 
-# Get the Showroom App for iOS to give it a try
+If you use the open-source library in your project, please make sure to credit and backlink to www.ramotion.com
+
+## 📱 Get the Showroom App for iOS to give it a try
 Try this UI component and more like this in our iOS app. Contact us if interested.
 
 <a href="https://itunes.apple.com/app/apple-store/id1182360240?pt=550053&ct=folding-cell&mt=8" >
 <img src="https://github.com/ramotion/gliding-collection/raw/master/app_store@2x.png" width="117" height="34"></a>
 
-<a href="mailto:alex.a@ramotion.com?subject=Project%20inquiry%20from%20Github">
+<a href="https://dev.ramotion.com?utm_source=gthb&utm_medium=repo&utm_campaign=folding-cell">
 <img src="https://github.com/ramotion/gliding-collection/raw/master/contact_our_team@2x.png" width="187" height="34"></a>
-<br>
-<br>
-
-## Follow us for the latest update<br>
-<a href="https://goo.gl/rPFpid" >
-<img src="https://i.imgur.com/ziSqeSo.png/" width="156" height="28"></a>