Adress feedback

Author: niels9001

CommunityToolkit.Labs.Core.SourceGenerators/Attributes/ToolkitSampleBoolOptionAttribute.cs

@@ -20,19 +20,14 @@ public sealed class ToolkitSampleBoolOptionAttribute : ToolkitSampleOptionBaseAt
     /// <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 ToolkitSampleBoolOptionAttribute(string bindingName, string label, bool defaultState, string? title = null)
-        : base(bindingName, defaultState, title)
+    public ToolkitSampleBoolOptionAttribute(string bindingName, bool defaultState)
+        : base(bindingName, null)
     {
-        Label = label;
+
     }
 
     /// <summary>
     /// The source generator-friendly type name used for casting.
     /// </summary>
     internal override string TypeName { get; } = "bool";
-
-    /// <summary>
-    /// A label to display along the boolean option.
-    /// </summary>
-    public string Label { get; }
 }

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

@@ -21,8 +21,8 @@ public sealed class ToolkitSampleMultiChoiceOptionAttribute : ToolkitSampleOptio
     /// <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 ToolkitSampleMultiChoiceOptionAttribute(string bindingName, string? title = null, params string[] choices)
-        : base(bindingName, null, title)
+    public ToolkitSampleMultiChoiceOptionAttribute(string bindingName, params string[] choices)
+        : base(bindingName, null)
     {
         Choices = choices.Select(x =>
         {

CommunityToolkit.Labs.Core.SourceGenerators/Attributes/ToolkitSampleOptionBaseAttribute.cs

@@ -15,9 +15,8 @@ public abstract class ToolkitSampleOptionBaseAttribute : Attribute
     /// <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 ToolkitSampleOptionBaseAttribute(string bindingName, object? defaultState, string? title = null)
+    public ToolkitSampleOptionBaseAttribute(string bindingName, object? defaultState)
     {
-        Title = title;
         Name = bindingName;
         DefaultState = defaultState;
     }
@@ -35,7 +34,7 @@ public ToolkitSampleOptionBaseAttribute(string bindingName, object? defaultState
     /// <summary>
     /// A title to display on top of the option.
     /// </summary>
-    public string? Title { get; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// The source generator-friendly type name used for casting.

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

@@ -21,8 +21,8 @@ public sealed class ToolkitSampleSliderOptionAttribute : ToolkitSampleOptionBase
     /// <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)
+    public ToolkitSampleSliderOptionAttribute(string bindingName, double initial = 0, double min = 0, double max = 10, double step = 1)
+        : base(bindingName, null)
     {
         Initial = initial;
         Min = min;

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

@@ -20,8 +20,8 @@ public sealed class ToolkitSampleTextOptionAttribute : ToolkitSampleOptionBaseAt
     /// <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)
+    public ToolkitSampleTextOptionAttribute(string bindingName, string? placeholderText = null)
+        : base(bindingName, placeholderText)
     {
         PlaceholderText = placeholderText;
     }
@@ -34,5 +34,5 @@ public ToolkitSampleTextOptionAttribute(string bindingName, string placeholderTe
     /// <summary>
     /// A label to display along the boolean option.
     /// </summary>
-    public string PlaceholderText { get; }
+    public string? PlaceholderText { get; }
 }

CommunityToolkit.Labs.Core.SourceGenerators/Metadata/ToolkitSampleBoolOptionMetadataViewModel.cs

@@ -15,18 +15,16 @@ namespace CommunityToolkit.Labs.Core.SourceGenerators.Metadata;
 /// </remarks>
 public class ToolkitSampleBoolOptionMetadataViewModel : IGeneratedToolkitSampleOptionViewModel
 {
-    private string _label;
     private string? _title;
     private object _value;
 
     /// <summary>
     /// Creates a new instance of <see cref="ToolkitSampleBoolOptionAttribute"/>.
     /// </summary>
-    public ToolkitSampleBoolOptionMetadataViewModel(string id, string label, bool defaultState, string? title = null)
+    public ToolkitSampleBoolOptionMetadataViewModel(string id, bool defaultState, string? title = null)
     {
         Name = id;
         _title = title;
-        _label = label;
         _value = defaultState;
     }
 
@@ -68,19 +66,6 @@ public object? Value
         }
     }
 
-    /// <summary>
-    /// A label to display along the boolean option.
-    /// </summary>
-    public string Label
-    {
-        get => _label;
-        set
-        {
-            _label = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Label)));
-        }
-    }
-
     /// <summary>
     /// A title to display on top of the boolean option.
     /// </summary>

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

@@ -44,9 +44,9 @@ public ToolkitSampleSliderOptionMetadataViewModel(string name, double initial =
     /// <summary>
     /// The initial double value.
     /// </summary>
-    public double Initial
+    public double? Initial
     {
-        get => (double)_value;
+        get => (double?)_value;
         set
         {
             _value = value;

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

@@ -291,7 +291,7 @@ private static IEnumerable<string> BuildNewGeneratedSampleOptionMetadataSource(T
             }
             else if (item is ToolkitSampleBoolOptionAttribute boolAttribute)
             {
-                yield return $@"new {typeof(ToolkitSampleBoolOptionMetadataViewModel).FullName}(id: ""{boolAttribute.Name}"", label: ""{boolAttribute.Label}"", defaultState: {boolAttribute.DefaultState?.ToString().ToLower()}, title: ""{boolAttribute.Title}"")";
+                yield return $@"new {typeof(ToolkitSampleBoolOptionMetadataViewModel).FullName}(id: ""{boolAttribute.Name}"", defaultState: {boolAttribute.DefaultState?.ToString().ToLower()}, title: ""{boolAttribute.Title}"")";
             }
             else if (item is ToolkitSampleSliderOptionAttribute sliderAttribute)
             {

CommunityToolkit.Labs.Shared/Renderers/GeneratedSampleOptionsRenderer.xaml

@@ -19,8 +19,9 @@
                     <StackPanel>
                         <TextBlock Text="{x:Bind Title}"
                                    Visibility="{x:Bind local:GeneratedSampleOptionsRenderer.NullOrWhiteSpaceToVisibility(Title)}" />
-                        <CheckBox Content="{x:Bind Label}"
-                                  IsChecked="{x:Bind BoolValue, Mode=TwoWay}" />
+                        <!--<CheckBox Content="{x:Bind Title}"
+                                  IsChecked="{x:Bind BoolValue, Mode=TwoWay}" />-->
+                        <ToggleSwitch IsOn="{x:Bind BoolValue, Mode=TwoWay}" />
                     </StackPanel>
                 </DataTemplate>
             </local:GeneratedSampleOptionTemplateSelector.BoolOptionTemplate>