Support Switch elements for Dimmer items #168

Author: TheNinth7

source/sitemap/widgets/switch/SitemapSwitch.mc

@@ -110,7 +110,9 @@ class SitemapSwitch extends SitemapWidget {
         var switchDisplayState = _mappings.lookup( _switchItem.getState() );
 
         if( switchDisplayState == null ) {
-            if( hasRemoteDisplayState() ) {
+            if( _switchItem.getType().equals( "Dimmer" ) ) {
+                switchDisplayState = _switchItem.getState() + _switchItem.getUnit();
+            } else if( hasRemoteDisplayState() ) {
                 // Second priority: 
                 // If we got the state from the server, then the remoteDisplayState
                 // may be filled and we'll just use it. 

source/user-interface/sitemap-menu/menu-items/switch/OnOffSwitchMenuItem.mc

@@ -34,24 +34,27 @@ class OnOffSwitchMenuItem extends BaseSwitchMenuItem {
         processingMode as BasePageMenu.ProcessingMode
     ) {
         var itemState = sitemapSwitch.getSwitchItem().getState();
-        if( ! ( itemState.equals( SwitchItem.ITEM_STATE_ON ) 
-                || itemState.equals( SwitchItem.ITEM_STATE_OFF ) ) 
-        ) {      
-            throw new JsonParsingException( "Switch '" + sitemapSwitch.getLabel() + "': invalid state '" + itemState + "'" );
-        }
         _isEnabled = parseItemState( itemState );
         _smallIcon = sitemapSwitch.getLinkedPage() != null;
         _stateDrawable = new OnOffStateDrawable( _isEnabled, _smallIcon );
 
+        if( sitemapSwitch.getSwitchItem().getType().equals( "Dimmer" ) ) {
+            var displayState = sitemapSwitch.getDisplayState();
+            System.println( displayState );
+            var stateTextResponsive = sitemapSwitch.getSwitchItem().getType().equals( "Dimmer" )
+                    ? sitemapSwitch.getDisplayState()
+                    : sitemapSwitch.hasRemoteDisplayState()
+                        ? sitemapSwitch.getRemoteDisplayState()
+                        : null;
+            System.println( stateTextResponsive );
+        }
+
         // Initialize the superclass
         // For the toggle switch we support the display
         // of a display state, if provided by the server
         BaseSwitchMenuItem.initialize( {
                 :sitemapWidget => sitemapSwitch,
-                :stateTextResponsive => 
-                    sitemapSwitch.hasRemoteDisplayState()
-                    ? sitemapSwitch.getRemoteDisplayState()
-                    : null,
+                :stateTextResponsive => getStateTextResponsive( sitemapSwitch ),
                 :stateDrawable => _stateDrawable,
                 :isActionable => false,
                 :parent => parent,
@@ -68,16 +71,41 @@ class OnOffSwitchMenuItem extends BaseSwitchMenuItem {
             : SwitchItem.ITEM_STATE_ON;
     }
 
+    // Determines the display state of a toggle switch.
+    // Special handling is applied for Dimmers, which are rendered manually
+    // to ensure consistent appearance throughout the app.
+    private static function getStateTextResponsive( 
+        sitemapSwitch as SitemapSwitch 
+    ) as String? {
+        return
+            sitemapSwitch.getSwitchItem().getType().equals( "Dimmer" )
+            ? sitemapSwitch.getDisplayState()
+            : sitemapSwitch.hasRemoteDisplayState()
+                ? sitemapSwitch.getRemoteDisplayState()
+                : null;
+    }
+
     // Converts the string state to a Boolean for _isEnabled
-    // ON => true; OFF => false
+    // The widget supports string states:
+    // "ON" => true; "OFF" => false
+    // And numeric states:
+    // 0 => false; 1-100 => true
     private function parseItemState( itemState as String ) as Boolean {
         if( itemState.equals( SwitchItem.ITEM_STATE_ON ) ) {
             return true;            
         } else if( itemState.equals( SwitchItem.ITEM_STATE_OFF ) ) {
             return false;
         } else {
-            throw new GeneralException( "OnOffSwitchMenuItem: state '" + itemState + "' is not supported" );
+            var numericState = itemState.toNumber();
+            if( numericState != null ) {
+                if( numericState == 0 ) {
+                    return false;
+                } else if( numericState > 0 && numericState <= 100 ) {
+                    return true;
+                }
+            }
         }
+        throw new GeneralException( "OnOffSwitchMenuItem: state '" + itemState + "' is not supported" );
     }
 
     // Update the member and Drawable
@@ -92,11 +120,7 @@ class OnOffSwitchMenuItem extends BaseSwitchMenuItem {
     public function updateWidget( sitemapWidget as SitemapWidget ) as Void {
         BaseSwitchMenuItem.updateWidget( sitemapWidget );
         _smallIcon = sitemapWidget.getLinkedPage() != null;
-        // Update the display state provided by the server
-        setStateTextResponsive( 
-            sitemapWidget.hasRemoteDisplayState()
-            ? sitemapWidget.getRemoteDisplayState()
-            : null
-        );
+        // Update the display state
+        setStateTextResponsive( getStateTextResponsive( sitemapWidget as SitemapSwitch ) );
     }
 }