From f54c8b23df83486694a67d79fe1ca83425e59085 Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Sun, 19 Nov 2023 22:28:25 +0100
Subject: [PATCH 1/2] Support for switchSupport

---
 openHAB.xcodeproj/project.pbxproj             |   8 +
 openHAB/Main.storyboard                       | 150 ++++++++++++------
 openHAB/OpenHABSitemapViewController.swift    |   7 +-
 ...iderWithSwitchSupportUITableViewCell.swift | 137 ++++++++++++++++
 openHABUITests/OpenHABUITests.swift           |   2 +-
 .../Views/ContentView.swift                   |   4 +-
 .../Rows/SliderWithSwitchSupportRow.swift     |  89 +++++++++++
 7 files changed, 348 insertions(+), 49 deletions(-)
 create mode 100644 openHAB/SliderWithSwitchSupportUITableViewCell.swift
 create mode 100644 openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift

diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index 02eae31fc..e69099782 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -92,6 +92,8 @@
 		DA2E0B0E23DCC153009B0A99 /* MapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2E0B0D23DCC152009B0A99 /* MapView.swift */; };
 		DA2E0B1023DCC439009B0A99 /* MapViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2E0B0F23DCC439009B0A99 /* MapViewRow.swift */; };
 		DA4D4DB5233F9ACB00B37E37 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = DA4D4DB4233F9ACB00B37E37 /* README.md */; };
+		DA50C7BD2B0A51BD0009F716 /* SliderWithSwitchSupportRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA50C7BC2B0A51BD0009F716 /* SliderWithSwitchSupportRow.swift */; };
+		DA50C7BF2B0A65300009F716 /* SliderWithSwitchSupportUITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA50C7BE2B0A652F0009F716 /* SliderWithSwitchSupportUITableViewCell.swift */; };
 		DA65871F236F83CE007E2E7F /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA65871E236F83CD007E2E7F /* UserDefaultsExtension.swift */; };
 		DA6587222370C9D8007E2E7F /* PreferencesHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA6587212370C9D8007E2E7F /* PreferencesHostingController.swift */; };
 		DA7224D223828D3400712D20 /* PreviewConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA7224D123828D3300712D20 /* PreviewConstants.swift */; };
@@ -367,6 +369,8 @@
 		DA2E0B0F23DCC439009B0A99 /* MapViewRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapViewRow.swift; sourceTree = "<group>"; };
 		DA4D4DB4233F9ACB00B37E37 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		DA4D4E0E2340A00200B37E37 /* Changes.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Changes.md; sourceTree = "<group>"; };
+		DA50C7BC2B0A51BD0009F716 /* SliderWithSwitchSupportRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SliderWithSwitchSupportRow.swift; sourceTree = "<group>"; };
+		DA50C7BE2B0A652F0009F716 /* SliderWithSwitchSupportUITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SliderWithSwitchSupportUITableViewCell.swift; sourceTree = "<group>"; };
 		DA65871E236F83CD007E2E7F /* UserDefaultsExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsExtension.swift; sourceTree = "<group>"; };
 		DA6587212370C9D8007E2E7F /* PreferencesHostingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesHostingController.swift; sourceTree = "<group>"; };
 		DA7224D123828D3300712D20 /* PreviewConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewConstants.swift; sourceTree = "<group>"; };
@@ -757,6 +761,7 @@
 			children = (
 				DA077649234683BC0086C685 /* SwitchRow.swift */,
 				DA0F37CF23D4ACC7007EAB48 /* SliderRow.swift */,
+				DA50C7BC2B0A51BD0009F716 /* SliderWithSwitchSupportRow.swift */,
 				DAF457A123DB6C640018B495 /* RollershutterRow.swift */,
 				DAF4579F23DA3E1C0018B495 /* SegmentRow.swift */,
 				DAF457A523DB9CE00018B495 /* SetpointRow.swift */,
@@ -850,6 +855,7 @@
 				DF05FF221896BD2D00FF2F9B /* SelectionUITableViewCell.swift */,
 				DFA16EB718883CF300EDB0BB /* SetpointUITableViewCell.swift */,
 				DFA16EBA18883DE500EDB0BB /* SliderUITableViewCell.swift */,
+				DA50C7BE2B0A652F0009F716 /* SliderWithSwitchSupportUITableViewCell.swift */,
 				DFA13CB318872EBD006355C3 /* SwitchUITableViewCell.swift */,
 				DAA42BA921DC983B00244B2A /* VideoUITableViewCell.swift */,
 				DAA42BAB21DC984A00244B2A /* WebUITableViewCell.swift */,
@@ -1350,6 +1356,7 @@
 				DA0776F0234788010086C685 /* UserData.swift in Sources */,
 				DA6587222370C9D8007E2E7F /* PreferencesHostingController.swift in Sources */,
 				DAC6608D236F771600F4501E /* PreferencesSwiftUIView.swift in Sources */,
+				DA50C7BD2B0A51BD0009F716 /* SliderWithSwitchSupportRow.swift in Sources */,
 				DAF457A623DB9CE00018B495 /* SetpointRow.swift in Sources */,
 				DAF4581823DC4A050018B495 /* ImageRow.swift in Sources */,
 				9350F17923814FAC00054BA8 /* ObservableOpenHABWidget.swift in Sources */,
@@ -1395,6 +1402,7 @@
 				DF4B84041885A53700F34902 /* OpenHABDataObject.swift in Sources */,
 				DAC65FC7236EDF3900F4501E /* SpinnerViewController.swift in Sources */,
 				DF4A02421CF34096006C3456 /* OpenHABDrawerItem.swift in Sources */,
+				DA50C7BF2B0A65300009F716 /* SliderWithSwitchSupportUITableViewCell.swift in Sources */,
 				DF4A022C1CF315BA006C3456 /* OpenHABDrawerTableViewController.swift in Sources */,
 				DFDF452F1932032B00A6E581 /* OpenHABLegalViewController.swift in Sources */,
 				DA21EAE22339621C001AB415 /* Throttler.swift in Sources */,
diff --git a/openHAB/Main.storyboard b/openHAB/Main.storyboard
index fd3790ea0..938cda96a 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>
@@ -392,9 +392,31 @@
                                             <outlet property="widgetSegmentControl" destination="QBf-tO-eE0" id="SaO-tM-Eh5"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell autoresizesSubviews="NO" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="RollershutterUITableViewCell" rowHeight="44" id="Sg1-VD-yHT" customClass="RollershutterUITableViewCell" customModule="openHAB">
+                                    <tableViewCell autoresizesSubviews="NO" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ChartUITableViewCell" rowHeight="44" id="o5c-ql-8Ao" customClass="NewImageTableViewCell" customModule="openHAB" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="393" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="o5c-ql-8Ao" id="P0d-ou-gEj">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" tag="801" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MyD-7j-GMG">
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                                </imageView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="MyD-7j-GMG" firstAttribute="top" secondItem="P0d-ou-gEj" secondAttribute="top" id="5R0-Lc-nH4"/>
+                                                <constraint firstAttribute="bottom" secondItem="MyD-7j-GMG" secondAttribute="bottom" id="auN-JV-uZL"/>
+                                                <constraint firstAttribute="trailing" secondItem="MyD-7j-GMG" secondAttribute="trailing" id="gPx-dx-6Jn"/>
+                                                <constraint firstItem="MyD-7j-GMG" firstAttribute="leading" secondItem="P0d-ou-gEj" secondAttribute="leading" id="kvZ-vM-W95"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <accessibility key="accessibilityConfiguration">
+                                            <accessibilityTraits key="traits" notEnabled="YES"/>
+                                        </accessibility>
+                                    </tableViewCell>
+                                    <tableViewCell autoresizesSubviews="NO" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="RollershutterUITableViewCell" rowHeight="44" id="Sg1-VD-yHT" customClass="RollershutterUITableViewCell" customModule="openHAB">
+                                        <rect key="frame" x="0.0" y="437" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" autoresizesSubviews="NO" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sg1-VD-yHT" id="ITS-rT-SZ9">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
@@ -476,28 +498,6 @@
                                             <outlet property="upButton" destination="PzY-Bs-9MZ" id="3ms-J5-Frr"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell autoresizesSubviews="NO" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ChartUITableViewCell" rowHeight="44" id="o5c-ql-8Ao" customClass="NewImageTableViewCell" customModule="openHAB" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="437" width="375" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="o5c-ql-8Ao" id="P0d-ou-gEj">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" tag="801" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MyD-7j-GMG">
-                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                                                </imageView>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="MyD-7j-GMG" firstAttribute="top" secondItem="P0d-ou-gEj" secondAttribute="top" id="5R0-Lc-nH4"/>
-                                                <constraint firstAttribute="bottom" secondItem="MyD-7j-GMG" secondAttribute="bottom" id="auN-JV-uZL"/>
-                                                <constraint firstAttribute="trailing" secondItem="MyD-7j-GMG" secondAttribute="trailing" id="gPx-dx-6Jn"/>
-                                                <constraint firstItem="MyD-7j-GMG" firstAttribute="leading" secondItem="P0d-ou-gEj" secondAttribute="leading" id="kvZ-vM-W95"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <accessibility key="accessibilityConfiguration">
-                                            <accessibilityTraits key="traits" notEnabled="YES"/>
-                                        </accessibility>
-                                    </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ImageUITableViewCell" rowHeight="76" id="qAL-2k-0Oq" customClass="ImageUITableViewCell" customModule="openHAB">
                                         <rect key="frame" x="0.0" y="481" width="375" height="76"/>
                                         <autoresizingMask key="autoresizingMask"/>
@@ -545,6 +545,66 @@
                                             <accessibilityTraits key="traits" notEnabled="YES"/>
                                         </accessibility>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SliderWithSwitchSupportUITableViewCell" rowHeight="44" id="hdi-dL-Cmb" userLabel="SliderWithSwitchSupportUITableViewCell" customClass="SliderWithSwitchSupportUITableViewCell" customModule="openHAB" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="645" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hdi-dL-Cmb" id="fHE-DY-dah">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <slider opaque="NO" tag="400" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="7Yg-5Y-d79">
+                                                    <rect key="frame" x="144" y="7" width="154" height="31"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="Kwe-zd-0GA">
+                                                            <variation key="heightClass=regular-widthClass=compact" constant="150"/>
+                                                        </constraint>
+                                                        <constraint firstAttribute="height" constant="30" id="br8-Rp-VQ2"/>
+                                                    </constraints>
+                                                    <connections>
+                                                        <action selector="sliderTouchDown:" destination="hdi-dL-Cmb" eventType="touchDown" id="WzE-hc-GPK"/>
+                                                        <action selector="sliderTouchOutside:" destination="hdi-dL-Cmb" eventType="touchUpOutside" id="H1P-xb-dEv"/>
+                                                        <action selector="sliderTouchUp:" destination="hdi-dL-Cmb" eventType="touchUpInside" id="nGQ-7A-Ndt"/>
+                                                        <action selector="sliderValueChanged:" destination="hdi-dL-Cmb" eventType="valueChanged" id="zyb-2D-0Q0"/>
+                                                    </connections>
+                                                </slider>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Dimmer" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kir-ML-7Yp">
+                                                    <rect key="frame" x="62" y="11.999999999999998" width="42.666666666666657" height="20.333333333333329"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="100" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="191" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="msG-1F-fVE">
+                                                    <rect key="frame" x="112.66666666666667" y="11.999999999999998" width="25.333333333333329" height="20.333333333333329"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <color key="textColor" systemColor="secondaryLabelColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fOS-5q-DJq">
+                                                    <rect key="frame" x="306" y="6.6666666666666679" width="51" height="31.000000000000004"/>
+                                                </switch>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="msG-1F-fVE" firstAttribute="centerY" secondItem="fHE-DY-dah" secondAttribute="centerY" id="Azf-Xp-5TD"/>
+                                                <constraint firstItem="7Yg-5Y-d79" firstAttribute="leading" secondItem="msG-1F-fVE" secondAttribute="trailing" constant="8" id="L9G-8M-zih"/>
+                                                <constraint firstItem="fOS-5q-DJq" firstAttribute="leading" secondItem="7Yg-5Y-d79" secondAttribute="trailing" constant="10" id="LIR-nb-GEe"/>
+                                                <constraint firstAttribute="trailing" secondItem="fOS-5q-DJq" secondAttribute="trailing" constant="20" id="lgb-eU-zoa"/>
+                                                <constraint firstItem="Kir-ML-7Yp" firstAttribute="centerY" secondItem="fHE-DY-dah" secondAttribute="centerY" id="qCb-8x-16f"/>
+                                                <constraint firstItem="fOS-5q-DJq" firstAttribute="centerY" secondItem="fHE-DY-dah" secondAttribute="centerY" id="rqP-f3-LFK"/>
+                                                <constraint firstItem="7Yg-5Y-d79" firstAttribute="centerY" secondItem="fHE-DY-dah" secondAttribute="centerY" id="sO3-wo-q9F"/>
+                                                <constraint firstItem="Kir-ML-7Yp" firstAttribute="leading" secondItem="fHE-DY-dah" secondAttribute="leading" constant="62" id="uj0-hM-aOQ"/>
+                                                <constraint firstItem="msG-1F-fVE" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Kir-ML-7Yp" secondAttribute="trailing" constant="8" id="yg9-b3-tse"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <accessibility key="accessibilityConfiguration">
+                                            <accessibilityTraits key="traits" notEnabled="YES"/>
+                                        </accessibility>
+                                        <connections>
+                                            <outlet property="customDetailText" destination="msG-1F-fVE" id="xfd-bh-1eC"/>
+                                            <outlet property="customTextLabel" destination="Kir-ML-7Yp" id="3xw-jK-X0J"/>
+                                            <outlet property="widgetSlider" destination="7Yg-5Y-d79" id="1EW-U6-C38"/>
+                                            <outlet property="widgetSwitch" destination="fOS-5q-DJq" id="ssi-Ys-Igg"/>
+                                        </connections>
+                                    </tableViewCell>
                                 </prototypes>
                                 <connections>
                                     <outlet property="dataSource" destination="vXZ-lx-hvc" id="FMC-Oi-tEP"/>
@@ -567,7 +627,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3511" y="32"/>
+            <point key="canvasLocation" x="3509.5999999999999" y="31.773399014778327"/>
         </scene>
         <!--Settings-->
         <scene sceneID="bFA-oT-thf">
@@ -1119,7 +1179,7 @@
                                             <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="Clear Image Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EsS-lC-iXU">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clear Image Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EsS-lC-iXU">
                                                     <rect key="frame" x="32" y="11.999999999999998" width="144" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
@@ -1142,7 +1202,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Icon Type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xdK-7c-gvS">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Icon Type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xdK-7c-gvS">
                                                     <rect key="frame" x="32" y="11.999999999999998" width="74" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
@@ -1150,7 +1210,7 @@
                                                         <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="icon_type"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
-                                                <segmentedControl opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="N6V-Uk-Y4k">
+                                                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="N6V-Uk-Y4k">
                                                     <rect key="frame" x="252" y="6.6666666666666679" width="93" height="32"/>
                                                     <segments>
                                                         <segment title="PNG"/>
@@ -1174,7 +1234,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Sort sitemaps by" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="atQ-1e-lcL">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sort sitemaps by" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="atQ-1e-lcL">
                                                     <rect key="frame" x="32" y="11.999999999999998" width="128" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
@@ -1182,7 +1242,7 @@
                                                         <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="sortSitemapsBy"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
-                                                <segmentedControl opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="XGP-Fi-vHF">
+                                                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="XGP-Fi-vHF">
                                                     <rect key="frame" x="236" y="6.6666666666666679" width="109" height="32"/>
                                                     <segments>
                                                         <segment title="Label"/>
@@ -1207,10 +1267,10 @@
                                         <rect key="frame" x="0.0" y="995.33333015441895" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="K1V-oh-QdT" id="Tqr-A3-HHs">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44.000000000000114"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="App Version" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qfh-lz-UXm">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App Version" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qfh-lz-UXm">
                                                     <rect key="frame" x="32" y="12" width="92" height="20"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
@@ -1218,7 +1278,7 @@
                                                         <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="app_version"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="version" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gb-3M-iPN">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="version" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gb-3M-iPN">
                                                     <rect key="frame" x="300" y="11.666666666666664" width="55" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -1227,7 +1287,6 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="Qfh-lz-UXm" firstAttribute="centerY" secondItem="Tqr-A3-HHs" secondAttribute="centerY" id="SBh-BJ-rUI"/>
-                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Qfh-lz-UXm" secondAttribute="trailing" id="X9u-0N-Iwy"/>
                                                 <constraint firstItem="1gb-3M-iPN" firstAttribute="centerY" secondItem="Tqr-A3-HHs" secondAttribute="centerY" id="dBG-1a-dPb"/>
                                                 <constraint firstAttribute="bottomMargin" secondItem="Qfh-lz-UXm" secondAttribute="bottom" constant="1" id="fn0-xK-s5a"/>
                                                 <constraint firstAttribute="trailing" secondItem="1gb-3M-iPN" secondAttribute="trailing" constant="20" id="h6K-rx-qCo"/>
@@ -1243,8 +1302,8 @@
                                             <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">
-                                                    <rect key="frame" x="27.999999999999996" y="13.666666666666664" width="34.666666666666657" height="17"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Legal" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8c-Ps-18a">
+                                                    <rect key="frame" x="32" y="11.999999999999998" width="41" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
                                                     <userDefinedRuntimeAttributes>
@@ -1269,8 +1328,8 @@
                                             <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">
-                                                    <rect key="frame" x="28.000000000000007" y="13.666666666666664" width="89.666666666666686" height="17"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Privacy Policy" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vcs-uN-ETx">
+                                                    <rect key="frame" x="31.999999999999993" y="11.999999999999998" width="105.33333333333331" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
                                                     <userDefinedRuntimeAttributes>
@@ -1280,7 +1339,6 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="Vcs-uN-ETx" firstAttribute="leading" secondItem="9lh-Vk-icE" secondAttribute="leadingMargin" constant="12" id="5Nf-8Q-356"/>
-                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Vcs-uN-ETx" secondAttribute="trailing" id="7y9-et-7NB"/>
                                                 <constraint firstItem="Vcs-uN-ETx" firstAttribute="centerY" secondItem="9lh-Vk-icE" secondAttribute="centerY" id="S7c-ad-fo2"/>
                                             </constraints>
                                         </tableViewCellContentView>
@@ -1403,7 +1461,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 +1483,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>
@@ -1508,11 +1566,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 +1601,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"/>
@@ -1667,7 +1725,7 @@
             <color white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift
index d825bb955..a670d8d65 100644
--- a/openHAB/OpenHABSitemapViewController.swift
+++ b/openHAB/OpenHABSitemapViewController.swift
@@ -18,6 +18,7 @@ import OpenHABCore
 import os.log
 import SafariServices
 import SVGKit
+import SwiftUI
 import UIKit
 
 enum Action<I, O> {
@@ -653,7 +654,11 @@ extension OpenHABSitemapViewController: UITableViewDelegate, UITableViewDataSour
         case .setpoint:
             cell = tableView.dequeueReusableCell(for: indexPath) as SetpointUITableViewCell
         case .slider:
-            cell = tableView.dequeueReusableCell(for: indexPath) as SliderUITableViewCell
+            if let switchSupport = widget?.switchSupport, switchSupport {
+                cell = tableView.dequeueReusableCell(for: indexPath) as SliderWithSwitchSupportUITableViewCell
+            } else {
+                cell = tableView.dequeueReusableCell(for: indexPath) as SliderUITableViewCell
+            }
         case .selection:
             cell = tableView.dequeueReusableCell(for: indexPath) as SelectionUITableViewCell
         case .colorpicker:
diff --git a/openHAB/SliderWithSwitchSupportUITableViewCell.swift b/openHAB/SliderWithSwitchSupportUITableViewCell.swift
new file mode 100644
index 000000000..994c8b054
--- /dev/null
+++ b/openHAB/SliderWithSwitchSupportUITableViewCell.swift
@@ -0,0 +1,137 @@
+// 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 Alamofire
+import AVFoundation
+import AVKit
+import OpenHABCore
+import os.log
+
+class SliderWithSwitchSupportUITableViewCell: GenericUITableViewCell {
+    private var step: Float = 1.0
+
+    private var widgetValue: Double {
+        adj(Double(widgetSlider?.value ?? Float(widget.minValue)))
+    }
+
+    @IBOutlet private var widgetSlider: UISlider!
+    @IBOutlet private var widgetSwitch: UISwitch!
+    @IBOutlet private var customDetailText: UILabel!
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        initialize()
+    }
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        initialize()
+    }
+
+    @IBAction private func sliderValueChanged(_ sender: UISlider) {
+        customDetailText?.text = widgetValue.valueText(step: widget.step)
+        // Calling sliderDidChange leads to interference with other cells.
+        // sliderDidChange(toValue: widgetValue)
+    }
+
+    @IBAction private func sliderTouchUp(_ sender: UISlider) {
+        sliderDidChange(toValue: widgetValue)
+        touchEventDelegate?.touchUp()
+    }
+
+    @IBAction private func sliderTouchDown(_ sender: UISlider) {
+        touchEventDelegate?.touchDown()
+    }
+
+    @IBAction private func sliderTouchOutside(_ sender: UISlider) {
+        sliderTouchUp(sender)
+    }
+
+    override public func initialize() {
+        selectionStyle = .none
+        separatorInset = .zero
+        if let widget {
+            step = Float(widget.step)
+        } else {
+            step = 1.0
+        }
+    }
+
+    private func adj(_ raw: Double) -> Double {
+        var valueAdjustedToStep = Double(floor(Float(((raw - widget.minValue))) / step) * step)
+        valueAdjustedToStep += widget.minValue
+        return valueAdjustedToStep.clamped(to: widget.minValue ... widget.maxValue)
+    }
+
+    private func adjustedValue() -> Double {
+        if let item = widget.item {
+            adj(item.stateAsDouble())
+        } else {
+            widget.minValue
+        }
+    }
+
+    override func displayWidget() {
+        // guard !isInTransition else { return }
+
+        customTextLabel?.text = widget.labelText
+        var state = widget.state
+        // if state is nil or empty using the item state ( OH 1.x compatability )
+        if state.isEmpty {
+            state = (widget.item?.state) ?? ""
+        }
+        widgetSwitch?.isOn = state.parseAsBool()
+        widgetSwitch?.addTarget(self, action: .switchChange, for: .valueChanged)
+        super.displayWidget()
+
+        if let item = widget.item, item.isOfTypeOrGroupType(.color) {
+            widgetSlider?.minimumValue = 0.0
+            widgetSlider?.maximumValue = 100.0
+            step = 1.0
+            widgetSlider.value = Float(item.state?.parseAsBrightness() ?? 0)
+        } else {
+            // Fix "The stepSize must be 0, or a factor of the valueFrom-valueTo range" exception
+            widgetSlider?.minimumValue = Float(widget.minValue)
+            widgetSlider?.maximumValue = Float(widget.maxValue)
+            let widgetValue = adjustedValue()
+            widgetSlider?.value = Float(widgetValue)
+            step = Float(widget.step)
+
+            // if there is a formatted value in widget label, take it. Otherwise display local value
+            if let labelValue = widget?.labelValue {
+                customDetailText?.text = labelValue
+            } else {
+                customDetailText?.text = widgetValue.valueText(step: Double(step))
+            }
+        }
+        customTextLabel?.text = widget.labelText
+    }
+
+    private func sliderDidChange(toValue value: Double) {
+        os_log("Slider new value = %g", log: .default, type: .info, value)
+        widget.sendCommand(value.valueText(step: Double(step)))
+    }
+
+    @objc
+    func switchChange() {
+        if (widgetSwitch?.isOn)! {
+            os_log("Switch to ON", log: .viewCycle, type: .info)
+            widget.sendCommand("ON")
+        } else {
+            os_log("Switch to OFF", log: .viewCycle, type: .info)
+            widget.sendCommand("OFF")
+        }
+    }
+}
+
+private extension Selector {
+    static let switchChange = #selector(SwitchUITableViewCell.switchChange)
+}
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..988395f40 100644
--- a/openHABWatch Extension/Views/ContentView.swift	
+++ b/openHABWatch Extension/Views/ContentView.swift	
@@ -63,7 +63,9 @@ struct ContentView: View {
         case .switcher:
             SwitchRow(widget: widget)
         case .slider:
-            SliderRow(widget: widget)
+            if widget.switchSupport {
+                SliderRow(widget: widget)
+            } else {}
         case .segmented:
             SegmentRow(widget: widget)
         case .rollershutter:
diff --git a/openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift b/openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift
new file mode 100644
index 000000000..3cd1b2336
--- /dev/null
+++ b/openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift	
@@ -0,0 +1,89 @@
+// 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 OpenHABCore
+import os.log
+import SwiftUI
+
+struct SliderWithSwitchSupportRow: View {
+    @ObservedObject var widget: ObservableOpenHABWidget
+    @ObservedObject var settings = ObservableOpenHABDataObject.shared
+
+    var body: some View {
+        let valueBinding = Binding<Double>(
+            get: {
+                widget.adjustedValue
+            },
+            set: {
+                os_log("Slider new value = %g", log: .default, type: .info, $0)
+                widget.sendCommand($0.valueText(step: widget.step))
+
+                // self.widget.stateEnumBinding = .slider($0)
+            }
+        )
+
+        let stateBinding = Binding<Bool>(
+            get: {
+                widget.stateEnumBinding.boolState
+            },
+            set: {
+                if $0 {
+                    os_log("Switch to ON", log: .viewCycle, type: .info)
+                    widget.sendCommand("ON")
+                } else {
+                    os_log("Switch to OFF", log: .viewCycle, type: .info)
+                    widget.sendCommand("OFF")
+                }
+                widget.stateEnumBinding = .switcher($0)
+            }
+        )
+
+        return
+            VStack(spacing: 3) {
+                Toggle(isOn: stateBinding) {
+                    HStack {
+                        IconView(widget: widget, settings: settings)
+                        VStack {
+                            TextLabelView(widget: widget)
+                            DetailTextLabelView(widget: widget)
+                        }
+                    }
+                }
+                .focusable(true)
+                .padding(.trailing)
+                .cornerRadius(5)
+
+                Slider(value: valueBinding, in: widget.minValue ... widget.maxValue, step: widget.step)
+                    .labelsHidden()
+                    .focusable(true)
+                    .digitalCrownRotation(
+                        valueBinding,
+                        from: widget.minValue,
+                        through: widget.maxValue,
+                        by: widget.step,
+                        sensitivity: .medium,
+                        isHapticFeedbackEnabled: true
+                    )
+            }
+    }
+}
+
+struct SliderWithSwitchSupportRow_Previews: PreviewProvider {
+    static var previews: some View {
+        let widget = UserData().widgets[3]
+        return Group {
+            SliderRow(widget: widget)
+                .previewLayout(.fixed(width: 300, height: 70))
+            SliderRow(widget: widget)
+                .previewDevice("Apple Watch Series 4 - 44mm")
+        }
+    }
+}

From dd8db9600273262c8f98f8ee9b4aafbc535c14bb Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:22:19 +0100
Subject: [PATCH 2/2] Handling of switchSupport for watch app

---
 openHAB/Main.storyboard                               |  7 +++----
 openHABWatch Extension/Views/ContentView.swift        |  4 +++-
 .../Views/Rows/SliderWithSwitchSupportRow.swift       | 11 +++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/openHAB/Main.storyboard b/openHAB/Main.storyboard
index 938cda96a..0f6f07888 100644
--- a/openHAB/Main.storyboard
+++ b/openHAB/Main.storyboard
@@ -1190,7 +1190,6 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="EsS-lC-iXU" firstAttribute="centerY" secondItem="7Uf-fl-adr" secondAttribute="centerY" id="PcY-qR-Osq"/>
-                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="EsS-lC-iXU" secondAttribute="trailing" id="UEk-ze-NxE"/>
                                                 <constraint firstItem="EsS-lC-iXU" firstAttribute="leading" secondItem="7Uf-fl-adr" secondAttribute="leadingMargin" constant="12" id="xgs-ga-gNW"/>
                                             </constraints>
                                         </tableViewCellContentView>
@@ -1267,7 +1266,7 @@
                                         <rect key="frame" x="0.0" y="995.33333015441895" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="K1V-oh-QdT" id="Tqr-A3-HHs">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44.000000000000114"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App Version" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qfh-lz-UXm">
@@ -1291,7 +1290,6 @@
                                                 <constraint firstAttribute="bottomMargin" secondItem="Qfh-lz-UXm" secondAttribute="bottom" constant="1" id="fn0-xK-s5a"/>
                                                 <constraint firstAttribute="trailing" secondItem="1gb-3M-iPN" secondAttribute="trailing" constant="20" id="h6K-rx-qCo"/>
                                                 <constraint firstItem="Qfh-lz-UXm" firstAttribute="leading" secondItem="Tqr-A3-HHs" secondAttribute="leadingMargin" constant="12" id="mws-cm-0mM"/>
-                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Qfh-lz-UXm" secondAttribute="trailing" constant="10" id="v4p-cx-dml"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -1338,6 +1336,7 @@
                                                 </label>
                                             </subviews>
                                             <constraints>
+                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Vcs-uN-ETx" secondAttribute="trailing" constant="50" id="48t-Um-RyA"/>
                                                 <constraint firstItem="Vcs-uN-ETx" firstAttribute="leading" secondItem="9lh-Vk-icE" secondAttribute="leadingMargin" constant="12" id="5Nf-8Q-356"/>
                                                 <constraint firstItem="Vcs-uN-ETx" firstAttribute="centerY" secondItem="9lh-Vk-icE" secondAttribute="centerY" id="S7c-ad-fo2"/>
                                             </constraints>
@@ -1725,7 +1724,7 @@
             <color white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/openHABWatch Extension/Views/ContentView.swift b/openHABWatch Extension/Views/ContentView.swift
index 988395f40..45fba2a97 100644
--- a/openHABWatch Extension/Views/ContentView.swift	
+++ b/openHABWatch Extension/Views/ContentView.swift	
@@ -65,7 +65,9 @@ struct ContentView: View {
         case .slider:
             if widget.switchSupport {
                 SliderRow(widget: widget)
-            } else {}
+            } else {
+                SliderWithSwitchSupportRow(widget: widget)
+            }
         case .segmented:
             SegmentRow(widget: widget)
         case .rollershutter:
diff --git a/openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift b/openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift
index 3cd1b2336..1c82658ad 100644
--- a/openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift	
+++ b/openHABWatch Extension/Views/Rows/SliderWithSwitchSupportRow.swift	
@@ -32,17 +32,20 @@ struct SliderWithSwitchSupportRow: View {
 
         let stateBinding = Binding<Bool>(
             get: {
-                widget.stateEnumBinding.boolState
+                if widget.adjustedValue > widget.minValue {
+                    true
+                } else {
+                    false
+                }
             },
             set: {
                 if $0 {
                     os_log("Switch to ON", log: .viewCycle, type: .info)
-                    widget.sendCommand("ON")
+                    widget.sendCommand(widget.maxValue.valueText(step: widget.step))
                 } else {
                     os_log("Switch to OFF", log: .viewCycle, type: .info)
-                    widget.sendCommand("OFF")
+                    widget.sendCommand(widget.minValue.valueText(step: widget.step))
                 }
-                widget.stateEnumBinding = .switcher($0)
             }
         )