diff --git a/Corona.xcodeproj/project.pbxproj b/Corona.xcodeproj/project.pbxproj index c646cf2..8e363e2 100644 --- a/Corona.xcodeproj/project.pbxproj +++ b/Corona.xcodeproj/project.pbxproj @@ -663,7 +663,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Corona/App.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.3.1; + CURRENT_PROJECT_VERSION = 1.4; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 37BYKL96J7; INFOPLIST_FILE = Corona/Info.plist; @@ -671,7 +671,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.1; + MARKETING_VERSION = 1.4; PRODUCT_BUNDLE_IDENTIFIER = com.samabox.corona; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -687,7 +687,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Corona/App.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.3.1; + CURRENT_PROJECT_VERSION = 1.4; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 37BYKL96J7; INFOPLIST_FILE = Corona/Info.plist; @@ -695,7 +695,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.1; + MARKETING_VERSION = 1.4; PRODUCT_BUNDLE_IDENTIFIER = com.samabox.corona; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; diff --git a/Corona.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Corona.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3b5dc48..0da1199 100644 --- a/Corona.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Corona.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,7 +33,7 @@ "repositoryURL": "https://github.com/MhdHejazi/FloatingPanel", "state": { "branch": "master", - "revision": "53ce8282f60964f946c3468de97ba414e563a3d0", + "revision": "7db5b234f825dc34a0ed52045f2b4118fcd1a004", "version": null } } diff --git a/Corona/Controller/MapController.swift b/Corona/Controller/MapController.swift index 21e6d86..9395df9 100644 --- a/Corona/Controller/MapController.swift +++ b/Corona/Controller/MapController.swift @@ -175,7 +175,7 @@ class MapController: UIViewController { @IBAction func buttonUpdateTapped(_ sender: Any) { let alertController = UIAlertController.init( title: "New Version Available", - message: "Please update from https://github.com/MhdHejazi/CoronaTracker", + message: "Please update from \(App.updateURL.absoluteString)", preferredStyle: .alert) #if targetEnvironment(macCatalyst) diff --git a/Corona/Info.plist b/Corona/Info.plist index 785bb01..0ec08ac 100644 --- a/Corona/Info.plist +++ b/Corona/Info.plist @@ -22,6 +22,8 @@ public.app-category.medical LSRequiresIPhoneOS + NSPhotoLibraryAddUsageDescription + The app needs permission to save the shared image on your device. UIApplicationSceneManifest UIApplicationSupportsMultipleScenes @@ -62,7 +64,5 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - NSPhotoLibraryAddUsageDescription - The app needs permission to save the shared image on your device. diff --git a/Corona/Main/App.swift b/Corona/Main/App.swift index b9827b0..4f2f156 100644 --- a/Corona/Main/App.swift +++ b/Corona/Main/App.swift @@ -10,6 +10,12 @@ import UIKit import SafariServices class App { + #if targetEnvironment(macCatalyst) + static let updateURL = URL(string: "https://coronatracker.samabox.com/")! + #else + static let updateURL = URL(string: "https://github.com/MhdHejazi/CoronaTracker")! + #endif + static func checkForAppUpdate(completion: @escaping (_ updateAvailable: Bool) -> Void) { let checkForUpdateURL = URL(string: "https://api.github.com/repos/MhdHejazi/CoronaTracker/releases/latest")! _ = URLSession.shared.dataTask(with: checkForUpdateURL) { (data, response, error) in @@ -33,8 +39,7 @@ class App { } public static func openUpdatePage(viewController: UIViewController) { - let url = URL(string: "https://github.com/MhdHejazi/CoronaTracker/releases/latest")! - let safariController = SFSafariViewController(url: url) + let safariController = SFSafariViewController(url: updateURL) safariController.modalPresentationStyle = .pageSheet viewController.present(safariController, animated: true) } diff --git a/Corona/Map/RegionAnnotationView.swift b/Corona/Map/RegionAnnotationView.swift index 16c2c97..4f0ff50 100644 --- a/Corona/Map/RegionAnnotationView.swift +++ b/Corona/Map/RegionAnnotationView.swift @@ -80,8 +80,8 @@ class RegionAnnotationView: MKAnnotationView { didSet { configure() - // BUG FIX: the data within detailAccessoryView would become stale in some cases. To address this, we now ensure that the report text is set each time the annotation is updated - detailAccessoryView?.attributedText = detailsString + /// Ensure that the report text is set each time the annotation is updated + detailAccessoryView?.attributedText = detailsString } }