Skip to content

Commit 2d088e8

Browse files
author
Jim Boulter
committed
Rename LoadingViewController to SwiftyDropboxLoadingViewController to avoid conflicts
1 parent 8c51369 commit 2d088e8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Source/SwiftyDropbox/Platform/SwiftyDropbox_iOS/LoadingViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Foundation
88
import UIKit
99

1010
/// A VC with a loading spinner at its view center.
11-
class LoadingViewController: UIViewController {
11+
class SwiftyDropboxLoadingViewController: UIViewController {
1212
private let loadingSpinner: UIActivityIndicatorView
1313

1414
override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {

Source/SwiftyDropbox/Platform/SwiftyDropbox_iOS/OAuthMobile.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -617,15 +617,15 @@ public class MobileSharedApplication: SharedApplication {
617617
/// Web OAuth flow, present the spinner over the MobileSafariViewController.
618618
private func presentLoadingInWeb() {
619619
let safariViewController = controller?.presentedViewController as? MobileSafariViewController
620-
let loadingVC = LoadingViewController(nibName: nil, bundle: nil)
620+
let loadingVC = SwiftyDropboxLoadingViewController(nibName: nil, bundle: nil)
621621
loadingVC.modalPresentationStyle = .overFullScreen
622622
safariViewController?.present(loadingVC, animated: false)
623623
}
624624

625625
// Web OAuth flow, dismiss loading view on the MobileSafariViewController.
626626
private func dismissLoadingInWeb() {
627627
let safariViewController = controller?.presentedViewController as? MobileSafariViewController
628-
let loadingView = safariViewController?.presentedViewController as? LoadingViewController
628+
let loadingView = safariViewController?.presentedViewController as? SwiftyDropboxLoadingViewController
629629
loadingView?.dismiss(animated: false)
630630
}
631631

@@ -635,7 +635,7 @@ public class MobileSharedApplication: SharedApplication {
635635
if let loadingStatusDelegate = loadingStatusDelegate {
636636
loadingStatusDelegate.showLoading()
637637
} else {
638-
let loadingVC = LoadingViewController(nibName: nil, bundle: nil)
638+
let loadingVC = SwiftyDropboxLoadingViewController(nibName: nil, bundle: nil)
639639
loadingVC.modalPresentationStyle = .overFullScreen
640640
controller?.present(loadingVC, animated: false)
641641
}
@@ -646,7 +646,7 @@ public class MobileSharedApplication: SharedApplication {
646646
private func dismissLoadingInApp() {
647647
if let loadingStatusDelegate = loadingStatusDelegate {
648648
loadingStatusDelegate.dismissLoading()
649-
} else if let loadingView = controller?.presentedViewController as? LoadingViewController {
649+
} else if let loadingView = controller?.presentedViewController as? SwiftyDropboxLoadingViewController {
650650
loadingView.dismiss(animated: false)
651651
}
652652
}

0 commit comments

Comments
 (0)