From 244ede7f0850ced5d77609c3ecd43eff099851ad Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Wed, 22 Nov 2023 19:35:16 +0100
Subject: [PATCH 01/14] First attempt to get to diffable data source

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 openHAB.xcodeproj/project.pbxproj             |  6 ++
 .../OpenHABSelectionTableViewController.swift | 81 ++++++++++++++++---
 openHABUITests/OpenHABUITests.swift           |  2 +-
 .../Views/ContentView.swift                   | 66 +++++++--------
 4 files changed, 110 insertions(+), 45 deletions(-)

diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index 02eae31fc..72f682241 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -1617,6 +1617,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1659,6 +1660,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1788,6 +1790,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABTestsSwift/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1831,6 +1834,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABTestsSwift/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1988,6 +1992,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "openHAB/openHAB-Prefix.pch";
 				INFOPLIST_FILE = "openHAB/openHAB-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2032,6 +2037,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "openHAB/openHAB-Prefix.pch";
 				INFOPLIST_FILE = "openHAB/openHAB-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/openHAB/OpenHABSelectionTableViewController.swift b/openHAB/OpenHABSelectionTableViewController.swift
index e3bc64820..37ccbe967 100644
--- a/openHAB/OpenHABSelectionTableViewController.swift
+++ b/openHAB/OpenHABSelectionTableViewController.swift
@@ -19,9 +19,12 @@ public protocol OpenHABSelectionTableViewControllerDelegate: NSObjectProtocol {
 }
 
 class OpenHABSelectionTableViewController: UITableViewController {
-    static let tableViewCellIdentifier = "SelectionCell"
+    private let cellReuseIdentifier = "SelectionCell"
 
-    var mappings: [AnyHashable] = []
+    private lazy var dataSource = makeDataSource()
+    private lazy var collectionView = makeCollectionView()
+
+    var mappings: [OpenHABWidgetMapping] = []
     weak var delegate: OpenHABSelectionTableViewControllerDelegate?
     var selectionItem: OpenHABItem?
 
@@ -48,15 +51,14 @@ class OpenHABSelectionTableViewController: UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell: UITableViewCell = tableView.dequeueReusableCell(withIdentifier: OpenHABSelectionTableViewController.tableViewCellIdentifier, for: indexPath)
-        if let mapping = mappings[indexPath.row] as? OpenHABWidgetMapping {
-            cell.textLabel?.text = mapping.label
-            if selectionItem?.state == mapping.command {
-                os_log("This item is selected", log: .viewCycle, type: .info)
-                cell.accessoryType = .checkmark
-            } else {
-                cell.accessoryType = .none
-            }
+        let cell: UITableViewCell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
+        let mapping = mappings[indexPath.row]
+        cell.textLabel?.text = mapping.label
+        if selectionItem?.state == mapping.command {
+            os_log("This item is selected", log: .viewCycle, type: .info)
+            cell.accessoryType = .checkmark
+        } else {
+            cell.accessoryType = .none
         }
         return cell
     }
@@ -68,3 +70,60 @@ class OpenHABSelectionTableViewController: UITableViewController {
         navigationController?.popViewController(animated: true)
     }
 }
+
+private extension OpenHABSelectionTableViewController {
+    enum Section: String, CaseIterable {
+        case uniq
+    }
+}
+
+private extension OpenHABSelectionTableViewController {
+    typealias Cell = UICollectionViewListCell
+    typealias CellRegistration = UICollectionView.CellRegistration<Cell, OpenHABWidgetMapping>
+
+    func makeCellRegistration() -> CellRegistration {
+        CellRegistration { cell, indexPath, mapping in
+
+            var content = cell.defaultContentConfiguration()
+            content.text = mapping.label
+
+            if self.selectionItem?.state == mapping.command {
+                os_log("This item is selected", log: .viewCycle, type: .info)
+                content.accessoryType = .checkmark
+            } else {
+                cell.accessoryType = .none
+            }
+            cell.contentConfiguration = content
+        }
+    }
+}
+
+private extension OpenHABSelectionTableViewController {
+    func makeDataSource() -> UICollectionViewDiffableDataSource<Section, OpenHABWidgetMapping> {
+        UICollectionViewDiffableDataSource(
+            collectionView: collectionView,
+            cellProvider: makeCellRegistration().cellProvider
+        )
+    }
+}
+
+extension UICollectionView.CellRegistration {
+    var cellProvider: (UICollectionView, IndexPath, Item) -> Cell {
+        return { collectionView, indexPath, product in
+            collectionView.dequeueConfiguredReusableCell(
+                using: self,
+                for: indexPath,
+                item: product
+            )
+        }
+    }
+}
+
+extension OpenHABSelectionTableViewController {
+    func update(with list: [OpenHABWidgetMapping], animate: Bool = true) {
+        var snapshot = NSDiffableDataSourceSnapshot<Section, OpenHABWidgetMapping>()
+        snapshot.appendSections(Section.allCases)
+        snapshot.appendItems(list, toSection: .uniq)
+        dataSource.apply(snapshot, animatingDifferences: animate)
+    }
+}
diff --git a/openHABUITests/OpenHABUITests.swift b/openHABUITests/OpenHABUITests.swift
index be90ef4f5..b2f8531ec 100644
--- a/openHABUITests/OpenHABUITests.swift
+++ b/openHABUITests/OpenHABUITests.swift
@@ -63,7 +63,7 @@ class OpenHABUITests: XCTestCase {
 
         menuStaticText?.tap()
         sleep(1)
-        
+
         // openHAB logo in left menu
         webViewsQuery.links.allElementsBoundByIndex[1].tap()
         sleep(2)
diff --git a/openHABWatch Extension/Views/ContentView.swift b/openHABWatch Extension/Views/ContentView.swift
index b852d70b6..f5c2e164b 100644
--- a/openHABWatch Extension/Views/ContentView.swift	
+++ b/openHABWatch Extension/Views/ContentView.swift	
@@ -19,41 +19,41 @@ struct ContentView: View {
     @State var title = "openHAB"
 
     var body: some View {
-        ScrollView {
-            ForEach(viewModel.widgets) { widget in
-                rowWidget(widget: widget)
-                    .environmentObject(settings)
-            }
-        }
-        .navigationBarTitle(Text(title))
-        .alert(isPresented: $viewModel.showAlert) {
-            Alert(
-                title: Text(NSLocalizedString("error", comment: "")),
-                message: Text(viewModel.errorDescription),
-                dismissButton: .default(Text(NSLocalizedString("retry", comment: ""))) {
-                    DispatchQueue.main.async {
-                        viewModel.refreshUrl()
-                        os_log("reload after alert", log: .default, type: .info)
-                    }
+        ZStack {
+            ScrollView {
+                ForEach(viewModel.widgets) { widget in
+                    rowWidget(widget: widget)
+                        .environmentObject(settings)
                 }
-            )
-        }
-        .actionSheet(isPresented: $viewModel.showCertificateAlert) {
-            ActionSheet(
-                title: Text(NSLocalizedString("warning", comment: "")),
-                message: Text(viewModel.certificateErrorDescription),
-                buttons: [
-                    .default(Text(NSLocalizedString("abort", comment: ""))) {
-                        NetworkConnection.shared.serverCertificateManager.evaluateResult = .deny
-                    },
-                    .default(Text(NSLocalizedString("once", comment: ""))) {
-                        NetworkConnection.shared.serverCertificateManager.evaluateResult = .permitOnce
-                    },
-                    .default(Text(NSLocalizedString("always", comment: ""))) {
-                        NetworkConnection.shared.serverCertificateManager.evaluateResult = .permitAlways
+            }
+            .navigationBarTitle(Text(title))
+            .actionSheet(isPresented: $viewModel.showCertificateAlert) {
+                ActionSheet(
+                    title: Text(NSLocalizedString("warning", comment: "")),
+                    message: Text(viewModel.certificateErrorDescription),
+                    buttons: [
+                        .default(Text(NSLocalizedString("abort", comment: ""))) {
+                            NetworkConnection.shared.serverCertificateManager.evaluateResult = .deny
+                        },
+                        .default(Text(NSLocalizedString("once", comment: ""))) {
+                            NetworkConnection.shared.serverCertificateManager.evaluateResult = .permitOnce
+                        },
+                        .default(Text(NSLocalizedString("always", comment: ""))) {
+                            NetworkConnection.shared.serverCertificateManager.evaluateResult = .permitAlways
+                        }
+                    ]
+                )
+            }
+            if viewModel.showAlert {
+                Text("Refreshing...")
+                    .onAppear {
+                        DispatchQueue.main.async {
+                            viewModel.refreshUrl()
+                            os_log("reload after alert", log: .default, type: .info)
+                        }
+                        viewModel.showAlert = false
                     }
-                ]
-            )
+            }
         }
     }
 

From 8c7f1497cac4f0dfbe4d6a0c205f8ab498b16b52 Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Wed, 22 Nov 2023 21:38:55 +0100
Subject: [PATCH 02/14] Crashing because of link to to Storyboard searching for
 a TableView

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 .../OpenHABSelectionTableViewController.swift | 41 ++++---------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/openHAB/OpenHABSelectionTableViewController.swift b/openHAB/OpenHABSelectionTableViewController.swift
index 37ccbe967..11e58976f 100644
--- a/openHAB/OpenHABSelectionTableViewController.swift
+++ b/openHAB/OpenHABSelectionTableViewController.swift
@@ -18,11 +18,10 @@ public protocol OpenHABSelectionTableViewControllerDelegate: NSObjectProtocol {
     func didSelectWidgetMapping(_ selectedMapping: Int)
 }
 
-class OpenHABSelectionTableViewController: UITableViewController {
+class OpenHABSelectionTableViewController: UICollectionViewController {
     private let cellReuseIdentifier = "SelectionCell"
 
     private lazy var dataSource = makeDataSource()
-    private lazy var collectionView = makeCollectionView()
 
     var mappings: [OpenHABWidgetMapping] = []
     weak var delegate: OpenHABSelectionTableViewControllerDelegate?
@@ -37,33 +36,10 @@ class OpenHABSelectionTableViewController: UITableViewController {
 
         os_log("I have %d mappings", log: .viewCycle, type: .info, mappings.count)
 
-        // Uncomment the following line to preserve selection between presentations.
-        // self.clearsSelectionOnViewWillAppear = NO;
-
-        // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
-        // self.navigationItem.rightBarButtonItem = self.editButtonItem;
-    }
-
-    // MARK: - Table view data source
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        mappings.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell: UITableViewCell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
-        let mapping = mappings[indexPath.row]
-        cell.textLabel?.text = mapping.label
-        if selectionItem?.state == mapping.command {
-            os_log("This item is selected", log: .viewCycle, type: .info)
-            cell.accessoryType = .checkmark
-        } else {
-            cell.accessoryType = .none
-        }
-        return cell
+        collectionView.dataSource = dataSource
     }
 
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         os_log("Selected mapping %d", log: .viewCycle, type: .info, indexPath.row)
 
         delegate?.didSelectWidgetMapping(indexPath.row)
@@ -82,18 +58,19 @@ private extension OpenHABSelectionTableViewController {
     typealias CellRegistration = UICollectionView.CellRegistration<Cell, OpenHABWidgetMapping>
 
     func makeCellRegistration() -> CellRegistration {
-        CellRegistration { cell, indexPath, mapping in
+        CellRegistration { cell, _, mapping in
 
             var content = cell.defaultContentConfiguration()
             content.text = mapping.label
 
+            cell.contentConfiguration = content
+
             if self.selectionItem?.state == mapping.command {
                 os_log("This item is selected", log: .viewCycle, type: .info)
-                content.accessoryType = .checkmark
+                cell.accessories = [.checkmark()]
             } else {
-                cell.accessoryType = .none
+                cell.accessories = []
             }
-            cell.contentConfiguration = content
         }
     }
 }
@@ -109,7 +86,7 @@ private extension OpenHABSelectionTableViewController {
 
 extension UICollectionView.CellRegistration {
     var cellProvider: (UICollectionView, IndexPath, Item) -> Cell {
-        return { collectionView, indexPath, product in
+        { collectionView, indexPath, product in
             collectionView.dequeueConfiguredReusableCell(
                 using: self,
                 for: indexPath,

From 8fe48624485a2f3f77431dca88d41aed67fd710b Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Wed, 22 Nov 2023 22:33:18 +0100
Subject: [PATCH 03/14] Migrated OpenHABSelectionTableViewController to
 CollectionView  - Renamed to OpenHABSelectionCollectionViewController
 Migrated OpenHABSelectionCollectionViewController away from Storyboard
 Showing view controllers, rather than pushing them, see 
 https://www.swiftbysundell.com/tips/showing-view-controllers/

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 ... => OpenHABSelectionCollectionViewController.swift} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename openHAB/{OpenHABSelectionTableViewController.swift => OpenHABSelectionCollectionViewController.swift} (90%)

diff --git a/openHAB/OpenHABSelectionTableViewController.swift b/openHAB/OpenHABSelectionCollectionViewController.swift
similarity index 90%
rename from openHAB/OpenHABSelectionTableViewController.swift
rename to openHAB/OpenHABSelectionCollectionViewController.swift
index 11e58976f..d7b6cdc99 100644
--- a/openHAB/OpenHABSelectionTableViewController.swift
+++ b/openHAB/OpenHABSelectionCollectionViewController.swift
@@ -18,7 +18,7 @@ public protocol OpenHABSelectionTableViewControllerDelegate: NSObjectProtocol {
     func didSelectWidgetMapping(_ selectedMapping: Int)
 }
 
-class OpenHABSelectionTableViewController: UICollectionViewController {
+class OpenHABSelectionCollectionViewController: UICollectionViewController {
     private let cellReuseIdentifier = "SelectionCell"
 
     private lazy var dataSource = makeDataSource()
@@ -47,13 +47,13 @@ class OpenHABSelectionTableViewController: UICollectionViewController {
     }
 }
 
-private extension OpenHABSelectionTableViewController {
+private extension OpenHABSelectionCollectionViewController {
     enum Section: String, CaseIterable {
         case uniq
     }
 }
 
-private extension OpenHABSelectionTableViewController {
+private extension OpenHABSelectionCollectionViewController {
     typealias Cell = UICollectionViewListCell
     typealias CellRegistration = UICollectionView.CellRegistration<Cell, OpenHABWidgetMapping>
 
@@ -75,7 +75,7 @@ private extension OpenHABSelectionTableViewController {
     }
 }
 
-private extension OpenHABSelectionTableViewController {
+private extension OpenHABSelectionCollectionViewController {
     func makeDataSource() -> UICollectionViewDiffableDataSource<Section, OpenHABWidgetMapping> {
         UICollectionViewDiffableDataSource(
             collectionView: collectionView,
@@ -96,7 +96,7 @@ extension UICollectionView.CellRegistration {
     }
 }
 
-extension OpenHABSelectionTableViewController {
+extension OpenHABSelectionCollectionViewController {
     func update(with list: [OpenHABWidgetMapping], animate: Bool = true) {
         var snapshot = NSDiffableDataSourceSnapshot<Section, OpenHABWidgetMapping>()
         snapshot.appendSections(Section.allCases)

From 9e2eecefe1fa13700be4f7783eb9dcac41c63562 Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Wed, 22 Nov 2023 22:33:54 +0100
Subject: [PATCH 04/14] Migrated OpenHABSelectionTableViewController to
 CollectionView  - Renamed to OpenHABSelectionCollectionViewController
 Migrated OpenHABSelectionCollectionViewController away from Storyboard
 Showing view controllers, rather than pushing them, see 
 https://www.swiftbysundell.com/tips/showing-view-controllers/

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 openHAB.xcodeproj/project.pbxproj             |  8 ++--
 openHAB/Main.storyboard                       | 47 ++++---------------
 ...HABSelectionCollectionViewController.swift |  5 +-
 openHAB/OpenHABSitemapViewController.swift    |  7 ++-
 4 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index 72f682241..7d136c87f 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -137,7 +137,7 @@
 		DF05EF121D00696200DD646D /* DrawerUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF05EF111D00696200DD646D /* DrawerUITableViewCell.swift */; };
 		DF05FF2018965B5400FF2F9B /* RollershutterUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF05FF1F18965B5400FF2F9B /* RollershutterUITableViewCell.swift */; };
 		DF05FF231896BD2D00FF2F9B /* SelectionUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF05FF221896BD2D00FF2F9B /* SelectionUITableViewCell.swift */; };
-		DF06F1F618FE7A160011E7B9 /* OpenHABSelectionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF06F1F518FE7A160011E7B9 /* OpenHABSelectionTableViewController.swift */; };
+		DF06F1F618FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF06F1F518FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift */; };
 		DF06F1F918FEA8420011E7B9 /* ColorPickerUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF06F1F818FEA8420011E7B9 /* ColorPickerUITableViewCell.swift */; };
 		DF06F1FC18FEC2020011E7B9 /* ColorPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF06F1FB18FEC2020011E7B9 /* ColorPickerViewController.swift */; };
 		DF1B302D1CF5C667009C921C /* OpenHABNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1B302C1CF5C667009C921C /* OpenHABNotification.swift */; };
@@ -417,7 +417,7 @@
 		DF05EF111D00696200DD646D /* DrawerUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DrawerUITableViewCell.swift; sourceTree = "<group>"; };
 		DF05FF1F18965B5400FF2F9B /* RollershutterUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RollershutterUITableViewCell.swift; sourceTree = "<group>"; };
 		DF05FF221896BD2D00FF2F9B /* SelectionUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectionUITableViewCell.swift; sourceTree = "<group>"; };
-		DF06F1F518FE7A160011E7B9 /* OpenHABSelectionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenHABSelectionTableViewController.swift; sourceTree = "<group>"; };
+		DF06F1F518FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenHABSelectionCollectionViewController.swift; sourceTree = "<group>"; };
 		DF06F1F818FEA8420011E7B9 /* ColorPickerUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPickerUITableViewCell.swift; sourceTree = "<group>"; };
 		DF06F1FB18FEC2020011E7B9 /* ColorPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPickerViewController.swift; sourceTree = "<group>"; };
 		DF1B302C1CF5C667009C921C /* OpenHABNotification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenHABNotification.swift; sourceTree = "<group>"; };
@@ -816,7 +816,7 @@
 				DFDEE3FC18831099008B26AC /* OpenHABSettingsViewController.swift */,
 				DAEAA89A21E2611000267EA3 /* OpenHABNotificationsViewController.swift */,
 				DFDF452E1932032B00A6E581 /* OpenHABLegalViewController.swift */,
-				DF06F1F518FE7A160011E7B9 /* OpenHABSelectionTableViewController.swift */,
+				DF06F1F518FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift */,
 				A07EF79F2230C0A20040919F /* OpenHABClientCertificatesViewController.swift */,
 				DF4B84101886DA9900F34902 /* Widgets */,
 				DF4A02291CF3157B006C3456 /* Drawer */,
@@ -1402,7 +1402,7 @@
 				DAEAA89B21E2611000267EA3 /* OpenHABNotificationsViewController.swift in Sources */,
 				DF1B302D1CF5C667009C921C /* OpenHABNotification.swift in Sources */,
 				938BF9D324EFD0B700E6B52F /* UIViewController+Localization.swift in Sources */,
-				DF06F1F618FE7A160011E7B9 /* OpenHABSelectionTableViewController.swift in Sources */,
+				DF06F1F618FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift in Sources */,
 				DAA42BA821DC97E000244B2A /* NotificationTableViewCell.swift in Sources */,
 				6595667E28E0BE8E00E8A53B /* MulticastDelegate.swift in Sources */,
 				286F556F22EA062700AECC5C /* DynamicButtonStyleBell.swift in Sources */,
diff --git a/openHAB/Main.storyboard b/openHAB/Main.storyboard
index fd3790ea0..1c31bbd51 100644
--- a/openHAB/Main.storyboard
+++ b/openHAB/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ni3-JL-qg0">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ni3-JL-qg0">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -1240,7 +1240,7 @@
                                         <rect key="frame" x="0.0" y="1039.3333301544189" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Rk-xB-wOS" id="szB-fb-9zj">
-                                            <rect key="frame" x="0.0" y="0.0" width="356.66666666666669" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="344.66666666666669" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Legal" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8c-Ps-18a">
@@ -1266,7 +1266,7 @@
                                         <rect key="frame" x="0.0" y="1083.3333301544189" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gOB-5d-9fY" id="9lh-Vk-icE">
-                                            <rect key="frame" x="0.0" y="0.0" width="356.66666666666669" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="344.66666666666669" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Privacy Policy" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vcs-uN-ETx">
@@ -1403,7 +1403,7 @@
             <objects>
                 <navigationController storyboardIdentifier="RightMenuNavigationController" id="TS8-mI-318" customClass="SideMenuNavigationController" customModule="SideMenu" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="1Cd-5P-USA">
-                        <rect key="frame" x="0.0" y="47" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="50" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <userDefinedRuntimeAttributes>
@@ -1425,7 +1425,7 @@
             <objects>
                 <tableViewController id="sb0-mR-isg" userLabel="Client Certificates" customClass="OpenHABClientCertificatesViewController" customModule="openHAB" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="dsq-Ze-GrF">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="755"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
@@ -1470,35 +1470,6 @@
             </objects>
             <point key="canvasLocation" x="2753" y="1654"/>
         </scene>
-        <!--OpenHAB Selection Table View Controller-->
-        <scene sceneID="0ai-k8-BoH">
-            <objects>
-                <tableViewController storyboardIdentifier="OpenHABSelectionTableViewController" id="ph5-ka-6sJ" customClass="OpenHABSelectionTableViewController" customModule="openHAB" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="m37-LD-lvF">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectionCell" id="gQe-g6-ibM">
-                                <rect key="frame" x="0.0" y="50" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gQe-g6-ibM" id="uG8-D3-W03">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="ph5-ka-6sJ" id="xA2-8E-QG2"/>
-                            <outlet property="delegate" destination="ph5-ka-6sJ" id="ADj-0B-dZE"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="dBD-6t-7Di"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="umd-R3-6kf" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1975" y="1655"/>
-        </scene>
         <!--Legal-->
         <scene sceneID="ftz-wU-zmi">
             <objects>
@@ -1508,11 +1479,11 @@
                         <viewControllerLayoutGuide type="bottom" id="vRb-Nk-z4d"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="NPT-SP-acq">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="755"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="lllsls" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8QX-Dp-MYj">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="721"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
                                 <color key="textColor" systemColor="lightTextColor"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -1543,7 +1514,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="ni3-JL-qg0" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="1IA-wu-eGo">
-                        <rect key="frame" x="0.0" y="47" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="50" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
diff --git a/openHAB/OpenHABSelectionCollectionViewController.swift b/openHAB/OpenHABSelectionCollectionViewController.swift
index d7b6cdc99..d09c6cca9 100644
--- a/openHAB/OpenHABSelectionCollectionViewController.swift
+++ b/openHAB/OpenHABSelectionCollectionViewController.swift
@@ -27,16 +27,13 @@ class OpenHABSelectionCollectionViewController: UICollectionViewController {
     weak var delegate: OpenHABSelectionTableViewControllerDelegate?
     var selectionItem: OpenHABItem?
 
-    required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
 
         os_log("I have %d mappings", log: .viewCycle, type: .info, mappings.count)
 
         collectionView.dataSource = dataSource
+        update(with: mappings)
     }
 
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index d825bb955..ab025a0fa 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -765,13 +765,16 @@ extension OpenHABSitemapViewController: UITableViewDelegate, UITableViewDataSour
             os_log("Selected selection widget", log: .viewCycle, type: .info)
 
             selectedWidgetRow = indexPath.row
-            let selectionViewController = (storyboard?.instantiateViewController(withIdentifier: "OpenHABSelectionTableViewController") as? OpenHABSelectionTableViewController)!
+            let layout = UICollectionViewCompositionalLayout.list(
+                using: UICollectionLayoutListConfiguration(appearance: .insetGrouped)
+            )
+            let selectionViewController = OpenHABSelectionCollectionViewController(collectionViewLayout: layout)
             let selectedWidget: OpenHABWidget? = relevantWidget(indexPath: indexPath)
             selectionViewController.title = selectedWidget?.labelText
             selectionViewController.mappings = selectedWidget?.mappingsOrItemOptions ?? []
             selectionViewController.delegate = self
             selectionViewController.selectionItem = selectedWidget?.item
-            navigationController?.pushViewController(selectionViewController, animated: true)
+            show(selectionViewController, sender: self)
         }
         if let index = widgetTableView.indexPathForSelectedRow {
             widgetTableView.deselectRow(at: index, animated: false)

From 3320cd2410c568bdb032f6d172b03b129422080d Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Fri, 24 Nov 2023 08:09:24 +0100
Subject: [PATCH 05/14] Migrated OpenHABSelectionTableViewController to
 CollectionView  - Renamed to OpenHABSelectionCollectionViewController
 Migrated OpenHABSelectionCollectionViewController away from Storyboard
 Showing view controllers, rather than pushing them, see 
 https://www.swiftbysundell.com/tips/showing-view-controllers/

Migrated OpenHABSitemapViewController to diffable data source / Avoiding reloadData()

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 openHAB.xcodeproj/project.pbxproj             |   4 +
 openHAB/Main.storyboard                       |  34 +-
 ...HABSelectionCollectionViewController.swift |  24 +-
 openHAB/OpenHABSitemapViewController.swift    | 290 +++++++++---------
 ...lectionViewCellRegistrationExtension.swift |  25 ++
 5 files changed, 186 insertions(+), 191 deletions(-)
 create mode 100644 openHAB/UICollectionViewCellRegistrationExtension.swift

diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index 7d136c87f..45385f07b 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -105,6 +105,7 @@
 		DAA42BA821DC97E000244B2A /* NotificationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAA42BA721DC97DF00244B2A /* NotificationTableViewCell.swift */; };
 		DAA42BAA21DC983B00244B2A /* VideoUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAA42BA921DC983B00244B2A /* VideoUITableViewCell.swift */; };
 		DAA42BAC21DC984A00244B2A /* WebUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAA42BAB21DC984A00244B2A /* WebUITableViewCell.swift */; };
+		DABA07542B0F9E7A00708281 /* UICollectionViewCellRegistrationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DABA07532B0F9E7A00708281 /* UICollectionViewCellRegistrationExtension.swift */; };
 		DAC65FC7236EDF3900F4501E /* SpinnerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC65FC6236EDF3900F4501E /* SpinnerViewController.swift */; };
 		DAC6608D236F771600F4501E /* PreferencesSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC6608C236F771600F4501E /* PreferencesSwiftUIView.swift */; };
 		DAC6608F236F80BA00F4501E /* PreferencesRowUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC6608E236F80BA00F4501E /* PreferencesRowUIView.swift */; };
@@ -382,6 +383,7 @@
 		DAA42BA721DC97DF00244B2A /* NotificationTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationTableViewCell.swift; sourceTree = "<group>"; };
 		DAA42BA921DC983B00244B2A /* VideoUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoUITableViewCell.swift; sourceTree = "<group>"; };
 		DAA42BAB21DC984A00244B2A /* WebUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebUITableViewCell.swift; sourceTree = "<group>"; };
+		DABA07532B0F9E7A00708281 /* UICollectionViewCellRegistrationExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UICollectionViewCellRegistrationExtension.swift; sourceTree = "<group>"; };
 		DAC65FC6236EDF3900F4501E /* SpinnerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerViewController.swift; sourceTree = "<group>"; };
 		DAC6608B236F6F4200F4501E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		DAC6608C236F771600F4501E /* PreferencesSwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesSwiftUIView.swift; sourceTree = "<group>"; };
@@ -965,6 +967,7 @@
 				938BF9C524EFCC0700E6B52F /* UILabel+Localization.swift */,
 				938BF9D224EFD0B700E6B52F /* UIViewController+Localization.swift */,
 				935B484525342B8E00E44CF0 /* URL+Static.swift */,
+				DABA07532B0F9E7A00708281 /* UICollectionViewCellRegistrationExtension.swift */,
 			);
 			name = Util;
 			sourceTree = "<group>";
@@ -1409,6 +1412,7 @@
 				DFDEE3FD18831099008B26AC /* OpenHABSettingsViewController.swift in Sources */,
 				938EDCE122C4FEB800661CA1 /* ScaleAspectFitImageView.swift in Sources */,
 				DAEAA89F21E6B16600267EA3 /* UITableView.swift in Sources */,
+				DABA07542B0F9E7A00708281 /* UICollectionViewCellRegistrationExtension.swift in Sources */,
 				DFB2624418830A3600D3244D /* OpenHABSitemapViewController.swift in Sources */,
 				DF05FF2018965B5400FF2F9B /* RollershutterUITableViewCell.swift in Sources */,
 				653B54C2285E714900298ECD /* OpenHABViewController.swift in Sources */,
diff --git a/openHAB/Main.storyboard b/openHAB/Main.storyboard
index 1c31bbd51..c98db79cc 100644
--- a/openHAB/Main.storyboard
+++ b/openHAB/Main.storyboard
@@ -2,7 +2,6 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ni3-JL-qg0">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -562,7 +561,7 @@
                     </view>
                     <navigationItem key="navigationItem" id="N7h-KT-EtL"/>
                     <connections>
-                        <outlet property="widgetTableView" destination="S7g-eE-wf7" id="KbB-WO-sKI"/>
+                        <outlet property="tableView" destination="S7g-eE-wf7" id="KbB-WO-sKI"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
@@ -1240,7 +1239,7 @@
                                         <rect key="frame" x="0.0" y="1039.3333301544189" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Rk-xB-wOS" id="szB-fb-9zj">
-                                            <rect key="frame" x="0.0" y="0.0" width="344.66666666666669" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="356.66666666666669" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Legal" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8c-Ps-18a">
@@ -1266,7 +1265,7 @@
                                         <rect key="frame" x="0.0" y="1083.3333301544189" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gOB-5d-9fY" id="9lh-Vk-icE">
-                                            <rect key="frame" x="0.0" y="0.0" width="344.66666666666669" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="356.66666666666669" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Privacy Policy" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vcs-uN-ETx">
@@ -1425,7 +1424,7 @@
             <objects>
                 <tableViewController id="sb0-mR-isg" userLabel="Client Certificates" customClass="OpenHABClientCertificatesViewController" customModule="openHAB" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="dsq-Ze-GrF">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
@@ -1479,7 +1478,7 @@
                         <viewControllerLayoutGuide type="bottom" id="vRb-Nk-z4d"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="NPT-SP-acq">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="lllsls" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8QX-Dp-MYj">
@@ -1607,29 +1606,6 @@
             <point key="canvasLocation" x="1890" y="32"/>
         </scene>
     </scenes>
-    <designables>
-        <designable name="OR4-bR-Ekg">
-            <size key="intrinsicContentSize" width="30" height="34"/>
-        </designable>
-        <designable name="PuF-sy-GZG">
-            <size key="intrinsicContentSize" width="30" height="34"/>
-        </designable>
-        <designable name="PzY-Bs-9MZ">
-            <size key="intrinsicContentSize" width="30" height="34"/>
-        </designable>
-        <designable name="bnc-pN-4ms">
-            <size key="intrinsicContentSize" width="30" height="34"/>
-        </designable>
-        <designable name="gIa-Hx-tGr">
-            <size key="intrinsicContentSize" width="30" height="34"/>
-        </designable>
-        <designable name="riU-tV-5Y6">
-            <size key="intrinsicContentSize" width="30" height="34"/>
-        </designable>
-        <designable name="vxc-Zw-Oyh">
-            <size key="intrinsicContentSize" width="30" height="34"/>
-        </designable>
-    </designables>
     <resources>
         <systemColor name="groupTableViewBackgroundColor">
             <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/openHAB/OpenHABSelectionCollectionViewController.swift b/openHAB/OpenHABSelectionCollectionViewController.swift
index d09c6cca9..1c286dd50 100644
--- a/openHAB/OpenHABSelectionCollectionViewController.swift
+++ b/openHAB/OpenHABSelectionCollectionViewController.swift
@@ -45,14 +45,12 @@ class OpenHABSelectionCollectionViewController: UICollectionViewController {
 }
 
 private extension OpenHABSelectionCollectionViewController {
+    typealias Cell = UICollectionViewListCell
+    typealias CellRegistration = UICollectionView.CellRegistration<Cell, OpenHABWidgetMapping>
+
     enum Section: String, CaseIterable {
         case uniq
     }
-}
-
-private extension OpenHABSelectionCollectionViewController {
-    typealias Cell = UICollectionViewListCell
-    typealias CellRegistration = UICollectionView.CellRegistration<Cell, OpenHABWidgetMapping>
 
     func makeCellRegistration() -> CellRegistration {
         CellRegistration { cell, _, mapping in
@@ -70,30 +68,14 @@ private extension OpenHABSelectionCollectionViewController {
             }
         }
     }
-}
 
-private extension OpenHABSelectionCollectionViewController {
     func makeDataSource() -> UICollectionViewDiffableDataSource<Section, OpenHABWidgetMapping> {
         UICollectionViewDiffableDataSource(
             collectionView: collectionView,
             cellProvider: makeCellRegistration().cellProvider
         )
     }
-}
-
-extension UICollectionView.CellRegistration {
-    var cellProvider: (UICollectionView, IndexPath, Item) -> Cell {
-        { collectionView, indexPath, product in
-            collectionView.dequeueConfiguredReusableCell(
-                using: self,
-                for: indexPath,
-                item: product
-            )
-        }
-    }
-}
 
-extension OpenHABSelectionCollectionViewController {
     func update(with list: [OpenHABWidgetMapping], animate: Bool = true) {
         var snapshot = NSDiffableDataSourceSnapshot<Section, OpenHABWidgetMapping>()
         snapshot.appendSections(Section.allCases)
diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index ab025a0fa..6d19dfb2b 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -25,6 +25,10 @@ enum Action<I, O> {
     typealias Async = (UIViewController, I, @escaping (O) -> Void) -> Void
 }
 
+enum ViewControllerSection {
+    case main
+}
+
 struct OpenHABImageProcessor: ImageProcessor {
     // `identifier` should be the same for processors with the same properties/functionality
     // It will be used when storing and retrieving the image to/from cache.
@@ -109,7 +113,10 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
         search.isActive && !searchBarIsEmpty
     }
 
-    @IBOutlet private var widgetTableView: UITableView!
+    @IBOutlet private var tableView: UITableView!
+
+    var dataSource: UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>! = nil
+    var currentSnapshot: NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>! = nil
 
     // Here goes everything about view loading, appearing, disappearing, entering background and becoming active
     override func viewDidLoad() {
@@ -118,16 +125,17 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
 
         pageNetworkStatus = nil
         sitemaps = []
-        widgetTableView.tableFooterView = UIView()
+        //      tableView.tableFooterView = UIView()
 
         registerTableViewCells()
+        dataSource = makeDataSource()
         configureTableView()
 
         refreshControl = UIRefreshControl()
 
         refreshControl?.addTarget(self, action: #selector(OpenHABSitemapViewController.handleRefresh(_:)), for: .valueChanged)
         if let refreshControl {
-            widgetTableView.refreshControl = refreshControl
+            tableView.refreshControl = refreshControl
         }
 
         search.searchResultsUpdater = self
@@ -137,7 +145,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
 
         #if DEBUG
         // setup accessibilityIdentifiers for UITest
-        widgetTableView.accessibilityIdentifier = "OpenHABSitemapViewControllerWidgetTableView"
+        tableView.accessibilityIdentifier = "OpenHABSitemapViewControllerWidgetTableView"
         #endif
     }
 
@@ -171,7 +179,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
             appData?.sitemapViewController = self
             if currentPage != nil {
                 currentPage?.widgets = []
-                widgetTableView.reloadData()
+                updateUI()
             }
             os_log("OpenHABSitemapViewController pageUrl is empty, this is first launch", log: .viewCycle, type: .info)
             OpenHABTracker.shared.multicastDelegate.add(self)
@@ -243,7 +251,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 
-        widgetTableView.reloadData()
+        updateUI()
     }
 
     /// Implementation of GenericUITableViewCellTouchEventDelegate
@@ -255,28 +263,28 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
     func touchUp() {
         isUserInteracting = false
         if isWaitingToReload {
-            widgetTableView.reloadData()
+            updateUI()
             refreshControl?.endRefreshing()
         }
         isWaitingToReload = false
     }
 
     func configureTableView() {
-        widgetTableView.dataSource = self
-        widgetTableView.delegate = self
+        tableView.dataSource = dataSource
+        tableView.delegate = self
     }
 
     func registerTableViewCells() {
-        widgetTableView.register(cellType: MapViewTableViewCell.self)
-        widgetTableView.register(cellType: NewImageUITableViewCell.self)
-        widgetTableView.register(cellType: VideoUITableViewCell.self)
+        tableView.register(cellType: MapViewTableViewCell.self)
+        tableView.register(cellType: NewImageUITableViewCell.self)
+        tableView.register(cellType: VideoUITableViewCell.self)
     }
 
     @objc
     func handleRefresh(_ refreshControl: UIRefreshControl?) {
         loadPage(false)
-        widgetTableView.reloadData()
-        widgetTableView.layoutIfNeeded()
+        updateUI()
+        tableView.layoutIfNeeded()
     }
 
     func restart() {
@@ -295,8 +303,8 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
 
     private func updateWidgetTableView() {
         UIView.performWithoutAnimation {
-            widgetTableView.beginUpdates()
-            widgetTableView.endUpdates()
+            tableView.beginUpdates()
+            tableView.endUpdates()
         }
     }
 
@@ -373,7 +381,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
                 }
                 // isUserInteracting fixes https://github.com/openhab/openhab-ios/issues/646 where reloading while the user is interacting can have unintended consequences
                 if !isUserInteracting {
-                    widgetTableView.reloadData()
+                    updateUI()
                     refreshControl?.endRefreshing()
                 } else {
                     isWaitingToReload = true
@@ -437,7 +445,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
                     self.showSideMenu()
                 default: break
                 }
-                self.widgetTableView.reloadData()
+                self.updateUI()
             case let .failure(error):
                 os_log("%{PUBLIC}@ %d", log: .default, type: .error, error.localizedDescription, response.response?.statusCode ?? 0)
                 DispatchQueue.main.async {
@@ -511,7 +519,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
         filteredPage?.sendCommand = { [weak self] item, command in
             self?.sendCommand(item, commandToSend: command)
         }
-        widgetTableView.reloadData()
+        updateUI()
     }
 
     func sendCommand(_ item: OpenHABItem?, commandToSend command: String?) {
@@ -580,7 +588,7 @@ extension OpenHABSitemapViewController: ColorPickerUITableViewCellDelegate {
     func didPressColorButton(_ cell: ColorPickerUITableViewCell?) {
         let colorPickerViewController = storyboard?.instantiateViewController(withIdentifier: "ColorPickerViewController") as? ColorPickerViewController
         if let cell {
-            let widget = relevantPage?.widgets[widgetTableView.indexPath(for: cell)?.row ?? 0]
+            let widget = relevantPage?.widgets[tableView.indexPath(for: cell)?.row ?? 0]
             colorPickerViewController?.title = widget?.labelText
             colorPickerViewController?.widget = widget
         }
@@ -590,20 +598,130 @@ extension OpenHABSitemapViewController: ColorPickerUITableViewCellDelegate {
     }
 }
 
-// MARK: - UITableViewDelegate, UITableViewDataSource
+extension OpenHABSitemapViewController {
+    private func makeDataSource() -> UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget> {
+        UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>(tableView: tableView) { [weak self] (tableView: UITableView, indexPath: IndexPath, widget: OpenHABWidget) -> UITableViewCell? in
+
+            let cell: UITableViewCell
+
+            switch widget.type {
+            case .frame:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: FrameUITableViewCell.self)
+            case .switchWidget:
+                // Reflecting the discussion held in https://github.com/openhab/openhab-core/issues/952
+                if !widget.mappings.isEmpty {
+                    cell = tableView.dequeueReusableCell(for: indexPath, cellType: SegmentedUITableViewCell.self)
+                } else if widget.item?.isOfTypeOrGroupType(.switchItem) ?? false {
+                    cell = tableView.dequeueReusableCell(for: indexPath, cellType: SwitchUITableViewCell.self)
+                } else if widget.item?.isOfTypeOrGroupType(.rollershutter) ?? false {
+                    cell = tableView.dequeueReusableCell(for: indexPath, cellType: RollershutterUITableViewCell.self)
+                } else if !widget.mappingsOrItemOptions.isEmpty {
+                    cell = tableView.dequeueReusableCell(for: indexPath, cellType: SegmentedUITableViewCell.self)
+                } else {
+                    cell = tableView.dequeueReusableCell(for: indexPath, cellType: SwitchUITableViewCell.self)
+                }
+            case .setpoint:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: SetpointUITableViewCell.self)
+            case .slider:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: SliderUITableViewCell.self)
+            case .selection:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: SelectionUITableViewCell.self)
+            case .colorpicker:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: ColorPickerUITableViewCell.self)
+                (cell as? ColorPickerUITableViewCell)?.delegate = self
+            case .image, .chart:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: NewImageUITableViewCell.self)
+                (cell as? NewImageUITableViewCell)?.didLoad = { [weak self] in
+                    self?.updateWidgetTableView()
+                }
+            case .video:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: VideoUITableViewCell.self)
+                (cell as? VideoUITableViewCell)?.didLoad = { [weak self] in
+                    self?.updateWidgetTableView()
+                }
+            case .webview:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: WebUITableViewCell.self)
+            case .mapview:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: MapViewTableViewCell.self)
+            case .group, .text:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: GenericUITableViewCell.self)
+            default:
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: GenericUITableViewCell.self)
+            }
 
-extension OpenHABSitemapViewController: UITableViewDelegate, UITableViewDataSource {
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if currentPage != nil {
-            if isFiltering {
-                return filteredPage?.widgets.count ?? 0
+            var iconColor = widget.iconColor
+            if iconColor.isEmpty, self?.traitCollection.userInterfaceStyle == .dark {
+                iconColor = "white"
             }
-            return currentPage?.widgets.count ?? 0
-        } else {
-            return 0
+            // No icon is needed for image, video, frame and web widgets
+            if !((cell is NewImageUITableViewCell) || (cell is VideoUITableViewCell) || (cell is FrameUITableViewCell) || (cell is WebUITableViewCell)) {
+                if let urlc = Endpoint.icon(
+                    rootUrl: self?.openHABRootUrl ?? "",
+                    version: self?.appData?.openHABVersion ?? 2,
+                    icon: widget.icon,
+                    state: widget.iconState(),
+                    iconType: self?.iconType ?? .svg,
+                    iconColor: iconColor
+                ).url {
+                    var imageRequest = URLRequest(url: urlc)
+                    imageRequest.timeoutInterval = 10.0
+
+                    let reportOnResults: ((Swift.Result<RetrieveImageResult, KingfisherError>) -> Void)? = { result in
+                        switch result {
+                        case let .success(value):
+                            os_log("Task done for: %{PUBLIC}@", log: .viewCycle, type: .info, value.source.url?.absoluteString ?? "")
+                        case let .failure(error):
+                            os_log("Job failed: %{PUBLIC}@", log: .viewCycle, type: .info, error.localizedDescription)
+                        }
+                    }
+
+                    cell.imageView?.kf.setImage(
+                        with: KF.ImageResource(downloadURL: urlc, cacheKey: urlc.path + (urlc.query ?? "")),
+                        placeholder: UIImage(named: "blankicon.png"),
+                        options: [.processor(OpenHABImageProcessor())],
+                        completionHandler: reportOnResults
+                    )
+                }
+            }
+
+            if cell is FrameUITableViewCell {
+                cell.backgroundColor = .ohSystemGroupedBackground
+            } else {
+                cell.backgroundColor = .ohSecondarySystemGroupedBackground
+            }
+
+            if let cell = cell as? GenericUITableViewCell {
+                cell.widget = widget
+                cell.displayWidget()
+                cell.touchEventDelegate = self
+            }
+
+            // Check if this is not the last row in the widgets list
+            if indexPath.row < (self?.relevantPage?.widgets.count ?? 1) - 1 {
+                let nextWidget: OpenHABWidget? = self?.relevantPage?.widgets[indexPath.row + 1]
+                if let type = nextWidget?.type, type.isAny(of: .frame, .image, .video, .webview, .chart) {
+                    cell.separatorInset = UIEdgeInsets.zero
+                } else if !(widget.type == .frame) {
+                    cell.separatorInset = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 0)
+                }
+            }
+
+            return cell
         }
     }
 
+    /// - Tag: WiFiUpdate
+    func updateUI(animated: Bool = true) {
+        currentSnapshot = NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>()
+        currentSnapshot.appendSections([.main])
+        currentSnapshot.appendItems(relevantPage?.widgets ?? [], toSection: .main)
+        dataSource.apply(currentSnapshot, animatingDifferences: animated)
+    }
+}
+
+// MARK: - UITableViewDelegate, UITableViewDataSource
+
+extension OpenHABSitemapViewController: UITableViewDelegate { // }, UITableViewDataSource {
     func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
         44.0
     }
@@ -629,116 +747,6 @@ extension OpenHABSitemapViewController: UITableViewDelegate, UITableViewDataSour
         }
     }
 
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let widget: OpenHABWidget? = relevantWidget(indexPath: indexPath)
-
-        let cell: UITableViewCell
-
-        switch widget?.type {
-        case .frame:
-            cell = tableView.dequeueReusableCell(for: indexPath) as FrameUITableViewCell
-        case .switchWidget:
-            // Reflecting the discussion held in https://github.com/openhab/openhab-core/issues/952
-            if !(widget?.mappings ?? []).isEmpty {
-                cell = tableView.dequeueReusableCell(for: indexPath) as SegmentedUITableViewCell
-            } else if widget?.item?.isOfTypeOrGroupType(.switchItem) ?? false {
-                cell = tableView.dequeueReusableCell(for: indexPath) as SwitchUITableViewCell
-            } else if widget?.item?.isOfTypeOrGroupType(.rollershutter) ?? false {
-                cell = tableView.dequeueReusableCell(for: indexPath) as RollershutterUITableViewCell
-            } else if !(widget?.mappingsOrItemOptions ?? []).isEmpty {
-                cell = tableView.dequeueReusableCell(for: indexPath) as SegmentedUITableViewCell
-            } else {
-                cell = tableView.dequeueReusableCell(for: indexPath) as SwitchUITableViewCell
-            }
-        case .setpoint:
-            cell = tableView.dequeueReusableCell(for: indexPath) as SetpointUITableViewCell
-        case .slider:
-            cell = tableView.dequeueReusableCell(for: indexPath) as SliderUITableViewCell
-        case .selection:
-            cell = tableView.dequeueReusableCell(for: indexPath) as SelectionUITableViewCell
-        case .colorpicker:
-            cell = tableView.dequeueReusableCell(for: indexPath) as ColorPickerUITableViewCell
-            (cell as? ColorPickerUITableViewCell)?.delegate = self
-        case .image, .chart:
-            cell = tableView.dequeueReusableCell(for: indexPath) as NewImageUITableViewCell
-            (cell as? NewImageUITableViewCell)?.didLoad = { [weak self] in
-                self?.updateWidgetTableView()
-            }
-        case .video:
-            cell = tableView.dequeueReusableCell(for: indexPath) as VideoUITableViewCell
-            (cell as? VideoUITableViewCell)?.didLoad = { [weak self] in
-                self?.updateWidgetTableView()
-            }
-        case .webview:
-            cell = tableView.dequeueReusableCell(for: indexPath) as WebUITableViewCell
-        case .mapview:
-            cell = tableView.dequeueReusableCell(for: indexPath) as MapViewTableViewCell
-        case .group, .text:
-            cell = tableView.dequeueReusableCell(for: indexPath) as GenericUITableViewCell
-        default:
-            cell = tableView.dequeueReusableCell(for: indexPath) as GenericUITableViewCell
-        }
-
-        var iconColor = widget?.iconColor
-        if iconColor == nil || iconColor!.isEmpty, traitCollection.userInterfaceStyle == .dark {
-            iconColor = "white"
-        }
-        // No icon is needed for image, video, frame and web widgets
-        if widget?.icon != nil, !((cell is NewImageUITableViewCell) || (cell is VideoUITableViewCell) || (cell is FrameUITableViewCell) || (cell is WebUITableViewCell)) {
-            if let urlc = Endpoint.icon(
-                rootUrl: openHABRootUrl,
-                version: appData?.openHABVersion ?? 2,
-                icon: widget?.icon,
-                state: widget?.iconState() ?? "",
-                iconType: iconType,
-                iconColor: iconColor!
-            ).url {
-                var imageRequest = URLRequest(url: urlc)
-                imageRequest.timeoutInterval = 10.0
-
-                let reportOnResults: ((Swift.Result<RetrieveImageResult, KingfisherError>) -> Void)? = { result in
-                    switch result {
-                    case let .success(value):
-                        os_log("Task done for: %{PUBLIC}@", log: .viewCycle, type: .info, value.source.url?.absoluteString ?? "")
-                    case let .failure(error):
-                        os_log("Job failed: %{PUBLIC}@", log: .viewCycle, type: .info, error.localizedDescription)
-                    }
-                }
-
-                cell.imageView?.kf.setImage(
-                    with: KF.ImageResource(downloadURL: urlc, cacheKey: urlc.path + (urlc.query ?? "")),
-                    placeholder: UIImage(named: "blankicon.png"),
-                    options: [.processor(OpenHABImageProcessor())],
-                    completionHandler: reportOnResults
-                )
-            }
-        }
-
-        if cell is FrameUITableViewCell {
-            cell.backgroundColor = .ohSystemGroupedBackground
-        } else {
-            cell.backgroundColor = .ohSecondarySystemGroupedBackground
-        }
-
-        if let cell = cell as? GenericUITableViewCell {
-            cell.widget = widget
-            cell.displayWidget()
-            cell.touchEventDelegate = self
-        }
-
-        // Check if this is not the last row in the widgets list
-        if indexPath.row < (relevantPage?.widgets.count ?? 1) - 1 {
-            let nextWidget: OpenHABWidget? = relevantPage?.widgets[indexPath.row + 1]
-            if let type = nextWidget?.type, type.isAny(of: .frame, .image, .video, .webview, .chart) {
-                cell.separatorInset = UIEdgeInsets.zero
-            } else if !(widget?.type == .frame) {
-                cell.separatorInset = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 0)
-            }
-        }
-
-        return cell
-    }
-
     func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
         // Prevent the cell from inheriting the Table View's margin settings
         cell.preservesSuperviewLayoutMargins = false
@@ -776,8 +784,8 @@ extension OpenHABSitemapViewController: UITableViewDelegate, UITableViewDataSour
             selectionViewController.selectionItem = selectedWidget?.item
             show(selectionViewController, sender: self)
         }
-        if let index = widgetTableView.indexPathForSelectedRow {
-            widgetTableView.deselectRow(at: index, animated: false)
+        if let index = tableView.indexPathForSelectedRow {
+            tableView.deselectRow(at: index, animated: false)
         }
     }
 
diff --git a/openHAB/UICollectionViewCellRegistrationExtension.swift b/openHAB/UICollectionViewCellRegistrationExtension.swift
new file mode 100644
index 000000000..e4cc0efde
--- /dev/null
+++ b/openHAB/UICollectionViewCellRegistrationExtension.swift
@@ -0,0 +1,25 @@
+// Copyright (c) 2010-2023 Contributors to the openHAB project
+//
+// See the NOTICE file(s) distributed with this work for additional
+// information.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0
+//
+// SPDX-License-Identifier: EPL-2.0
+
+import Foundation
+import UIKit
+
+extension UICollectionView.CellRegistration {
+    var cellProvider: (UICollectionView, IndexPath, Item) -> Cell {
+        { collectionView, indexPath, product in
+            collectionView.dequeueConfiguredReusableCell(
+                using: self,
+                for: indexPath,
+                item: product
+            )
+        }
+    }
+}

From 762f7f8cb212a0f2d89ee0a63d5b9f2515e46484 Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Fri, 24 Nov 2023 09:56:39 +0100
Subject: [PATCH 06/14] Swiftlinted

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 openHAB/OpenHABSitemapViewController.swift     | 4 ++--
 openHABWatch Extension/Views/ContentView.swift | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index 6d19dfb2b..46eb9d579 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -113,11 +113,11 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
         search.isActive && !searchBarIsEmpty
     }
 
-    @IBOutlet private var tableView: UITableView!
-
     var dataSource: UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>! = nil
     var currentSnapshot: NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>! = nil
 
+    @IBOutlet private var tableView: UITableView!
+
     // Here goes everything about view loading, appearing, disappearing, entering background and becoming active
     override func viewDidLoad() {
         super.viewDidLoad()
diff --git a/openHABWatch Extension/Views/ContentView.swift b/openHABWatch Extension/Views/ContentView.swift
index d7fe30701..2100dc406 100644
--- a/openHABWatch Extension/Views/ContentView.swift	
+++ b/openHABWatch Extension/Views/ContentView.swift	
@@ -22,8 +22,8 @@ struct ContentView: View {
         ZStack {
             ScrollView {
                 ForEach(viewModel.widgets) { widget in
-                    self.rowWidget(widget: widget)
-                        .environmentObject(self.settings)
+                    rowWidget(widget: widget)
+                        .environmentObject(settings)
                 }
             }
             .navigationBarTitle(Text(title))
@@ -49,7 +49,7 @@ struct ContentView: View {
                     .onAppear {
                         DispatchQueue.main.async {
                             viewModel.refreshUrl()
-                            self.viewModel.refreshUrl()
+                            viewModel.refreshUrl()
                             os_log("reload after alert", log: .default, type: .info)
                         }
                         viewModel.showAlert = false

From 1c90e9eef52ad2aa53aa8aa5a882f1f98ac81a0b Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Mon, 27 Nov 2023 20:27:15 +0100
Subject: [PATCH 07/14] Migrating OpenHABUITile to diffable data source Making
 the code more maintainable

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 BuildTools/.swiftlint.yml                     |   1 +
 .../OpenHABCore/Model/OpenHABUiTile.swift     |  10 +-
 .../OpenHABCore/Util/NetworkConnection.swift  |   3 +-
 .../OpenHABDrawerTableViewController.swift    | 193 ++++++++----------
 ...HABSelectionCollectionViewController.swift |   4 +-
 5 files changed, 103 insertions(+), 108 deletions(-)

diff --git a/BuildTools/.swiftlint.yml b/BuildTools/.swiftlint.yml
index c6622e780..c44c0e264 100644
--- a/BuildTools/.swiftlint.yml
+++ b/BuildTools/.swiftlint.yml
@@ -93,6 +93,7 @@ custom_rules:
 
 file_name:
   suffix_pattern: "Extension?|\\+.*"
+  excluded: "UICollectionViewCellRegistrationExtension.swift"
 
 opening_brace:
   allow_multiline_func: true
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABUiTile.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABUiTile.swift
index 3e602a331..8ce061078 100644
--- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABUiTile.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABUiTile.swift
@@ -11,7 +11,7 @@
 
 import Foundation
 
-public class OpenHABUiTile: Decodable {
+public class OpenHABUiTile: Decodable, Hashable {
     public var name = ""
     public var url = ""
     public var imageUrl = ""
@@ -21,6 +21,14 @@ public class OpenHABUiTile: Decodable {
         self.url = url
         self.imageUrl = imageUrl
     }
+
+    public static func == (lhs: OpenHABUiTile, rhs: OpenHABUiTile) -> Bool {
+        lhs.name == rhs.name
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(name)
+    }
 }
 
 public extension OpenHABUiTile {
diff --git a/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift b/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift
index fc6784916..a6cabaa51 100644
--- a/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift
@@ -110,6 +110,7 @@ public class NetworkConnection {
     public static func uiTiles(openHABRootUrl: String,
                                completionHandler: @escaping (DataResponse<Data, AFError>) -> Void) {
         if let url = Endpoint.uiTiles(openHABRootUrl: openHABRootUrl).url {
+            os_log("URL for Endpoint %{PUBLIC}@", log: .default, type: .info, url.debugDescription)
             load(from: url, completionHandler: completionHandler)
         }
     }
@@ -154,7 +155,7 @@ public class NetworkConnection {
 
             commandRequest.setValue("text/plain", forHTTPHeaderField: "Content-type")
 
-            os_log("Timeout %{PUBLIC}g", log: .default, type: .info, commandRequest.timeoutInterval)
+            os_log("Timeout %{PUBLIC}@", log: .default, type: .info, commandRequest.timeoutInterval)
             let link = item.link
             os_log("OpenHABViewController posting %{PUBLIC}@ command to %{PUBLIC}@", log: .default, type: .info, command ?? "", link)
             os_log("%{PUBLIC}@", log: .default, type: .info, commandRequest.debugDescription)
diff --git a/openHAB/OpenHABDrawerTableViewController.swift b/openHAB/OpenHABDrawerTableViewController.swift
index fe9bd7c73..69bfc5849 100644
--- a/openHAB/OpenHABDrawerTableViewController.swift
+++ b/openHAB/OpenHABDrawerTableViewController.swift
@@ -58,7 +58,7 @@ func deriveSitemaps(_ response: Data?, version: Int?) -> [OpenHABSitemap] {
     return sitemaps
 }
 
-struct UiTile: Decodable {
+struct UiTile: Decodable, Hashable {
     var name: String
     var url: String
     var imageUrl: String
@@ -69,9 +69,9 @@ class OpenHABDrawerTableViewController: UITableViewController {
 
     var sitemaps: [OpenHABSitemap] = []
     var uiTiles: [OpenHABUiTile] = []
+    var drawerItems: [OpenHABDrawerItem] = []
     var openHABUsername = ""
     var openHABPassword = ""
-    var drawerItems: [OpenHABDrawerItem] = []
     weak var delegate: ModalHandler?
 
     // App wide data access
@@ -79,6 +79,8 @@ class OpenHABDrawerTableViewController: UITableViewController {
         AppDelegate.appDelegate.appData
     }
 
+    var dataSource: DataSource!
+
     init() {
         super.init(nibName: nil, bundle: nil)
     }
@@ -90,17 +92,26 @@ class OpenHABDrawerTableViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         tableView.tableFooterView = UIView()
-        drawerItems = []
-        sitemaps = []
         loadSettings()
-        setStandardDrawerItems()
+        configureDataSource()
+        getData()
         os_log("OpenHABDrawerTableViewController did load", log: .viewCycle, type: .info)
     }
 
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        os_log("OpenHABDrawerTableViewController viewWillAppear", log: .viewCycle, type: .info)
+    func updateUI(animatingDifferences: Bool = false) {
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections([.main])
+        snapshot.appendItems([Item.main], toSection: .main)
+        snapshot.appendSections([.tiles])
+        snapshot.appendItems(uiTiles.map { Item.tiles($0) }, toSection: .tiles)
+        snapshot.appendSections([.sitemaps])
+        snapshot.appendItems(sitemaps.map { Item.sitemaps($0) }, toSection: .sitemaps)
+        snapshot.appendSections([.system])
+        snapshot.appendItems(getStandardDrawerItems().map { Item.system($0) }, toSection: .system)
+        dataSource.apply(snapshot, animatingDifferences: animatingDifferences)
+    }
 
+    func getData() {
         NetworkConnection.sitemaps(openHABRootUrl: appData?.openHABRootUrl ?? "") { response in
             switch response.result {
             case let .success(data):
@@ -117,22 +128,15 @@ class OpenHABDrawerTableViewController: UITableViewController {
                 case .label: self.sitemaps.sort { $0.label < $1.label }
                 case .name: self.sitemaps.sort { $0.name < $1.name }
                 }
-
-                self.drawerItems.removeAll()
-                self.setStandardDrawerItems()
-                self.tableView.reloadData()
+                self.updateUI()
             case let .failure(error):
                 os_log("%{PUBLIC}@", log: .default, type: .error, error.localizedDescription)
-                self.drawerItems.removeAll()
-                self.setStandardDrawerItems()
-                self.tableView.reloadData()
             }
         }
 
         NetworkConnection.uiTiles(openHABRootUrl: appData?.openHABRootUrl ?? "") { response in
             switch response.result {
             case .success:
-                UIApplication.shared.isNetworkActivityIndicatorVisible = false
                 os_log("ui tiles response", log: .viewCycle, type: .info)
                 guard let responseData = response.data else {
                     os_log("Error: did not receive data", log: OSLog.remoteAccess, type: .info)
@@ -140,72 +144,56 @@ class OpenHABDrawerTableViewController: UITableViewController {
                 }
                 do {
                     self.uiTiles = try JSONDecoder().decode([OpenHABUiTile].self, from: responseData)
-                    self.tableView.reloadData()
+                    self.updateUI()
                 } catch {
                     os_log("Error: did not receive data %{PUBLIC}@", log: OSLog.remoteAccess, type: .info, error.localizedDescription)
                 }
             case let .failure(error):
-                UIApplication.shared.isNetworkActivityIndicatorVisible = false
                 os_log("%{PUBLIC}@", log: .default, type: .error, error.localizedDescription)
             }
         }
     }
+}
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        tableView.reloadData()
-        os_log("RightDrawerViewController viewDidAppear", log: .viewCycle, type: .info)
-        os_log("Sitemap count: %d", log: .viewCycle, type: .info, Int(sitemaps.count))
-        os_log("Menu items count: %d", log: .viewCycle, type: .info, Int(drawerItems.count))
-    }
-
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated) // Call the super class implementation.
-        os_log("RightDrawerViewController viewDidDisappear", log: .viewCycle, type: .info)
-    }
+extension OpenHABDrawerTableViewController {
+    typealias SectionType = Section
 
-    // MARK: - Table view data source
+    enum Section: Int, CaseIterable, CustomStringConvertible {
+        var description: String {
+            switch self {
+            case .main: "Main"
+            case .tiles: "Tiles"
+            case .sitemaps: "Sitemaps"
+            case .system: "System"
+            }
+        }
 
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        4
+        case main = 0
+        case tiles
+        case sitemaps
+        case system
     }
 
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        switch section {
-        case 0:
-            1
-        case 1:
-            uiTiles.count
-        case 2:
-            sitemaps.count
-        case 3:
-            drawerItems.count
-        default:
-            0
-        }
+    enum Item: Hashable {
+        case main
+        case tiles(OpenHABUiTile)
+        case sitemaps(OpenHABSitemap)
+        case system(OpenHABDrawerItem)
     }
 
-    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        switch section {
-        case 0:
-            "Main"
-        case 1:
-            "Tiles"
-        case 2:
-            "Sitemaps"
-        case 3:
-            "System"
-        default:
-            "Unknown"
+    class DataSource: UITableViewDiffableDataSource<Section, Item> {
+        override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+            let sectionKind = Section(rawValue: section)
+            return sectionKind?.description
         }
     }
 
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    func cell(tableView: UITableView, indexPath: IndexPath, item: Item) -> UITableViewCell? {
         let cell = (tableView.dequeueReusableCell(withIdentifier: OpenHABDrawerTableViewController.tableViewCellIdentifier) as? DrawerUITableViewCell)!
         cell.customImageView.subviews.forEach { $0.removeFromSuperview() }
         cell.accessoryView = nil
-        switch indexPath.section {
-        case 0:
+        switch item {
+        case .main:
             cell.customTextLabel?.text = "Home"
             cell.customImageView.image = UIImage(named: "openHABIcon")
             if let currentView = appData?.currentView {
@@ -214,10 +202,9 @@ class OpenHABDrawerTableViewController: UITableViewController {
                     cell.accessoryView = UIImageView(image: UIImage(named: "arrow.triangle.2.circlepath"))
                 }
             }
-        case 1:
-            let imageView = UIImageView(frame: cell.customImageView.bounds)
-            let tile = uiTiles[indexPath.row]
+        case let .tiles(tile):
             cell.customTextLabel?.text = tile.name
+            let imageView = UIImageView(frame: cell.customImageView.bounds)
             let passedURL = tile.imageUrl
             // Dependent on $OPENHAB_CONF/services/runtime.cfg
             // Can either be an absolute URL, a path (sometimes malformed) or the content to be displayed (for imageURL)
@@ -240,25 +227,18 @@ class OpenHABDrawerTableViewController: UITableViewController {
                 imageView.image = UIImage(named: "openHABIcon")
             }
             cell.customImageView.image = imageView.image
-        case 2:
-            if !sitemaps.isEmpty {
-                let siteMapIndex = indexPath.row
-                let imageView = UIImageView(frame: cell.customImageView.bounds)
-
-                cell.customTextLabel?.text = sitemaps[siteMapIndex].label
-                if !sitemaps[siteMapIndex].icon.isEmpty {
-                    if let iconURL = Endpoint.iconForDrawer(rootUrl: appData?.openHABRootUrl ?? "", version: appData?.openHABVersion ?? 2, icon: sitemaps[siteMapIndex].icon).url {
-                        imageView.kf.setImage(with: iconURL, placeholder: UIImage(named: "openHABIcon"))
-                    }
-                } else {
-                    imageView.image = UIImage(named: "openHABIcon")
+        case let .sitemaps(sitemap):
+            let imageView = UIImageView(frame: cell.customImageView.bounds)
+            cell.customTextLabel?.text = sitemap.label
+            if !sitemap.icon.isEmpty {
+                if let iconURL = Endpoint.iconForDrawer(rootUrl: appData?.openHABRootUrl ?? "", version: appData?.openHABVersion ?? 2, icon: sitemap.icon).url {
+                    imageView.kf.setImage(with: iconURL, placeholder: UIImage(named: "openHABIcon"))
                 }
-                cell.customImageView.image = imageView.image
+            } else {
+                imageView.image = UIImage(named: "openHABIcon")
             }
-        case 3:
-            // Then menu items
-            let drawerItem = drawerItems[indexPath.row]
-
+            cell.customImageView.image = imageView.image
+        case let .system(drawerItem):
             cell.customTextLabel?.text = drawerItem.localizedString
 
             if #available(iOS 13, *) {
@@ -283,8 +263,6 @@ class OpenHABDrawerTableViewController: UITableViewController {
                 }
                 cell.customImageView.addSubview(buttonIcon)
             }
-        default:
-            break
         }
         cell.separatorInset = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 0)
 
@@ -294,6 +272,16 @@ class OpenHABDrawerTableViewController: UITableViewController {
         return cell
     }
 
+    func configureDataSource() {
+        dataSource = DataSource(tableView: tableView) { [unowned self] (tableView, indexPath, item) -> UITableViewCell? in
+            cell(tableView: tableView, indexPath: indexPath, item: item)
+        }
+    }
+}
+
+extension OpenHABDrawerTableViewController {
+    // MARK: - Table view delegate
+
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         44
     }
@@ -303,9 +291,11 @@ class OpenHABDrawerTableViewController: UITableViewController {
         os_log("Clicked on drawer section %d row %d", log: .viewCycle, type: .info, indexPath.section, indexPath.row)
 
         tableView.deselectRow(at: indexPath, animated: false)
-        // First sitemaps
-        switch indexPath.section {
-        case 0:
+
+        guard let menuItem = dataSource.itemIdentifier(for: indexPath) else { return }
+
+        switch menuItem {
+        case .main:
             dismiss(animated: true) {
                 os_log("openHABVersion %d", log: .viewCycle, type: .info, self.appData?.openHABVersion ?? -1)
                 if self.appData?.openHABVersion ?? 2 < 2 {
@@ -314,8 +304,8 @@ class OpenHABDrawerTableViewController: UITableViewController {
                     self.delegate?.modalDismissed(to: .webview)
                 }
             }
-        case 1:
-            let passedURL = uiTiles[indexPath.row].url
+        case let .tiles(tile):
+            let passedURL = tile.url
             // Dependent on $OPENHAB_CONF/services/runtime.cfg
             // Can either be an absolute URL, a path (sometimes malformed)
             if !passedURL.isEmpty {
@@ -327,20 +317,15 @@ class OpenHABDrawerTableViewController: UITableViewController {
                     openURL(url: builtURL.url)
                 }
             }
-        case 2:
-            if !sitemaps.isEmpty {
-                let sitemap = sitemaps[indexPath.row]
-                Preferences.defaultSitemap = sitemap.name
-                appData?.sitemapViewController?.pageUrl = ""
-                dismiss(animated: true) {
-                    os_log("self delegate %d", log: .viewCycle, type: .info, self.delegate != nil)
-                    self.delegate?.modalDismissed(to: .sitemap)
-                }
+        case let .sitemaps(sitemap):
+            Preferences.defaultSitemap = sitemap.name
+            appData?.sitemapViewController?.pageUrl = ""
+            dismiss(animated: true) {
+                os_log("self delegate %d", log: .viewCycle, type: .info, self.delegate != nil)
+                self.delegate?.modalDismissed(to: .sitemap)
             }
-        case 3:
-            // Then menu items
-            let drawerItem = drawerItems[indexPath.row]
 
+        case let .system(drawerItem):
             switch drawerItem {
             case .settings:
                 dismiss(animated: true) {
@@ -351,12 +336,11 @@ class OpenHABDrawerTableViewController: UITableViewController {
                     self.delegate?.modalDismissed(to: .notifications)
                 }
             }
-        default:
-            break
         }
     }
 
-    private func setStandardDrawerItems() {
+    private func getStandardDrawerItems() -> [OpenHABDrawerItem] {
+        var drawerItems: [OpenHABDrawerItem] = []
         // check if we are using my.openHAB, add notifications menu item then
         // Actually this should better test whether the host of the remoteUrl is on openhab.org
         if Preferences.remoteUrl.contains("openhab.org"), !Preferences.demomode {
@@ -364,9 +348,10 @@ class OpenHABDrawerTableViewController: UITableViewController {
         }
         // Settings always go last
         drawerItems.append(.settings)
+        return drawerItems
     }
 
-    func loadSettings() {
+    private func loadSettings() {
         openHABUsername = Preferences.username
         openHABPassword = Preferences.password
     }
diff --git a/openHAB/OpenHABSelectionCollectionViewController.swift b/openHAB/OpenHABSelectionCollectionViewController.swift
index 1c286dd50..3fa220ebd 100644
--- a/openHAB/OpenHABSelectionCollectionViewController.swift
+++ b/openHAB/OpenHABSelectionCollectionViewController.swift
@@ -49,7 +49,7 @@ private extension OpenHABSelectionCollectionViewController {
     typealias CellRegistration = UICollectionView.CellRegistration<Cell, OpenHABWidgetMapping>
 
     enum Section: String, CaseIterable {
-        case uniq
+        case main
     }
 
     func makeCellRegistration() -> CellRegistration {
@@ -79,7 +79,7 @@ private extension OpenHABSelectionCollectionViewController {
     func update(with list: [OpenHABWidgetMapping], animate: Bool = true) {
         var snapshot = NSDiffableDataSourceSnapshot<Section, OpenHABWidgetMapping>()
         snapshot.appendSections(Section.allCases)
-        snapshot.appendItems(list, toSection: .uniq)
+        snapshot.appendItems(list, toSection: .main)
         dataSource.apply(snapshot, animatingDifferences: animate)
     }
 }

From bc00e6b896704b316c1a9c45a1e06420fec31b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller-Seydlitz?= <timbms@gmail.com>
Date: Mon, 26 Aug 2024 21:58:54 +0200
Subject: [PATCH 08/14] Merge current status of develop Port switchsupport  to
 branch diffable

---
 BuildTools/.swiftlint.yml                     |  2 +
 OpenHABCore/Package.swift                     |  8 ++--
 .../OpenHABCore/Util/NetworkConnection.swift  |  1 -
 openHAB.xcodeproj/project.pbxproj             | 10 ++---
 .../xcshareddata/swiftpm/Package.resolved     | 42 +++++++++----------
 openHAB/OpenHABSitemapViewController.swift    | 15 ++++---
 6 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/BuildTools/.swiftlint.yml b/BuildTools/.swiftlint.yml
index c44c0e264..6de1dff5c 100644
--- a/BuildTools/.swiftlint.yml
+++ b/BuildTools/.swiftlint.yml
@@ -29,6 +29,8 @@ excluded:
   - ../fastlane
   - ../OpenHABCore/.build
   - .build
+  - ../OpenHABCore/Sources/OpenHABCore/GeneratedSources/*
+  - ../OpenHABCore/swift-openapi-generator
 
 nesting:
     type_level: 2
diff --git a/OpenHABCore/Package.swift b/OpenHABCore/Package.swift
index 8363eda5b..007d40c6d 100644
--- a/OpenHABCore/Package.swift
+++ b/OpenHABCore/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "OpenHABCore",
-    platforms: [.iOS(.v12), .watchOS(.v6)],
+    platforms: [.iOS(.v16), .watchOS(.v8)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
@@ -15,8 +15,8 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(name: "Alamofire", url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0"),
-        .package(name: "Kingfisher", url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0")
+        .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0"),
+        .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
diff --git a/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift b/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift
index 23400ff4a..b0a07d4f0 100644
--- a/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Util/NetworkConnection.swift
@@ -155,7 +155,6 @@ public class NetworkConnection {
 
             commandRequest.setValue("text/plain", forHTTPHeaderField: "Content-type")
 
-            os_log("Timeout %{PUBLIC}@", log: .default, type: .info, commandRequest.timeoutInterval)
             let link = item.link
             os_log("OpenHABViewController posting %{PUBLIC}@ command to %{PUBLIC}@", log: .default, type: .info, command ?? "", link)
             os_log("%{PUBLIC}@", log: .default, type: .info, commandRequest.debugDescription)
diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index c7b20a775..80507ad0e 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -146,7 +146,6 @@
 		DF05EF121D00696200DD646D /* DrawerUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF05EF111D00696200DD646D /* DrawerUITableViewCell.swift */; };
 		DF05FF231896BD2D00FF2F9B /* SelectionUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF05FF221896BD2D00FF2F9B /* SelectionUITableViewCell.swift */; };
 		DF06F1F618FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF06F1F518FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift */; };
-		DF06F1F918FEA8420011E7B9 /* ColorPickerUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF06F1F818FEA8420011E7B9 /* ColorPickerUITableViewCell.swift */; };
 		DF06F1FC18FEC2020011E7B9 /* ColorPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF06F1FB18FEC2020011E7B9 /* ColorPickerViewController.swift */; };
 		DF1B302D1CF5C667009C921C /* OpenHABNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1B302C1CF5C667009C921C /* OpenHABNotification.swift */; };
 		DF4A022C1CF315BA006C3456 /* OpenHABDrawerTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4A022B1CF315BA006C3456 /* OpenHABDrawerTableViewController.swift */; };
@@ -441,7 +440,6 @@
 		DF05EF111D00696200DD646D /* DrawerUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DrawerUITableViewCell.swift; sourceTree = "<group>"; };
 		DF05FF221896BD2D00FF2F9B /* SelectionUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectionUITableViewCell.swift; sourceTree = "<group>"; };
 		DF06F1F518FE7A160011E7B9 /* OpenHABSelectionCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenHABSelectionCollectionViewController.swift; sourceTree = "<group>"; };
-		DF06F1F818FEA8420011E7B9 /* ColorPickerUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPickerUITableViewCell.swift; sourceTree = "<group>"; };
 		DF06F1FB18FEC2020011E7B9 /* ColorPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPickerViewController.swift; sourceTree = "<group>"; };
 		DF1B302C1CF5C667009C921C /* OpenHABNotification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenHABNotification.swift; sourceTree = "<group>"; };
 		DF4A022B1CF315BA006C3456 /* OpenHABDrawerTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenHABDrawerTableViewController.swift; sourceTree = "<group>"; };
@@ -1911,7 +1909,7 @@
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				VERSIONING_SYSTEM = "apple-generic";
-				WATCHOS_DEPLOYMENT_TARGET = 7.0;
+				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Debug;
 		};
@@ -1958,7 +1956,7 @@
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				VERSIONING_SYSTEM = "apple-generic";
-				WATCHOS_DEPLOYMENT_TARGET = 7.0;
+				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Release;
 		};
@@ -2186,7 +2184,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "openHAB/openHAB-Prefix.pch";
 				INFOPLIST_FILE = "openHAB/openHAB-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2232,7 +2230,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "openHAB/openHAB-Prefix.pch";
 				INFOPLIST_FILE = "openHAB/openHAB-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6a0027af9..12b4092c7 100644
--- a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/google/abseil-cpp-binary.git",
         "state": {
           "branch": null,
-          "revision": "194a6706acbd25e4ef639bcaddea16e8758a3e27",
-          "version": "1.2024011602.0"
+          "revision": "748c7837511d0e6a507737353af268484e1745e2",
+          "version": "1.2024011601.1"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
         "state": {
           "branch": null,
-          "revision": "d120af1e8638c7da36c8481fd61a66c0c08dc4fc",
-          "version": "5.4.4"
+          "revision": "f455c2975872ccd2d9c81594c658af65716e9b9a",
+          "version": "5.9.1"
         }
       },
       {
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/google/app-check.git",
         "state": {
           "branch": null,
-          "revision": "3b62f154d00019ae29a71e9738800bb6f18b236d",
-          "version": "10.19.2"
+          "revision": "076b241a625e25eac22f8849be256dfb960fcdfe",
+          "version": "10.19.1"
         }
       },
       {
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git",
         "state": {
           "branch": null,
-          "revision": "eca84fd638116dd6adb633b5a3f31cc7befcbb7d",
-          "version": "10.29.0"
+          "revision": "9d17b500cd98d9a7009751ad62f802e152e97021",
+          "version": "10.26.0"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git",
         "state": {
           "branch": null,
-          "revision": "fe727587518729046fc1465625b9afd80b5ab361",
-          "version": "10.28.0"
+          "revision": "16244d177c4e989f87b25e9db1012b382cfedc55",
+          "version": "10.25.0"
         }
       },
       {
@@ -101,7 +101,7 @@
         }
       },
       {
-        "package": "gRPC",
+        "package": "grpc-binary",
         "repositoryURL": "https://github.com/google/grpc-binary.git",
         "state": {
           "branch": null,
@@ -114,12 +114,12 @@
         "repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
         "state": {
           "branch": null,
-          "revision": "a2ab612cb980066ee56d90d60d8462992c07f24b",
-          "version": "3.5.0"
+          "revision": "0382ca27f22fb3494cf657d8dc356dc282cd1193",
+          "version": "3.4.1"
         }
       },
       {
-        "package": "InteropForGoogle",
+        "package": "interop-ios-for-google-sdks",
         "repositoryURL": "https://github.com/google/interop-ios-for-google-sdks.git",
         "state": {
           "branch": null,
@@ -132,8 +132,8 @@
         "repositoryURL": "https://github.com/onevcat/Kingfisher.git",
         "state": {
           "branch": null,
-          "revision": "c1f60c63f356d364f4284ba82961acbe7de79bcc",
-          "version": "7.8.1"
+          "revision": "5b92f029fab2cce44386d28588098b5be0824ef5",
+          "version": "7.11.0"
         }
       },
       {
@@ -155,7 +155,7 @@
         }
       },
       {
-        "package": "Promises",
+        "package": "promises",
         "repositoryURL": "https://github.com/google/promises.git",
         "state": {
           "branch": null,
@@ -195,8 +195,8 @@
         "repositoryURL": "https://github.com/apple/swift-log",
         "state": {
           "branch": null,
-          "revision": "9cb486020ebf03bfa5b5df985387a14a98744537",
-          "version": "1.6.1"
+          "revision": "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
+          "version": "1.5.4"
         }
       },
       {
@@ -204,8 +204,8 @@
         "repositoryURL": "https://github.com/apple/swift-protobuf.git",
         "state": {
           "branch": null,
-          "revision": "e17d61f26df0f0e06f58f6977ba05a097a720106",
-          "version": "1.27.1"
+          "revision": "9f0c76544701845ad98716f3f6a774a892152bcb",
+          "version": "1.26.0"
         }
       },
       {
diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index 0a66fe835..283cda632 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -249,7 +249,6 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
 
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
-
         updateUI()
     }
 
@@ -595,21 +594,25 @@ extension OpenHABSitemapViewController {
                 } else if widget.item?.isOfTypeOrGroupType(.switchItem) ?? false {
                     cell = tableView.dequeueReusableCell(for: indexPath, cellType: SwitchUITableViewCell.self)
                 } else if widget.item?.isOfTypeOrGroupType(.rollershutter) ?? false {
-                    cell = tableView.dequeueReusableCell(for: indexPath, cellType: RollershutterUITableViewCell.self)
+                    cell = tableView.dequeueReusableCell(for: indexPath, cellType: RollershutterCell.self)
                 } else if !widget.mappingsOrItemOptions.isEmpty {
                     cell = tableView.dequeueReusableCell(for: indexPath, cellType: SegmentedUITableViewCell.self)
                 } else {
                     cell = tableView.dequeueReusableCell(for: indexPath, cellType: SwitchUITableViewCell.self)
                 }
             case .setpoint:
-                cell = tableView.dequeueReusableCell(for: indexPath, cellType: SetpointUITableViewCell.self)
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: SetpointCell.self)
             case .slider:
-                cell = tableView.dequeueReusableCell(for: indexPath, cellType: SliderUITableViewCell.self)
+                if widget.switchSupport {
+                    cell = tableView.dequeueReusableCell(for: indexPath) as SliderWithSwitchSupportUITableViewCell
+                } else {
+                    cell = tableView.dequeueReusableCell(for: indexPath) as SliderUITableViewCell
+                }
             case .selection:
                 cell = tableView.dequeueReusableCell(for: indexPath, cellType: SelectionUITableViewCell.self)
             case .colorpicker:
-                cell = tableView.dequeueReusableCell(for: indexPath, cellType: ColorPickerUITableViewCell.self)
-                (cell as? ColorPickerUITableViewCell)?.delegate = self
+                cell = tableView.dequeueReusableCell(for: indexPath, cellType: ColorPickerCell.self)
+                (cell as? ColorPickerCell)?.delegate = self
             case .image, .chart:
                 cell = tableView.dequeueReusableCell(for: indexPath, cellType: NewImageUITableViewCell.self)
                 (cell as? NewImageUITableViewCell)?.didLoad = { [weak self] in

From 545e8918eb6cf239911c53dbc6271045d5272d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller-Seydlitz?= <timbms@gmail.com>
Date: Tue, 27 Aug 2024 16:09:42 +0200
Subject: [PATCH 09/14] Change to without animation

---
 openHAB/OpenHABSitemapViewController.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index 283cda632..eeac03771 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -580,6 +580,8 @@ extension OpenHABSitemapViewController: ColorPickerCellDelegate {
 
 extension OpenHABSitemapViewController {
     private func makeDataSource() -> UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget> {
+        // Code from cellForItemAt transplanted into cell provider closure
+
         UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>(tableView: tableView) { [weak self] (tableView: UITableView, indexPath: IndexPath, widget: OpenHABWidget) -> UITableViewCell? in
 
             let cell: UITableViewCell
@@ -695,7 +697,7 @@ extension OpenHABSitemapViewController {
     }
 
     /// - Tag: WiFiUpdate
-    func updateUI(animated: Bool = true) {
+    func updateUI(animated: Bool = false) {
         currentSnapshot = NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>()
         currentSnapshot.appendSections([.main])
         currentSnapshot.appendItems(relevantPage?.widgets ?? [], toSection: .main)

From f06791086a4e32de78d3f89eff1fcc87db3fdb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller-Seydlitz?= <timbms@gmail.com>
Date: Tue, 27 Aug 2024 18:00:03 +0200
Subject: [PATCH 10/14] Raise deployment target for tests to iOS 16.0

---
 openHAB.xcodeproj/project.pbxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index 80507ad0e..495f6cee2 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -1798,7 +1798,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1845,7 +1845,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1981,7 +1981,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABTestsSwift/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2025,7 +2025,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = openHABTestsSwift/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

From dba903f102a0cf35878f7de7a5eac14906096bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller-Seydlitz?= <timbms@gmail.com>
Date: Wed, 28 Aug 2024 11:54:24 +0200
Subject: [PATCH 11/14] Migrate widgets from [OpenHABWidget] to
 OrderedDictionary<String, OpenHABWidget> using swift-collections

---
 OpenHABCore/Package.swift                     |   6 +-
 .../Model/OpenHABSitemapPage.swift            |  32 +-
 .../xcshareddata/swiftpm/Package.resolved     | 449 +++++++++---------
 ...HABSelectionCollectionViewController.swift |  10 +-
 openHAB/OpenHABSitemapViewController.swift    |  84 ++--
 5 files changed, 304 insertions(+), 277 deletions(-)

diff --git a/OpenHABCore/Package.swift b/OpenHABCore/Package.swift
index 007d40c6d..6ef11ec1f 100644
--- a/OpenHABCore/Package.swift
+++ b/OpenHABCore/Package.swift
@@ -16,7 +16,8 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0"),
-        .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0")
+        .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0"),
+        .package(url: "https://github.com/apple/swift-collections.git", .upToNextMajor(from: "1.1.0"))
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -25,7 +26,8 @@ let package = Package(
             name: "OpenHABCore",
             dependencies: [
                 .product(name: "Alamofire", package: "Alamofire", condition: .when(platforms: [.iOS, .watchOS])),
-                .product(name: "Kingfisher", package: "Kingfisher", condition: .when(platforms: [.iOS, .watchOS]))
+                .product(name: "Kingfisher", package: "Kingfisher", condition: .when(platforms: [.iOS, .watchOS])),
+                .product(name: "Collections", package: "swift-collections")
             ]
         ),
         .testTarget(
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift
index bc16248ad..2c18aedd8 100644
--- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift
@@ -9,18 +9,36 @@
 //
 // SPDX-License-Identifier: EPL-2.0
 
+import Collections
 import Foundation
 import os.log
 
-public class OpenHABSitemapPage: NSObject {
+public class OpenHABSitemapPage: NSObject, ObservableObject {
     public var sendCommand: ((_ item: OpenHABItem, _ command: String?) -> Void)?
-    public var widgets: [OpenHABWidget] = []
+    public var widgets = OrderedDictionary<String, OpenHABWidget>()
     public var pageId = ""
     public var title = ""
     public var link = ""
     public var leaf = false
     public var icon = ""
 
+    public init(pageId: String, title: String, link: String, leaf: Bool, widgets: OrderedDictionary<String, OpenHABWidget>, icon: String) {
+        super.init()
+        self.pageId = pageId
+        self.title = title
+        self.link = link
+        self.leaf = leaf
+
+        self.widgets = widgets
+
+        for (_, widget) in self.widgets {
+            widget.sendCommand = { [weak self] item, command in
+                self?.sendCommand(item, commandToSend: command)
+            }
+        }
+        self.icon = icon
+    }
+
     public init(pageId: String, title: String, link: String, leaf: Bool, widgets: [OpenHABWidget], icon: String) {
         super.init()
         self.pageId = pageId
@@ -29,8 +47,12 @@ public class OpenHABSitemapPage: NSObject {
         self.leaf = leaf
         var tempWidgets = [OpenHABWidget]()
         tempWidgets.flatten(widgets)
-        self.widgets = tempWidgets
-        for widget in self.widgets {
+
+        self.widgets = OrderedDictionary(
+            uniqueKeysWithValues: tempWidgets.map { ($0.id, $0) }
+        )
+
+        for (_, widget) in self.widgets {
             widget.sendCommand = { [weak self] item, command in
                 self?.sendCommand(item, commandToSend: command)
             }
@@ -47,7 +69,7 @@ public class OpenHABSitemapPage: NSObject {
 }
 
 public extension OpenHABSitemapPage {
-    func filter(_ isIncluded: (OpenHABWidget) throws -> Bool) rethrows -> OpenHABSitemapPage {
+    func filter(_ isIncluded: (String, OpenHABWidget) throws -> Bool) rethrows -> OpenHABSitemapPage {
         let filteredOpenHABSitemapPage = try OpenHABSitemapPage(
             pageId: pageId,
             title: title,
diff --git a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 12b4092c7..352b2730d 100644
--- a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,223 +1,230 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "abseil",
-        "repositoryURL": "https://github.com/google/abseil-cpp-binary.git",
-        "state": {
-          "branch": null,
-          "revision": "748c7837511d0e6a507737353af268484e1745e2",
-          "version": "1.2024011601.1"
-        }
-      },
-      {
-        "package": "Alamofire",
-        "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
-        "state": {
-          "branch": null,
-          "revision": "f455c2975872ccd2d9c81594c658af65716e9b9a",
-          "version": "5.9.1"
-        }
-      },
-      {
-        "package": "AlamofireNetworkActivityIndicator",
-        "repositoryURL": "https://github.com/Alamofire/AlamofireNetworkActivityIndicator.git",
-        "state": {
-          "branch": null,
-          "revision": "392bed083e8d193aca16bfa684ee24e4bcff0510",
-          "version": "3.1.0"
-        }
-      },
-      {
-        "package": "AppCheck",
-        "repositoryURL": "https://github.com/google/app-check.git",
-        "state": {
-          "branch": null,
-          "revision": "076b241a625e25eac22f8849be256dfb960fcdfe",
-          "version": "10.19.1"
-        }
-      },
-      {
-        "package": "CocoaLumberjack",
-        "repositoryURL": "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
-        "state": {
-          "branch": null,
-          "revision": "4b8714a7fb84d42393314ce897127b3939885ec3",
-          "version": "3.8.5"
-        }
-      },
-      {
-        "package": "DeviceKit",
-        "repositoryURL": "https://github.com/devicekit/DeviceKit.git",
-        "state": {
-          "branch": null,
-          "revision": "d37e70cb2646666dcf276d7d3d4a9760a41ff8a6",
-          "version": "4.9.0"
-        }
-      },
-      {
-        "package": "Firebase",
-        "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git",
-        "state": {
-          "branch": null,
-          "revision": "9d17b500cd98d9a7009751ad62f802e152e97021",
-          "version": "10.26.0"
-        }
-      },
-      {
-        "package": "FlexColorPicker",
-        "repositoryURL": "https://github.com/RastislavMirek/FlexColorPicker.git",
-        "state": {
-          "branch": null,
-          "revision": "72a5c2c5e28074e6c5f13efe3c98eb780ae2f906",
-          "version": "1.4.4"
-        }
-      },
-      {
-        "package": "GoogleAppMeasurement",
-        "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git",
-        "state": {
-          "branch": null,
-          "revision": "16244d177c4e989f87b25e9db1012b382cfedc55",
-          "version": "10.25.0"
-        }
-      },
-      {
-        "package": "GoogleDataTransport",
-        "repositoryURL": "https://github.com/google/GoogleDataTransport.git",
-        "state": {
-          "branch": null,
-          "revision": "a637d318ae7ae246b02d7305121275bc75ed5565",
-          "version": "9.4.0"
-        }
-      },
-      {
-        "package": "GoogleUtilities",
-        "repositoryURL": "https://github.com/google/GoogleUtilities.git",
-        "state": {
-          "branch": null,
-          "revision": "57a1d307f42df690fdef2637f3e5b776da02aad6",
-          "version": "7.13.3"
-        }
-      },
-      {
-        "package": "grpc-binary",
-        "repositoryURL": "https://github.com/google/grpc-binary.git",
-        "state": {
-          "branch": null,
-          "revision": "e9fad491d0673bdda7063a0341fb6b47a30c5359",
-          "version": "1.62.2"
-        }
-      },
-      {
-        "package": "GTMSessionFetcher",
-        "repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
-        "state": {
-          "branch": null,
-          "revision": "0382ca27f22fb3494cf657d8dc356dc282cd1193",
-          "version": "3.4.1"
-        }
-      },
-      {
-        "package": "interop-ios-for-google-sdks",
-        "repositoryURL": "https://github.com/google/interop-ios-for-google-sdks.git",
-        "state": {
-          "branch": null,
-          "revision": "2d12673670417654f08f5f90fdd62926dc3a2648",
-          "version": "100.0.0"
-        }
-      },
-      {
-        "package": "Kingfisher",
-        "repositoryURL": "https://github.com/onevcat/Kingfisher.git",
-        "state": {
-          "branch": null,
-          "revision": "5b92f029fab2cce44386d28588098b5be0824ef5",
-          "version": "7.11.0"
-        }
-      },
-      {
-        "package": "leveldb",
-        "repositoryURL": "https://github.com/firebase/leveldb.git",
-        "state": {
-          "branch": null,
-          "revision": "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
-          "version": "1.22.5"
-        }
-      },
-      {
-        "package": "nanopb",
-        "repositoryURL": "https://github.com/firebase/nanopb.git",
-        "state": {
-          "branch": null,
-          "revision": "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
-          "version": "2.30910.0"
-        }
-      },
-      {
-        "package": "promises",
-        "repositoryURL": "https://github.com/google/promises.git",
-        "state": {
-          "branch": null,
-          "revision": "540318ecedd63d883069ae7f1ed811a2df00b6ac",
-          "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",
-        "state": {
-          "branch": null,
-          "revision": "8bd4fd128923cf5494fa726839af8afe12908ad9",
-          "version": "6.5.0"
-        }
-      },
-      {
-        "package": "SVGKit",
-        "repositoryURL": "https://github.com/SVGKit/SVGKit.git",
-        "state": {
-          "branch": "3.x",
-          "revision": "02421928cab787faaffb2403d47c39392936fbc7",
-          "version": null
-        }
-      },
-      {
-        "package": "swift-log",
-        "repositoryURL": "https://github.com/apple/swift-log",
-        "state": {
-          "branch": null,
-          "revision": "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
-          "version": "1.5.4"
-        }
-      },
-      {
-        "package": "SwiftProtobuf",
-        "repositoryURL": "https://github.com/apple/swift-protobuf.git",
-        "state": {
-          "branch": null,
-          "revision": "9f0c76544701845ad98716f3f6a774a892152bcb",
-          "version": "1.26.0"
-        }
-      },
-      {
-        "package": "SwiftMessages",
-        "repositoryURL": "https://github.com/SwiftKickMobile/SwiftMessages.git",
-        "state": {
-          "branch": null,
-          "revision": "62e12e138fc3eedf88c7553dd5d98712aa119f40",
-          "version": "9.0.9"
-        }
-      }
-    ]
-  },
-  "version": 1
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "748c7837511d0e6a507737353af268484e1745e2",
+        "version" : "1.2024011601.1"
+      }
+    },
+    {
+      "identity" : "alamofire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Alamofire/Alamofire.git",
+      "state" : {
+        "revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a",
+        "version" : "5.9.1"
+      }
+    },
+    {
+      "identity" : "alamofirenetworkactivityindicator",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Alamofire/AlamofireNetworkActivityIndicator.git",
+      "state" : {
+        "revision" : "392bed083e8d193aca16bfa684ee24e4bcff0510",
+        "version" : "3.1.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "076b241a625e25eac22f8849be256dfb960fcdfe",
+        "version" : "10.19.1"
+      }
+    },
+    {
+      "identity" : "cocoalumberjack",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
+      "state" : {
+        "revision" : "4b8714a7fb84d42393314ce897127b3939885ec3",
+        "version" : "3.8.5"
+      }
+    },
+    {
+      "identity" : "devicekit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/devicekit/DeviceKit.git",
+      "state" : {
+        "revision" : "d37e70cb2646666dcf276d7d3d4a9760a41ff8a6",
+        "version" : "4.9.0"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk.git",
+      "state" : {
+        "revision" : "9d17b500cd98d9a7009751ad62f802e152e97021",
+        "version" : "10.26.0"
+      }
+    },
+    {
+      "identity" : "flexcolorpicker",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/RastislavMirek/FlexColorPicker.git",
+      "state" : {
+        "revision" : "72a5c2c5e28074e6c5f13efe3c98eb780ae2f906",
+        "version" : "1.4.4"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "16244d177c4e989f87b25e9db1012b382cfedc55",
+        "version" : "10.25.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
+        "version" : "9.4.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6",
+        "version" : "7.13.3"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "e9fad491d0673bdda7063a0341fb6b47a30c5359",
+        "version" : "1.62.2"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193",
+        "version" : "3.4.1"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
+        "version" : "100.0.0"
+      }
+    },
+    {
+      "identity" : "kingfisher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/onevcat/Kingfisher.git",
+      "state" : {
+        "revision" : "5b92f029fab2cce44386d28588098b5be0824ef5",
+        "version" : "7.11.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+        "version" : "2.30910.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+        "version" : "2.4.0"
+      }
+    },
+    {
+      "identity" : "sfsafesymbols",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SFSafeSymbols/SFSafeSymbols",
+      "state" : {
+        "revision" : "e2e28f4e56e1769c2ec3c61c9355fc64eb7a535a",
+        "version" : "5.3.0"
+      }
+    },
+    {
+      "identity" : "sidemenu",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jonkykong/SideMenu.git",
+      "state" : {
+        "revision" : "8bd4fd128923cf5494fa726839af8afe12908ad9",
+        "version" : "6.5.0"
+      }
+    },
+    {
+      "identity" : "svgkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SVGKit/SVGKit.git",
+      "state" : {
+        "branch" : "3.x",
+        "revision" : "02421928cab787faaffb2403d47c39392936fbc7"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections.git",
+      "state" : {
+        "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
+        "version" : "1.1.3"
+      }
+    },
+    {
+      "identity" : "swift-log",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-log",
+      "state" : {
+        "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
+        "version" : "1.5.4"
+      }
+    },
+    {
+      "identity" : "swift-protobuf",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-protobuf.git",
+      "state" : {
+        "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
+        "version" : "1.26.0"
+      }
+    },
+    {
+      "identity" : "swiftmessages",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SwiftKickMobile/SwiftMessages.git",
+      "state" : {
+        "revision" : "62e12e138fc3eedf88c7553dd5d98712aa119f40",
+        "version" : "9.0.9"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/openHAB/OpenHABSelectionCollectionViewController.swift b/openHAB/OpenHABSelectionCollectionViewController.swift
index 17a8499f3..5b5fbb4ba 100644
--- a/openHAB/OpenHABSelectionCollectionViewController.swift
+++ b/openHAB/OpenHABSelectionCollectionViewController.swift
@@ -15,7 +15,7 @@ import UIKit
 
 // swiftlint:disable:next type_name
 public protocol OpenHABSelectionTableViewControllerDelegate: NSObjectProtocol {
-    func didSelectWidgetMapping(_ selectedMapping: Int)
+    func didSelectWidgetMapping(_ selectedMapping: Int, widget: OpenHABWidget)
 }
 
 class OpenHABSelectionCollectionViewController: UICollectionViewController {
@@ -25,7 +25,7 @@ class OpenHABSelectionCollectionViewController: UICollectionViewController {
 
     var mappings: [OpenHABWidgetMapping] = []
     weak var delegate: OpenHABSelectionTableViewControllerDelegate?
-    var selectionItem: OpenHABItem?
+    var selectionWidget: OpenHABWidget?
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -38,8 +38,8 @@ class OpenHABSelectionCollectionViewController: UICollectionViewController {
 
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         os_log("Selected mapping %d", log: .viewCycle, type: .info, indexPath.row)
-
-        delegate?.didSelectWidgetMapping(indexPath.row)
+        guard let selectionWidget else { fatalError("Not known selectionItem") }
+        delegate?.didSelectWidgetMapping(indexPath.row, widget: selectionWidget)
         navigationController?.popViewController(animated: true)
     }
 }
@@ -60,7 +60,7 @@ private extension OpenHABSelectionCollectionViewController {
 
             cell.contentConfiguration = content
 
-            if self.selectionItem?.state == mapping.command {
+            if self.selectionWidget?.item?.state == mapping.command {
                 os_log("This item is selected", log: .viewCycle, type: .info)
                 cell.accessories = [.checkmark()]
             } else {
diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index eeac03771..aa66dc2ac 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -63,7 +63,6 @@ struct OpenHABImageProcessor: ImageProcessor {
 
 class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCellTouchEventDelegate {
     var pageUrl = ""
-    private var selectedWidgetRow: Int = 0
     private var currentPageOperation: Alamofire.Request?
     private var commandOperation: Alamofire.Request?
     private var iconType: IconType = .png
@@ -177,7 +176,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
             // Set self as root view controller
             appData?.sitemapViewController = self
             if currentPage != nil {
-                currentPage?.widgets = []
+                currentPage?.widgets = [:]
                 updateUI()
             }
             os_log("OpenHABSitemapViewController pageUrl is empty, this is first launch", log: .viewCycle, type: .info)
@@ -295,10 +294,6 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
         }
     }
 
-    func relevantWidget(indexPath: IndexPath) -> OpenHABWidget? {
-        relevantPage?.widgets[safe: indexPath.row]
-    }
-
     private func updateWidgetTableView() {
         UIView.performWithoutAnimation {
             tableView.beginUpdates()
@@ -493,8 +488,8 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
     func filterContentForSearchText(_ searchText: String?, scope: String = "All") {
         guard let searchText else { return }
 
-        filteredPage = currentPage?.filter {
-            $0.label.lowercased().contains(searchText.lowercased()) && $0.type != .frame
+        filteredPage = currentPage?.filter { (_, widget) in
+            widget.label.lowercased().contains(searchText.lowercased()) && widget.type != .frame
         }
         filteredPage?.sendCommand = { [weak self] item, command in
             self?.sendCommand(item, commandToSend: command)
@@ -547,10 +542,9 @@ extension OpenHABSitemapViewController: OpenHABTrackerDelegate {
 
 extension OpenHABSitemapViewController: OpenHABSelectionTableViewControllerDelegate {
     // send command on selected selection widget mapping
-    func didSelectWidgetMapping(_ selectedMappingIndex: Int) {
-        let selectedWidget: OpenHABWidget? = relevantPage?.widgets[selectedWidgetRow]
-        let selectedMapping: OpenHABWidgetMapping? = selectedWidget?.mappingsOrItemOptions[selectedMappingIndex]
-        sendCommand(selectedWidget?.item, commandToSend: selectedMapping?.command)
+    func didSelectWidgetMapping(_ selectedMappingIndex: Int, widget: OpenHABWidget) {
+        let selectedMapping: OpenHABWidgetMapping? = widget.mappingsOrItemOptions[selectedMappingIndex]
+        sendCommand(widget.item, commandToSend: selectedMapping?.command)
     }
 }
 
@@ -566,13 +560,14 @@ extension OpenHABSitemapViewController: UISearchResultsUpdating {
 
 extension OpenHABSitemapViewController: ColorPickerCellDelegate {
     func didPressColorButton(_ cell: ColorPickerCell?) {
-        let colorPickerViewController = storyboard?.instantiateViewController(withIdentifier: "ColorPickerViewController") as? ColorPickerViewController
-        if let cell {
-            let widget = relevantPage?.widgets[tableView.indexPath(for: cell)?.row ?? 0]
-            colorPickerViewController?.title = widget?.labelText
-            colorPickerViewController?.widget = widget
-        }
-        if let colorPickerViewController {
+        if let colorPickerViewController = storyboard?.instantiateViewController(withIdentifier: "ColorPickerViewController") as? ColorPickerViewController,
+           let cell,
+           let indexPath = tableView.indexPath(for: cell),
+
+           let widget = dataSource.itemIdentifier(for: indexPath) {
+            colorPickerViewController.title = widget.labelText
+            colorPickerViewController.widget = widget
+
             navigationController?.pushViewController(colorPickerViewController, animated: true)
         }
     }
@@ -683,14 +678,15 @@ extension OpenHABSitemapViewController {
             }
 
             // Check if this is not the last row in the widgets list
-            if indexPath.row < (self?.relevantPage?.widgets.count ?? 1) - 1 {
-                let nextWidget: OpenHABWidget? = self?.relevantPage?.widgets[indexPath.row + 1]
-                if let type = nextWidget?.type, type.isAny(of: .frame, .image, .video, .webview, .chart) {
-                    cell.separatorInset = UIEdgeInsets.zero
-                } else if !(widget.type == .frame) {
-                    cell.separatorInset = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 0)
-                }
-            }
+            // TODO Switch to separator layout guide https://developer.apple.com/videos/play/wwdc2020/10026/
+//            if indexPath.row < (self?.relevantPage?.widgets.count ?? 1) - 1 {
+//                let nextWidget: OpenHABWidget? = self?.relevantPage?.widgets[indexPath.row + 1]
+//                if let type = nextWidget?.type, type.isAny(of: .frame, .image, .video, .webview, .chart) {
+//                    cell.separatorInset = UIEdgeInsets.zero
+//                } else if !(widget.type == .frame) {
+//                    cell.separatorInset = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 0)
+//                }
+//            }
 
             return cell
         }
@@ -700,7 +696,9 @@ extension OpenHABSitemapViewController {
     func updateUI(animated: Bool = false) {
         currentSnapshot = NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>()
         currentSnapshot.appendSections([.main])
-        currentSnapshot.appendItems(relevantPage?.widgets ?? [], toSection: .main)
+        if let relevantPage {
+            currentSnapshot.appendItems(Array(relevantPage.widgets.values), toSection: .main)
+        }
         dataSource.apply(currentSnapshot, animatingDifferences: animated)
     }
 }
@@ -713,14 +711,14 @@ extension OpenHABSitemapViewController: UITableViewDelegate { // }, UITableViewD
     }
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let widget: OpenHABWidget? = relevantPage?.widgets[indexPath.row]
-        switch widget?.type {
+        guard let widget = dataSource.itemIdentifier(for: indexPath) else { return 44.0 }
+        switch widget.type {
         case .frame:
-            return widget?.label.count ?? 0 > 0 ? 35.0 : 0
+            return !widget.label.isEmpty ? 35.0 : 0
         case .image, .chart, .video:
             return UITableView.automaticDimension
         case .webview, .mapview:
-            if let height = widget?.height {
+            if let height = widget.height {
                 // calculate webview/mapview height and return it. Limited to UIScreen.main.bounds.height
                 let heightValue = height * 44
                 os_log("Webview/Mapview height would be %g", log: .viewCycle, type: .info, heightValue)
@@ -744,30 +742,28 @@ extension OpenHABSitemapViewController: UITableViewDelegate { // }, UITableViewD
     }
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let widget: OpenHABWidget? = relevantWidget(indexPath: indexPath)
-        if widget?.linkedPage != nil {
-            if let link = widget?.linkedPage?.link {
+        guard let widget = dataSource.itemIdentifier(for: indexPath) else { return }
+
+        if widget.linkedPage != nil {
+            if let link = widget.linkedPage?.link {
                 os_log("Selected %{PUBLIC}@", log: .viewCycle, type: .info, link)
             }
-            selectedWidgetRow = indexPath.row
             let newViewController = (storyboard?.instantiateViewController(withIdentifier: "OpenHABPageViewController") as? OpenHABSitemapViewController)!
-            newViewController.title = widget?.linkedPage?.title.components(separatedBy: "[")[0]
-            newViewController.pageUrl = widget?.linkedPage?.link ?? ""
+            newViewController.title = widget.linkedPage?.title.components(separatedBy: "[")[0]
+            newViewController.pageUrl = widget.linkedPage?.link ?? ""
             newViewController.openHABRootUrl = openHABRootUrl
             navigationController?.pushViewController(newViewController, animated: true)
-        } else if widget?.type == .selection {
+        } else if widget.type == .selection {
             os_log("Selected selection widget", log: .viewCycle, type: .info)
 
-            selectedWidgetRow = indexPath.row
             let layout = UICollectionViewCompositionalLayout.list(
                 using: UICollectionLayoutListConfiguration(appearance: .insetGrouped)
             )
             let selectionViewController = OpenHABSelectionCollectionViewController(collectionViewLayout: layout)
-            let selectedWidget: OpenHABWidget? = relevantWidget(indexPath: indexPath)
-            selectionViewController.title = selectedWidget?.labelText
-            selectionViewController.mappings = selectedWidget?.mappingsOrItemOptions ?? []
+            selectionViewController.title = widget.labelText
+            selectionViewController.mappings = widget.mappingsOrItemOptions
             selectionViewController.delegate = self
-            selectionViewController.selectionItem = selectedWidget?.item
+            selectionViewController.selectionWidget = widget
             show(selectionViewController, sender: self)
         }
         if let index = tableView.indexPathForSelectedRow {

From 3d7241920af80b8eb0be224bfd24f20ae1869f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller-Seydlitz?= <timbms@gmail.com>
Date: Wed, 28 Aug 2024 11:55:11 +0200
Subject: [PATCH 12/14] Minor changes

---
 openHAB/OpenHABSitemapViewController.swift       | 2 +-
 openHABWatch Extension/Views/Rows/ImageRow.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index aa66dc2ac..39185ff53 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -678,7 +678,7 @@ extension OpenHABSitemapViewController {
             }
 
             // Check if this is not the last row in the widgets list
-            // TODO Switch to separator layout guide https://developer.apple.com/videos/play/wwdc2020/10026/
+            // TODO: Switch to separator layout guide https://developer.apple.com/videos/play/wwdc2020/10026/
 //            if indexPath.row < (self?.relevantPage?.widgets.count ?? 1) - 1 {
 //                let nextWidget: OpenHABWidget? = self?.relevantPage?.widgets[indexPath.row + 1]
 //                if let type = nextWidget?.type, type.isAny(of: .frame, .image, .video, .webview, .chart) {
diff --git a/openHABWatch Extension/Views/Rows/ImageRow.swift b/openHABWatch Extension/Views/Rows/ImageRow.swift
index feb886a3d..8c0ee46a7 100644
--- a/openHABWatch Extension/Views/Rows/ImageRow.swift	
+++ b/openHABWatch Extension/Views/Rows/ImageRow.swift	
@@ -26,7 +26,7 @@ struct ImageRow: View {
                 os_log("Failure loading icon: %{PUBLIC}s", log: .notifications, type: .debug, kingfisherError.localizedDescription)
             }
             .placeholder {
-                Image(systemSymbol: .arrow2CirclepathCircle)
+                Image(systemSymbol: .arrowTriangle2CirclepathCircle)
                     .font(.callout)
                     .opacity(0.3)
             }

From 19463c9691ff1aed0e9caefa626ea2cd0cfd9443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller-Seydlitz?= <timbms@gmail.com>
Date: Fri, 30 Aug 2024 13:33:59 +0200
Subject: [PATCH 13/14] Preparing to make OpenHABWidget an ObservableObject
 Getting the separatorInset back Reverting diffable data source to work on
 OpenHABWidget instead of OpenHABWidget.ID

---
 openHAB/FrameCellView.swift | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 openHAB/FrameCellView.swift

diff --git a/openHAB/FrameCellView.swift b/openHAB/FrameCellView.swift
new file mode 100644
index 000000000..4ff1acb78
--- /dev/null
+++ b/openHAB/FrameCellView.swift
@@ -0,0 +1,19 @@
+//
+//  FrameCellView.swift
+//  openHAB
+//
+//  Created by Tim on 29.08.24.
+//  Copyright © 2024 openHAB e.V. All rights reserved.
+//
+
+import SwiftUI
+
+struct FrameCellView: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+    }
+}
+
+#Preview {
+    FrameCellView()
+}

From aa7e0b9f04c030231ef556d3e488467355b8dacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller-Seydlitz?= <timbms@gmail.com>
Date: Fri, 30 Aug 2024 13:34:50 +0200
Subject: [PATCH 14/14] Staged files for previous commit

---
 .../OpenHABCore/Model/OpenHABWidget.swift     |  4 +-
 openHAB.xcodeproj/project.pbxproj             |  4 ++
 .../xcshareddata/xcschemes/openHAB.xcscheme   |  9 ++++
 openHAB/FrameCellView.swift                   | 28 ++++++++---
 openHAB/OpenHABSitemapViewController.swift    | 49 +++++++++++--------
 5 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
index 44773b735..3ffa72bdc 100644
--- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
@@ -48,7 +48,7 @@ protocol Widget: AnyObject {
     func flatten(_: [ChildWidget])
 }
 
-public class OpenHABWidget: NSObject, MKAnnotation, Identifiable {
+public class OpenHABWidget: NSObject, MKAnnotation, Identifiable, ObservableObject {
     public enum WidgetType: String {
         case chart = "Chart"
         case colorpicker = "Colorpicker"
@@ -86,7 +86,7 @@ public class OpenHABWidget: NSObject, MKAnnotation, Identifiable {
     public var labelcolor = ""
     public var valuecolor = ""
     public var service = ""
-    public var state = ""
+    @Published public var state = ""
     public var text = ""
     public var legend: Bool?
     public var encoding = ""
diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index 495f6cee2..0bc0848ff 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -84,6 +84,7 @@
 		DA07764A234683BC0086C685 /* SwitchRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA077649234683BC0086C685 /* SwitchRow.swift */; };
 		DA0776F0234788010086C685 /* UserData.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA0776EF234788010086C685 /* UserData.swift */; };
 		DA0F37D023D4ACC7007EAB48 /* SliderRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA0F37CF23D4ACC7007EAB48 /* SliderRow.swift */; };
+		DA11B2482C8125E8004D96C9 /* FrameCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA11B2472C8125E8004D96C9 /* FrameCellView.swift */; };
 		DA15BFBD23C6726400BD8ADA /* ObservableOpenHABDataObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA15BFBC23C6726400BD8ADA /* ObservableOpenHABDataObject.swift */; };
 		DA19E25B22FD801D002F8F2F /* OpenHABGeneralTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA19E25A22FD801D002F8F2F /* OpenHABGeneralTests.swift */; };
 		DA21EAE22339621C001AB415 /* Throttler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA21EAE12339621C001AB415 /* Throttler.swift */; };
@@ -339,6 +340,7 @@
 		DA077649234683BC0086C685 /* SwitchRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchRow.swift; sourceTree = "<group>"; };
 		DA0776EF234788010086C685 /* UserData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserData.swift; sourceTree = "<group>"; };
 		DA0F37CF23D4ACC7007EAB48 /* SliderRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SliderRow.swift; sourceTree = "<group>"; };
+		DA11B2472C8125E8004D96C9 /* FrameCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameCellView.swift; sourceTree = "<group>"; };
 		DA15BFBC23C6726400BD8ADA /* ObservableOpenHABDataObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservableOpenHABDataObject.swift; sourceTree = "<group>"; };
 		DA19E25A22FD801D002F8F2F /* OpenHABGeneralTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenHABGeneralTests.swift; sourceTree = "<group>"; };
 		DA1C2E4B230DC28F00FACFB0 /* Appfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Appfile; sourceTree = "<group>"; };
@@ -897,6 +899,7 @@
 				DAEAA89E21E6B16600267EA3 /* UITableView.swift */,
 				DA7E1E47222EB00B002AEFD8 /* PlayerView.swift */,
 				DA21EAE12339621C001AB415 /* Throttler.swift */,
+				DA11B2472C8125E8004D96C9 /* FrameCellView.swift */,
 			);
 			name = Widgets;
 			sourceTree = "<group>";
@@ -1478,6 +1481,7 @@
 				DF4B84041885A53700F34902 /* OpenHABDataObject.swift in Sources */,
 				DAC65FC7236EDF3900F4501E /* SpinnerViewController.swift in Sources */,
 				DF4A02421CF34096006C3456 /* OpenHABDrawerItem.swift in Sources */,
+				DA11B2482C8125E8004D96C9 /* FrameCellView.swift in Sources */,
 				DA50C7BF2B0A65300009F716 /* SliderWithSwitchSupportUITableViewCell.swift in Sources */,
 				DF4A022C1CF315BA006C3456 /* OpenHABDrawerTableViewController.swift in Sources */,
 				DFDF452F1932032B00A6E581 /* OpenHABLegalViewController.swift in Sources */,
diff --git a/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme b/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme
index fe4eb7c51..e6061377e 100644
--- a/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme
+++ b/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme
@@ -60,6 +60,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      enableAddressSanitizer = "YES"
+      enableASanStackUseAfterReturn = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -83,6 +85,13 @@
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "MallocScribble"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/openHAB/FrameCellView.swift b/openHAB/FrameCellView.swift
index 4ff1acb78..5662e2b04 100644
--- a/openHAB/FrameCellView.swift
+++ b/openHAB/FrameCellView.swift
@@ -1,19 +1,35 @@
+// Copyright (c) 2010-2024 Contributors to the openHAB project
 //
-//  FrameCellView.swift
-//  openHAB
+// See the NOTICE file(s) distributed with this work for additional
+// information.
 //
-//  Created by Tim on 29.08.24.
-//  Copyright © 2024 openHAB e.V. All rights reserved.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0
 //
+// SPDX-License-Identifier: EPL-2.0
 
+import OpenHABCore
 import SwiftUI
 
 struct FrameCellView: View {
+    @ObservedObject var widget: OpenHABWidget
+    let gray = Color(UIColor.darkGray)
+
     var body: some View {
-        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+        Text(widget.label.uppercased())
+            .font(.system(.callout))
+            .lineLimit(1)
+            .foregroundColor(Color(.ohSecondaryLabel))
+            .padding()
+            .background(gray.edgesIgnoringSafeArea(.all))
+            .listRowInsets(EdgeInsets()) // Equivalent to separatorInset
+            .frame(maxWidth: .infinity, alignment: .leading)
     }
 }
 
 #Preview {
-    FrameCellView()
+    let widget = OpenHABWidget()
+    widget.label = "??"
+    return FrameCellView(widget: widget)
 }
diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index 39185ff53..4cb1de847 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -111,8 +111,8 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
         search.isActive && !searchBarIsEmpty
     }
 
-    var dataSource: UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>! = nil
-    var currentSnapshot: NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>! = nil
+    var dataSource: UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>!
+    var currentSnapshot: NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>!
 
     @IBOutlet private var tableView: UITableView!
 
@@ -334,11 +334,10 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
                 if !NetworkConnection.atmosphereTrackingId.isEmpty {
                     os_log("Found X-Atmosphere-tracking-id: %{PUBLIC}@", log: .remoteAccess, type: .info, NetworkConnection.atmosphereTrackingId)
                 }
-                var openHABSitemapPage: OpenHABSitemapPage?
                 do {
                     // Self-executing closure
                     // Inspired by https://www.swiftbysundell.com/posts/inline-types-and-functions-in-swift
-                    openHABSitemapPage = try {
+                    currentPage = try {
                         let sitemapPageCodingData = try data.decoded(as: OpenHABSitemapPage.CodingData.self)
                         return sitemapPageCodingData.openHABSitemapPage
                     }()
@@ -346,7 +345,6 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
                     os_log("Should not throw %{PUBLIC}@", log: OSLog.remoteAccess, type: .error, error.localizedDescription)
                 }
 
-                currentPage = openHABSitemapPage
                 if isFiltering {
                     filterContentForSearchText(search.searchBar.text)
                 }
@@ -563,8 +561,9 @@ extension OpenHABSitemapViewController: ColorPickerCellDelegate {
         if let colorPickerViewController = storyboard?.instantiateViewController(withIdentifier: "ColorPickerViewController") as? ColorPickerViewController,
            let cell,
            let indexPath = tableView.indexPath(for: cell),
-
            let widget = dataSource.itemIdentifier(for: indexPath) {
+//           let widgetId = dataSource.itemIdentifier(for: indexPath),
+//           let widget = relevantPage?.widgets[widgetId] {
             colorPickerViewController.title = widget.labelText
             colorPickerViewController.widget = widget
 
@@ -577,10 +576,10 @@ extension OpenHABSitemapViewController {
     private func makeDataSource() -> UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget> {
         // Code from cellForItemAt transplanted into cell provider closure
 
-        UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>(tableView: tableView) { [weak self] (tableView: UITableView, indexPath: IndexPath, widget: OpenHABWidget) -> UITableViewCell? in
+        UITableViewDiffableDataSource<ViewControllerSection, OpenHABWidget>(tableView: tableView) { [unowned self] (tableView: UITableView, indexPath: IndexPath, widget: OpenHABWidget) -> UITableViewCell? in
 
             let cell: UITableViewCell
-
+//            guard let widget = self?.relevantPage?.widgets[widgetId] else { return nil }
             switch widget.type {
             case .frame:
                 cell = tableView.dequeueReusableCell(for: indexPath, cellType: FrameUITableViewCell.self)
@@ -631,17 +630,17 @@ extension OpenHABSitemapViewController {
             }
 
             var iconColor = widget.iconColor
-            if iconColor.isEmpty, self?.traitCollection.userInterfaceStyle == .dark {
+            if iconColor.isEmpty, traitCollection.userInterfaceStyle == .dark {
                 iconColor = "white"
             }
             // No icon is needed for image, video, frame and web widgets
             if !((cell is NewImageUITableViewCell) || (cell is VideoUITableViewCell) || (cell is FrameUITableViewCell) || (cell is WebUITableViewCell)) {
                 if let urlc = Endpoint.icon(
-                    rootUrl: self?.openHABRootUrl ?? "",
-                    version: self?.appData?.openHABVersion ?? 2,
+                    rootUrl: openHABRootUrl ?? "",
+                    version: appData?.openHABVersion ?? 2,
                     icon: widget.icon,
                     state: widget.iconState(),
-                    iconType: self?.iconType ?? .svg,
+                    iconType: iconType ?? .svg,
                     iconColor: iconColor
                 ).url {
                     var imageRequest = URLRequest(url: urlc)
@@ -679,14 +678,16 @@ extension OpenHABSitemapViewController {
 
             // Check if this is not the last row in the widgets list
             // TODO: Switch to separator layout guide https://developer.apple.com/videos/play/wwdc2020/10026/
-//            if indexPath.row < (self?.relevantPage?.widgets.count ?? 1) - 1 {
-//                let nextWidget: OpenHABWidget? = self?.relevantPage?.widgets[indexPath.row + 1]
-//                if let type = nextWidget?.type, type.isAny(of: .frame, .image, .video, .webview, .chart) {
-//                    cell.separatorInset = UIEdgeInsets.zero
-//                } else if !(widget.type == .frame) {
-//                    cell.separatorInset = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 0)
-//                }
-//            }
+            if indexPath.row < (relevantPage?.widgets.count ?? 1) - 1 {
+                let nextRow = indexPath.index(after: indexPath.row)
+                let nextIndexPath = IndexPath(row: nextRow, section: indexPath.section)
+                let nextWidget = dataSource.itemIdentifier(for: nextIndexPath)
+                if let type = nextWidget?.type, type.isAny(of: .frame, .image, .video, .webview, .chart) {
+                    cell.separatorInset = UIEdgeInsets.zero
+                } else if !(widget.type == .frame) {
+                    cell.separatorInset = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 0)
+                }
+            }
 
             return cell
         }
@@ -694,10 +695,11 @@ extension OpenHABSitemapViewController {
 
     /// - Tag: WiFiUpdate
     func updateUI(animated: Bool = false) {
-        currentSnapshot = NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>()
+        currentSnapshot = NSDiffableDataSourceSnapshot<ViewControllerSection, OpenHABWidget>() // Changed
         currentSnapshot.appendSections([.main])
         if let relevantPage {
             currentSnapshot.appendItems(Array(relevantPage.widgets.values), toSection: .main)
+//            currentSnapshot.appendItems(relevantPage.widgets.map(\.value.widgetId), toSection: .main)
         }
         dataSource.apply(currentSnapshot, animatingDifferences: animated)
     }
@@ -712,6 +714,9 @@ extension OpenHABSitemapViewController: UITableViewDelegate { // }, UITableViewD
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         guard let widget = dataSource.itemIdentifier(for: indexPath) else { return 44.0 }
+
+//        guard let widgetId = dataSource.itemIdentifier(for: indexPath), let widget = relevantPage?.widgets[widgetId] else { return 44.0 }
+
         switch widget.type {
         case .frame:
             return !widget.label.isEmpty ? 35.0 : 0
@@ -744,6 +749,8 @@ extension OpenHABSitemapViewController: UITableViewDelegate { // }, UITableViewD
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         guard let widget = dataSource.itemIdentifier(for: indexPath) else { return }
 
+        // guard let widgetId = dataSource.itemIdentifier(for: indexPath), let widget = relevantPage?.widgets[widgetId] else { return }
+
         if widget.linkedPage != nil {
             if let link = widget.linkedPage?.link {
                 os_log("Selected %{PUBLIC}@", log: .viewCycle, type: .info, link)