Revert "Updated many of the components to the Windows 11 style (WinUI…

… 3.0)." This reverts commit 78ba473.
BobbyESP · Oct 30, 2021 · 9208061 · 9208061
1 parent 93a9eed
commit 9208061
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 80 deletions.
diff --git a/src/Notepads/App.xaml b/src/Notepads/App.xaml
@@ -1,17 +1,12 @@
 <Application
     x:Class="Notepads.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.UI.Xaml.Controls">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Application.Resources>
+        <ResourceDictionary>
 
-
-        <controls:XamlControlsResources>
-            <controls:XamlControlsResources.MergedDictionaries>
-                <ResourceDictionary>
-
-                    <!--<ResourceDictionary.ThemeDictionaries>
+            <!--<ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light">
 
                 </ResourceDictionary>
@@ -23,33 +18,30 @@
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>-->
 
-                    <ResourceDictionary.MergedDictionaries>
-                        <ResourceDictionary Source="Notepads.Controls/Themes/Generic.xaml" />
-                        <ResourceDictionary Source="Controls/TextEditor/TextEditorCore.xaml" />
-                        <ResourceDictionary Source="Controls/FindAndReplace/FindAndReplacePlaceholder.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/DismissButtonStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/TransparentTextBoxStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/CustomSplitViewStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/InAppNotificationNoDismissButton.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/CustomSliderStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/CustomRadioButtonStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/CustomToggleSwitchStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/CustomNavigationViewItemStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/CustomAppBarButtonStyle.xaml"></ResourceDictionary>
-                        <ResourceDictionary Source="Resource/CustomCheckBoxStyle.xaml"></ResourceDictionary>
-                    </ResourceDictionary.MergedDictionaries>
-
-                    <Style x:Key="CompactSubtitleTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource SubtitleTextBlockStyle}">
-                        <Setter Property="FontSize" Value="18"/>
-                    </Style>
-
-                    <Style x:Key="DescriptionTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemBaseMediumHighColor}"/>
-                    </Style>
-
-                </ResourceDictionary>
-            </controls:XamlControlsResources.MergedDictionaries>
-        </controls:XamlControlsResources>
-
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Notepads.Controls/Themes/Generic.xaml" />
+                <ResourceDictionary Source="Controls/TextEditor/TextEditorCore.xaml" />
+                <ResourceDictionary Source="Controls/FindAndReplace/FindAndReplacePlaceholder.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/DismissButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/TransparentTextBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/CustomSplitViewStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/InAppNotificationNoDismissButton.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/CustomSliderStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/CustomRadioButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/CustomToggleSwitchStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/CustomNavigationViewItemStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/CustomAppBarButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/CustomCheckBoxStyle.xaml"></ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+
+            <Style x:Key="CompactSubtitleTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource SubtitleTextBlockStyle}">
+                <Setter Property="FontSize" Value="18"/>
+            </Style>
+
+            <Style x:Key="DescriptionTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
+                <Setter Property="Foreground" Value="{ThemeResource SystemBaseMediumHighColor}"/>
+            </Style>
+
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/Notepads/Notepads.csproj b/src/Notepads/Notepads.csproj
@@ -415,17 +415,14 @@
       <Version>4.4.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>4.4.0</Version>
+      <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
       <Version>6.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.8.0-prerelease.210927001</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.Win32.Registry">
       <Version>5.0.0</Version>
     </PackageReference>

diff --git a/src/Notepads/Views/MainPage/NotepadsMainPage.xaml b/src/Notepads/Views/MainPage/NotepadsMainPage.xaml
@@ -8,10 +8,8 @@
     xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
     xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d"
     NavigationCacheMode="Required"
-
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <Grid x:Name="RootGrid" Background="Transparent">

diff --git a/src/Notepads/Views/Settings/SettingsPage.xaml b/src/Notepads/Views/Settings/SettingsPage.xaml
@@ -6,10 +6,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:settings="using:Notepads.Views.Settings"
     mc:Ignorable="d"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     Background="{ThemeResource SystemControlForegroundTransparentBrush}">
 
-    <muxc:NavigationView x:Name="SettingsNavigationView"
+    <NavigationView x:Name="SettingsNavigationView"
                     IsPaneOpen="False"
                     IsSettingsVisible="False"
                     IsBackEnabled="False"
@@ -18,42 +17,42 @@
                     OpenPaneLength="200"
                     ItemInvoked="SettingsPanel_OnItemInvoked">
 
-        <muxc:NavigationView.MenuItems>
-            <muxc:NavigationViewItem 
+        <NavigationView.MenuItems>
+            <NavigationViewItem Style="{StaticResource CustomNavigationViewItemStyle}" 
                                 x:Uid="/Settings/TextAndEditorPage_Title"
                                 Tag="TextAndEditor"
                                 IsSelected="True">
-                <muxc:NavigationViewItem.Icon>
+                <NavigationViewItem.Icon>
                     <FontIcon FontFamily="Segoe MDL2 Assets"
                               Glyph="&#xF17F;" />
-                </muxc:NavigationViewItem.Icon>
-            </muxc:NavigationViewItem>
-            <muxc:NavigationViewItem 
+                </NavigationViewItem.Icon>
+            </NavigationViewItem>
+            <NavigationViewItem Style="{StaticResource CustomNavigationViewItemStyle}" 
                                 x:Uid="/Settings/PersonalizationPage_Title"
                                 Tag="Personalization" >
-                <muxc:NavigationViewItem.Icon>
+                <NavigationViewItem.Icon>
                     <FontIcon FontFamily="Segoe MDL2 Assets"
                               Glyph="&#xE771;" />
-                </muxc:NavigationViewItem.Icon>
-            </muxc:NavigationViewItem>
-            <muxc:NavigationViewItem
+                </NavigationViewItem.Icon>
+            </NavigationViewItem>
+            <NavigationViewItem Style="{StaticResource CustomNavigationViewItemStyle}" 
                                 x:Uid="/Settings/AdvancedPage_Title"
                                 Tag="Advanced" >
-                <muxc:NavigationViewItem.Icon>
+                <NavigationViewItem.Icon>
                     <FontIcon FontFamily="Segoe MDL2 Assets"
                               Glyph="&#xE9E9;" />
-                </muxc:NavigationViewItem.Icon>
-            </muxc:NavigationViewItem>
-            <muxc:NavigationViewItem
+                </NavigationViewItem.Icon>
+            </NavigationViewItem>
+            <NavigationViewItem Style="{StaticResource CustomNavigationViewItemStyle}" 
                                 x:Uid="/Settings/AboutPage_Title"
                                 Tag="About" >
-                <muxc:NavigationViewItem.Icon>
+                <NavigationViewItem.Icon>
                     <FontIcon FontFamily="Segoe MDL2 Assets"
                               Glyph="&#xE946;" />
-                </muxc:NavigationViewItem.Icon>
-            </muxc:NavigationViewItem>
-        </muxc:NavigationView.MenuItems>
+                </NavigationViewItem.Icon>
+            </NavigationViewItem>
+        </NavigationView.MenuItems>
         <settings:SettingsPanel x:Name="SettingsPanel"/>
-    </muxc:NavigationView>
+    </NavigationView>
 
 </Page>
diff --git a/src/Notepads/Views/Settings/SettingsPage.xaml.cs b/src/Notepads/Views/Settings/SettingsPage.xaml.cs
@@ -5,11 +5,10 @@
     using System.Linq;
     using Windows.UI;
     using Windows.UI.Xaml;
-    using muxc = Microsoft.UI.Xaml;
+    using Windows.UI.Xaml.Controls;
     using Windows.UI.Xaml.Navigation;
-    using Microsoft.UI.Xaml.Controls;
 
-    public sealed partial class SettingsPage : Windows.UI.Xaml.Controls.Page
+    public sealed partial class SettingsPage : Page
     {
         public SettingsPage()
         {
@@ -33,19 +32,6 @@ private void SettingsPage_Loaded(object sender, RoutedEventArgs e)
             ((NavigationViewItem)SettingsNavigationView.MenuItems.First()).IsSelected = true;
         }
 
-        /*private void SettingsPage_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (App.IsGameBarWidget)
-            {
-                ThemeSettingsService.OnThemeChanged += ThemeSettingsService_OnThemeChanged;
-                ThemeSettingsService.OnAccentColorChanged += ThemeSettingsService_OnAccentColorChanged;
-            }
-            SettingsNavigationView.SelectedItem = SettingsNavigationView.MenuItems[0];
-        }*/
-
-
-
-
         private void SettingsPage_Unloaded(object sender, RoutedEventArgs e)
         {
             if (App.IsGameBarWidget)
@@ -82,7 +68,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         private void SettingsPanel_OnItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
         {
             SettingsPanel.Show((args.InvokedItem as string), (args.InvokedItemContainer as NavigationViewItem)?.Tag as string);
-
         }
     }
 }