Eliminate DynamicButton (#795)

* Eliminate dependency on DynamicButton 
* Make use of SFSafeSymbols for type safe SF Symbols

---------

Signed-off-by: Tim Müller-Seydlitz <timbms@gmail.com>

NotificationService/NotificationService.swift

@@ -18,23 +18,23 @@ import UserNotifications
 class NotificationService: UNNotificationServiceExtension {
  var contentHandler: ((UNNotificationContent) -> Void)?
  var bestAttemptContent: UNMutableNotificationContent?
- 
+
  override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
  self.contentHandler = contentHandler
  bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
  if let bestAttemptContent {
  var notificationActions: [UNNotificationAction] = []
  let userInfo = bestAttemptContent.userInfo
- 
+
  os_log("didReceive userInfo %{PUBLIC}@", log: .default, type: .info, userInfo)
- 
+
  if let title = userInfo["title"] as? String {
  bestAttemptContent.title = title
  }
  if let message = userInfo["message"] as? String {
  bestAttemptContent.body = message
  }
- 
+
  // Check if the user has defined custom actions in the payload
  if let actionsArray = parseActions(userInfo), let category = parseCategory(userInfo) {
  for actionDict in actionsArray {
@@ -56,12 +56,12 @@ class NotificationService: UNNotificationServiceExtension {
  if !notificationActions.isEmpty {
  os_log("didReceive registering %{PUBLIC}@ for category %{PUBLIC}@", log: .default, type: .info, notificationActions, category)
  let notificationCategory =
- UNNotificationCategory(
- identifier: category,
- actions: notificationActions,
- intentIdentifiers: [],
- options: .customDismissAction
- )
+  UNNotificationCategory(
+  identifier: category,
+  actions: notificationActions,
+  intentIdentifiers: [],
+  options: .customDismissAction
+  )
  UNUserNotificationCenter.current().getNotificationCategories { existingCategories in
  var updatedCategories = existingCategories
  os_log("handleNotification adding category %{PUBLIC}@", log: .default, type: .info, category)
@@ -70,13 +70,13 @@ class NotificationService: UNNotificationServiceExtension {
  }
  }
  }
- 
+
  // check if there is an attachment to put on the notification
  // this should be last as we need to wait for media
  // TODO: we should support relative paths and try the user's openHAB (local,remote) for content
  if let attachmentURLString = userInfo["media-attachment-url"] as? String {
  let isItem = attachmentURLString.starts(with: "item:")
- 
+
  let downloadCompletionHandler: @Sendable (UNNotificationAttachment?) -> Void = { attachment in
  if let attachment {
  os_log("handleNotification attaching %{PUBLIC}@", log: .default, type: .info, attachmentURLString)
@@ -86,7 +86,7 @@ class NotificationService: UNNotificationServiceExtension {
  }
  contentHandler(bestAttemptContent)
  }
- 
+
  if isItem {
  downloadAndAttachItemImage(itemURI: attachmentURLString, completion: downloadCompletionHandler)
  } else {
@@ -97,7 +97,7 @@ class NotificationService: UNNotificationServiceExtension {
  }
  }
  }
- 
+
  override func serviceExtensionTimeWillExpire() {
  // Called just before the extension will be terminated by the system.
  // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used.
@@ -106,7 +106,7 @@ class NotificationService: UNNotificationServiceExtension {
  contentHandler(bestAttemptContent)
  }
  }
- 
+
  private func parseActions(_ userInfo: [AnyHashable: Any]) -> [[String: String]]? {
  // Extract actions and convert it from JSON string to an array of dictionaries
  if let actionsString = userInfo["actions"] as? String, let actionsData = actionsString.data(using: .utf8) {
@@ -120,7 +120,7 @@ class NotificationService: UNNotificationServiceExtension {
  }
  return nil
  }
- 
+
  private func parseCategory(_ userInfo: [AnyHashable: Any]) -> String? {
  // Extract category from aps dictionary
  if let aps = userInfo["aps"] as? [String: Any],
@@ -129,10 +129,10 @@ class NotificationService: UNNotificationServiceExtension {
  }
  return nil
  }
- 
+
  private func downloadAndAttachMedia(url: String, completion: @escaping (UNNotificationAttachment?) -> Void) {
  let client = HTTPClient(username: Preferences.username, password: Preferences.username, alwaysSendBasicAuth: Preferences.alwaysSendCreds)
- 
+
  let downloadCompletionHandler: @Sendable (URL?, URLResponse?, Error?) -> Void = { (localURL, response, error) in
  guard let localURL else {
  os_log("Error downloading media %{PUBLIC}@", log: .default, type: .error, error?.localizedDescription ?? "Unknown error")
@@ -147,16 +147,16 @@ class NotificationService: UNNotificationServiceExtension {
  client.downloadFile(url: url, completionHandler: downloadCompletionHandler)
  }
  }
- 
+
  func downloadAndAttachItemImage(itemURI: String, completion: @escaping (UNNotificationAttachment?) -> Void) {
  guard let itemURI = URL(string: itemURI), let scheme = itemURI.scheme else {
  os_log("Could not find scheme %{PUBLIC}@", log: .default, type: .info)
  completion(nil)
  return
  }
- 
+
  let itemName = String(itemURI.absoluteString.dropFirst(scheme.count + 1))
- 
+
  let client = HTTPClient(username: Preferences.username, password: Preferences.password, alwaysSendBasicAuth: Preferences.alwaysSendCreds)
  client.getItem(baseURLs: [Preferences.localUrl, Preferences.remoteUrl], itemName: itemName) { item, error in
  guard let item else {
@@ -199,16 +199,16 @@ class NotificationService: UNNotificationServiceExtension {
  completion(nil)
  }
  }
- 
+
  func attachFile(localURL: URL, mimeType: String?, completion: @escaping (UNNotificationAttachment?) -> Void) {
  do {
  let fileManager = FileManager.default
  let tempDirectory = NSTemporaryDirectory()
  let tempFile = URL(fileURLWithPath: tempDirectory).appendingPathComponent(UUID().uuidString)
- 
+
  try fileManager.moveItem(at: localURL, to: tempFile)
  let attachment: UNNotificationAttachment?
- 
+
  if let mimeType,
  let utType = UTType(mimeType: mimeType),
  utType.conforms(to: .data) {

OpenHABCore/Sources/OpenHABCore/Util/UIColorExtension.swift

@@ -80,10 +80,6 @@ public extension UIColor {
  return .white
  }
 
- class var ohHightlightStrokeColor: UIColor {
- OHInterfaceStyle.current == .light ? .black : .white
- }
-
  // standard colors
  class var ohMaroon: UIColor {
  OHInterfaceStyle.current == .light ? UIColor(hex: "#800000") : UIColor(hex: "#800000")