Skip to content

Rename LoadingViewController to SwiftyDropboxLoadingViewController to avoid conflicts #451

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
jboulter11 merged 1 commit into from
Nov 21, 2025
Merged

Rename LoadingViewController to SwiftyDropboxLoadingViewController to avoid conflicts #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Source/SwiftyDropbox/Platform/SwiftyDropbox_iOS/LoadingViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Foundation
import UIKit

/// A VC with a loading spinner at its view center.
class LoadingViewController: UIViewController {
class SwiftyDropboxLoadingViewController: UIViewController {
private let loadingSpinner: UIActivityIndicatorView

override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
Expand Down
8 changes: 4 additions & 4 deletions Source/SwiftyDropbox/Platform/SwiftyDropbox_iOS/OAuthMobile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,15 +617,15 @@ public class MobileSharedApplication: SharedApplication {
/// Web OAuth flow, present the spinner over the MobileSafariViewController.
private func presentLoadingInWeb() {
let safariViewController = controller?.presentedViewController as? MobileSafariViewController
let loadingVC = LoadingViewController(nibName: nil, bundle: nil)
let loadingVC = SwiftyDropboxLoadingViewController(nibName: nil, bundle: nil)
loadingVC.modalPresentationStyle = .overFullScreen
safariViewController?.present(loadingVC, animated: false)
}

// Web OAuth flow, dismiss loading view on the MobileSafariViewController.
private func dismissLoadingInWeb() {
let safariViewController = controller?.presentedViewController as? MobileSafariViewController
let loadingView = safariViewController?.presentedViewController as? LoadingViewController
let loadingView = safariViewController?.presentedViewController as? SwiftyDropboxLoadingViewController
loadingView?.dismiss(animated: false)
}

Expand All @@ -635,7 +635,7 @@ public class MobileSharedApplication: SharedApplication {
if let loadingStatusDelegate = loadingStatusDelegate {
loadingStatusDelegate.showLoading()
} else {
let loadingVC = LoadingViewController(nibName: nil, bundle: nil)
let loadingVC = SwiftyDropboxLoadingViewController(nibName: nil, bundle: nil)
loadingVC.modalPresentationStyle = .overFullScreen
controller?.present(loadingVC, animated: false)
}
Expand All @@ -646,7 +646,7 @@ public class MobileSharedApplication: SharedApplication {
private func dismissLoadingInApp() {
if let loadingStatusDelegate = loadingStatusDelegate {
loadingStatusDelegate.dismissLoading()
} else if let loadingView = controller?.presentedViewController as? LoadingViewController {
} else if let loadingView = controller?.presentedViewController as? SwiftyDropboxLoadingViewController {
loadingView.dismiss(animated: false)
}
}
Expand Down
Loading