Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d69a98dd1 |
@@ -10,7 +10,6 @@
|
||||
8422CA731CF73EE4007E8522 /* AnimationBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8422CA701CF73EE4007E8522 /* AnimationBarButton.swift */; };
|
||||
8422CA741CF73EE4007E8522 /* Rotatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8422CA721CF73EE4007E8522 /* Rotatable.swift */; };
|
||||
8485962C1CF585F3000BCC74 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8485962B1CF585F3000BCC74 /* AppDelegate.swift */; };
|
||||
8485962E1CF585F3000BCC74 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8485962D1CF585F3000BCC74 /* ViewController.swift */; };
|
||||
848596311CF585F3000BCC74 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8485962F1CF585F3000BCC74 /* Main.storyboard */; };
|
||||
848596331CF585F3000BCC74 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 848596321CF585F3000BCC74 /* Assets.xcassets */; };
|
||||
848596361CF585F3000BCC74 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 848596341CF585F3000BCC74 /* LaunchScreen.storyboard */; };
|
||||
@@ -50,7 +49,6 @@
|
||||
8422CA721CF73EE4007E8522 /* Rotatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Rotatable.swift; sourceTree = "<group>"; };
|
||||
848596281CF585F3000BCC74 /* DemoExpandingCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoExpandingCollection.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
8485962B1CF585F3000BCC74 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
8485962D1CF585F3000BCC74 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
|
||||
848596301CF585F3000BCC74 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||
848596321CF585F3000BCC74 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
848596351CF585F3000BCC74 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
@@ -148,7 +146,6 @@
|
||||
8485965E1CF5870B000BCC74 /* Source */,
|
||||
848596521CF586E0000BCC74 /* ViewControllers */,
|
||||
8485962B1CF585F3000BCC74 /* AppDelegate.swift */,
|
||||
8485962D1CF585F3000BCC74 /* ViewController.swift */,
|
||||
8485962F1CF585F3000BCC74 /* Main.storyboard */,
|
||||
848596321CF585F3000BCC74 /* Assets.xcassets */,
|
||||
848596341CF585F3000BCC74 /* LaunchScreen.storyboard */,
|
||||
@@ -408,7 +405,6 @@
|
||||
TargetAttributes = {
|
||||
848596271CF585F3000BCC74 = {
|
||||
CreatedOnToolsVersion = 7.3.1;
|
||||
DevelopmentTeam = LEAZS7L33U;
|
||||
};
|
||||
8485963B1CF585F3000BCC74 = {
|
||||
CreatedOnToolsVersion = 7.3.1;
|
||||
@@ -486,7 +482,6 @@
|
||||
8485965B1CF586F7000BCC74 /* DemoCollectionViewCell.swift in Sources */,
|
||||
8485966A1CF58853000BCC74 /* ExpandingTableViewController.swift in Sources */,
|
||||
8485967B1CF5897B000BCC74 /* ScreenShotHelper.swift in Sources */,
|
||||
8485962E1CF585F3000BCC74 /* ViewController.swift in Sources */,
|
||||
848596721CF58954000BCC74 /* CornerAnimatable.swift in Sources */,
|
||||
8422CA741CF73EE4007E8522 /* Rotatable.swift in Sources */,
|
||||
8485965D1CF586F7000BCC74 /* DemoViewController.swift in Sources */,
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
//
|
||||
// ViewController.swift
|
||||
// DemoExpandingCollection
|
||||
//
|
||||
// Created by Alex K. on 25/05/16.
|
||||
// Copyright © 2016 Alex K. All rights reserved.
|
||||
//
|
||||
|
||||
import UIKit
|
||||
|
||||
class ViewController: UIViewController {
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
// Do any additional setup after loading the view, typically from a nib.
|
||||
}
|
||||
|
||||
override func didReceiveMemoryWarning() {
|
||||
super.didReceiveMemoryWarning()
|
||||
// Dispose of any resources that can be recreated.
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -69,7 +69,7 @@
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4h2-Xv-xjU">
|
||||
<rect key="frame" x="0.0" y="0.0" width="256" height="335"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="image" translatesAutoresizingMaskIntoConstraints="NO" id="9FK-FA-F0l">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="item0" translatesAutoresizingMaskIntoConstraints="NO" id="9FK-FA-F0l">
|
||||
<rect key="frame" x="0.0" y="0.0" width="256" height="335"/>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ATCOASTAL" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XFh-D7-eSl">
|
||||
@@ -190,7 +190,7 @@
|
||||
<resources>
|
||||
<image name="dots" width="4" height="19"/>
|
||||
<image name="icons" width="116" height="39"/>
|
||||
<image name="image" width="375" height="382"/>
|
||||
<image name="item0" width="414" height="736"/>
|
||||
<image name="pinIcon" width="26" height="32"/>
|
||||
<image name="stars" width="77" height="11"/>
|
||||
</resources>
|
||||
|
||||
+1
-1
@@ -99,7 +99,7 @@ extension DemoViewController {
|
||||
extension DemoViewController {
|
||||
|
||||
func scrollViewDidScroll(scrollView: UIScrollView) {
|
||||
pageLabel.text = "\(currentIndex)/\(items.count)"
|
||||
pageLabel.text = "\(currentIndex+1)/\(items.count)"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ public class ExpandingTableViewController: UITableViewController {
|
||||
|
||||
// MARK: Vars
|
||||
|
||||
var headerHeight: CGFloat = 236
|
||||
public var headerHeight: CGFloat = 236
|
||||
var transitionDriver: TransitionDriver?
|
||||
|
||||
public required init?(coder aDecoder: NSCoder) {
|
||||
|
||||
@@ -34,7 +34,7 @@ extension ExpandingViewController {
|
||||
|
||||
// MARK: Transition
|
||||
|
||||
extension ExpandingViewController {
|
||||
public extension ExpandingViewController {
|
||||
|
||||
func pushToViewController(viewController: ExpandingTableViewController) {
|
||||
guard let collectionView = self.collectionView else {
|
||||
|
||||
Reference in New Issue
Block a user