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.

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

Separate spacing between action button and first action item #262

Merged
merged 6 commits into from
Apr 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ internal class ConfigurationExampleViewController: UIViewController {
actionButton.buttonImageSize = CGSize(width: 30, height: 30)

actionButton.buttonAnimationConfiguration = .transition(toImage: #imageLiteral(resourceName: "X"))
actionButton.itemAnimationConfiguration = .slideIn(withInterItemSpacing: 14)
actionButton.itemAnimationConfiguration = .slideIn(withInterItemSpacing: 14, firstItemSpacing: 28)

actionButton.layer.shadowColor = UIColor.black.cgColor
actionButton.layer.shadowOffset = CGSize(width: 0, height: 1)
Expand Down
13 changes: 13 additions & 0 deletions Example/Tests/AnimationConfigurationSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ class AnimationConfigurationSpec: QuickSpec {
}
}

context("when using pop up style with separate first item spacing") {
beforeEach {
actionButton.itemAnimationConfiguration = .popUp(withInterItemSpacing: 10, firstItemSpacing: 50)
actionButton.buttonAnimationConfiguration = .transition(toImage: #imageLiteral(resourceName: "Owl"))
}

it("it looks correct") {
actionButton.open(animated: false)

expect(superview) == snapshot()
}
}

context("when using slide in style") {
beforeEach {
actionButton.itemAnimationConfiguration = .slideIn(withInterItemSpacing: 10)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 31 additions & 8 deletions Sources/AnimationConfiguration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,17 @@ import UIKit
/// - `itemLayout = .verticalLine()`
/// - `closedState = .scale()`
///
/// - Parameter interItemSpacing: The distance between two adjacent items.
/// - Parameter interItemSpacing: The distance between two adjacent items. Default is `12`.
/// - Parameter firstItemSpacing: The distance between the action button and the first action item.
/// When `firstItemSpacing` is `0` or less `interItemSpacing` is used instead.
/// Default is `0`.
///
/// - Returns: An item animation configuration object.
///
@objc static func popUp(withInterItemSpacing interItemSpacing: CGFloat = 12) -> JJItemAnimationConfiguration {
@objc static func popUp(withInterItemSpacing interItemSpacing: CGFloat = 12,
firstItemSpacing: CGFloat = 0) -> JJItemAnimationConfiguration {
let configuration = JJItemAnimationConfiguration()
configuration.itemLayout = .verticalLine(withInterItemSpacing: interItemSpacing)
configuration.itemLayout = .verticalLine(withInterItemSpacing: interItemSpacing, firstItemSpacing: firstItemSpacing)
configuration.closedState = .scale()
return configuration
}
Expand All @@ -224,13 +228,17 @@ import UIKit
/// - `itemLayout = .verticalLine()`
/// - `closedState = .horizontalOffset()`
///
/// - Parameter interItemSpacing: The distance between two adjacent items.
/// - Parameter interItemSpacing: The distance between two adjacent items. Default is `12`.
/// - Parameter firstItemSpacing: The distance between the action button and the first action item.
/// When `firstItemSpacing` is `0` or less `interItemSpacing` is used instead.
/// Default is `0`.
///
/// - Returns: An item animation configuration object.
///
@objc static func slideIn(withInterItemSpacing interItemSpacing: CGFloat = 12) -> JJItemAnimationConfiguration {
@objc static func slideIn(withInterItemSpacing interItemSpacing: CGFloat = 12,
firstItemSpacing: CGFloat = 0) -> JJItemAnimationConfiguration {
let configuration = JJItemAnimationConfiguration()
configuration.itemLayout = .verticalLine(withInterItemSpacing: interItemSpacing)
configuration.itemLayout = .verticalLine(withInterItemSpacing: interItemSpacing, firstItemSpacing: firstItemSpacing)
configuration.closedState = .horizontalOffset()
return configuration
}
Expand Down Expand Up @@ -290,15 +298,21 @@ import UIKit
/// Returns an item layout object that places the items in a vertical line with given inter item spacing.
///
/// - Parameter interItemSpacing: The distance between two adjacent items.
/// - Parameter firstItemSpacing: The distance between the action button and the first action item.
/// When `firstItemSpacing` is 0 or less `interItemSpacing` is used instead.
/// Default is 0.
///
/// - Returns: An item layout object.
///
@objc public static func verticalLine(withInterItemSpacing interItemSpacing: CGFloat = 12) -> JJItemLayout {
@objc public static func verticalLine(withInterItemSpacing interItemSpacing: CGFloat = 12,
firstItemSpacing: CGFloat = 0) -> JJItemLayout {
return JJItemLayout { items, actionButton in
var previousItem: JJActionItem?
for item in items {
let previousView = previousItem ?? actionButton
item.bottomAnchor.constraint(equalTo: previousView.topAnchor, constant: -interItemSpacing).isActive = true
let isFirstItem = (previousItem == nil)
let spacing = selectSpacing(forFirstItem: isFirstItem, defaultSpacing: interItemSpacing, firstItemSpacing: firstItemSpacing)
item.bottomAnchor.constraint(equalTo: previousView.topAnchor, constant: -spacing).isActive = true
item.circleView.centerXAnchor.constraint(equalTo: actionButton.centerXAnchor).isActive = true
previousItem = item
}
Expand Down Expand Up @@ -467,6 +481,15 @@ internal extension JJItemAnimationConfiguration {
}
}

fileprivate extension JJItemLayout {
static func selectSpacing(forFirstItem isFirstItem: Bool, defaultSpacing: CGFloat, firstItemSpacing: CGFloat) -> CGFloat {
if isFirstItem && firstItemSpacing > 0 {
return firstItemSpacing
}
return defaultSpacing
}
}

fileprivate extension JJActionItem {
func scale(by factor: CGFloat, translationX: CGFloat = 0, translationY: CGFloat = 0) {
let scale = scaleTransformation(factor: factor)
Expand Down