From 04d182e601ffd7f350cd602c0a025741e80d6bdc Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Sat, 30 Nov 2024 22:27:52 +0330
Subject: [PATCH] Update Templates

---
 .../DevWinUI_Template/source.extension.vsixmanifest   |  2 +-
 .../WinUIApp-Blank-UnitTest/App.xaml.cs               |  1 +
 .../WinUIApp-Blank-UnitTest/Views/MainPage.xaml       | 11 +++++++----
 VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml        |  3 +--
 VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml.cs     |  1 +
 .../WinUIApp-Blank/Views/MainPage.xaml                | 11 +++++++----
 .../WinUIApp-MVVM-NavigationView/Common/AppConfig.cs  |  1 +
 .../WinUIApp-MVVM/Common/AppConfig.cs                 |  1 +
 .../WinUIApp-MVVM/Views/MainPage.xaml                 |  1 +
 .../WinUIApp-NavigationView/Common/AppConfig.cs       |  1 +
 VSIX/DevWinUI_Template/WinUIApp/Common/AppConfig.cs   |  1 +
 VSIX/DevWinUI_Template/WinUIApp/Views/MainPage.xaml   |  1 +
 12 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest b/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest
index 417dd33..19863b1 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="DevWinUI_Template.18eb89b1-bd1f-4e22-9196-6ea05b8ca61d" Version="11.0.0" Language="en-US" Publisher="Mahdi Hosseini" />
+        <Identity Id="DevWinUI_Template.18eb89b1-bd1f-4e22-9196-6ea05b8ca61d" Version="11.0.1" Language="en-US" Publisher="Mahdi Hosseini" />
         <DisplayName>DevWinUI Templates for WinUI</DisplayName>
         <Description xml:space="preserve">DevWinUI  Project Template, help you quickly create a new WinUI 3 App with DevWinUI  and MVVM Packages. We prepare your project with the following features: NavigationView, Custom TitleBar, HomeLandingPage and Settings Page (with Theme settings).
 We also always use the latest version of WindowsAppSDK. 
diff --git a/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/App.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/App.xaml.cs
index ea0598d..01bc9e9 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/App.xaml.cs
+++ b/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/App.xaml.cs
@@ -20,6 +20,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
             MainWindow.Content = rootFrame = new Frame();
         }
 
+        MainWindow.SystemBackdrop = new Microsoft.UI.Xaml.Media.MicaBackdrop();
         rootFrame.Navigate(typeof(MainPage));
         MainWindow.Activate();
         
diff --git a/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/Views/MainPage.xaml b/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/Views/MainPage.xaml
index 4adceae..3984cad 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/Views/MainPage.xaml
+++ b/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/Views/MainPage.xaml
@@ -5,15 +5,18 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:$safeprojectname$"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">
     <Grid RowDefinitions="Auto, *">
         <TitleBar x:Name="AppTitleBar"
                   Title="$safeprojectname$"
-                  IconSource="{dev:BitmapIconSource Source=ms-appx:///Assets/AppIcon.png}"
-                  Subtitle="1.0.0" />
+                  Subtitle="1.0.0">
+            <TitleBar.IconSource>
+                <BitmapIconSource ShowAsMonochrome="False"
+                                  UriSource="ms-appx:///Assets/AppIcon.png" />
+            </TitleBar.IconSource>
+        </TitleBar>
         <StackPanel Grid.Row="1">
-            
+
         </StackPanel>
     </Grid>
 </Page>
diff --git a/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml b/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml
index f41380f..bc75f1f 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml
+++ b/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml
@@ -6,8 +6,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                $DevWinUI.Controls$$AppDicColors$$AppDicFonts$$AppDicConverters$$AppDicStyles$
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" /> $DevWinUI.Controls$$AppDicColors$$AppDicFonts$$AppDicConverters$$AppDicStyles$
             </ResourceDictionary.MergedDictionaries>
             <!--  Other app resources here  -->
         </ResourceDictionary>
diff --git a/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml.cs
index c8a8c62..d85cc2b 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml.cs
+++ b/VSIX/DevWinUI_Template/WinUIApp-Blank/App.xaml.cs
@@ -18,6 +18,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
             MainWindow.Content = rootFrame = new Frame();
         }
 
+        MainWindow.SystemBackdrop = new Microsoft.UI.Xaml.Media.MicaBackdrop();
         rootFrame.Navigate(typeof(MainPage));
         MainWindow.Activate();
     }
diff --git a/VSIX/DevWinUI_Template/WinUIApp-Blank/Views/MainPage.xaml b/VSIX/DevWinUI_Template/WinUIApp-Blank/Views/MainPage.xaml
index 4adceae..3984cad 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-Blank/Views/MainPage.xaml
+++ b/VSIX/DevWinUI_Template/WinUIApp-Blank/Views/MainPage.xaml
@@ -5,15 +5,18 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:$safeprojectname$"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">
     <Grid RowDefinitions="Auto, *">
         <TitleBar x:Name="AppTitleBar"
                   Title="$safeprojectname$"
-                  IconSource="{dev:BitmapIconSource Source=ms-appx:///Assets/AppIcon.png}"
-                  Subtitle="1.0.0" />
+                  Subtitle="1.0.0">
+            <TitleBar.IconSource>
+                <BitmapIconSource ShowAsMonochrome="False"
+                                  UriSource="ms-appx:///Assets/AppIcon.png" />
+            </TitleBar.IconSource>
+        </TitleBar>
         <StackPanel Grid.Row="1">
-            
+
         </StackPanel>
     </Grid>
 </Page>
diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Common/AppConfig.cs b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Common/AppConfig.cs
index b06a1b2..f72c05e 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Common/AppConfig.cs
+++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Common/AppConfig.cs
@@ -3,6 +3,7 @@
 
 namespace $safeprojectname$.Common;
 
+
 [GenerateAutoSaveOnChange]
 public partial class AppConfig : NotifiyingJsonSettings, IVersionable
 {
diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM/Common/AppConfig.cs b/VSIX/DevWinUI_Template/WinUIApp-MVVM/Common/AppConfig.cs
index b06a1b2..f72c05e 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-MVVM/Common/AppConfig.cs
+++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM/Common/AppConfig.cs
@@ -3,6 +3,7 @@
 
 namespace $safeprojectname$.Common;
 
+
 [GenerateAutoSaveOnChange]
 public partial class AppConfig : NotifiyingJsonSettings, IVersionable
 {
diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM/Views/MainPage.xaml b/VSIX/DevWinUI_Template/WinUIApp-MVVM/Views/MainPage.xaml
index ace08f7..907581b 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-MVVM/Views/MainPage.xaml
+++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM/Views/MainPage.xaml
@@ -3,6 +3,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:dev="using:DevWinUI"
       xmlns:local="using:$safeprojectname$"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Common/AppConfig.cs b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Common/AppConfig.cs
index b06a1b2..f72c05e 100644
--- a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Common/AppConfig.cs
+++ b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Common/AppConfig.cs
@@ -3,6 +3,7 @@
 
 namespace $safeprojectname$.Common;
 
+
 [GenerateAutoSaveOnChange]
 public partial class AppConfig : NotifiyingJsonSettings, IVersionable
 {
diff --git a/VSIX/DevWinUI_Template/WinUIApp/Common/AppConfig.cs b/VSIX/DevWinUI_Template/WinUIApp/Common/AppConfig.cs
index b06a1b2..f72c05e 100644
--- a/VSIX/DevWinUI_Template/WinUIApp/Common/AppConfig.cs
+++ b/VSIX/DevWinUI_Template/WinUIApp/Common/AppConfig.cs
@@ -3,6 +3,7 @@
 
 namespace $safeprojectname$.Common;
 
+
 [GenerateAutoSaveOnChange]
 public partial class AppConfig : NotifiyingJsonSettings, IVersionable
 {
diff --git a/VSIX/DevWinUI_Template/WinUIApp/Views/MainPage.xaml b/VSIX/DevWinUI_Template/WinUIApp/Views/MainPage.xaml
index 6d59593..2008967 100644
--- a/VSIX/DevWinUI_Template/WinUIApp/Views/MainPage.xaml
+++ b/VSIX/DevWinUI_Template/WinUIApp/Views/MainPage.xaml
@@ -3,6 +3,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:dev="using:DevWinUI"
       xmlns:local="using:$safeprojectname$"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">