From 28c3808f1a8bed22d5a8ab9dbbf10d3e5b94ffa8 Mon Sep 17 00:00:00 2001 From: Boyko Mihail Date: Tue, 29 Jun 2021 16:47:39 +0300 Subject: [PATCH] fix: pr issue --- .../Helpers/DefaultAnimators/ParalaxAnimator.swift | 4 +++- .../DefaultAnimators/ParalaxWithScaleAnimator.swift | 4 +++- .../ParalaxWithTransitionAnimator .swift | 8 ++++++-- .../Helpers/Protocols/NavigationBarHolder.swift | 11 ----------- .../Sources/Helpers/Protocols/TableViewHolder.swift | 11 ----------- 5 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 TIUIElements/Sources/Helpers/Protocols/NavigationBarHolder.swift delete mode 100644 TIUIElements/Sources/Helpers/Protocols/TableViewHolder.swift diff --git a/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxAnimator.swift b/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxAnimator.swift index 7f66ba40..eeaacbe6 100644 --- a/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxAnimator.swift +++ b/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxAnimator.swift @@ -16,7 +16,9 @@ final public class ParalaxAnimator: CollapsibleViewsAnimator { private weak var navBar: UINavigationBar? private weak var tableHeaderView: ParallaxTableHeaderView? - public init(tableHeaderView: ParallaxTableHeaderView, navBar: UINavigationBar? = nil, currentContentOffset: CGPoint) { // if nil - no alpha animation + public init(tableHeaderView: ParallaxTableHeaderView, + navBar: UINavigationBar? = nil, + currentContentOffset: CGPoint) { // if nil - no alpha animation self.currentContentOffset = currentContentOffset self.tableHeaderView = tableHeaderView self.navBar = navBar diff --git a/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithScaleAnimator.swift b/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithScaleAnimator.swift index 825f1aad..359b2113 100644 --- a/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithScaleAnimator.swift +++ b/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithScaleAnimator.swift @@ -22,7 +22,9 @@ final public class ParalaxWithScaleAnimator: CollapsibleViewsAnimator { public init(tableHeaderView: ParallaxTableHeaderView, navBar: UINavigationBar? = nil, currentContentOffset: CGPoint) { self.navBar = navBar - paralaxAnimator = ParalaxAnimator(tableHeaderView: tableHeaderView, navBar: nil, currentContentOffset: currentContentOffset) + paralaxAnimator = ParalaxAnimator(tableHeaderView: tableHeaderView, + navBar: nil, + currentContentOffset: currentContentOffset) scaleAnimator = ScaleAnimator(navBar: navBar) self.currentContentOffset = currentContentOffset } diff --git a/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithTransitionAnimator .swift b/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithTransitionAnimator .swift index 04aa7565..2f441e10 100644 --- a/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithTransitionAnimator .swift +++ b/TIUIElements/Sources/Helpers/DefaultAnimators/ParalaxWithTransitionAnimator .swift @@ -20,9 +20,13 @@ final public class ParalaxWithTransitionAnimator: CollapsibleViewsAnimator { private weak var navBar: UINavigationBar? - public init(tableHeaderView: ParallaxTableHeaderView, navBar: UINavigationBar? = nil, currentContentOffset: CGPoint) { + public init(tableHeaderView: ParallaxTableHeaderView, + navBar: UINavigationBar? = nil, + currentContentOffset: CGPoint) { self.navBar = navBar - paralaxAnimator = ParalaxAnimator(tableHeaderView: tableHeaderView, navBar: nil, currentContentOffset: currentContentOffset) + paralaxAnimator = ParalaxAnimator(tableHeaderView: tableHeaderView, + navBar: nil, + currentContentOffset: currentContentOffset) transitionAnimator = TransitionAnimator(navBar: navBar) self.currentContentOffset = currentContentOffset } diff --git a/TIUIElements/Sources/Helpers/Protocols/NavigationBarHolder.swift b/TIUIElements/Sources/Helpers/Protocols/NavigationBarHolder.swift deleted file mode 100644 index b4dcb788..00000000 --- a/TIUIElements/Sources/Helpers/Protocols/NavigationBarHolder.swift +++ /dev/null @@ -1,11 +0,0 @@ -import UIKit - -public protocol NavigationBarHolder { - var navBar: UINavigationBar? { get } -} - -extension UIViewController: NavigationBarHolder { - public var navBar: UINavigationBar? { - navigationController?.navigationBar - } -} diff --git a/TIUIElements/Sources/Helpers/Protocols/TableViewHolder.swift b/TIUIElements/Sources/Helpers/Protocols/TableViewHolder.swift deleted file mode 100644 index 3aea1351..00000000 --- a/TIUIElements/Sources/Helpers/Protocols/TableViewHolder.swift +++ /dev/null @@ -1,11 +0,0 @@ -import UIKit - -public protocol TableViewHolder { - var tableView: UITableView { get } -} - -public extension TableViewHolder { - var startOffset: CGPoint { - tableView.contentOffset - } -}