Skip to content

Made a few methods private from ViewControllable #309

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

Merged
tinder-SamMarshall merged 11 commits into from
Mar 28, 2023
Merged

Made a few methods private from ViewControllable #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
451398c
Removed and refactored a handful of methods
tinder-SamMarshall Dec 22, 2022
d018847
Removed Methods
tinder-SamMarshall Jan 19, 2023
5246b6e
Merge branch 'main' into feature/TDP-139956-removed-and-refactored
tinder-SamMarshall Feb 14, 2023
dcf2b87
Fixed code
tinder-SamMarshall Feb 14, 2023
3db43d7
Merge branch 'feature/TDP-139956-removed-and-refactored' into feature…
tinder-SamMarshall Feb 14, 2023
5b127a9
made funcs private
tinder-SamMarshall Feb 14, 2023
8b460f4
fixed code
tinder-SamMarshall Feb 14, 2023
1c4a18f
Merge branch 'main' into feature/remove-view-controllable-methods
tinder-SamMarshall Mar 7, 2023
a597ef7
Fixed comp
tinder-SamMarshall Mar 7, 2023
7f687ee
Moved private method after public methods
tinder-SamMarshall Mar 13, 2023
a7d786a
addressing comments
tinder-SamMarshall Mar 27, 2023
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
56 changes: 16 additions & 40 deletions Sources/Nodes/ViewControllable/UIKit/UIViewController+ViewControllable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,44 +49,6 @@ extension UIViewController: ViewControllable {
dismiss(animated: animated, completion: completion)
}

/// Called just before the ``ViewControllable`` instance is added or removed from a container
/// ``ViewControllable`` instance.
///
/// - Parameter viewController: The parent ``ViewControllable`` instance, or `nil` if there is no parent.
public func willMove(toParent viewController: ViewControllable?) {
let viewController: UIViewController? = viewController?._asUIViewController()
willMove(toParent: viewController)
}

/// Called after the ``ViewControllable`` instance is added or removed from a container
/// ``ViewControllable`` instance.
///
/// - Parameter viewController: The parent ``ViewControllable`` instance, or `nil` if there is no parent.
public func didMove(toParent viewController: ViewControllable?) {
let viewController: UIViewController? = viewController?._asUIViewController()
didMove(toParent: viewController)
}

/// Adds the given ``ViewControllable`` instance as a child.
///
/// - Parameter viewController: The ``ViewControllable`` instance to be added as a child.
public func addChild(_ viewController: ViewControllable) {
let viewController: UIViewController = viewController._asUIViewController()
guard !children.contains(viewController)
else { return }
addChild(viewController)
}

/// Removes the given ``ViewControllable`` instance from its parent.
///
/// - Parameter viewController: The ``ViewControllable`` instance to be removed from its parent.
public func removeChild(_ viewController: ViewControllable) {
let viewController: UIViewController = viewController._asUIViewController()
guard children.contains(viewController)
else { return }
viewController.removeFromParent()
}

/// Contains the given ``ViewControllable`` instance within the entire bounds of the parent
/// ``ViewControllable`` instance.
///
Expand Down Expand Up @@ -114,7 +76,7 @@ extension UIViewController: ViewControllable {
subview.centerYAnchor.constraint(equalTo: view.centerYAnchor),
subview.centerXAnchor.constraint(equalTo: view.centerXAnchor)
])
viewController.didMove(toParent: self)
viewController._asUIViewController().didMove(toParent: self)
}

/// Uncontains the given ``ViewControllable`` instance.
Expand All @@ -124,7 +86,7 @@ extension UIViewController: ViewControllable {
let subview: UIView = viewController._asUIViewController().view
guard subview.isDescendant(of: view)
else { return }
viewController.willMove(toParent: nil)
viewController._asUIViewController().willMove(toParent: nil)
subview.removeFromSuperview()
removeChild(viewController)
}
Expand All @@ -135,6 +97,20 @@ extension UIViewController: ViewControllable {
public func _asUIViewController() -> UIViewController { // swiftlint:disable:this identifier_name
self
}

private func addChild(_ viewController: ViewControllable) {
let viewController: UIViewController = viewController._asUIViewController()
guard !children.contains(viewController)
else { return }
addChild(viewController)
}

private func removeChild(_ viewController: ViewControllable) {
let viewController: UIViewController = viewController._asUIViewController()
guard children.contains(viewController)
else { return }
viewController.removeFromParent()
}
}

#endif
22 changes: 0 additions & 22 deletions Sources/Nodes/ViewControllable/ViewControllable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,6 @@ public protocol ViewControllable: AnyObject {
completion: (() -> Void)?
)

/// Called just before the ``ViewControllable`` instance is added or removed from a container
/// ``ViewControllable`` instance.
///
/// - Parameter viewController: The parent ``ViewControllable`` instance, or `nil` if there is no parent.
func willMove(toParent viewController: ViewControllable?)

/// Called after the ``ViewControllable`` instance is added or removed from a container
/// ``ViewControllable`` instance.
///
/// - Parameter viewController: The parent ``ViewControllable`` instance, or `nil` if there is no parent.
func didMove(toParent viewController: ViewControllable?)

/// Adds the given ``ViewControllable`` instance as a child.
///
/// - Parameter viewController: The ``ViewControllable`` instance to be added as a child.
func addChild(_ viewController: ViewControllable)

/// Removes the given ``ViewControllable`` instance from its parent.
///
/// - Parameter viewController: The ``ViewControllable`` instance to be removed from its parent.
func removeChild(_ viewController: ViewControllable)

/// Contains the given ``ViewControllable`` instance within the entire bounds of the parent
/// ``ViewControllable`` instance.
///
Expand Down