Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix access to functions in AnimationConfiguration #259

Merged
merged 4 commits into from
Apr 18, 2020
Merged

Fix access to functions in AnimationConfiguration #259

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dec0256
Make internal functions of AnimationConfiguration public
jjochen Apr 17, 2020
44884c3
Merge branch 'master' into feature/public_configuration_functions
jjochen Apr 17, 2020
a75e473
'public' modifier is redundant for static method declared in a public…
jjochen Apr 17, 2020
6a90472
Merge branch 'master' into feature/public_configuration_functions
jjochen Apr 17, 2020
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
14 changes: 7 additions & 7 deletions Sources/AnimationConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ import UIKit
///
/// - Returns: An item layout object.
///
@objc static func verticalLine(withInterItemSpacing interItemSpacing: CGFloat = 12) -> JJItemLayout {
@objc public static func verticalLine(withInterItemSpacing interItemSpacing: CGFloat = 12) -> JJItemLayout {
return JJItemLayout { items, actionButton in
var previousItem: JJActionItem?
for item in items {
Expand All @@ -311,7 +311,7 @@ import UIKit
///
/// - Returns: An item layout object.
///
@objc static func circular(withRadius radius: CGFloat = 100) -> JJItemLayout {
@objc public static func circular(withRadius radius: CGFloat = 100) -> JJItemLayout {
return JJItemLayout { items, actionButton in
let numberOfItems = items.count
var index: Int = 0
Expand Down Expand Up @@ -357,7 +357,7 @@ import UIKit
///
/// - Returns: An item preparation object.
///
@objc static func identity() -> JJItemPreparation {
@objc public static func identity() -> JJItemPreparation {
return JJItemPreparation { item, _, _, _ in
item.transform = .identity
item.alpha = 1
Expand All @@ -372,7 +372,7 @@ import UIKit
///
/// - Returns: An item preparation object.
///
@objc static func scale(by ratio: CGFloat = 0.4) -> JJItemPreparation {
@objc public static func scale(by ratio: CGFloat = 0.4) -> JJItemPreparation {
return JJItemPreparation { item, _, _, _ in
item.scale(by: ratio)
item.alpha = 0
Expand All @@ -390,7 +390,7 @@ import UIKit
///
/// - Returns: An item preparation object.
///
@objc static func offset(translationX: CGFloat, translationY: CGFloat, scale: CGFloat = 0.4) -> JJItemPreparation {
@objc public static func offset(translationX: CGFloat, translationY: CGFloat, scale: CGFloat = 0.4) -> JJItemPreparation {
return JJItemPreparation { item, _, _, _ in
item.scale(by: scale, translationX: translationX, translationY: translationY)
item.alpha = 0
Expand All @@ -409,7 +409,7 @@ import UIKit
///
/// - Returns: An item preparation object.
///
@objc static func horizontalOffset(distance: CGFloat = 50, scale: CGFloat = 0.4) -> JJItemPreparation {
@objc public static func horizontalOffset(distance: CGFloat = 50, scale: CGFloat = 0.4) -> JJItemPreparation {
return JJItemPreparation { item, _, _, actionButton in
let translationX = actionButton.isOnLeftSideOfScreen ? -distance : distance
item.scale(by: scale, translationX: translationX)
Expand All @@ -429,7 +429,7 @@ import UIKit
///
/// - Returns: An item preparation object.
///
@objc static func circularOffset(distance: CGFloat = 50, scale: CGFloat = 0.4) -> JJItemPreparation {
@objc public static func circularOffset(distance: CGFloat = 50, scale: CGFloat = 0.4) -> JJItemPreparation {
return JJItemPreparation { item, index, numberOfItems, actionButton in
let itemAngle = JJItemAnimationConfiguration.angleForItem(at: index,
numberOfItems: numberOfItems,
Expand Down