Skip to content

Commit a3b33bd

Browse files
rnkyrrnkyr
authored
Merge pull request #33 from Yalantis/develop
Develop
2 parents 1896a2f + b77fbe3 commit a3b33bd

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

‎DisplaySwitcher.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@
318318
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.Pod;
319319
PRODUCT_NAME = "$(TARGET_NAME)";
320320
SKIP_INSTALL = YES;
321-
SWIFT_VERSION = 3.0;
321+
SWIFT_VERSION = 4.0;
322322
};
323323
name = Debug;
324324
};
@@ -336,7 +336,7 @@
336336
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.Pod;
337337
PRODUCT_NAME = "$(TARGET_NAME)";
338338
SKIP_INSTALL = YES;
339-
SWIFT_VERSION = 3.0;
339+
SWIFT_VERSION = 4.0;
340340
};
341341
name = Release;
342342
};

‎Example/DisplaySwitcher/Views/CollectionViewCells/UserCollectionViewCell/UserCollectionViewCell.xib

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
510
</dependencies>
611
<customFonts key="customFonts">
7-
<mutableArray key="Dosis-ExtraLight.otf">
12+
<array key="Dosis-ExtraLight.otf">
813
<string>Dosis-ExtraLight</string>
9-
</mutableArray>
10-
<mutableArray key="Dosis-Regular.otf">
14+
</array>
15+
<array key="Dosis-Regular.otf">
1116
<string>Dosis-Regular</string>
12-
<string>Dosis-Regular</string>
13-
</mutableArray>
17+
</array>
1418
</customFonts>
1519
<objects>
1620
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
1721
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
18-
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="UserCollectionViewCell" id="gdF-wQ-JiZ" customClass="UserCollectionViewCell" customModule="YALLayoutTransitioning" customModuleProvider="target">
22+
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="UserCollectionViewCell" id="gdF-wQ-JiZ" customClass="UserCollectionViewCell" customModule="DisplaySwitcher_Example" customModuleProvider="target">
1923
<rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
2024
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2125
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -24,35 +28,35 @@
2428
<subviews>
2529
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xuV-JL-rj1">
2630
<rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
27-
<color key="backgroundColor" red="0.1215686275" green="0.1450980392" blue="0.15686274510000001" alpha="1" colorSpace="calibratedRGB"/>
31+
<color key="backgroundColor" red="0.1215686275" green="0.1450980392" blue="0.15686274510000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2832
</view>
2933
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="23 posts • 78 comments • 341 likes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tae-yd-Jjo">
3034
<rect key="frame" x="95" y="44" width="200" height="19"/>
3135
<fontDescription key="fontDescription" name="Dosis-ExtraLight" family="Dosis" pointSize="15"/>
32-
<color key="textColor" red="0.396078431372549" green="0.52941176470588236" blue="0.50588235294117645" alpha="1" colorSpace="calibratedRGB"/>
36+
<color key="textColor" red="0.396078431372549" green="0.52941176470588236" blue="0.50588235294117645" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
3337
<nil key="highlightedColor"/>
3438
</label>
3539
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Grace Simpson" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hwV-Zy-XbA">
3640
<rect key="frame" x="95" y="15" width="97" height="22"/>
3741
<fontDescription key="fontDescription" name="Dosis-Regular" family="Dosis" pointSize="17"/>
38-
<color key="textColor" red="0.56078431370000004" green="0.62745098040000002" blue="0.6705882353" alpha="1" colorSpace="calibratedRGB"/>
42+
<color key="textColor" red="0.56078431370000004" green="0.62745098040000002" blue="0.6705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
3943
<nil key="highlightedColor"/>
4044
</label>
4145
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bNy-hc-AKS" userLabel="Container View">
4246
<rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
4347
<subviews>
4448
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Grace Simpson" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ffm-Pv-DOi">
45-
<rect key="frame" x="10" y="33" width="59" height="43"/>
49+
<rect key="frame" x="10" y="54.5" width="96.5" height="21.5"/>
4650
<fontDescription key="fontDescription" name="Dosis-Regular" family="Dosis" pointSize="17"/>
47-
<color key="textColor" red="0.5607843137254902" green="0.62745098039215685" blue="0.6705882352941176" alpha="1" colorSpace="calibratedRGB"/>
51+
<color key="textColor" red="0.5607843137254902" green="0.62745098039215685" blue="0.6705882352941176" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4852
<nil key="highlightedColor"/>
4953
</label>
5054
</subviews>
51-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
55+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
5256
<constraints>
5357
<constraint firstItem="ffm-Pv-DOi" firstAttribute="leading" secondItem="bNy-hc-AKS" secondAttribute="leading" constant="10" id="bND-9Z-Tui"/>
5458
<constraint firstAttribute="bottom" secondItem="ffm-Pv-DOi" secondAttribute="bottom" constant="4" id="mC0-hz-8zg"/>
55-
<constraint firstAttribute="trailing" secondItem="ffm-Pv-DOi" secondAttribute="trailing" constant="11" id="xtL-Jy-8km"/>
59+
<constraint firstAttribute="trailing" secondItem="ffm-Pv-DOi" secondAttribute="trailing" priority="750" constant="11" id="xtL-Jy-8km"/>
5660
</constraints>
5761
</view>
5862
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rMa-bq-TqE">
@@ -63,7 +67,6 @@
6367
</constraints>
6468
</imageView>
6569
</subviews>
66-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
6770
</view>
6871
<constraints>
6972
<constraint firstItem="rMa-bq-TqE" firstAttribute="top" secondItem="gdF-wQ-JiZ" secondAttribute="top" id="DRm-1f-DUn"/>

‎Pod/Classes/TransitionManager/TransitionManager.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UIKit
1010

1111
private let finishTransitionValue = 1.0
1212

13-
open class TransitionManager {
13+
@objc open class TransitionManager: NSObject {
1414

1515
fileprivate let duration: TimeInterval
1616
fileprivate let collectionView: UICollectionView
@@ -34,7 +34,7 @@ open class TransitionManager {
3434
self.collectionView.reloadData()
3535
UIApplication.shared.endIgnoringInteractionEvents()
3636
}
37-
} as! TransitionLayout
37+
} as! TransitionLayout
3838
transitionLayout.layoutState = layoutState
3939
createUpdaterAndStart()
4040
}
@@ -50,7 +50,7 @@ fileprivate extension TransitionManager {
5050
updater.add(to: RunLoop.current, forMode: .commonModes)
5151
}
5252

53-
dynamic func updateTransitionProgress() {
53+
@objc func updateTransitionProgress() {
5454
var progress = (updater.timestamp - startTime) / duration
5555
progress = min(1, progress)
5656
progress = max(0, progress)

0 commit comments

Comments
 (0)