Merge branch 'develop' into diffable

Signed-off-by: Tim Bert <[email protected]>

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")

openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -55,15 +55,6 @@
           "version": "4.9.0"
         }
       },
-      {
-        "package": "DynamicButton",
-        "repositoryURL": "https://github.com/yannickl/DynamicButton.git",
-        "state": {
-          "branch": null,
-          "revision": "4fbd60e46a548e77fd118483bbb4e58d3c11c5ed",
-          "version": "6.2.1"
-        }
-      },
       {
         "package": "Firebase",
         "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git",
@@ -172,6 +163,15 @@
           "version": "2.4.0"
         }
       },
+      {
+        "package": "SFSafeSymbols",
+        "repositoryURL": "https://github.com/SFSafeSymbols/SFSafeSymbols",
+        "state": {
+          "branch": null,
+          "revision": "e2e28f4e56e1769c2ec3c61c9355fc64eb7a535a",
+          "version": "5.3.0"
+        }
+      },
       {
         "package": "SideMenu",
         "repositoryURL": "https://github.com/jonkykong/SideMenu.git",

openHAB/ColorPickerUITableViewCell.swift → openHAB/ColorPickerCell.swift

@@ -9,24 +9,23 @@
 //
 // SPDX-License-Identifier: EPL-2.0
 
-import DynamicButton
 import OpenHABCore
 import os.log
 import UIKit
 
-protocol ColorPickerUITableViewCellDelegate: NSObjectProtocol {
-    func didPressColorButton(_ cell: ColorPickerUITableViewCell?)
+protocol ColorPickerCellDelegate: NSObjectProtocol {
+    func didPressColorButton(_ cell: ColorPickerCell?)
 }
 
-class ColorPickerUITableViewCell: GenericUITableViewCell {
-    weak var delegate: ColorPickerUITableViewCellDelegate?
+class ColorPickerCell: GenericUITableViewCell {
+    weak var delegate: ColorPickerCellDelegate?
 
-    @IBOutlet private var upButton: DynamicButton!
+    @IBOutlet private var downButton: UIButton!
+    @IBOutlet private var upButton: UIButton!
     @IBOutlet private var colorButton: UICircleButton!
-    @IBOutlet private var downButton: DynamicButton!
 
     required init?(coder: NSCoder) {
-        os_log("ColorPickerUITableViewCell initWithCoder", log: OSLog.viewCycle, type: .info)
+        os_log("ColorPickerCell initWithCoder", log: OSLog.viewCycle, type: .info)
 
         super.init(coder: coder)
 
@@ -46,15 +45,10 @@ class ColorPickerUITableViewCell: GenericUITableViewCell {
     }
 
     override func displayWidget() {
-        downButton.setStyle(.caretDown, animated: false)
-        upButton.setStyle(.caretUp, animated: false)
-
         customTextLabel?.text = widget.labelText
         colorButton?.backgroundColor = widget.item?.stateAsUIColor()
         upButton?.addTarget(self, action: .upButtonPressed, for: .touchUpInside)
         downButton?.addTarget(self, action: .downButtonPressed, for: .touchUpInside)
-        downButton?.highlightStokeColor = .ohHightlightStrokeColor
-        upButton?.highlightStokeColor = .ohHightlightStrokeColor
     }
 
     @objc
@@ -71,6 +65,6 @@ class ColorPickerUITableViewCell: GenericUITableViewCell {
 }
 
 private extension Selector {
-    static let upButtonPressed = #selector(ColorPickerUITableViewCell.upButtonPressed)
-    static let downButtonPressed = #selector(ColorPickerUITableViewCell.downButtonPressed)
+    static let upButtonPressed = #selector(ColorPickerCell.upButtonPressed)
+    static let downButtonPressed = #selector(ColorPickerCell.downButtonPressed)
 }