diff --git a/.package.resolved b/.package.resolved index 460646984..36a0b84af 100644 --- a/.package.resolved +++ b/.package.resolved @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Infomaniak/ios-version-checker", "state" : { - "revision" : "7f8a2fe8dd13e7b5fe3272d1ee64233b3524339a", - "version" : "1.1.1" + "revision" : "867d65cd4fc23d2a58b35975742bb448fd686f2c", + "version" : "1.1.2" } }, { diff --git a/Project.swift b/Project.swift index 358f4451f..2dd4b6785 100644 --- a/Project.swift +++ b/Project.swift @@ -46,7 +46,7 @@ let project = Project(name: "kDrive", .package(url: "https://github.com/raspu/Highlightr", .upToNextMajor(from: "2.1.0")), .package(url: "https://github.com/bmoliveira/MarkdownKit", .upToNextMajor(from: "1.7.0")), .package(url: "https://github.com/matomo-org/matomo-sdk-ios", .upToNextMajor(from: "7.5.1")), - .package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "1.1.1")), + .package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "1.1.2")), ], targets: [ Target(name: "kDrive", diff --git a/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift b/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift index a437ca30c..08d942a28 100644 --- a/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift +++ b/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift @@ -24,6 +24,8 @@ import UIKit import VersionChecker class DriveUpdateRequiredViewController: UIViewController { + var dismissHandler: (() -> Void)? + private let sharedStyle: TemplateSharedStyle = { let largeButtonStyle = IKLargeButton.Style.primaryButton return TemplateSharedStyle( @@ -45,7 +47,8 @@ class DriveUpdateRequiredViewController: UIViewController { let hostingViewController = UIHostingController(rootView: UpdateRequiredView( image: KDriveResourcesAsset.updateRequired.swiftUIImage, sharedStyle: sharedStyle, - handler: updateApp + updateHandler: updateApp, + dismissHandler: dismissHandler )) guard let hostingView = hostingViewController.view else { return } @@ -63,6 +66,10 @@ class DriveUpdateRequiredViewController: UIViewController { hostingViewController.didMove(toParent: self) } + override func viewWillAppear(_ animated: Bool) { + navigationController?.setNavigationBarHidden(true, animated: animated) + } + private func updateApp() { let storeURL: URLConstants = Bundle.main.isRunningInTestFlight ? .testFlight : .appStore UIConstants.openUrl(storeURL.url, from: self) diff --git a/kDriveActionExtension/ActionNavigationController.swift b/kDriveActionExtension/ActionNavigationController.swift index 1a7cce941..0ba42d23a 100644 --- a/kDriveActionExtension/ActionNavigationController.swift +++ b/kDriveActionExtension/ActionNavigationController.swift @@ -61,7 +61,11 @@ final class ActionNavigationController: TitleSizeAdjustingNavigationController { private func checkAppVersion() async throws { guard try await VersionChecker.standard.checkAppVersionStatus() == .updateIsRequired else { return } Task { @MainActor in - viewControllers = [DriveUpdateRequiredViewController()] + let updateRequiredViewController = DriveUpdateRequiredViewController() + updateRequiredViewController.dismissHandler = { [weak self] in + self?.dismiss(animated: true) + } + viewControllers = [updateRequiredViewController] } } } diff --git a/kDriveShareExtension/ShareNavigationViewController.swift b/kDriveShareExtension/ShareNavigationViewController.swift index 197cd89b1..faa3a7483 100644 --- a/kDriveShareExtension/ShareNavigationViewController.swift +++ b/kDriveShareExtension/ShareNavigationViewController.swift @@ -61,7 +61,11 @@ final class ShareNavigationViewController: TitleSizeAdjustingNavigationControlle private func checkAppVersion() async throws { guard try await VersionChecker.standard.checkAppVersionStatus() == .updateIsRequired else { return } Task { @MainActor in - viewControllers = [DriveUpdateRequiredViewController()] + let updateRequiredViewController = DriveUpdateRequiredViewController() + updateRequiredViewController.dismissHandler = { [weak self] in + self?.dismiss(animated: true) + } + viewControllers = [updateRequiredViewController] } } }