Add touch-strip text toggle and layout updates for Adaptive Dial

.gitignore

@@ -18,3 +18,4 @@ site/
 Thumbs.db
 *.lscache
 /plugin-out
+/.cr

CHANGELOG.md

@@ -15,6 +15,17 @@ Notes:
 
 ---
 
+## v1.2.3.0 - Minor Release
+
+### Features / Improvements
+
+- Added a `Touch Strip Text` toggle for `Adaptive Dial` so the dial title can be shown or hidden on the Stream Deck+ touch strip.
+
+### Bug Fixes
+
+- Reworked the Adaptive Dial feedback layouts to remove the default grey bottom-right bar.
+- Increased the usable icon area and balanced the captioned layout so the icon no longer looks cramped next to the touch-strip text.
+
 ## v1.2.2.1 - Build Release
 
 ### Internal / Refactor

PluginCore/ActionKeys/SCDialActionBase.cs

@@ -21,6 +21,13 @@ namespace SCStreamDeck.ActionKeys;
 /// </summary>
 public abstract class SCDialActionBase : EncoderBase
 {
+    private const string DefaultDialTitle = "Adaptive Dial";
+    private const string DialLayoutNoCaption = "Layouts/adaptiveDial.json";
+    private const string DialLayoutWithCaption = "Layouts/adaptiveDial.caption.json";
+
+    private string _customDialTitle = DefaultDialTitle;
+    private string? _activeDialLayout;
+
     [ExcludeFromCodeCoverage]
     protected SCDialActionBase(SDConnection connection, InitialPayload payload) : base(connection, payload)
     {
@@ -39,6 +46,7 @@ protected SCDialActionBase(SDConnection connection, InitialPayload payload) : ba
         InitializationService.KeybindingsStateChanged += OnKeybindingsStateChanged;
         PluginLocaleService.LocaleChanged += OnPluginLocaleChanged;
         Connection.OnPropertyInspectorDidAppear += OnPropertyInspectorDidAppear;
+        Connection.OnTitleParametersDidChange += OnTitleParametersDidChange;
         Connection.OnSendToPlugin += OnSendToPlugin;
 
         TryMigrateFunctionSettingsIfPossible();
@@ -47,6 +55,8 @@ protected SCDialActionBase(SDConnection connection, InitialPayload payload) : ba
         {
             SendPropertyInspectorUpdate();
         }
+
+        SendDialTextUpdate();
     }
 
     private InitializationService InitializationService { get; }
@@ -99,6 +109,7 @@ public override void OnTick()
     public override void Dispose()
     {
         Connection.OnPropertyInspectorDidAppear -= OnPropertyInspectorDidAppear;
+        Connection.OnTitleParametersDidChange -= OnTitleParametersDidChange;
         Connection.OnSendToPlugin -= OnSendToPlugin;
         InitializationService.KeybindingsStateChanged -= OnKeybindingsStateChanged;
         PluginLocaleService.LocaleChanged -= OnPluginLocaleChanged;
@@ -116,10 +127,44 @@ public override void ReceivedSettings(ReceivedSettingsPayload payload)
         }
 
         TryMigrateFunctionSettingsIfPossible();
+        SendDialTextUpdate();
     }
 
     private void SendPropertyInspectorUpdate() => _ = SendPropertyInspectorUpdateAsync();
 
+    private void SendDialTextUpdate() => _ = UpdateDialTextAsync();
+
+    private async Task UpdateDialTextAsync()
+    {
+        try
+        {
+            bool showText = Settings.ShowTouchText;
+            string targetLayout = showText ? DialLayoutWithCaption : DialLayoutNoCaption;
+
+            if (!string.Equals(_activeDialLayout, targetLayout, StringComparison.Ordinal))
+            {
+                await Connection.SetFeedbackLayoutAsync(targetLayout).ConfigureAwait(false);
+                _activeDialLayout = targetLayout;
+            }
+
+            string caption = showText ? BuildTouchStripText() : string.Empty;
+
+            await Connection.SetFeedbackAsync(new JObject
+            {
+                ["caption"] = caption
+            }).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            Log.Err($"[{GetType().Name}] Failed to update dial text: {ex.Message}", ex);
+        }
+    }
+
+    private string BuildTouchStripText()
+    {
+        return string.IsNullOrWhiteSpace(_customDialTitle) ? DefaultDialTitle : _customDialTitle;
+    }
+
     private async Task SendPropertyInspectorUpdateAsync()
     {
         PluginLocaleResolution pluginLocale = await GetPluginLocaleResolutionAsync().ConfigureAwait(false);
@@ -171,10 +216,28 @@ private async Task<PluginLocaleResolution> GetPluginLocaleResolutionAsync()
     private void OnPropertyInspectorDidAppear(object? sender, SDEventReceivedEventArgs<PropertyInspectorDidAppear> e) =>
         SendPropertyInspectorUpdate();
 
+    private void OnTitleParametersDidChange(object? sender, SDEventReceivedEventArgs<TitleParametersDidChange> e)
+    {
+        try
+        {
+            string? incomingTitle = e.Event?.Payload?.Title;
+            _customDialTitle = string.IsNullOrWhiteSpace(incomingTitle)
+                ? DefaultDialTitle
+                : incomingTitle.Trim();
+
+            SendDialTextUpdate();
+        }
+        catch (Exception ex)
+        {
+            Log.Err($"[{GetType().Name}] Failed to process title update: {ex.Message}", ex);
+        }
+    }
+
     private void OnKeybindingsStateChanged()
     {
         TryMigrateFunctionSettingsIfPossible();
         SendPropertyInspectorUpdate();
+        SendDialTextUpdate();
     }
 
     private void OnPluginLocaleChanged() => SendPropertyInspectorUpdate();

PluginCore/ActionKeys/Settings/DialSettings.cs

@@ -18,4 +18,7 @@ public sealed class DialSettings
 
     [JsonProperty(PropertyName = "clickSoundPath")]
     public string? ClickSoundPath { get; set; }
+
+    [JsonProperty(PropertyName = "showTouchText")]
+    public bool ShowTouchText { get; set; } = false;
 }

PluginCore/Layouts/adaptiveDial.caption.json

@@ -0,0 +1,26 @@
+{
+  "id": "scsd-adaptive-dial-caption",
+  "items": [
+    {
+      "key": "background",
+      "type": "pixmap",
+      "rect": [0, 0, 200, 100],
+      "zOrder": 0,
+      "value": ""
+    },
+    {
+      "key": "icon",
+      "type": "pixmap",
+      "rect": [64, 0, 72, 72],
+      "zOrder": 1,
+      "value": ""
+    },
+    {
+      "key": "caption",
+      "type": "text",
+      "rect": [8, 78, 184, 20],
+      "zOrder": 2,
+      "value": ""
+    }
+  ]
+}

PluginCore/Layouts/adaptiveDial.json

@@ -0,0 +1,19 @@
+{
+  "id": "scsd-adaptive-dial",
+  "items": [
+    {
+      "key": "background",
+      "type": "pixmap",
+      "rect": [0, 0, 200, 100],
+      "zOrder": 0,
+      "value": ""
+    },
+    {
+      "key": "icon",
+      "type": "pixmap",
+      "rect": [50, 0, 100, 100],
+      "zOrder": 1,
+      "value": ""
+    }
+  ]
+}

PluginCore/PluginCore.csproj

@@ -84,6 +84,9 @@
     <Content Include="PropertyInspector\**\*.*" Exclude="PropertyInspector\**\src\**\*.*">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Layouts\**\*.*">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <Target Name="BuildPropertyInspectorAssets" BeforeTargets="CopyFilesToOutputDirectory">

PluginCore/PropertyInspector/Dials/AdaptiveDial.html

@@ -100,6 +100,17 @@
         <div class="pi-file-picker" data-accept=".wav,.mp3" id="audioFilePicker"></div>
       </div>
     </div>
+
+    <div class="pi-section">
+      <div class="pi-picker-row">
+        <div class="pi-picker-label">Touch Strip Text</div>
+        <label class="checkable-container">
+          <input id="showTouchTextToggle" type="checkbox">
+          <span class="checkable-symbol" role="checkbox"></span>
+          <span class="checkable-text">Show</span>
+        </label>
+      </div>
+    </div>
   </div>
 </div>
 </body>

PluginCore/PropertyInspector/js/src/pi-dial-action.js

@@ -89,6 +89,39 @@
     settingsKey: 'clickSoundPath'
   });
 
+  const showTouchTextToggle = document.getElementById('showTouchTextToggle');
+  function toBoolean(value, defaultValue = true) {
+    if (typeof value === 'boolean') {
+      return value;
+    }
+
+    if (typeof value === 'string') {
+      const normalized = value.trim().toLowerCase();
+      if (normalized === 'false' || normalized === '0' || normalized === 'off' || normalized === 'no') {
+        return false;
+      }
+
+      if (normalized === 'true' || normalized === '1' || normalized === 'on' || normalized === 'yes') {
+        return true;
+      }
+    }
+
+    return defaultValue;
+  }
+
+  const [getShowTouchText, setShowTouchText] = globalThis.SDPIComponents.useSettings(
+    'showTouchText',
+    (value) => {
+      if (showTouchTextToggle) {
+        showTouchTextToggle.checked = toBoolean(value, true);
+      }
+    }
+  );
+
+  showTouchTextToggle?.addEventListener('change', () => {
+    setShowTouchText(showTouchTextToggle.checked);
+  });
+
   function flattenFunctionsData(groups) {
     const flatten = SCPI?.functionPicker?.flattenFunctionsData;
     if (typeof flatten !== 'function') {
@@ -218,6 +251,11 @@
   });
 
   SCPI?.util?.onDocumentReady?.(() => {
+    if (showTouchTextToggle) {
+      const current = getShowTouchText();
+      showTouchTextToggle.checked = toBoolean(current, true);
+    }
+
     slotStates.forEach((slot) => {
       const savedValue = slot.getValue();
       slot.currentValue = savedValue || '';

PluginCore/manifest.json

@@ -25,7 +25,7 @@
         "Encoder"
       ],
       "Encoder": {
-        "layout": "$B1",
+        "layout": "Layouts/adaptiveDial.json",
         "TriggerDescription": {
           "Rotate": "Execute left or right function",
           "Push": "Execute push function"

Tests/Tests.csproj

@@ -9,12 +9,12 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageReference Include="coverlet.collector" Version="10.0.0">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="8.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="ReportGenerator" Version="5.5.10" />