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 linter issues in example #289

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Fix linter issues in example #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions Example/JJFloatingActionButton/ConfigurationExampleViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class ConfigurationExampleViewController: UIViewController {
super.viewDidLoad()

configureActionButton()
addItems()

view.addSubview(actionButton)

Expand Down Expand Up @@ -94,8 +95,6 @@ class ConfigurationExampleViewController: UIViewController {
item.layer.shadowOpacity = Float(0.4)
item.layer.shadowRadius = CGFloat(2)
}

addItems()
}

fileprivate func addItems() {
Expand Down
12 changes: 8 additions & 4 deletions Sources/AnimationConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ public typealias JJItemAngle = (_ index: Int, _ numberOfItems: Int, _ actionButt
/// - Returns: An item animation configuration object.
///
static func circularPopUp(withRadius radius: CGFloat = 100,
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem) -> JJItemAnimationConfiguration {
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem)
-> JJItemAnimationConfiguration {
let configuration = JJItemAnimationConfiguration()
configuration.itemLayout = .circular(withRadius: radius, angleForItem: angleForItem)
configuration.closedState = .scale()
Expand All @@ -286,7 +287,8 @@ public typealias JJItemAngle = (_ index: Int, _ numberOfItems: Int, _ actionButt
/// - Returns: An item animation configuration object.
///
static func circularSlideIn(withRadius radius: CGFloat = 100,
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem) -> JJItemAnimationConfiguration {
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem)
-> JJItemAnimationConfiguration {
let configuration = JJItemAnimationConfiguration()
configuration.itemLayout = .circular(withRadius: radius, angleForItem: angleForItem)
configuration.closedState = .circularOffset(distance: radius * 0.75, angleForItem: angleForItem)
Expand Down Expand Up @@ -346,7 +348,8 @@ public typealias JJItemAngle = (_ index: Int, _ numberOfItems: Int, _ actionButt
/// - Returns: An item layout object.
///
@objc public static func circular(withRadius radius: CGFloat = 100,
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem) -> JJItemLayout {
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem)
-> JJItemLayout {
return JJItemLayout { items, actionButton in
let numberOfItems = items.count
for (index, item) in items.enumerated() {
Expand Down Expand Up @@ -465,7 +468,8 @@ public typealias JJItemAngle = (_ index: Int, _ numberOfItems: Int, _ actionButt
///
@objc public static func circularOffset(distance: CGFloat = 50,
scale: CGFloat = 0.4,
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem) -> JJItemPreparation {
angleForItem: @escaping JJItemAngle = JJItemAnimationConfiguration.angleForItem)
-> JJItemPreparation {
return JJItemPreparation { item, index, numberOfItems, actionButton in
let itemAngle = angleForItem(index, numberOfItems, actionButton)
let transitionAngle = itemAngle + CGFloat.pi
Expand Down