Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
f0a7453
Changed the accessibility of DraggableCardView's contentView
brownsoo Feb 26, 2018
1170af0
Added the possibility to have the card stack at the top or at the bot…
lorenzOliveto Sep 14, 2018
8ad914c
public defaulValues
leonardoherbert Sep 28, 2018
12d73e2
Add `backgroundCardsTopMargin` property as public
MaxRandom Nov 8, 2018
0cc0922
Add ability to silently swipe a card
MaxRandom Nov 9, 2018
dc5832e
Add willShow method delegate
MaxRandom Nov 12, 2018
ee64d1d
Remove restriction for swiping speed
MaxRandom Nov 15, 2018
3470c2c
little publicity
sroik Dec 5, 2018
6356d02
Call `willShow` delegate method upon appearing
MaxRandom Dec 10, 2018
b33bca3
Merge pull request #380 from brownsoo/change-contentview-accessiblilty
rnkyr Dec 25, 2018
919d16e
Merge pull request #402 from app-craft/little_publicity
rnkyr Dec 25, 2018
42815b9
Merge branch 'master' into master
rnkyr Dec 25, 2018
227254d
Merge pull request #387 from leonardoherbert/master
rnkyr Dec 25, 2018
ad52040
Merge branch 'master' into master
rnkyr Dec 25, 2018
ddeb293
[refactor] re-arrange public fields
rnkyr Dec 25, 2018
1ca6083
Merge branch 'master' into master
rnkyr Dec 25, 2018
6fc69bd
Merge pull request #382 from lorenzOliveto/master
rnkyr Dec 25, 2018
0701d40
Xcode 9 and Xcode 10 Swift version support
rnkyr Dec 25, 2018
a4d8dfc
[update] swift to 4.2
rnkyr Dec 25, 2018
0222bc9
Merge pull request #405 from Yalantis/feature/xcode-9-compatibility
rnkyr Dec 25, 2018
f339104
[update] version, changelog
rnkyr Dec 25, 2018
89da17e
Update README.md
rnkyr Dec 25, 2018
2393f57
do not layoutDeck during drag.
Jan 10, 2019
60ca992
remove iterating.
Jan 10, 2019
034f90f
Fix the bug with false-positive choosing a direction
Jan 11, 2019
d9deb5d
Merge pull request #1 from dantish/master
MaxRandom Jan 11, 2019
21b0bff
Fix calling didShowCard too early
Jan 11, 2019
8e0f363
Merge pull request #2 from dantish/master
MaxRandom Jan 11, 2019
74afe3c
Hello, fixed the vulnerability that the card could not respond due to…
lixiang1994 Jan 17, 2019
f663a5c
Fixed vulnerabilities where gesture limits are invalid
lixiang1994 Jan 18, 2019
1dfecea
some code line breaks be removed.
lixiang1994 Jan 23, 2019
3077d44
1. Optimized position calculation
lixiang1994 Feb 3, 2019
3703add
Merge pull request #409 from soundsmitten/bugfix/panFlicker
rnkyr Mar 13, 2019
582a193
Merge branch 'master' into master
rnkyr Mar 13, 2019
5b3be08
Merge pull request #412 from lixiang1994/master
rnkyr Mar 13, 2019
dec1a52
[update] readme, podspec
rnkyr Mar 13, 2019
0799cee
update framework to Swift 5.0
maxxfrazer Mar 29, 2019
0bdc05f
bumping the version in swift badge to 5.0
maxxfrazer Mar 31, 2019
18da878
Merge pull request #422 from maxxfrazer/master
rnkyr May 2, 2019
2ba6a25
[update] meta files
rnkyr May 2, 2019
8727fad
have added `func koloda(_ koloda:, didRewindTo:)` delegate method
s-navka Apr 7, 2020
8336c82
carthage update versions
s-navka Apr 7, 2020
65c05e4
[update] changelog
s-navka Apr 7, 2020
dc249cd
Merge pull request #446 from Yalantis/feature/442-rewind-card
YuryGrinenko Apr 7, 2020
b088c61
removed force unwrap
s-navka Apr 15, 2020
8539e9d
typo
s-navka Apr 15, 2020
ab06185
Merge pull request #447 from Yalantis/feature/434-crash-on-dragging-card
PravdaEvgen Apr 16, 2020
be55dc4
[update] podspec, readme
s-navka Apr 16, 2020
cdce408
Merge branch 'master' of github.com:Yalantis/Koloda
s-navka Apr 16, 2020
27886cd
reload fix
sergey-prikhodko Apr 20, 2020
134d93b
fix swipePercentageMargin
sergey-prikhodko Apr 21, 2020
77c6439
Merge pull request #448 from Yalantis/bugfix
PravdaEvgen Apr 21, 2020
f8e6bef
Merge branch 'master' of https://github.com/Yalantis/Koloda into Yala…
MaxRandom Jan 9, 2021
167e2de
Merge branch 'Yalantis-master'
MaxRandom Jan 9, 2021
16a5004
Fix example project
MaxRandom Jan 9, 2021
88cff5a
Fix forced swipe to the restricted direction
MaxRandom Apr 16, 2021
270d8f6
Fix forced swipe speed
MaxRandom Apr 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "facebook/pop" "1.0.9"
github "facebook/pop" "1.0.12"
30 changes: 14 additions & 16 deletions Example/Koloda.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
607FACC71AFB9204008FA782 = {
isa = PBXGroup;
children = (
607FACF51AFB993E008FA782 /* Podspec Metadata */,
607FACD21AFB9204008FA782 /* Example */,
607FACD11AFB9204008FA782 /* Products */,
AB88095976C7B6CA809587FB /* Pods */,
85B3405D0F2A73D9A709B3FA /* Frameworks */,
AB88095976C7B6CA809587FB /* Pods */,
607FACF51AFB993E008FA782 /* Podspec Metadata */,
607FACD11AFB9204008FA782 /* Products */,
);
sourceTree = "<group>";
};
Expand All @@ -82,18 +82,18 @@
isa = PBXGroup;
children = (
607FACD51AFB9204008FA782 /* AppDelegate.swift */,
607FACD71AFB9204008FA782 /* ViewController.swift */,
440FB7681B515995009FC9FC /* BackgroundAnimationViewController.swift */,
446BFD081CB0184A00619E78 /* BackgroundKolodaAnimator.swift */,
4420661E1B4457E800FD4CAD /* ExampleOverlayView.swift */,
440FB7661B51499A009FC9FC /* CustomKolodaView.swift */,
44B5EC281B660C8500895E3D /* CustomOverlayView.swift */,
607FACD91AFB9204008FA782 /* Main.storyboard */,
44B5EC2A1B660C9100895E3D /* CustomOverlayView.xib */,
4420661E1B4457E800FD4CAD /* ExampleOverlayView.swift */,
607FACDC1AFB9204008FA782 /* Images.xcassets */,
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
607FACD91AFB9204008FA782 /* Main.storyboard */,
4420661B1B44577500FD4CAD /* OverlayView.xib */,
44B5EC2A1B660C9100895E3D /* CustomOverlayView.xib */,
607FACD31AFB9204008FA782 /* Supporting Files */,
607FACD71AFB9204008FA782 /* ViewController.swift */,
);
name = Example;
path = Koloda;
Expand All @@ -111,8 +111,8 @@
isa = PBXGroup;
children = (
D6781607B5327BAF503C32E3 /* Koloda.podspec */,
8C6AF94B3192C604963C53B3 /* README.md */,
5C6DBB80685DABAE785B8715 /* LICENSE */,
8C6AF94B3192C604963C53B3 /* README.md */,
);
name = "Podspec Metadata";
sourceTree = "<group>";
Expand Down Expand Up @@ -170,13 +170,13 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0900;
LastSwiftMigration = 1020;
};
};
};
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "Koloda" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -232,7 +232,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Koloda_Example/Pods-Koloda_Example-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-Koloda_Example/Pods-Koloda_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Koloda/Koloda.framework",
"${BUILT_PRODUCTS_DIR}/pop/pop.framework",
);
Expand All @@ -243,7 +243,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Koloda_Example/Pods-Koloda_Example-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Koloda_Example/Pods-Koloda_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -408,8 +408,7 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.Koloda-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -425,8 +424,7 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.Koloda-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
5 changes: 4 additions & 1 deletion Example/Koloda/BackgroundAnimationViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ class BackgroundAnimationViewController: UIViewController {

//MARK: KolodaViewDelegate
extension BackgroundAnimationViewController: KolodaViewDelegate {

func koloda(_ koloda: KolodaView, willShow card: UIView, at index: Int) {

}

func kolodaDidRunOutOfCards(_ koloda: KolodaView) {
kolodaView.resetCurrentCardIndex()
}
Expand Down
5 changes: 4 additions & 1 deletion Example/Koloda/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ class ViewController: UIViewController {
// MARK: KolodaViewDelegate

extension ViewController: KolodaViewDelegate {

func koloda(_ koloda: KolodaView, willShow card: UIView, at index: Int) {

}

func kolodaDidRunOutOfCards(_ koloda: KolodaView) {
let position = kolodaView.currentCardIndex
for i in 1...4 {
Expand Down
12 changes: 6 additions & 6 deletions Koloda.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = "Koloda"
s.version = '4.5.1'
s.summary = "KolodaView is a class designed to simplify the implementation of Tinder like cards on iOS. "
s.name = 'Koloda'
s.version = '5.0.1'
s.summary = 'KolodaView is a class designed to simplify the implementation of Tinder like cards on iOS. '

s.homepage = "https://github.com/Yalantis/Koloda"
s.homepage = 'https://github.com/Yalantis/Koloda'
s.license = 'MIT'
s.author = "Yalantis"
s.source = { :git => "https://github.com/Yalantis/Koloda.git", :tag => s.version }
s.author = 'Yalantis'
s.source = { :git => 'https://github.com/Yalantis/Koloda.git', :tag => s.version }
s.social_media_url = 'https://twitter.com/yalantis'

s.platform = :ios, '8.0'
Expand Down
Loading