Passing iconType from iOS to watchOS

Avoid swiftformat on too long line
openhab · Jan 12, 2024 · 3e2b282 · 3e2b282
1 parent ce0f178
commit 3e2b282
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABItem.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABItem.swift
@@ -159,7 +159,17 @@ public extension OpenHABItem.CodingData {
     var openHABItem: OpenHABItem {
         let mappedMembers = members?.map(\.openHABItem) ?? []
 
-        return OpenHABItem(name: name, type: type, state: state, link: link, label: label, groupType: groupType, stateDescription: stateDescription?.openHABStateDescription, commandDescription: commandDescription?.openHABCommandDescription, members: mappedMembers, category: category, options: options)
+        return OpenHABItem(name: name, 
+                           type: type,
+                           state: state,
+                           link: link,
+                           label: label,
+                           groupType: groupType,
+                           stateDescription: stateDescription?.openHABStateDescription,
+                           commandDescription: commandDescription?.openHABCommandDescription,
+                           members: mappedMembers,
+                           category: category,
+                           options: options)
     }
 }
 

diff --git a/openHAB/WatchMessageService.swift b/openHAB/WatchMessageService.swift
@@ -57,7 +57,8 @@ class WatchMessageService: NSObject, WCSessionDelegate {
                 "defaultSitemap": Preferences.defaultSitemap,
                 "ignoreSSL": Preferences.ignoreSSL,
                 "trustedCertificates": NetworkConnection.shared.serverCertificateManager.trustedCertificates,
-                "sitemapForWatch": Preferences.sitemapForWatch
+                "sitemapForWatch": Preferences.sitemapForWatch,
+                "iconType": Preferences.iconType
             ]
 
         return applicationDict

diff --git a/openHABWatch/External/AppMessageService.swift b/openHABWatch/External/AppMessageService.swift
@@ -61,6 +61,10 @@ class AppMessageService: NSObject, WCSessionDelegate {
                 ObservableOpenHABDataObject.shared.openHABAlwaysSendCreds = alwaysSendCreds
             }
 
+            if let iconType = applicationContext["iconType"] as? IconType {
+                ObservableOpenHABDataObject.shared.iconType = iconType
+            }
+
             ObservableOpenHABDataObject.shared.haveReceivedAppContext = true
         }
     }