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

iOS 10309 crouton on screen #382

Merged
merged 5 commits into from
Jul 26, 2024
Merged

iOS 10309 crouton on screen #382

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d1f930
IOS-10309: Force crouton on exact screen
WanaldinoTelefonica Jul 4, 2024
f15788b
IOS-10309: Unify show functions
WanaldinoTelefonica Jul 4, 2024
057c64c
Run swiftformat
WanaldinoTelefonica Jul 9, 2024
5aec62c
Remove comments and added assert
WanaldinoTelefonica Jul 22, 2024
0ec4064
Fix autoclosure on tests
WanaldinoTelefonica Jul 24, 2024
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
109 changes: 35 additions & 74 deletions Sources/Mistica/Components/Crouton/Presentation/CroutonController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@
import UIKit

public class CroutonController: NSObject {
public enum RootViewController {
public typealias Closure = () -> UIViewController?
public static let `default`: Closure = { UIApplication.shared.windows.filter(\.isKeyWindow).first?.rootViewController }
}

// public typealias RootViewControllerClosure = () -> UIViewController?
// public static let defaultRootViewControllerClosure = { UIApplication.shared.windows.filter(\.isKeyWindow).first?.rootViewController }

WanaldinoTelefonica marked this conversation as resolved.
Show resolved Hide resolved
public typealias Token = UUID
public typealias ActionConfig = (text: String, accessibilityLabel: String?, handler: DidTapActionBlock)
fileprivate typealias OngoingCrouton = (token: Token, croutonView: CroutonView, rootViewController: () -> UIViewController?)

public typealias DismissHandlerBlock = (SnackbarDismissReason) -> Void
public typealias DidTapActionBlock = () -> Void
Expand All @@ -33,20 +40,20 @@ public extension CroutonController {
/// - action: An optional action which will show a button with the given title and invoke the handler when the button is pressed
/// - style: The style of the crouton, `.info` by default
/// - dismissHandler: A handler which is called when the handler is removed from the screen
@available(iOSApplicationExtension, unavailable)
@discardableResult
func showCrouton(
config: SnackbarConfig,
style: CroutonStyle = .info,
dismissHandler: DismissHandlerBlock? = nil
) -> Token {
showCrouton(
config: config,
style: style,
dismissHandler: dismissHandler,
rootViewController: UIApplication.shared.windows.filter(\.isKeyWindow).first?.rootViewController
)
}
// @available(iOSApplicationExtension, unavailable)
// @discardableResult
// func showCrouton(
// config: SnackbarConfig,
// style: CroutonStyle = .info,
// dismissHandler: DismissHandlerBlock? = nil
// ) -> Token {
// showCrouton(
// config: config,
// style: style,
// dismissHandler: dismissHandler,
// rootViewController: UIApplication.shared.windows.filter(\.isKeyWindow).first?.rootViewController
// )
// }
WanaldinoTelefonica marked this conversation as resolved.
Show resolved Hide resolved

/// Show a crouton (or enqueue one if there is already a crouton shown)
/// - Parameters:
Expand All @@ -60,7 +67,8 @@ public extension CroutonController {
config: SnackbarConfig,
style: CroutonStyle = .info,
dismissHandler: DismissHandlerBlock? = nil,
rootViewController: @escaping @autoclosure () -> UIViewController?
exactViewController: UIViewController? = nil,
rootViewController: RootViewController.Closure? = nil
) -> Token {
assertMainThread()

Expand All @@ -84,15 +92,21 @@ public extension CroutonController {
}

let token = Token()
let crouton = CroutonView(
let croutonView = CroutonView(
text: config.title,
action: overwrittenAction,
config: styleConfig,
dismissHandler: dismissHandler,
forceDismiss: config.forceDismiss
)

show(crouton, token: token, rootViewController: rootViewController)
let ongoingCrouton = OngoingCrouton(
token: token,
croutonView: croutonView,
exactViewController: exactViewController,
rootViewController: rootViewController
)
show(ongoingCrouton)

return token
}
Expand Down Expand Up @@ -125,9 +139,8 @@ public extension CroutonController {
// MARK: Private methods

private extension CroutonController {
func show(_ crouton: CroutonView, token: Token, rootViewController: @escaping () -> UIViewController?) {
enqueue(OngoingCrouton(token: token, croutonView: crouton, rootViewController: rootViewController))

func show(_ crouton: OngoingCrouton) {
enqueue(crouton)
showEnqueuedCrouton()
}

Expand Down Expand Up @@ -165,62 +178,10 @@ private extension CroutonController {
func showEnqueuedCrouton() {
guard showingToken == nil else { return }
guard let ongoingCrouton = croutonViewList.first else { return }
guard let containerView = visibleContainerView(ongoingCrouton.rootViewController) else { return }
guard let containerView = ongoingCrouton.view() else { return }

showingToken = ongoingCrouton.token

ongoingCrouton.croutonView.show(in: containerView)
}

func visibleContainerView(_ rootViewController: () -> UIViewController?) -> UIView? {
guard let viewController = visibleViewController(rootViewController) else { return nil }

if let viewController = viewController as? CustomCroutonContainer {
return viewController.customCroutonContainerView
} else {
return viewController.view
}
}

func visibleViewController(_ rootViewController: () -> UIViewController?) -> UIViewController? {
guard let rootViewController = rootViewController() else {
assertionFailure("Root view controller not found!")
return nil
}

let visibleVC = visibleViewController(from: rootViewController)

if let rootVC = visibleVC as? UINavigationController {
return visibleViewController(from: rootVC.topViewController!)
} else if let homeVC = visibleVC.parent?.tabBarController,
let selectedNavigationController = homeVC.selectedViewController as? UINavigationController {
return visibleViewController(from: selectedNavigationController.topViewController!)
} else {
return visibleVC
}
}

func visibleViewController(from viewController: UIViewController) -> UIViewController {
if let presentedViewController = viewController.presentedViewController {
if presentedViewController is UIAlertController {
return viewController
} else {
return visibleViewController(from: presentedViewController)
}
} else if let viewController = viewController as? UINavigationController {
if let topViewController = viewController.topViewController {
return visibleViewController(from: topViewController)
} else {
return viewController
}
} else if let tabViewController = viewController as? UITabBarController {
if let selectedTab = tabViewController.selectedViewController {
return selectedTab
} else {
return viewController
}
}

return viewController
}
}
92 changes: 92 additions & 0 deletions Sources/Mistica/Components/Crouton/Presentation/OngoingCrouton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
//
// OngoingCrouton.swift
//
// Made with ❤️ by Novum
//
// Copyright © Telefonica. All rights reserved.
//

import UIKit

extension CroutonController {
struct OngoingCrouton {
let token: Token
let croutonView: CroutonView
private weak var exactViewController: UIViewController?
private let rootViewController: RootViewController.Closure

init(
token: Token,
croutonView: CroutonView,
exactViewController: UIViewController? = nil,
rootViewController: RootViewController.Closure? = nil
) {
self.token = token
self.croutonView = croutonView
self.exactViewController = exactViewController
self.rootViewController = rootViewController ?? RootViewController.default
}

func view() -> UIView? {
guard let viewController = viewController() else { return nil }

if let viewController = viewController as? CustomCroutonContainer {
return viewController.customCroutonContainerView
} else {
return viewController.view
}
}

private func viewController() -> UIViewController? {
if let exactViewController {
return exactViewController
} else if let rootViewController = rootViewController() {
return visibleViewController(from: rootViewController)
} else {
return nil
WanaldinoTelefonica marked this conversation as resolved.
Show resolved Hide resolved
}
}

// private func visibleViewController(_ rootViewController: () -> UIViewController?) -> UIViewController? {
// guard let rootViewController = rootViewController() else {
// assertionFailure("Root view controller not found!")
// return nil
// }
//
// let visibleVC = visibleViewController(from: rootViewController)
//
// if let rootVC = visibleVC as? UINavigationController {
// return visibleViewController(from: rootVC.topViewController!)
// } else if let homeVC = visibleVC.parent?.tabBarController,
// let selectedNavigationController = homeVC.selectedViewController as? UINavigationController {
// return visibleViewController(from: selectedNavigationController.topViewController!)
// } else {
// return visibleVC
// }
// }
WanaldinoTelefonica marked this conversation as resolved.
Show resolved Hide resolved

private func visibleViewController(from viewController: UIViewController) -> UIViewController {
if let presentedViewController = viewController.presentedViewController {
if presentedViewController is UIAlertController {
return viewController
} else {
return visibleViewController(from: presentedViewController)
}
} else if let viewController = viewController as? UINavigationController {
if let topViewController = viewController.topViewController {
return visibleViewController(from: topViewController)
} else {
return viewController
}
} else if let tabViewController = viewController as? UITabBarController {
if let selectedTab = tabViewController.selectedViewController {
return selectedTab
} else {
return viewController
}
}

return viewController
}
}
}