From 72f24689d8c07541c7c0a0e919ddd9e9042c2485 Mon Sep 17 00:00:00 2001
From: Steven Moyes <stmoy@microsoft.com>
Date: Fri, 10 Jul 2020 17:45:14 -0700
Subject: [PATCH 1/6] Clarify the distinction between RadioButton and
 RadioButtons by moving RadioButtons into the Layouts section and clarify
 wording

---
 .../DataModel/ControlInfoData.json            | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/XamlControlsGallery/DataModel/ControlInfoData.json b/XamlControlsGallery/DataModel/ControlInfoData.json
index b7d208b7b..21b1889f9 100644
--- a/XamlControlsGallery/DataModel/ControlInfoData.json
+++ b/XamlControlsGallery/DataModel/ControlInfoData.json
@@ -898,8 +898,7 @@
           "ImagePath": "ms-appx:///Assets/RadioButton.png",
           "Description": "Use RadioButtons to let a user choose between mutually exclusive, related options.",
           "Content": "<p>Look at the <i>RadioButtonPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
-          "IsNew": false,
-          "IsPreview": true,
+          "IsUpdated": true,
           "Docs": [
             {
               "Title": "RadioButton - API",
@@ -917,32 +916,6 @@
             "ToggleButton"
           ]
         },
-        {
-          "UniqueId": "RadioButtons",
-          "Title": "RadioButtons",
-          "Subtitle": "A control that allows a user to select a single option from a group of options. The RadioButtons control makes the available options mutually exclusive",
-          "ImagePath": "ms-appx:///Assets/RadioButton.png",
-          "Description": "Use RadioButtons to let a user choose between mutually exclusive, related options.",
-          "Content": "<p>Look at the <i>RadioButtonsPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
-          "IsNew": false,
-          "IsPreview": true,
-          "Docs": [
-            {
-              "Title": "RadioButtons - API",
-              "Uri": "https://docs.microsoft.com/uwp/api/microsoft.ui.xaml.controls.radiobuttons?view=winui-2.4"
-            },
-            {
-              "Title": "Guidelines",
-              "Uri": "https://docs.microsoft.com/windows/uwp/design/controls-and-patterns/radio-button"
-            }
-          ],
-          "RelatedControls": [
-            "CheckBox",
-            "RadioButton",
-            "ToggleSwitch",
-            "ToggleButton"
-          ]
-        },
         {
           "UniqueId": "RatingControl",
           "Title": "RatingControl",
@@ -1376,6 +1349,31 @@
             "VariableSizedWrapGrid",
             "RelativePanel"
           ]
+        },
+                {
+          "UniqueId": "RadioButtons",
+          "Title": "RadioButtons",
+          "Subtitle": "A control that displays a group of related RadioButton controls.",
+          "ImagePath": "ms-appx:///Assets/RadioButton.png",
+          "Description": "A control that displays a group of related RadioButton controls.",
+          "Content": "<p>Look at the <i>RadioButtonsPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
+          "IsNew": true,
+          "Docs": [
+            {
+              "Title": "RadioButtons - API",
+              "Uri": "https://docs.microsoft.com/uwp/api/microsoft.ui.xaml.controls.radiobuttons?view=winui-2.4"
+            },
+            {
+              "Title": "Guidelines",
+              "Uri": "https://docs.microsoft.com/windows/uwp/design/controls-and-patterns/radio-button"
+            }
+          ],
+          "RelatedControls": [
+            "CheckBox",
+            "RadioButton",
+            "ToggleSwitch",
+            "ToggleButton"
+          ]
         },
         {
           "UniqueId": "RelativePanel",

From fd662906c04461ef23a364a2deedf031216db791 Mon Sep 17 00:00:00 2001
From: Steven Moyes <stmoy@microsoft.com>
Date: Fri, 10 Jul 2020 17:52:31 -0700
Subject: [PATCH 2/6] Remove unnecessary RelativePanel, update wording in json
 file

---
 XamlControlsGallery/ControlPages/RadioButtonPage.xaml  | 6 ++----
 XamlControlsGallery/ControlPages/RadioButtonsPage.xaml | 4 ++--
 XamlControlsGallery/DataModel/ControlInfoData.json     | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
index 8d7269f29..1bc6614b9 100644
--- a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
+++ b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
@@ -13,9 +13,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:AppUIBasics"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
-    <RelativePanel HorizontalAlignment="Left">
+    <StackPanel>
         <local:ControlExample x:Name="Example1"
                 HeaderText="A group of radio buttons implicitly grouped by their parent container.">
             <Grid>
@@ -44,6 +43,5 @@
                 </x:String>
             </local:ControlExample.Xaml>
         </local:ControlExample>
-
-    </RelativePanel>
+    </StackPanel>
 </Page>
diff --git a/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml b/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml
index 0381b0ebe..d13b1eee0 100644
--- a/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml
+++ b/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml
@@ -19,7 +19,7 @@
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <RelativePanel HorizontalAlignment="Left">
+    <StackPanel>
         <local:ControlExample HeaderText="Two RadioButtons controls with strings as options.">
             <StackPanel>
                 <muxc:RadioButtons MaxColumns="4" Header="Background" SelectedIndex="1" SelectionChanged="BackgroundColor_SelectionChanged">
@@ -52,5 +52,5 @@
                 </x:String>
             </local:ControlExample.Xaml>
         </local:ControlExample>
-    </RelativePanel>
+    </StackPanel>
 </Page>
diff --git a/XamlControlsGallery/DataModel/ControlInfoData.json b/XamlControlsGallery/DataModel/ControlInfoData.json
index 21b1889f9..a022890f0 100644
--- a/XamlControlsGallery/DataModel/ControlInfoData.json
+++ b/XamlControlsGallery/DataModel/ControlInfoData.json
@@ -894,9 +894,9 @@
         {
           "UniqueId": "RadioButton",
           "Title": "RadioButton",
-          "Subtitle": "A control that allows a user to select a single option from a group of options. When radio buttons are grouped together they are mutually exclusive.",
+          "Subtitle": "A control that allows a user to select a single option from a group of options.",
           "ImagePath": "ms-appx:///Assets/RadioButton.png",
-          "Description": "Use RadioButtons to let a user choose between mutually exclusive, related options.",
+          "Description": "Use RadioButtons to let a user choose between mutually exclusive, related options. Generally contained within a RadioButtons group control.",
           "Content": "<p>Look at the <i>RadioButtonPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsUpdated": true,
           "Docs": [
@@ -1353,9 +1353,9 @@
                 {
           "UniqueId": "RadioButtons",
           "Title": "RadioButtons",
-          "Subtitle": "A control that displays a group of related RadioButton controls.",
+          "Subtitle": "A control that displays a group of related RadioButton controls with keyboarding and accessibility support.",
           "ImagePath": "ms-appx:///Assets/RadioButton.png",
-          "Description": "A control that displays a group of related RadioButton controls.",
+          "Description": "A control that displays a group of related RadioButton controls with keyboarding and accessibility support.",
           "Content": "<p>Look at the <i>RadioButtonsPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsNew": true,
           "Docs": [

From c689e3064ba7bcc948d6b6821161d254a2aac9de Mon Sep 17 00:00:00 2001
From: Steven Moyes <stmoy@microsoft.com>
Date: Fri, 10 Jul 2020 18:00:07 -0700
Subject: [PATCH 3/6] Clean up RadioButton sample.

---
 .../ControlPages/RadioButtonPage.xaml         | 38 ++++++++-----------
 .../ControlPages/RadioButtonPage.xaml.cs      | 14 +------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
index 1bc6614b9..ad0e4053c 100644
--- a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
+++ b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
@@ -13,33 +13,25 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:AppUIBasics"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
     <StackPanel>
-        <local:ControlExample x:Name="Example1"
-                HeaderText="A group of radio buttons implicitly grouped by their parent container.">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <StackPanel>
-                    <!-- A RadioButton group. -->
-                    <TextBlock Text="Options:"/>
-                    <RadioButton x:Name="Option1RadioButton" Content="Option 1" Checked="Option1RadioButton_Checked" />
-                    <RadioButton x:Name="Option2RadioButton" Content="Option 2" Checked="Option2RadioButton_Checked" />
-                    <RadioButton x:Name="Option3RadioButton" Content="Option 3" Checked="Option3RadioButton_Checked" />
-                </StackPanel>
-                <TextBlock x:Name="Control1Output" Text="Select an option." Style="{ThemeResource BodyTextBlockStyle}"
-                        VerticalAlignment="Center" Grid.Column="1" Margin="8,0"/>
-            </Grid>
+        <local:ControlExample HeaderText="A group of RadioButton controls in a RadioButtons group.">
+            <StackPanel>
+                <muxc:RadioButtons Header="Options:">
+                    <RadioButton Content="Option 1" Checked="RadioButton_Checked" />
+                    <RadioButton Content="Option 2" Checked="RadioButton_Checked" />
+                    <RadioButton Content="Option 3" Checked="RadioButton_Checked" />
+                </muxc:RadioButtons>
+                <TextBlock x:Name="Control1Output" Text="Select an option." Style="{ThemeResource BodyTextBlockStyle}" Margin="0,8" />
+            </StackPanel>
             <local:ControlExample.Xaml>
                 <x:String xml:space="preserve">
-&lt;StackPanel&gt;
-    &lt;TextBlock Text="Options:"/&gt;
-    &lt;RadioButton x:Name="Option1RadioButton" Content="Option 1" Checked="Option1RadioButton_Checked"/&gt;
-    &lt;RadioButton x:Name="Option2RadioButton" Content="Option 2" Checked="Option2RadioButton_Checked"/&gt;
-    &lt;RadioButton x:Name="Option3RadioButton" Content="Option 3" Checked="Option3RadioButton_Checked"/&gt;
-&lt;/StackPanel&gt;
+&lt;muxc:RadioButtons&gt;
+    &lt;RadioButton Content="Option 1" Checked="RadioButton_Checked"/&gt;
+    &lt;RadioButton Content="Option 2" Checked="RadioButton_Checked"/&gt;
+    &lt;RadioButton Content="Option 3" Checked="RadioButton_Checked"/&gt;
+&lt;/muxc:RadioButtons&gt;
                 </x:String>
             </local:ControlExample.Xaml>
         </local:ControlExample>
diff --git a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml.cs b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml.cs
index 99b10cc31..caf7cadad 100644
--- a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml.cs
+++ b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml.cs
@@ -21,19 +21,9 @@ public RadioButtonPage()
             this.InitializeComponent();
         }
 
-        private void Option1RadioButton_Checked(object sender, RoutedEventArgs e)
+        private void RadioButton_Checked(object sender, RoutedEventArgs e)
         {
-            Control1Output.Text = "You selected option 1.";
-        }
-
-        private void Option2RadioButton_Checked(object sender, RoutedEventArgs e)
-        {
-            Control1Output.Text = "You selected option 2.";
-        }
-
-        private void Option3RadioButton_Checked(object sender, RoutedEventArgs e)
-        {
-            Control1Output.Text = "You selected option 3.";
+            Control1Output.Text = string.Format("You selected {0}", (sender as RadioButton).Content.ToString());
         }
     }
 }

From dd377ba51335ef6ea814fe9b9220d7b6d812f783 Mon Sep 17 00:00:00 2001
From: Steven Moyes <stmoy@microsoft.com>
Date: Fri, 10 Jul 2020 18:25:08 -0700
Subject: [PATCH 4/6] Adding RadioButtons icon to differentiate from
 RadioButton

---
 XamlControlsGallery/Assets/RadioButtons.png      | Bin 0 -> 2071 bytes
 .../DataModel/ControlInfoData.json               |   2 +-
 XamlControlsGallery/XamlControlsGallery.csproj   |   1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 XamlControlsGallery/Assets/RadioButtons.png

diff --git a/XamlControlsGallery/Assets/RadioButtons.png b/XamlControlsGallery/Assets/RadioButtons.png
new file mode 100644
index 0000000000000000000000000000000000000000..c228311446c0572e9abe0bf23279f029968fd47e
GIT binary patch
literal 2071
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

literal 0
HcmV?d00001

diff --git a/XamlControlsGallery/DataModel/ControlInfoData.json b/XamlControlsGallery/DataModel/ControlInfoData.json
index a022890f0..a7f3b2e5a 100644
--- a/XamlControlsGallery/DataModel/ControlInfoData.json
+++ b/XamlControlsGallery/DataModel/ControlInfoData.json
@@ -1354,7 +1354,7 @@
           "UniqueId": "RadioButtons",
           "Title": "RadioButtons",
           "Subtitle": "A control that displays a group of related RadioButton controls with keyboarding and accessibility support.",
-          "ImagePath": "ms-appx:///Assets/RadioButton.png",
+          "ImagePath": "ms-appx:///Assets/RadioButtons.png",
           "Description": "A control that displays a group of related RadioButton controls with keyboarding and accessibility support.",
           "Content": "<p>Look at the <i>RadioButtonsPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsNew": true,
diff --git a/XamlControlsGallery/XamlControlsGallery.csproj b/XamlControlsGallery/XamlControlsGallery.csproj
index bf9c9b0ac..9e2a6558f 100644
--- a/XamlControlsGallery/XamlControlsGallery.csproj
+++ b/XamlControlsGallery/XamlControlsGallery.csproj
@@ -110,6 +110,7 @@
     </Content>
     <Content Include="Assets\LottieLogo1.png" />
     <Content Include="Assets\NumberBox.png" />
+    <Content Include="Assets\RadioButtons.png" />
     <Content Include="Assets\SampleMedia\cliff.jpg" />
     <Content Include="Assets\SampleMedia\fishes.wmv" />
     <Content Include="Assets\SampleMedia\grapes.jpg" />

From 75cc1f243cefc328b79cd0b829bde5e9d9abddce Mon Sep 17 00:00:00 2001
From: Steven Moyes <stmoy@microsoft.com>
Date: Fri, 10 Jul 2020 21:12:50 -0700
Subject: [PATCH 5/6] Add sample code substitution for SelectedIndex on
 RadioButtons page.

---
 .../ControlPages/RadioButtonsPage.xaml        | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml b/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml
index d13b1eee0..65c3ab188 100644
--- a/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml
+++ b/XamlControlsGallery/ControlPages/RadioButtonsPage.xaml
@@ -22,12 +22,12 @@
     <StackPanel>
         <local:ControlExample HeaderText="Two RadioButtons controls with strings as options.">
             <StackPanel>
-                <muxc:RadioButtons MaxColumns="4" Header="Background" SelectedIndex="1" SelectionChanged="BackgroundColor_SelectionChanged">
+                <muxc:RadioButtons x:Name="BackgroundRadioButtons" MaxColumns="3" Header="Background" SelectedIndex="0" SelectionChanged="BackgroundColor_SelectionChanged">
                     <x:String>Green</x:String>
                     <x:String>Yellow</x:String>
                     <x:String>White</x:String>
                 </muxc:RadioButtons>
-                <muxc:RadioButtons MaxColumns="4" Header="Border" SelectedIndex="2" SelectionChanged="BorderBrush_SelectionChanged">
+                <muxc:RadioButtons x:Name="BorderRadioButtons" MaxColumns="3" Header="Border" SelectedIndex="1" SelectionChanged="BorderBrush_SelectionChanged">
                     <x:String>Green</x:String>
                     <x:String>Yellow</x:String>
                     <x:String>White</x:String>
@@ -37,20 +37,22 @@
             </StackPanel>
             <local:ControlExample.Xaml>
                 <x:String xml:space="preserve">
-&lt;StackPanel&gt;
-    &lt;muxc:RadioButtons MaxColumns="4" Header="Background" SelectedIndex="1" SelectionChanged="BackgroundColor_SelectionChanged"&gt;
-        &lt;x:String&gt;Green&lt;/x:String&gt;
-        &lt;x:String&gt;Yellow&lt;/x:String&gt;
-        &lt;x:String&gt;White&lt;/x:String&gt;
-    &lt;/muxc:RadioButtons&gt;
-    &lt;muxc:RadioButtons MaxColumns="4" Header="Border" SelectedIndex="2" SelectionChanged="BorderBrush_SelectionChanged"&gt;
-        &lt;x:String&gt;Green&lt;/x:String&gt;
-        &lt;x:String&gt;Yellow&lt;/x:String&gt;
-        &lt;x:String&gt;White&lt;/x:String&gt;
-    &lt;/muxc:RadioButtons&gt;
-&lt;/StackPanel&gt;
+&lt;muxc:RadioButtons x:Name="BackgroundRadioButtons" SelectedIndex="$(BackgroundRadioButtonsSubstitution)"  MaxColumns="3" Header="Background" SelectionChanged="BackgroundColor_SelectionChanged"&gt;
+    &lt;x:String&gt;Green&lt;/x:String&gt;
+    &lt;x:String&gt;Yellow&lt;/x:String&gt;
+    &lt;x:String&gt;White&lt;/x:String&gt;
+&lt;/muxc:RadioButtons&gt;
+&lt;muxc:RadioButtons x:Name="BorderRadioButtons" SelectedIndex="$(BorderRadioButtonsSubstitution)" MaxColumns="3" Header="Border" SelectionChanged="BorderBrush_SelectionChanged"&gt;
+    &lt;x:String&gt;Green&lt;/x:String&gt;
+    &lt;x:String&gt;Yellow&lt;/x:String&gt;
+    &lt;x:String&gt;White&lt;/x:String&gt;
+&lt;/muxc:RadioButtons&gt;
                 </x:String>
             </local:ControlExample.Xaml>
+            <local:ControlExample.Substitutions>
+                <local:ControlExampleSubstitution Key="BackgroundRadioButtonsSubstitution" Value="{x:Bind BackgroundRadioButtons.SelectedIndex, Mode=OneWay}" />
+                <local:ControlExampleSubstitution Key="BorderRadioButtonsSubstitution" Value="{x:Bind BorderRadioButtons.SelectedIndex, Mode=OneWay}" />
+            </local:ControlExample.Substitutions>
         </local:ControlExample>
     </StackPanel>
 </Page>

From f959ec1a7ae942f2301826bd2851cad410ae6ebb Mon Sep 17 00:00:00 2001
From: Steven Moyes <stmoy@microsoft.com>
Date: Mon, 13 Jul 2020 16:51:25 -0700
Subject: [PATCH 6/6] Responding to PR feedback

---
 XamlControlsGallery/ControlPages/RadioButtonPage.xaml | 2 +-
 XamlControlsGallery/DataModel/ControlInfoData.json    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
index ad0e4053c..9630f56c3 100644
--- a/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
+++ b/XamlControlsGallery/ControlPages/RadioButtonPage.xaml
@@ -27,7 +27,7 @@
             </StackPanel>
             <local:ControlExample.Xaml>
                 <x:String xml:space="preserve">
-&lt;muxc:RadioButtons&gt;
+&lt;muxc:RadioButtons Header="Options:"&gt;
     &lt;RadioButton Content="Option 1" Checked="RadioButton_Checked"/&gt;
     &lt;RadioButton Content="Option 2" Checked="RadioButton_Checked"/&gt;
     &lt;RadioButton Content="Option 3" Checked="RadioButton_Checked"/&gt;
diff --git a/XamlControlsGallery/DataModel/ControlInfoData.json b/XamlControlsGallery/DataModel/ControlInfoData.json
index a7f3b2e5a..523017533 100644
--- a/XamlControlsGallery/DataModel/ControlInfoData.json
+++ b/XamlControlsGallery/DataModel/ControlInfoData.json
@@ -1353,9 +1353,9 @@
                 {
           "UniqueId": "RadioButtons",
           "Title": "RadioButtons",
-          "Subtitle": "A control that displays a group of related RadioButton controls with keyboarding and accessibility support.",
+          "Subtitle": "A control that displays a group of mutually exclusive options with keyboarding and accessibility support.",
           "ImagePath": "ms-appx:///Assets/RadioButtons.png",
-          "Description": "A control that displays a group of related RadioButton controls with keyboarding and accessibility support.",
+          "Description": "A control that displays a group of mutually exclusive options with keyboarding and accessibility support.",
           "Content": "<p>Look at the <i>RadioButtonsPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsNew": true,
           "Docs": [