Merge branch 'master' into bugfix/unsupported-url

beeminder · Jan 3, 2025 · c1b0e30 · c1b0e30
2 parents 8348e38 + d3c955d
commit c1b0e30
Show file tree

Hide file tree

Showing 52 changed files with 84 additions and 80 deletions.
diff --git a/BeeKit/BeeKit.h b/BeeKit/BeeKit.h
@@ -3,7 +3,7 @@
 //  BeeKit
 //
 //  Created by Andrew Brett on 5/19/21.
-//  Copyright © 2021 APB. All rights reserved.
+//  Copyright 2021 APB. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/BeeKit/Config.swift.sample b/BeeKit/Config.swift.sample
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andrew Brett on 2/20/20.
-//  Copyright © 2020 APB. All rights reserved.
+//  Copyright 2020 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/DateUtils.swift b/BeeKit/DateUtils.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Theo Spears on 1/27/23.
-//  Copyright © 2023 APB. All rights reserved.
+//  Copyright 2023 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/HeathKit/HealthKitConfig.swift b/BeeKit/HeathKit/HealthKitConfig.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 3/25/17.
-//  Copyright © 2017 APB. All rights reserved.
+//  Copyright 2017 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/HeathKit/HealthKitError.swift b/BeeKit/HeathKit/HealthKitError.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Theo Spears on 11/5/22.
-//  Copyright © 2022 APB. All rights reserved.
+//  Copyright 2022 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/Managers/CurrentUserManager.swift b/BeeKit/Managers/CurrentUserManager.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 4/26/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import CoreData
@@ -17,14 +17,16 @@ import SwiftyJSON
 public actor CurrentUserManager {
     let logger = Logger(subsystem: "com.beeminder.beeminder", category: "CurrentUserManager")
 
-    public static let signedInNotificationName     = "com.beeminder.signedInNotification"
-    public static let willSignOutNotificationName  = "com.beeminder.willSignOutNotification"
-    public static let failedSignInNotificationName = "com.beeminder.failedSignInNotification"
-    public static let signedOutNotificationName    = "com.beeminder.signedOutNotification"
-    public static let resetNotificationName        = "com.beeminder.resetNotification"
-    public static let willResetNotificationName    = "com.beeminder.willResetNotification"
-    public static let healthKitMetricRemovedNotificationName = "com.beeminder.healthKitMetricRemovedNotification"
-
+    public enum NotificationName {
+        public static let signedIn     = NSNotification.Name(rawValue: "com.beeminder.signedInNotification")
+        public static let willSignOut  = NSNotification.Name(rawValue: "com.beeminder.willSignOutNotification")
+        public static let failedSignIn = NSNotification.Name(rawValue: "com.beeminder.failedSignInNotification")
+        public static let signedOut    = NSNotification.Name(rawValue: "com.beeminder.signedOutNotification")
+        public static let reset        = NSNotification.Name(rawValue: "com.beeminder.resetNotification")
+        public static let willReset    = NSNotification.Name(rawValue: "com.beeminder.willResetNotification")
+        public static let healthKitMetricRemoved = NSNotification.Name(rawValue: "com.beeminder.healthKitMetricRemovedNotification")
+    }
+
     fileprivate let beemiosSecret = "C0QBFPWqDykIgE6RyQ2OJJDxGxGXuVA2CNqcJM185oOOl4EQTjmpiKgcwjki"
 
     internal static let accessTokenKey = "access_token"
@@ -165,28 +167,28 @@ public actor CurrentUserManager {
         self.setAccessToken(responseJSON[CurrentUserManager.accessTokenKey].string!)
 
         await Task { @MainActor in
-            NotificationCenter.default.post(name: Notification.Name(rawValue: CurrentUserManager.signedInNotificationName), object: self)
+            NotificationCenter.default.post(name: CurrentUserManager.NotificationName.signedIn, object: self)
         }.value
     }
 
     func handleFailedSignin(_ responseError: Error, errorMessage : String?) async throws {
         await Task { @MainActor in
-            NotificationCenter.default.post(name: Notification.Name(rawValue: CurrentUserManager.failedSignInNotificationName), object: self, userInfo: ["error" : responseError])
+            NotificationCenter.default.post(name: CurrentUserManager.NotificationName.failedSignIn, object: self, userInfo: ["error" : responseError])
         }.value
         try await self.signOut()
     }
 
     public func signOut() async throws {
         await Task { @MainActor in
-            NotificationCenter.default.post(name: Notification.Name(rawValue: CurrentUserManager.willSignOutNotificationName), object: self)
+            NotificationCenter.default.post(name: CurrentUserManager.NotificationName.willSignOut, object: self)
         }.value
 
         try deleteUser()
 
         keychain.delete(CurrentUserManager.accessTokenKey)
 
         await Task { @MainActor in
-            NotificationCenter.default.post(name: Notification.Name(rawValue: CurrentUserManager.signedOutNotificationName), object: self)
+            NotificationCenter.default.post(name: CurrentUserManager.NotificationName.signedOut, object: self)
         }.value
     }
-}
+}
diff --git a/BeeKit/Managers/GoalManager.swift b/BeeKit/Managers/GoalManager.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Theo Spears on 2/7/23.
-//  Copyright © 2023 APB. All rights reserved.
+//  Copyright 2023 APB. All rights reserved.
 //
 
 import Foundation
@@ -18,9 +18,11 @@ import OrderedCollections
 public actor GoalManager {
     private let logger = Logger(subsystem: "com.beeminder.beeminder", category: "GoalManager")
 
-    /// A notification that is triggered any time the data for one or more goals is updated
-    public static let goalsUpdatedNotificationName = "com.beeminder.goalsUpdatedNotification"
-
+    public enum NotificationName {
+        /// A notification that is triggered any time the data for one or more goals is updated
+        public static let goalsUpdated = NSNotification.Name(rawValue: "com.beeminder.goalsUpdatedNotification")
+    }
+
     private let requestManager: RequestManager
     private nonisolated let currentUserManager: CurrentUserManager
 
@@ -42,7 +44,7 @@ public actor GoalManager {
         // 2) Other methods may be called with the actor executor, so it is no longer safe for the constructor to
         //    access class properties.
 
-        NotificationCenter.default.addObserver(self, selector: #selector(self.onSignedOutNotification), name: NSNotification.Name(rawValue: CurrentUserManager.signedOutNotificationName), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.onSignedOutNotification), name: CurrentUserManager.NotificationName.signedOut, object: nil)
     }
 
     /// Return the state of goals the last time they were fetched from the server. This could have been an arbitrarily long time ago.
@@ -132,7 +134,7 @@ public actor GoalManager {
         // Notify all listeners of the update
         await Task { @MainActor in
             modelContainer.viewContext.refreshAllObjects()
-            NotificationCenter.default.post(name: Notification.Name(rawValue: GoalManager.goalsUpdatedNotificationName), object: self)
+            NotificationCenter.default.post(name: GoalManager.NotificationName.goalsUpdated, object: self)
         }.value
     }
 

diff --git a/BeeKit/Managers/HealthStoreManager.swift b/BeeKit/Managers/HealthStoreManager.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 11/28/17.
-//  Copyright © 2017 APB. All rights reserved.
+//  Copyright 2017 APB. All rights reserved.
 //
 
 import CoreData

diff --git a/BeeKit/Managers/RequestManager.swift b/BeeKit/Managers/RequestManager.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 5/10/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/Managers/SignedRequestManager.swift b/BeeKit/Managers/SignedRequestManager.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 11/30/17.
-//  Copyright © 2017 APB. All rights reserved.
+//  Copyright 2017 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/Managers/VersionManager.swift b/BeeKit/Managers/VersionManager.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andrew Brett on 3/19/20.
-//  Copyright © 2020 APB. All rights reserved.
+//  Copyright 2020 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/ServiceLocator.swift b/BeeKit/ServiceLocator.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Theo Spears on 2/7/23.
-//  Copyright © 2023 APB. All rights reserved.
+//  Copyright 2023 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/UI/BSButton.swift b/BeeKit/UI/BSButton.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 4/27/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/UI/BSLabel.swift b/BeeKit/UI/BSLabel.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 4/26/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/UI/BSTextField.swift b/BeeKit/UI/BSTextField.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 11/22/16.
-//  Copyright © 2016 APB. All rights reserved.
+//  Copyright 2016 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/UI/UIColorExtension.swift b/BeeKit/UI/UIColorExtension.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 4/26/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/UI/UIFontExtension.swift b/BeeKit/UI/UIFontExtension.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 11/7/15.
-//  Copyright © 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKit/Util/Constants.swift b/BeeKit/Util/Constants.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 5/15/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeKitTests/BeeKitTests.swift b/BeeKitTests/BeeKitTests.swift
@@ -3,7 +3,7 @@
 //  BeeKitTests
 //
 //  Created by Andrew Brett on 5/19/21.
-//  Copyright © 2021 APB. All rights reserved.
+//  Copyright 2021 APB. All rights reserved.
 //
 
 import XCTest

diff --git a/BeeSwift/AddDataIntentHandler.swift b/BeeSwift/AddDataIntentHandler.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andrew Brett on 3/28/21.
-//  Copyright © 2021 APB. All rights reserved.
+//  Copyright 2021 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeSwift/AppDelegate.swift b/BeeSwift/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 4/19/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import CoreSpotlight
@@ -41,8 +41,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
         NetworkActivityIndicatorManager.shared.isEnabled = true
 
-        NotificationCenter.default.addObserver(self, selector: #selector(self.handleGoalsUpdated), name: NSNotification.Name(rawValue: GoalManager.goalsUpdatedNotificationName), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(self.handleUserSignedOut), name: NSNotification.Name(rawValue: CurrentUserManager.signedOutNotificationName), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.handleGoalsUpdated), name: GoalManager.NotificationName.goalsUpdated, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.handleUserSignedOut), name: CurrentUserManager.NotificationName.signedOut, object: nil)
 
         backgroundUpdates.startUpdatingRegularlyInBackground()
 

diff --git a/BeeSwift/BeeSwift-Bridging-Header.h b/BeeSwift/BeeSwift-Bridging-Header.h
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 4/19/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/BeeSwift/Components/DatapointTableViewController.swift b/BeeSwift/Components/DatapointTableViewController.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Theo Spears on 11/27/22.
-//  Copyright © 2022 APB. All rights reserved.
+//  Copyright 2022 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeSwift/Components/DatapointValueAccessory.swift b/BeeSwift/Components/DatapointValueAccessory.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Theo Spears on 11/19/22.
-//  Copyright © 2022 APB. All rights reserved.
+//  Copyright 2022 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeSwift/Components/DatapointsTableView.swift b/BeeSwift/Components/DatapointsTableView.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 5/16/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeSwift/Components/GoalImageView.swift b/BeeSwift/Components/GoalImageView.swift
@@ -57,7 +57,7 @@ class GoalImageView : UIView {
         beeLemniscateView.isHidden = true
 
         NotificationCenter.default.addObserver(
-            forName: NSNotification.Name(rawValue: GoalManager.goalsUpdatedNotificationName),
+            forName: GoalManager.NotificationName.goalsUpdated,
             object: nil,
             queue: OperationQueue.main
         ) { [weak self] _ in

diff --git a/BeeSwift/Config.sample.swift b/BeeSwift/Config.sample.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 11/29/17.
-//  Copyright © 2017 APB. All rights reserved.
+//  Copyright 2017 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeSwift/DatapointTableViewCell.swift b/BeeSwift/DatapointTableViewCell.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 5/12/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import Foundation

diff --git a/BeeSwift/EditDatapointViewController.swift b/BeeSwift/EditDatapointViewController.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 8/8/18.
-//  Copyright © 2018 APB. All rights reserved.
+//  Copyright 2018 APB. All rights reserved.
 //
 
 import UIKit

diff --git a/BeeSwift/Gallery/ChooseGoalSortViewController.swift b/BeeSwift/Gallery/ChooseGoalSortViewController.swift
@@ -4,7 +4,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 12/21/17.
-//  Copyright © 2017 APB. All rights reserved.
+//  Copyright 2017 APB. All rights reserved.
 //
 
 import UIKit

diff --git a/BeeSwift/Gallery/GalleryViewController.swift b/BeeSwift/Gallery/GalleryViewController.swift
@@ -3,7 +3,7 @@
 //  BeeSwift
 //
 //  Created by Andy Brett on 4/19/15.
-//  Copyright (c) 2015 APB. All rights reserved.
+//  Copyright 2015 APB. All rights reserved.
 //
 
 import UIKit
@@ -65,10 +65,10 @@ class GalleryViewController: UIViewController, UICollectionViewDelegateFlowLayou
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        NotificationCenter.default.addObserver(self, selector: #selector(self.handleSignIn), name: NSNotification.Name(rawValue: CurrentUserManager.signedInNotificationName), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(self.handleSignOut), name: NSNotification.Name(rawValue: CurrentUserManager.signedOutNotificationName), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.handleSignIn), name: CurrentUserManager.NotificationName.signedIn, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.handleSignOut), name: CurrentUserManager.NotificationName.signedOut, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(self.openGoalFromNotification(_:)), name: NSNotification.Name(rawValue: "openGoal"), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(self.handleGoalsFetchedNotification), name: NSNotification.Name(rawValue: GoalManager.goalsUpdatedNotificationName), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.handleGoalsFetchedNotification), name: GoalManager.NotificationName.goalsUpdated, object: nil)
 
         self.view.addSubview(stackView)
         stackView.axis = .vertical