CI fixes

Author: niels9001

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

@@ -21,9 +21,9 @@ public sealed class ToolkitSampleBoolOptionAttribute : ToolkitSampleOptionBaseAt
     /// <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, bool defaultState)
-        : base(bindingName, null)
+        : base(bindingName, defaultState)
     {
-
+ 
     }
 
     /// <summary>

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

@@ -33,22 +33,22 @@ public ToolkitSampleSliderOptionAttribute(string bindingName, double initial = 0
     /// <summary>
     /// The default start value.
     /// </summary>
-    public double? Initial { get; }
+    public double Initial { get; }
 
     /// <summary>
     /// The minimal value.
     /// </summary>
-    public double? Min { get; }
+    public double Min { get; }
 
     /// <summary>
     /// The maximum value.
     /// </summary>
-    public double? Max { get; }
+    public double Max { get; }
 
     /// <summary>
     /// The step value.
     /// </summary>
-    public double? Step { get; }
+    public double Step { get; }
 
     /// <summary>
     /// The source generator-friendly type name used for casting.

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

@@ -12,7 +12,7 @@ namespace CommunityToolkit.Labs.Core.SourceGenerators.Metadata;
 public class ToolkitSampleSliderOptionMetadataViewModel : IGeneratedToolkitSampleOptionViewModel
 {
     private string? _title;
-    private object? _value;
+    private object _value;
 
     /// <summary>
     /// Creates a new instance of <see cref="ToolkitSampleSliderOptionMetadataViewModel"/>.
@@ -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;

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

@@ -16,18 +16,13 @@
         <local:GeneratedSampleOptionTemplateSelector x:Key="GeneratedSampleOptionTemplateSelector">
             <local:GeneratedSampleOptionTemplateSelector.BoolOptionTemplate>
                 <DataTemplate x:DataType="metadata:ToolkitSampleBoolOptionMetadataViewModel">
-                    <StackPanel>
-                        <TextBlock Text="{x:Bind Title}"
-                                   Visibility="{x:Bind local:GeneratedSampleOptionsRenderer.NullOrWhiteSpaceToVisibility(Title)}" />
-                        <!--<CheckBox Content="{x:Bind Title}"
-                                  IsChecked="{x:Bind BoolValue, Mode=TwoWay}" />-->
-                        <ToggleSwitch IsOn="{x:Bind BoolValue, Mode=TwoWay}" />
-                    </StackPanel>
+                    <ToggleSwitch Header="{x:Bind Title, Mode=OneWay}"
+                                  IsOn="{x:Bind BoolValue, Mode=TwoWay}" />
                 </DataTemplate>
             </local:GeneratedSampleOptionTemplateSelector.BoolOptionTemplate>
             <local:GeneratedSampleOptionTemplateSelector.MultiChoiceOptionTemplate>
                 <DataTemplate x:DataType="metadata:ToolkitSampleMultiChoiceOptionMetadataViewModel">
-                    <ComboBox Header="{x:Bind Title}"
+                    <ComboBox Header="{x:Bind Title, Mode=OneWay}"
                               ItemsSource="{x:Bind Options}"
                               SelectedIndex="0"
                               SelectedItem="{x:Bind Value, Mode=TwoWay}" />
@@ -44,13 +39,21 @@
             </local:GeneratedSampleOptionTemplateSelector.SliderOptionTemplate>
             <local:GeneratedSampleOptionTemplateSelector.TextOptionTemplate>
                 <DataTemplate x:DataType="metadata:ToolkitSampleTextOptionMetadataViewModel">
-                    <TextBox Header="{x:Bind Title}"
+                    <TextBox HorizontalAlignment="Stretch"
+                             Header="{x:Bind Title, Mode=OneWay}"
                              Text="{x:Bind PlaceholderText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </DataTemplate>
             </local:GeneratedSampleOptionTemplateSelector.TextOptionTemplate>
         </local:GeneratedSampleOptionTemplateSelector>
     </UserControl.Resources>
 
     <ItemsControl ItemTemplateSelector="{StaticResource GeneratedSampleOptionTemplateSelector}"
-                  ItemsSource="{x:Bind SampleOptions, Mode=OneWay}" />
+                  ItemsSource="{x:Bind SampleOptions, Mode=OneWay}">
+        <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+                <StackPanel Orientation="Vertical"
+                            Spacing="12" />
+            </ItemsPanelTemplate>
+        </ItemsControl.ItemsPanel>
+    </ItemsControl>
 </UserControl>

labs/SettingsControls/samples/SettingsControls.Samples/ClickableSettingsCardSample.xaml.cs

@@ -2,17 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.ComponentModel;
+
 namespace SettingsControlsExperiment.Samples;
 
+[ToolkitSampleTextOption("TextText", "Placeholder text", Title = "Input the text")]
 [ToolkitSampleBoolOption("IsCardEnabled", true, Title = "Is Enabled")]
-// Single values without a colon are used for both label and value.
-// To provide a different label for the value, separate with a colon surrounded by a single space on both sides ("label : value").
-//[ToolkitSampleMultiChoiceOption("TextSize", title: "Text size", "Small : 12", "Normal : 16", "Big : 32")]
-//[ToolkitSampleMultiChoiceOption("TextFontFamily", title: "Font family", "Segoe UI", "Arial", "Consolas")]
-//[ToolkitSampleMultiChoiceOption("TextForeground", title: "Text foreground",
-//    "Teal       : #0ddc8c",
-//    "Sand       : #e7a676",
-//    "Dull green : #5d7577")]
+[ToolkitSampleSliderOption("TextSize", 50, 1, 200, 10, Title = "FontSize")]
+[ToolkitSampleMultiChoiceOption("FontSelection", "Segoe UI", "Arial", "Consolas", Title = "Select font")]
 
 [ToolkitSample(id: nameof(ClickableSettingsCardSample), "ClickableSettingsCardSample", description: "A sample for showing how SettingsCard can be static or clickable.")]
 public sealed partial class ClickableSettingsCardSample : Page