From dbcf84af1a3ac6f52e71134786d3869cb0162ba4 Mon Sep 17 00:00:00 2001
From: Andrew KeepCoding <andrewkeepcoding@gmail.com>
Date: Tue, 17 Dec 2024 10:37:51 +0900
Subject: [PATCH 1/3] Improve xaml code format

---
 WinUIGallery/ControlPages/TeachingTipPage.xaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WinUIGallery/ControlPages/TeachingTipPage.xaml b/WinUIGallery/ControlPages/TeachingTipPage.xaml
index 93de0b46b..c3388c1ee 100644
--- a/WinUIGallery/ControlPages/TeachingTipPage.xaml
+++ b/WinUIGallery/ControlPages/TeachingTipPage.xaml
@@ -47,7 +47,9 @@
             XamlSource="TeachingTip/TeachingTipSample2_xaml.txt">
             <local:ControlExample.Example>
                 <Grid>
-                    <Button Click="TestButtonClick2" Content="Show TeachingTip" />
+                    <Button
+                        Click="TestButtonClick2"
+                        Content="Show TeachingTip" />
                     <TeachingTip
                         x:Name="ToggleThemeTeachingTip2"
                         Title="This is the title"

From b397f8373c45d2b8d40fe64895ff9c0c41fa5677 Mon Sep 17 00:00:00 2001
From: Andrew KeepCoding <andrewkeepcoding@gmail.com>
Date: Tue, 17 Dec 2024 10:40:02 +0900
Subject: [PATCH 2/3] Update the sample code to match the actual code

---
 .../TeachingTip/TeachingTipSample1_xaml.txt   | 15 +++++++-----
 .../TeachingTip/TeachingTipSample2_xaml.txt   | 24 +++++++++----------
 .../TeachingTip/TeachingTipSample3_xaml.txt   | 24 ++++++++++++-------
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt
index 3d959517d..9ee43827d 100644
--- a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt
@@ -1,9 +1,12 @@
-<Button Content="Show TeachingTip" Click="TestButtonClick1" />
-
-<TeachingTip x:Name="ToggleThemeTeachingTip1"
-    Target="{x:Bind ThemeButton}"
-    Title="Change themes without hassle"
-    Subtitle="It's easier than ever to see control samples in both light and dark theme!">
+<Button
+    x:Name="ThemeButton"
+    Click="TestButtonClick1"
+    Content="Show TeachingTip" />
+<TeachingTip
+    x:Name="ToggleThemeTeachingTip1"
+    Title="This is the title"
+    Subtitle="And this is the subtitle"
+    Target="{x:Bind ThemeButton}">
     <TeachingTip.IconSource>
         <SymbolIconSource Symbol="Refresh" />
     </TeachingTip.IconSource>
diff --git a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt
index 108cc6bc1..dd07dc87f 100644
--- a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt
@@ -1,12 +1,12 @@
-<Button Content="Show TeachingTip" Click="TestButtonClick2" />
-
-<TeachingTip x:Name="ToggleThemeTeachingTip2"                   
-	Title="Change themes without hassle"
-	Subtitle="It's easier than ever to see control samples in both light and dark theme!"
-	PreferredPlacement="Auto"                                              
-	PlacementMargin="20"
-	IsLightDismissEnabled="True"
-	ActionButtonClick="ToggleThemeTeachingTip2_ActionButtonClick"
-	ActionButtonContent="Toggle theme now"
-	CloseButtonContent="Got it!">
-</TeachingTip>
+<Button
+    Click="TestButtonClick2"
+    Content="Show TeachingTip" />
+<TeachingTip
+    x:Name="ToggleThemeTeachingTip2"
+    Title="This is the title"
+    ActionButtonContent="Action button"
+    CloseButtonContent="Close button"
+    IsLightDismissEnabled="True"
+    PlacementMargin="20"
+    PreferredPlacement="Auto"
+    Subtitle="And this is the subtitle" />
diff --git a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt
index e291a627a..4bd0e61a4 100644
--- a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt
@@ -1,14 +1,20 @@
-<Button Content="Show TeachingTip" Click="TestButtonClick3" />
-
-<TeachingTip x:Name="ToggleThemeTeachingTip3" 
-    Target="{x:Bind ThemeButton}"
-    Title="Change themes without hassle"
-    Subtitle="It's easier than ever to see control samples in both light and dark theme!"
-    PreferredPlacement="LeftEdgeAlignedBottom">
+<Button
+    x:Name="HeroButton"
+    Click="TestButtonClick3"
+    Content="Show TeachingTip" />
+<TeachingTip
+    x:Name="ToggleThemeTeachingTip3"
+    Title="This is the title"
+    PreferredPlacement="Bottom"
+    Subtitle="And this is the subtitle"
+    Target="{x:Bind HeroButton}">
     <TeachingTip.HeroContent>
-        <Image Source="/Assets/SampleMedia/sunset.jpg" AutomationProperties.Name="Sunset" />
+        <Image AutomationProperties.Name="Sunset" Source="/Assets/SampleMedia/sunset.jpg" />
     </TeachingTip.HeroContent>
     <TeachingTip.Content>
-        <TextBlock TextWrapping="WrapWholeWords" Margin="0,16,0,0">To change your desktop theme visit the <Hyperlink NavigateUri="ms-settings:colors">Settings app</Hyperlink>.</TextBlock>
+        <TextBlock
+            Margin="0,16,0,0"
+            Text="Description can go here"
+            TextWrapping="WrapWholeWords" />
     </TeachingTip.Content>
 </TeachingTip>

From 291486b81f3a625d9c2c098d626e03d3dfd61749 Mon Sep 17 00:00:00 2001
From: Andrew KeepCoding <andrewkeepcoding@gmail.com>
Date: Tue, 17 Dec 2024 11:12:41 +0900
Subject: [PATCH 3/3] Remove the word 'Theme' as it doesn't match the actual
 sample

---
 .../ControlPages/TeachingTipPage.xaml         | 28 ++++++++++---------
 .../ControlPages/TeachingTipPage.xaml.cs      | 12 ++++----
 .../TeachingTip/TeachingTipSample1_xaml.txt   |  8 +++---
 .../TeachingTip/TeachingTipSample2_xaml.txt   |  4 +--
 .../TeachingTip/TeachingTipSample3_xaml.txt   | 12 ++++----
 5 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/WinUIGallery/ControlPages/TeachingTipPage.xaml b/WinUIGallery/ControlPages/TeachingTipPage.xaml
index c3388c1ee..b7e02c836 100644
--- a/WinUIGallery/ControlPages/TeachingTipPage.xaml
+++ b/WinUIGallery/ControlPages/TeachingTipPage.xaml
@@ -20,19 +20,19 @@
     <StackPanel HorizontalAlignment="Left">
         <local:ControlExample
             CSharpSource="TeachingTip/TeachingTipSample1_cs.txt"
-            HeaderText="Show a targeted TeachingTip on the Toggle Theme button."
+            HeaderText="Show a targeted TeachingTip on a button."
             XamlSource="TeachingTip/TeachingTipSample1_xaml.txt">
             <local:ControlExample.Example>
                 <Grid>
                     <Button
-                        x:Name="ThemeButton"
-                        Click="TestButtonClick1"
+                        x:Name="TestButton1"
+                        Click="TestButton1Click"
                         Content="Show TeachingTip" />
                     <TeachingTip
-                        x:Name="ToggleThemeTeachingTip1"
+                        x:Name="TestButton1TeachingTip"
                         Title="This is the title"
                         Subtitle="And this is the subtitle"
-                        Target="{x:Bind ThemeButton}">
+                        Target="{x:Bind TestButton1}">
                         <TeachingTip.IconSource>
                             <SymbolIconSource Symbol="Refresh" />
                         </TeachingTip.IconSource>
@@ -48,10 +48,10 @@
             <local:ControlExample.Example>
                 <Grid>
                     <Button
-                        Click="TestButtonClick2"
+                        Click="TestButton2Click"
                         Content="Show TeachingTip" />
                     <TeachingTip
-                        x:Name="ToggleThemeTeachingTip2"
+                        x:Name="TestButton2TeachingTip"
                         Title="This is the title"
                         ActionButtonContent="Action button"
                         CloseButtonContent="Close button"
@@ -65,22 +65,24 @@
 
         <local:ControlExample
             CSharpSource="TeachingTip/TeachingTipSample3_cs.txt"
-            HeaderText="Show a targeted TeachingTip with hero content on the Toggle Theme button."
+            HeaderText="Show a targeted TeachingTip with hero content on a button."
             XamlSource="TeachingTip/TeachingTipSample3_xaml.txt">
             <local:ControlExample.Example>
                 <Grid>
                     <Button
-                        x:Name="HeroButton"
-                        Click="TestButtonClick3"
+                        x:Name="TestButton3"
+                        Click="TestButton3Click"
                         Content="Show TeachingTip" />
                     <TeachingTip
-                        x:Name="ToggleThemeTeachingTip3"
+                        x:Name="TestButton3TeachingTip"
                         Title="This is the title"
                         PreferredPlacement="Bottom"
                         Subtitle="And this is the subtitle"
-                        Target="{x:Bind HeroButton}">
+                        Target="{x:Bind TestButton3}">
                         <TeachingTip.HeroContent>
-                            <Image AutomationProperties.Name="Sunset" Source="/Assets/SampleMedia/sunset.jpg" />
+                            <Image
+                                AutomationProperties.Name="Sunset"
+                                Source="/Assets/SampleMedia/sunset.jpg" />
                         </TeachingTip.HeroContent>
                         <TeachingTip.Content>
                             <TextBlock
diff --git a/WinUIGallery/ControlPages/TeachingTipPage.xaml.cs b/WinUIGallery/ControlPages/TeachingTipPage.xaml.cs
index a7fe85bcf..a12ae501e 100644
--- a/WinUIGallery/ControlPages/TeachingTipPage.xaml.cs
+++ b/WinUIGallery/ControlPages/TeachingTipPage.xaml.cs
@@ -20,19 +20,19 @@ public TeachingTipPage()
             this.InitializeComponent();
         }
 
-        private void TestButtonClick1(object sender, RoutedEventArgs e)
+        private void TestButton1Click(object sender, RoutedEventArgs e)
         {
-            ToggleThemeTeachingTip1.IsOpen = true;
+            TestButton1TeachingTip.IsOpen = true;
         }
 
-        private void TestButtonClick2(object sender, RoutedEventArgs e)
+        private void TestButton2Click(object sender, RoutedEventArgs e)
         {
-            ToggleThemeTeachingTip2.IsOpen = true;
+            TestButton2TeachingTip.IsOpen = true;
         }
 
-        private void TestButtonClick3(object sender, RoutedEventArgs e)
+        private void TestButton3Click(object sender, RoutedEventArgs e)
         {
-            ToggleThemeTeachingTip3.IsOpen = true;
+            TestButton3TeachingTip.IsOpen = true;
         }
     }
 }
diff --git a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt
index 9ee43827d..e55e7146d 100644
--- a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample1_xaml.txt
@@ -1,12 +1,12 @@
 <Button
-    x:Name="ThemeButton"
-    Click="TestButtonClick1"
+    x:Name="TestButton1"
+    Click="TestButton1Click"
     Content="Show TeachingTip" />
 <TeachingTip
-    x:Name="ToggleThemeTeachingTip1"
+    x:Name="TestButton1TeachingTip"
     Title="This is the title"
     Subtitle="And this is the subtitle"
-    Target="{x:Bind ThemeButton}">
+    Target="{x:Bind TestButton1}">
     <TeachingTip.IconSource>
         <SymbolIconSource Symbol="Refresh" />
     </TeachingTip.IconSource>
diff --git a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt
index dd07dc87f..982378a4c 100644
--- a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample2_xaml.txt
@@ -1,8 +1,8 @@
 <Button
-    Click="TestButtonClick2"
+    Click="TestButton2Click"
     Content="Show TeachingTip" />
 <TeachingTip
-    x:Name="ToggleThemeTeachingTip2"
+    x:Name="TestButton2TeachingTip"
     Title="This is the title"
     ActionButtonContent="Action button"
     CloseButtonContent="Close button"
diff --git a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt
index 4bd0e61a4..4b570d344 100644
--- a/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/TeachingTip/TeachingTipSample3_xaml.txt
@@ -1,15 +1,17 @@
 <Button
-    x:Name="HeroButton"
-    Click="TestButtonClick3"
+    x:Name="TestButton3"
+    Click="TestButton3Click"
     Content="Show TeachingTip" />
 <TeachingTip
-    x:Name="ToggleThemeTeachingTip3"
+    x:Name="TestButton3TeachingTip"
     Title="This is the title"
     PreferredPlacement="Bottom"
     Subtitle="And this is the subtitle"
-    Target="{x:Bind HeroButton}">
+    Target="{x:Bind TestButton3}">
     <TeachingTip.HeroContent>
-        <Image AutomationProperties.Name="Sunset" Source="/Assets/SampleMedia/sunset.jpg" />
+        <Image
+            AutomationProperties.Name="Sunset"
+            Source="/Assets/SampleMedia/sunset.jpg" />
     </TeachingTip.HeroContent>
     <TeachingTip.Content>
         <TextBlock