diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift index d2d150ea22..7abff41767 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift @@ -74,29 +74,33 @@ final class BMCViewController: MWMViewController { } private func shareCategoryFile(at index: Int, anchor: UIView) { + UIApplication.shared.showLoadingOverlay() viewModel.shareCategoryFile(at: index, handler: sharingResultHandler(anchorView: anchor)) } private func shareAllCategories(anchor: UIView?) { + UIApplication.shared.showLoadingOverlay() viewModel.shareAllCategories(handler: sharingResultHandler(anchorView: anchor)) } private func sharingResultHandler(anchorView: UIView?) -> SharingResultCompletionHandler { { [weak self] status, url in - guard let self else { return } - switch status { - case .success: - let shareController = ActivityViewController.share(for: url, message: L("share_bookmarks_email_body")) - { [weak self] _, _, _, _ in - self?.viewModel?.finishShareCategory() + UIApplication.shared.hideLoadingOverlay { + guard let self else { return } + switch status { + case .success: + let shareController = ActivityViewController.share(for: url, message: L("share_bookmarks_email_body")) + { [weak self] _, _, _, _ in + self?.viewModel?.finishShareCategory() + } + shareController?.present(inParentViewController: self, anchorView: anchorView) + case .emptyCategory: + MWMAlertViewController.activeAlert().presentInfoAlert(L("bookmarks_error_title_share_empty"), + text: L("bookmarks_error_message_share_empty")) + case .fileError, .archiveError: + MWMAlertViewController.activeAlert().presentInfoAlert(L("dialog_routing_system_error"), + text: L("bookmarks_error_message_share_general")) } - shareController?.present(inParentViewController: self, anchorView: anchorView) - case .emptyCategory: - MWMAlertViewController.activeAlert().presentInfoAlert(L("bookmarks_error_title_share_empty"), - text: L("bookmarks_error_message_share_empty")) - case .fileError, .archiveError: - MWMAlertViewController.activeAlert().presentInfoAlert(L("dialog_routing_system_error"), - text: L("bookmarks_error_message_share_general")) } } } diff --git a/iphone/Maps/Categories/UIApplication+LoadingOverlay.swift b/iphone/Maps/Categories/UIApplication+LoadingOverlay.swift new file mode 100644 index 0000000000..c51b985500 --- /dev/null +++ b/iphone/Maps/Categories/UIApplication+LoadingOverlay.swift @@ -0,0 +1,24 @@ +extension UIApplication { + private static let overlayViewController = LoadingOverlayViewController() + + @objc + func showLoadingOverlay(completion: (() -> Void)? = nil) { + guard let window = self.windows.first(where: { $0.isKeyWindow }) else { + completion?() + return + } + + DispatchQueue.main.async { + UIApplication.overlayViewController.modalPresentationStyle = .overFullScreen + UIApplication.overlayViewController.modalTransitionStyle = .crossDissolve + window.rootViewController?.present(UIApplication.overlayViewController, animated: true, completion: completion) + } + } + + @objc + func hideLoadingOverlay(completion: (() -> Void)? = nil) { + DispatchQueue.main.async { + UIApplication.overlayViewController.dismiss(animated: true, completion: completion) + } + } +} diff --git a/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift b/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift new file mode 100644 index 0000000000..6ed26097d7 --- /dev/null +++ b/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift @@ -0,0 +1,29 @@ +final class LoadingOverlayViewController: UIViewController { + private var activityIndicator: UIActivityIndicatorView = { + let indicator: UIActivityIndicatorView + if #available(iOS 13.0, *) { + indicator = UIActivityIndicatorView(style: .large) + } else { + indicator = UIActivityIndicatorView(style: .whiteLarge) + } + indicator.color = .white + indicator.startAnimating() + indicator.translatesAutoresizingMaskIntoConstraints = false + return indicator + }() + + override func viewDidLoad() { + super.viewDidLoad() + view.backgroundColor = UIColor.black.withAlphaComponent(0.3) + setupViews() + } + + private func setupViews() { + view.addSubview(activityIndicator) + NSLayoutConstraint.activate([ + activityIndicator.centerXAnchor.constraint(equalTo: view.centerXAnchor), + activityIndicator.centerYAnchor.constraint(equalTo: view.centerYAnchor) + ]) + view.isUserInteractionEnabled = false + } +} diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 957179625b..955e3741f4 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -468,6 +468,8 @@ ED1263AB2B6F99F900AD99F3 /* UIView+AddSeparator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1263AA2B6F99F900AD99F3 /* UIView+AddSeparator.swift */; }; ED1ADA332BC6B1B40029209F /* CarPlayServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1ADA322BC6B1B40029209F /* CarPlayServiceTests.swift */; }; ED3EAC202B03C88100220A4A /* BottomTabBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */; }; + ED79A5AB2BD7AA9C00952D1F /* LoadingOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5AA2BD7AA9C00952D1F /* LoadingOverlayViewController.swift */; }; + ED79A5AD2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5AC2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift */; }; ED9966802B94FBC20083CE55 /* ColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED99667D2B94FBC20083CE55 /* ColorPicker.swift */; }; EDBD68072B625724005DD151 /* LocationServicesDisabledAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */; }; EDBD680B2B62572E005DD151 /* LocationServicesDisabledAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */; }; @@ -1358,6 +1360,8 @@ ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarButton.swift; sourceTree = ""; }; ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = ""; }; ED48BBB917C2B1E2003E7E92 /* CircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleView.m; sourceTree = ""; }; + ED79A5AA2BD7AA9C00952D1F /* LoadingOverlayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingOverlayViewController.swift; sourceTree = ""; }; + ED79A5AC2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+LoadingOverlay.swift"; sourceTree = ""; }; ED99667D2B94FBC20083CE55 /* ColorPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPicker.swift; sourceTree = ""; }; EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LocationServicesDisabledAlert.xib; sourceTree = ""; }; EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationServicesDisabledAlert.swift; sourceTree = ""; }; @@ -1741,6 +1745,7 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + ED79A5A92BD7AA7500952D1F /* LoadingOverlay */, CDB4D4E2222E8F8200104869 /* CarPlay */, 346EDAD81B9F0E15004F8DB5 /* Components */, 97B4E9271851DAB300BEC5D7 /* Custom Views */, @@ -2140,6 +2145,7 @@ 9957FAE0237AE04900855F48 /* MWMMapViewControlsManager+AddPlace.h */, 471A7BB7247FE3C300A0D4C1 /* URL+Query.swift */, EDC3573A2B7B5029001AE9CA /* CALayer+SetCorner.swift */, + ED79A5AC2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift */, ); path = Categories; sourceTree = ""; @@ -2978,6 +2984,14 @@ path = Tests; sourceTree = ""; }; + ED79A5A92BD7AA7500952D1F /* LoadingOverlay */ = { + isa = PBXGroup; + children = ( + ED79A5AA2BD7AA9C00952D1F /* LoadingOverlayViewController.swift */, + ); + path = LoadingOverlay; + sourceTree = ""; + }; ED99667C2B94FBC20083CE55 /* ColorPicker */ = { isa = PBXGroup; children = ( @@ -4232,6 +4246,7 @@ 993DF11723F6BDB100AC231A /* UINavigationBarRenderer.swift in Sources */, 6741A9E71BF340DE002C974C /* MWMCircularProgressView.m in Sources */, 34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */, + ED79A5AD2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift in Sources */, 9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */, 47CA68D62500448D00671019 /* BookmarksListInteractor.swift in Sources */, 4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */, @@ -4267,6 +4282,7 @@ F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */, F6E2FDF21E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */, 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */, + ED79A5AB2BD7AA9C00952D1F /* LoadingOverlayViewController.swift in Sources */, 34AB66111FC5AA320078E451 /* NavigationTurnsView.swift in Sources */, 475ED78624C7C7300063ADC7 /* ValueStepperViewRenderer.swift in Sources */, 3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */,