Minor swiftlint warnings addressed (#830)

Signed-off-by: Tim Bert <[email protected]> Co-authored-by: Dan Cunningham <[email protected]>
openhab · Sep 18, 2024 · 6754e0c · 6754e0c
1 parent e0069b4
commit 6754e0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift b/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift
@@ -33,16 +33,16 @@ public struct UserDefault<T> {
         }
     }
 
+    public var projectedValue: AnyPublisher<T, Never> {
+        subject.eraseToAnyPublisher()
+    }
+
     public init(_ key: String, defaultValue: T) {
         self.key = key
         self.defaultValue = defaultValue
         let currentValue = Preferences.sharedDefaults.object(forKey: key) as? T ?? defaultValue
         subject = CurrentValueSubject<T, Never>(currentValue)
     }
-
-    public var projectedValue: AnyPublisher<T, Never> {
-        subject.eraseToAnyPublisher()
-    }
 }
 
 @propertyWrapper
@@ -73,17 +73,17 @@ public struct UserDefaultURL {
         }
     }
 
+    public var projectedValue: AnyPublisher<String, Never> {
+        subject.eraseToAnyPublisher()
+    }
+
     public init(_ key: String, defaultValue: String) {
         self.key = key
         self.defaultValue = defaultValue
         let currentValue = Preferences.sharedDefaults.string(forKey: key) ?? defaultValue
         subject = CurrentValueSubject<String, Never>(currentValue)
     }
 
-    public var projectedValue: AnyPublisher<String, Never> {
-        subject.eraseToAnyPublisher()
-    }
-
     private func uriWithoutTrailingSlashes(_ hostUri: String) -> String {
         if hostUri.hasSuffix("/") {
             return String(hostUri[..<hostUri.index(before: hostUri.endIndex)])

diff --git a/openHAB/OpenHABRootViewController.swift b/openHAB/OpenHABRootViewController.swift
@@ -313,8 +313,8 @@ class OpenHABRootViewController: UIViewController {
                 }
                 if let urlComponents = URLComponents(string: path) {
                     let queryItems = urlComponents.queryItems
-                    let sitemap = queryItems?.first(where: { $0.name == "sitemap" })?.value
-                    let subview = queryItems?.first(where: { $0.name == "w" })?.value
+                    let sitemap = queryItems?.first { $0.name == "sitemap" }?.value
+                    let subview = queryItems?.first { $0.name == "w" }?.value
                     if let sitemap {
                         sitemapViewController.pushSitemap(name: sitemap, path: subview)
                     }