From 6f9d59bde49a7d77c72c9e8aebcaeccd7df113c4 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Thu, 23 Jan 2025 20:46:18 +0100
Subject: [PATCH 1/7] Update HomePage.xaml

---
 AIDevGallery/Pages/HomePage.xaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/AIDevGallery/Pages/HomePage.xaml b/AIDevGallery/Pages/HomePage.xaml
index 1cb99587..0e9d2bbc 100644
--- a/AIDevGallery/Pages/HomePage.xaml
+++ b/AIDevGallery/Pages/HomePage.xaml
@@ -17,6 +17,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:utils="using:AIDevGallery.Utils"
     xmlns:wuc="using:WinUICommunity"
+    Loaded="Page_Loaded"
     mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
@@ -43,5 +44,18 @@
                 </StackPanel>
             </Grid>
         </ScrollViewer>
+        <InfoBar
+            Title="Send optional diagnostic data"
+            Margin="16"
+            VerticalAlignment="Bottom"
+            IsClosable="False"
+            IsOpen="True"
+            Message="As a part of using this app, your app sends Microsoft a limited set of data that is necessary to keep this app secure, up to date, and working as expected. Help us improve your experience and fix problems more quickly by sending us additional diagnostic data.">
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <Button Content="Yes" />
+                <Button Content="No" />
+            </StackPanel>
+        </InfoBar>
+
     </Grid>
 </Page>

From d942e7d3ab43429b266e9e30d2b507c77e71e631 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 24 Jan 2025 19:56:07 +0100
Subject: [PATCH 2/7] Adding diagnostics toggle in Settings

---
 AIDevGallery/Pages/SettingsPage.xaml    | 18 +++++++-----------
 AIDevGallery/Pages/SettingsPage.xaml.cs | 17 +++++++++--------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/AIDevGallery/Pages/SettingsPage.xaml b/AIDevGallery/Pages/SettingsPage.xaml
index 3720eceb..9558def0 100644
--- a/AIDevGallery/Pages/SettingsPage.xaml
+++ b/AIDevGallery/Pages/SettingsPage.xaml
@@ -105,19 +105,15 @@
                             </DataTemplate>
                         </toolkit:SettingsExpander.ItemTemplate>
                     </toolkit:SettingsExpander>
-                    <!--<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Diagnostics &amp; feedback" />
-                    <toolkit:SettingsCard Header="Send optional diagnostic data" HeaderIcon="{ui:FontIcon Glyph=&#xE9D9;}">
-                        <toolkit:SettingsCard.Description>
-                            <TextBlock FontSize="12" >
-                                <Run Text="Help Microsoft improve your Application experience and fix problems more quickly by sending us additional diagnostic data." />
-                            </TextBlock>
-                        </toolkit:SettingsCard.Description>
+
+                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Diagnostics &amp; feedback" />
+                    <toolkit:SettingsCard
+                        Description="Help Microsoft improve your Application experience and fix problems more quickly by sending us additional diagnostic data."
+                        Header="Diagnostic data"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE9D9;}">
                         <ToggleSwitch x:Name="DiagnosticDataToggleSwitch" Toggled="DiagnosticDataToggleSwitch_Toggled" />
                     </toolkit:SettingsCard>
-                    <TextBlock TextWrapping="Wrap" FontSize="10">
-                        <Bold> You're sending required diagnostic data. </Bold>
-                        <Run> As a part of using this app, your app sends Microsoft a limited set of data that is necessary to keep this app secure, up to date, and working as expected. </Run>
-                    </TextBlock>-->
+
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="About" />
                     <toolkit:SettingsExpander
                         AutomationProperties.AccessibilityView="Raw"
diff --git a/AIDevGallery/Pages/SettingsPage.xaml.cs b/AIDevGallery/Pages/SettingsPage.xaml.cs
index ac568548..a666d27e 100644
--- a/AIDevGallery/Pages/SettingsPage.xaml.cs
+++ b/AIDevGallery/Pages/SettingsPage.xaml.cs
@@ -153,14 +153,15 @@ private void ModelFolder_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    // private async void DiagnosticDataToggleSwitch_Toggled(object sender, RoutedEventArgs e)
-    // {
-    //    if (App.AppData.IsDiagnosticDataEnabled != DiagnosticDataToggleSwitch.IsOn)
-    //    {
-    //        App.AppData.IsDiagnosticDataEnabled = DiagnosticDataToggleSwitch.IsOn;
-    //        await App.AppData.SaveAsync();
-    //    }
-    // }
+    private async void DiagnosticDataToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+    {
+        if (App.AppData.IsDiagnosticDataEnabled != DiagnosticDataToggleSwitch.IsOn)
+        {
+            App.AppData.IsDiagnosticDataEnabled = DiagnosticDataToggleSwitch.IsOn;
+            await App.AppData.SaveAsync();
+        }
+    }
+
     private async void ChangeCacheFolder_Click(object sender, RoutedEventArgs e)
     {
         var downloadCount = App.ModelCache.DownloadQueue.GetDownloads().Count;

From 5cde4d954eba4bafaac487b15b567c9e2a5d5a30 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 24 Jan 2025 21:34:24 +0100
Subject: [PATCH 3/7] Adding infobar

---
 AIDevGallery/Pages/HomePage.xaml    | 18 ++++++++++++------
 AIDevGallery/Pages/HomePage.xaml.cs | 27 +++++++++++++++++++++++++++
 AIDevGallery/Utils/AppData.cs       |  3 +++
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/AIDevGallery/Pages/HomePage.xaml b/AIDevGallery/Pages/HomePage.xaml
index 0e9d2bbc..383e44cd 100644
--- a/AIDevGallery/Pages/HomePage.xaml
+++ b/AIDevGallery/Pages/HomePage.xaml
@@ -45,17 +45,23 @@
             </Grid>
         </ScrollViewer>
         <InfoBar
+            x:Name="DiagnosticsInfoBar"
             Title="Send optional diagnostic data"
             Margin="16"
             VerticalAlignment="Bottom"
             IsClosable="False"
-            IsOpen="True"
-            Message="As a part of using this app, your app sends Microsoft a limited set of data that is necessary to keep this app secure, up to date, and working as expected. Help us improve your experience and fix problems more quickly by sending us additional diagnostic data.">
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <Button Content="Yes" />
-                <Button Content="No" />
+            IsOpen="False"
+            Message="Help us improve this app by sharing diagnostics data to inform bug fixes, performance, and feature enhancements.">
+            <StackPanel
+                Margin="0,0,0,8"
+                Orientation="Horizontal"
+                Spacing="8">
+                <Button
+                    Click="DiagnosticsYesButton_Click"
+                    Content="Yes"
+                    Style="{StaticResource AccentButtonStyle}" />
+                <Button Click="DiagnosticsNoButton_Click" Content="No" />
             </StackPanel>
         </InfoBar>
-
     </Grid>
 </Page>
diff --git a/AIDevGallery/Pages/HomePage.xaml.cs b/AIDevGallery/Pages/HomePage.xaml.cs
index 017f1b0f..417960b4 100644
--- a/AIDevGallery/Pages/HomePage.xaml.cs
+++ b/AIDevGallery/Pages/HomePage.xaml.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using AIDevGallery.Telemetry;
 using AIDevGallery.Telemetry.Events;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
@@ -19,4 +20,30 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         base.OnNavigatedTo(e);
         NavigatedToPageEvent.Log(nameof(HomePage));
     }
+
+    private void Page_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (!App.AppData.IsDiagnosticsMessageDismissed && PrivacyConsentHelpers.IsPrivacySensitiveRegion())
+        {
+            DiagnosticsInfoBar.IsOpen = true;
+        }
+    }
+
+    private void DiagnosticsYesButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        HandleDiagnosticsSetting(true);
+    }
+
+    private void DiagnosticsNoButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        HandleDiagnosticsSetting(false);
+    }
+
+    private async void HandleDiagnosticsSetting(bool isEnabled)
+    {
+        DiagnosticsInfoBar.IsOpen = false;
+        App.AppData.IsDiagnosticsMessageDismissed = true;
+        App.AppData.IsDiagnosticDataEnabled = isEnabled;
+        await App.AppData.SaveAsync();
+    }
 }
\ No newline at end of file
diff --git a/AIDevGallery/Utils/AppData.cs b/AIDevGallery/Utils/AppData.cs
index e636359b..a9c7d2de 100644
--- a/AIDevGallery/Utils/AppData.cs
+++ b/AIDevGallery/Utils/AppData.cs
@@ -24,10 +24,13 @@ internal class AppData
 
     public bool IsFirstRun { get; set; }
 
+    public bool IsDiagnosticsMessageDismissed { get; set; }
+
     public AppData()
     {
         IsDiagnosticDataEnabled = !PrivacyConsentHelpers.IsPrivacySensitiveRegion();
         IsFirstRun = true;
+        IsDiagnosticsMessageDismissed = false;
     }
 
     private static string GetConfigFilePath()

From a55804a32d74aa64b3d7cc0be95f4f09941ff793 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 24 Jan 2025 21:34:44 +0100
Subject: [PATCH 4/7] Adding settings controls

---
 AIDevGallery/Pages/SettingsPage.xaml    | 2 +-
 AIDevGallery/Pages/SettingsPage.xaml.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AIDevGallery/Pages/SettingsPage.xaml b/AIDevGallery/Pages/SettingsPage.xaml
index 9558def0..b8279c53 100644
--- a/AIDevGallery/Pages/SettingsPage.xaml
+++ b/AIDevGallery/Pages/SettingsPage.xaml
@@ -108,7 +108,7 @@
 
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Diagnostics &amp; feedback" />
                     <toolkit:SettingsCard
-                        Description="Help Microsoft improve your Application experience and fix problems more quickly by sending us additional diagnostic data."
+                        Description="Help us improve this app by sharing diagnostics data to inform bug fixes, performance, and feature enhancements"
                         Header="Diagnostic data"
                         HeaderIcon="{ui:FontIcon Glyph=&#xE9D9;}">
                         <ToggleSwitch x:Name="DiagnosticDataToggleSwitch" Toggled="DiagnosticDataToggleSwitch_Toggled" />
diff --git a/AIDevGallery/Pages/SettingsPage.xaml.cs b/AIDevGallery/Pages/SettingsPage.xaml.cs
index a666d27e..1c4d8a52 100644
--- a/AIDevGallery/Pages/SettingsPage.xaml.cs
+++ b/AIDevGallery/Pages/SettingsPage.xaml.cs
@@ -42,7 +42,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         VersionTextRun.Text = AppUtils.GetAppVersion();
         GetStorageInfo();
 
-        // DiagnosticDataToggleSwitch.IsOn = App.AppData.IsDiagnosticDataEnabled;
+        DiagnosticDataToggleSwitch.IsOn = App.AppData.IsDiagnosticDataEnabled;
         if (e.Parameter is string manageModels && manageModels == "ModelManagement")
         {
             ModelsExpander.IsExpanded = true;

From 64c1f4872e4b21829608e4d0c13f1bb260a9c816 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 27 Jan 2025 10:51:09 +0100
Subject: [PATCH 5/7] Update labels

---
 AIDevGallery/Pages/HomePage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AIDevGallery/Pages/HomePage.xaml b/AIDevGallery/Pages/HomePage.xaml
index 383e44cd..1dcfd11f 100644
--- a/AIDevGallery/Pages/HomePage.xaml
+++ b/AIDevGallery/Pages/HomePage.xaml
@@ -58,9 +58,9 @@
                 Spacing="8">
                 <Button
                     Click="DiagnosticsYesButton_Click"
-                    Content="Yes"
+                    Content="Allow"
                     Style="{StaticResource AccentButtonStyle}" />
-                <Button Click="DiagnosticsNoButton_Click" Content="No" />
+                <Button Click="DiagnosticsNoButton_Click" Content="Don't allow" />
             </StackPanel>
         </InfoBar>
     </Grid>

From 558f7639ffed2941dff90dfc6b4c126f02467fa6 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 27 Jan 2025 10:54:17 +0100
Subject: [PATCH 6/7] Update HomePage.xaml

---
 AIDevGallery/Pages/HomePage.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AIDevGallery/Pages/HomePage.xaml b/AIDevGallery/Pages/HomePage.xaml
index 1dcfd11f..34e1286b 100644
--- a/AIDevGallery/Pages/HomePage.xaml
+++ b/AIDevGallery/Pages/HomePage.xaml
@@ -49,6 +49,7 @@
             Title="Send optional diagnostic data"
             Margin="16"
             VerticalAlignment="Bottom"
+            Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
             IsClosable="False"
             IsOpen="False"
             Message="Help us improve this app by sharing diagnostics data to inform bug fixes, performance, and feature enhancements.">

From cebc43c1b7a4d160a44cab25dc399a2e7479fd4c Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 29 Jan 2025 16:27:15 +0100
Subject: [PATCH 7/7] Address feedback

---
 AIDevGallery/Pages/SettingsPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AIDevGallery/Pages/SettingsPage.xaml b/AIDevGallery/Pages/SettingsPage.xaml
index b8279c53..871a26de 100644
--- a/AIDevGallery/Pages/SettingsPage.xaml
+++ b/AIDevGallery/Pages/SettingsPage.xaml
@@ -108,8 +108,8 @@
 
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Diagnostics &amp; feedback" />
                     <toolkit:SettingsCard
-                        Description="Help us improve this app by sharing diagnostics data to inform bug fixes, performance, and feature enhancements"
-                        Header="Diagnostic data"
+                        Description="Help us improve this app by sharing optional diagnostics data to inform bug fixes, performance, and feature enhancements"
+                        Header="Optional diagnostic data"
                         HeaderIcon="{ui:FontIcon Glyph=&#xE9D9;}">
                         <ToggleSwitch x:Name="DiagnosticDataToggleSwitch" Toggled="DiagnosticDataToggleSwitch_Toggled" />
                     </toolkit:SettingsCard>