More Sample Option Attributes

common/CommunityToolkit.Labs.Core.SourceGenerators/Attributes/ToolkitSampleMultiChoiceOptionAttribute.cs

@@ -16,7 +16,7 @@ namespace CommunityToolkit.Labs.Core.SourceGenerators.Attributes;
 public sealed class ToolkitSampleMultiChoiceOptionAttribute : ToolkitSampleOptionBaseAttribute
 {
     /// <summary>
-    /// Creates a new instance of <see cref="ToolkitSampleBoolOptionAttribute"/>.
+    /// Creates a new instance of <see cref="ToolkitSampleMultiChoiceOptionAttribute"/>.
     /// </summary>
     /// <param name="bindingName">The name of the generated property, which you can bind to in XAML.</param>
     /// <param name="choices">A list of the choices to display to the user. Can be literal values, or labeled values. Use a " : " separator (single colon surrounded by at least 1 whitespace) to separate a label from a value.</param>

common/CommunityToolkit.Labs.Core.SourceGenerators/Attributes/ToolkitSampleSliderOptionAttribute.cs

@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace CommunityToolkit.Labs.Core.SourceGenerators.Attributes;
+
+/// <summary>
+/// Represents a boolean sample option.
+/// </summary>
+/// <remarks>
+/// Using this attribute will automatically generate an <see cref="INotifyPropertyChanged"/>-enabled property
+/// that you can bind to in XAML, and displays an options pane alonside your sample which allows the user to manipulate the property.
+/// <para/>
+/// </remarks>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public sealed class ToolkitSampleSliderOptionAttribute : ToolkitSampleOptionBaseAttribute
+{
+    /// <summary>
+    /// Creates a new instance of <see cref="ToolkitSampleSliderOptionAttribute"/>.
+    /// </summary>
+    /// <param name="bindingName">The name of the generated property, which you can bind to in XAML.</param>
+    /// <param name="choices">A list of the choices to display to the user. Can be literal values, or labeled values. Use a " : " separator (single colon surrounded by at least 1 whitespace) to separate a label from a value.</param>
+    /// <param name="title">A title to display on top of this option.</param>
+    public ToolkitSampleSliderOptionAttribute(string bindingName, double initial = 0, double min = 0, double max = 10, double step = 1, string? title = null)
+        : base(bindingName, null, title)
+    {
+        Initial = initial;
+        Min = min;
+        Max = max;
+        Step = step;
+    }
+
+    /// <summary>
+    /// The default start value
+    /// </summary>
+    public double? Initial { get; }
+
+    /// <summary>
+    /// The minimal value
+    /// </summary>
+    public double? Min { get; }
+
+    /// <summary>
+    /// The maximum value
+    /// </summary>
+    public double? Max { get; }
+
+    /// <summary>
+    /// The step value
+    /// </summary>
+    public double? Step { get; }
+
+    /// <summary>
+    /// The source generator-friendly type name used for casting.
+    /// </summary>
+    internal override string TypeName { get; } = "double";
+}

common/CommunityToolkit.Labs.Core.SourceGenerators/Attributes/ToolkitSampleTextOptionAttribute.cs

@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace CommunityToolkit.Labs.Core.SourceGenerators.Attributes;
+
+/// <summary>
+/// Represents a boolean sample option that the user can manipulate and the XAML can bind to.
+/// </summary>
+/// <remarks>
+/// Using this attribute will automatically generate an <see cref="INotifyPropertyChanged"/>-enabled property
+/// that you can bind to in XAML, and displays an options pane alonside your sample which allows the user to manipulate the property.
+/// </remarks>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public sealed class ToolkitSampleTextOptionAttribute : ToolkitSampleOptionBaseAttribute
+{
+    /// <summary>
+    /// Creates a new instance of <see cref="ToolkitSampleTextOptionAttribute"/>.
+    /// </summary>
+    /// <param name="bindingName">The name of the generated property, which you can bind to in XAML.</param>
+    /// <param name="defaultState">The initial value for the bound property.</param>
+    /// <param name="title">A title to display on top of this option.</param>
+    public ToolkitSampleTextOptionAttribute(string bindingName, string placeholderText = null, string? title = null)
+        : base(bindingName, placeholderText, title)
+    {
+        PlaceholderText = placeholderText;
+    }
+
+    /// <summary>
+    /// The source generator-friendly type name used for casting.
+    /// </summary>
+    internal override string TypeName { get; } = "string";
+
+    /// <summary>
+    /// A label to display along the boolean option.
+    /// </summary>
+    public string PlaceholderText { get; }
+}

common/CommunityToolkit.Labs.Core.SourceGenerators/Metadata/ToolkitSampleSliderOptionMetadataViewModel.cs

@@ -0,0 +1,95 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using CommunityToolkit.Labs.Core.SourceGenerators.Attributes;
+
+namespace CommunityToolkit.Labs.Core.SourceGenerators.Metadata;
+
+/// <summary>
+/// An INPC-enabled metadata container for data defined in an <see cref="ToolkitSampleSliderOptionAttribute"/>.
+/// </summary>
+public class ToolkitSampleSliderOptionMetadataViewModel : IGeneratedToolkitSampleOptionViewModel
+{
+    private string? _title;
+    private object? _value;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="ToolkitSampleSliderOptionMetadataViewModel"/>.
+    /// </summary>
+    public ToolkitSampleSliderOptionMetadataViewModel(string name, double initial = 0, double min = 0, double max = 10, double step = 1, string? title = null)
+    {
+        Name = name;
+        _title = title;
+        _value = initial;
+        Max = max;
+        Min = min;
+        Step = step;;
+    }
+
+    /// <inheritdoc cref="INotifyPropertyChanged.PropertyChanged"/>
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    /// <summary>
+    /// A unique identifier for this option.
+    /// </summary>
+    /// <remarks>
+    /// Used by the sample system to match up <see cref="ToolkitSampleSliderOptionMetadataViewModel"/> to the original <see cref="ToolkitSampleSliderOptionAttribute"/> and the control that declared it.
+    /// </remarks>
+    public string Name { get; }
+
+    /// <summary>
+    /// The available options presented to the user.
+    /// </summary>
+    /// <summary>
+    /// The initial double value.
+    /// </summary>
+    public double Initial
+    {
+        get => (double)_value;
+        set
+        {
+            _value = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(Name));
+        }
+    }
+
+    /// <inheritdoc/>
+    public object? Value
+    {
+        get => Initial;
+        set
+        {
+            Initial = (double)(value ?? 0.0);
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(Name));
+        }
+    }
+
+    /// <summary>
+    /// The Minimum value of the slider.
+    /// </summary>
+    public double Min { get; }
+
+    /// <summary>
+    /// The Maximum value of the slider.
+    /// </summary>
+    public double Max { get; }
+
+    /// <summary>
+    /// The StepFrequency value of the slider.
+    /// </summary>
+    public double Step { get; }
+
+    /// <summary>
+    /// A label to display along the slider.
+    /// </summary>
+    public string? Title
+    {
+        get => _title;
+        set
+        {
+            _title = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Title)));
+        }
+    }
+}

common/CommunityToolkit.Labs.Core.SourceGenerators/Metadata/ToolkitSampleTextOptionMetadataViewModel.cs

@@ -0,0 +1,81 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using CommunityToolkit.Labs.Core.SourceGenerators.Attributes;
+
+namespace CommunityToolkit.Labs.Core.SourceGenerators.Metadata;
+
+/// <summary>
+/// An INPC-enabled metadata container for data defined in an <see cref="ToolkitSampleTextOptionAttribute"/>.
+/// </summary>
+/// <remarks>
+/// Instances of these are generated by the <see cref="ToolkitSampleMetadataGenerator"/> and
+/// provided to the app alongside the sample registration.
+/// </remarks>
+public class ToolkitSampleTextOptionMetadataViewModel : IGeneratedToolkitSampleOptionViewModel
+{
+    private string? _title;
+    private object _value;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="ToolkitSampleTextOptionAttribute"/>.
+    /// </summary>
+    public ToolkitSampleTextOptionMetadataViewModel(string id, string placeholderText = null, string? title = null)
+    {
+        Name = id;
+        _title = title;
+        _value = placeholderText;
+    }
+
+    /// <inheritdoc cref="INotifyPropertyChanged.PropertyChanged"/>
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    /// <summary>
+    /// A unique identifier for this option.
+    /// </summary>
+    /// <remarks>
+    /// Used by the sample system to match up <see cref="ToolkitSampleTextOptionMetadataViewModel"/> to the original <see cref="ToolkitSampleTextOptionAttribute"/> and the control that declared it.
+    /// </remarks>
+    public string Name { get; }
+
+    /// <summary>
+    /// The current boolean value.
+    /// </summary>
+    /// <remarks>
+    /// Provided to accomodate binding to a property that is a non-nullable <see cref="bool"/>.
+    /// </remarks>
+    public string PlaceholderText
+    {
+        get => (string)_value;
+        set
+        {
+            _value = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(Name));
+        }
+    }
+
+    /// <inheritdoc/>
+    public object? Value
+    {
+        get => PlaceholderText;
+        set
+        {
+            PlaceholderText = (string)(value ?? string.Empty);
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(Name));
+        }
+    }
+
+    /// <summary>
+    /// A title to display on top of the boolean option.
+    /// </summary>
+    public string? Title
+    {
+        get => _title;
+        set
+        {
+            _title = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Title)));
+        }
+    }
+}

common/CommunityToolkit.Labs.Core.SourceGenerators/ToolkitSampleMetadataGenerator.Sample.cs

@@ -64,6 +64,12 @@ void Execute(IncrementalValuesProvider<ISymbol> types, bool skipDiagnostics = fa
                     if (x.Item2.TryReconstructAs<ToolkitSampleMultiChoiceOptionAttribute>() is ToolkitSampleMultiChoiceOptionAttribute multiChoiceOptionAttribute)
                         return (x.Item1, (ToolkitSampleOptionBaseAttribute)multiChoiceOptionAttribute);
 
+                    if (x.Item2.TryReconstructAs<ToolkitSampleSliderOptionAttribute>() is ToolkitSampleSliderOptionAttribute sliderOptionAttribute)
+                        return (x.Item1, (ToolkitSampleSliderOptionAttribute)sliderOptionAttribute);
+
+                    if (x.Item2.TryReconstructAs<ToolkitSampleTextOptionAttribute>() is ToolkitSampleTextOptionAttribute textOptionAttribute)
+                        return (x.Item1, (ToolkitSampleOptionBaseAttribute)textOptionAttribute);
+
                     return default;
                 })
                 .Where(static x => x != default)
@@ -287,6 +293,14 @@ private static IEnumerable<string> BuildNewGeneratedSampleOptionMetadataSource(T
             {
                 yield return $@"new {typeof(ToolkitSampleBoolOptionMetadataViewModel).FullName}(id: ""{boolAttribute.Name}"", label: ""{boolAttribute.Label}"", defaultState: {boolAttribute.DefaultState?.ToString().ToLower()}, title: ""{boolAttribute.Title}"")";
             }
+            else if (item is ToolkitSampleSliderOptionAttribute sliderAttribute)
+            {
+                yield return $@"new {typeof(ToolkitSampleSliderOptionMetadataViewModel).FullName}(name: ""{sliderAttribute.Name}"", initial: {sliderAttribute.Initial}, min: {sliderAttribute.Min}, max: {sliderAttribute.Max}, step: {sliderAttribute.Step}, title: ""{sliderAttribute.Title}"")";
+            }
+            else if (item is ToolkitSampleTextOptionAttribute textAttribute)
+            {
+                yield return $@"new {typeof(ToolkitSampleTextOptionMetadataViewModel).FullName}(id: ""{textAttribute.Name}"", placeholderText: ""{textAttribute.PlaceholderText}"", title: ""{textAttribute.Title}"")";
+            }
             else
             {
                 throw new NotSupportedException($"Unsupported or unhandled type {item.GetType()}.");

common/CommunityToolkit.Labs.Core.SourceGenerators/ToolkitSampleOptionGenerator.cs

@@ -41,6 +41,12 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                 if (x.Item2.TryReconstructAs<ToolkitSampleMultiChoiceOptionAttribute>() is ToolkitSampleMultiChoiceOptionAttribute multiChoiceOptionAttribute)
                     return (Attribute: (ToolkitSampleOptionBaseAttribute)multiChoiceOptionAttribute, ContainingClassSymbol: x.Item1, Type: typeof(ToolkitSampleMultiChoiceOptionMetadataViewModel));
 
+                if(x.Item2.TryReconstructAs<ToolkitSampleSliderOptionAttribute>() is ToolkitSampleSliderOptionAttribute sliderOptionAttribute)
+                    return (Attribute: (ToolkitSampleOptionBaseAttribute)sliderOptionAttribute, ContainingClassSymbol: x.Item1, Type: typeof(ToolkitSampleSliderOptionMetadataViewModel));
+
+                if (x.Item2.TryReconstructAs<ToolkitSampleTextOptionAttribute>() is ToolkitSampleTextOptionAttribute textOptionAttribute)
+                    return (Attribute: (ToolkitSampleOptionBaseAttribute)textOptionAttribute, ContainingClassSymbol: x.Item1, Type: typeof(ToolkitSampleTextOptionMetadataViewModel));
+
                 return default;
             })
             .Where(x => x != default);

common/CommunityToolkit.Labs.Shared/Renderers/GeneratedSampleOptionTemplateSelector.cs

@@ -15,12 +15,18 @@ internal class GeneratedSampleOptionTemplateSelector : DataTemplateSelector
 
     public DataTemplate? MultiChoiceOptionTemplate { get; set; }
 
+    public DataTemplate? SliderOptionTemplate { get; set; }
+
+    public DataTemplate? TextOptionTemplate { get; set; }
+
     protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
     {
         return item switch
         {
             ToolkitSampleBoolOptionMetadataViewModel => BoolOptionTemplate ?? base.SelectTemplateCore(item, container),
             ToolkitSampleMultiChoiceOptionMetadataViewModel => MultiChoiceOptionTemplate ?? base.SelectTemplateCore(item, container),
+            ToolkitSampleSliderOptionMetadataViewModel => SliderOptionTemplate ?? base.SelectTemplateCore(item, container),
+            ToolkitSampleTextOptionMetadataViewModel => TextOptionTemplate ?? base.SelectTemplateCore(item, container),
             _ => base.SelectTemplateCore(item, container),
         };
     }

common/CommunityToolkit.Labs.Shared/Renderers/GeneratedSampleOptionsRenderer.xaml

@@ -26,15 +26,27 @@
             </local:GeneratedSampleOptionTemplateSelector.BoolOptionTemplate>
             <local:GeneratedSampleOptionTemplateSelector.MultiChoiceOptionTemplate>
                 <DataTemplate x:DataType="metadata:ToolkitSampleMultiChoiceOptionMetadataViewModel">
-                    <StackPanel>
-                        <TextBlock Text="{x:Bind Title}"
-                                   Visibility="{x:Bind local:GeneratedSampleOptionsRenderer.NullOrWhiteSpaceToVisibility(Title)}" />
-                        <muxc:RadioButtons ItemsSource="{x:Bind Options}"
-                                           SelectedIndex="0"
-                                           SelectedItem="{x:Bind Value, Mode=TwoWay}" />
-                    </StackPanel>
+                    <ComboBox Header="{x:Bind Title}"
+                              ItemsSource="{x:Bind Options}"
+                              SelectedIndex="0"
+                              SelectedItem="{x:Bind Value, Mode=TwoWay}" />
                 </DataTemplate>
             </local:GeneratedSampleOptionTemplateSelector.MultiChoiceOptionTemplate>
+            <local:GeneratedSampleOptionTemplateSelector.SliderOptionTemplate>
+                <DataTemplate x:DataType="metadata:ToolkitSampleSliderOptionMetadataViewModel">
+                    <Slider Header="{x:Bind Title}"
+                            Maximum="{x:Bind Max, Mode=OneWay}"
+                            Minimum="{x:Bind Min, Mode=OneWay}"
+                            StepFrequency="{x:Bind Step, Mode=OneWay}"
+                            Value="{x:Bind Initial, Mode=TwoWay}" />
+                </DataTemplate>
+            </local:GeneratedSampleOptionTemplateSelector.SliderOptionTemplate>
+            <local:GeneratedSampleOptionTemplateSelector.TextOptionTemplate>
+                <DataTemplate x:DataType="metadata:ToolkitSampleTextOptionMetadataViewModel">
+                    <TextBox Header="{x:Bind Title}"
+                             Text="{x:Bind PlaceholderText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                </DataTemplate>
+            </local:GeneratedSampleOptionTemplateSelector.TextOptionTemplate>
         </local:GeneratedSampleOptionTemplateSelector>
     </UserControl.Resources>