From 5ec4b8d449d455a8f6fd4a6e0e4fa454538e6354 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels9001@hotmail.com>
Date: Mon, 16 Aug 2021 15:35:46 +0200
Subject: [PATCH] Revert "Clean up"

This reverts commit 028e15fab6d28fa2519f5a3afa2b7e3e9c2eb297.
---
 .../Microsoft.PowerToys.Settings.UI/App.xaml          |  3 +--
 .../Microsoft.PowerToys.Settings.UI.csproj            |  2 +-
 .../OOBE/Views/OobeShellPage.xaml                     | 11 +++++++++++
 .../OOBE/Views/OobeShellPage.xaml.cs                  |  2 +-
 .../Strings/en-us/Resources.resw                      |  3 +++
 .../Styles/TextBlock.xaml                             |  9 +++++++++
 .../Styles/_FontSizes.xaml                            |  4 ++++
 .../Styles/_Thickness.xaml                            |  4 ++++
 .../SettingsExpanderStyles.xaml}                      |  0
 9 files changed, 34 insertions(+), 4 deletions(-)
 rename src/settings-ui/Microsoft.PowerToys.Settings.UI/{Controls/SettingExpander/SettingExpanderStyles.xaml => Themes/SettingsExpanderStyles.xaml} (100%)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
index 34c6d79216..38284c963e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
@@ -9,7 +9,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" ControlsResourcesVersion="Version2" />
                 <ResourceDictionary Source="/Controls/KeyVisual/KeyVisual.xaml" />
-                <ResourceDictionary Source="/Controls/SettingExpander/SettingExpanderStyles.xaml"/>
                 <ResourceDictionary Source="/Styles/_FontSizes.xaml" />
                 <ResourceDictionary Source="/Styles/_Thickness.xaml" />
                 <ResourceDictionary Source="/Styles/_Sizes.xaml" />
@@ -17,7 +16,7 @@
                 <ResourceDictionary Source="/Styles/Button.xaml"/>
 
                 <ResourceDictionary Source="/Themes/Colors.xaml"/>
-                
+                <ResourceDictionary Source="/Themes/SettingsExpanderStyles.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index f098f4c221..79adec003a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -417,7 +417,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\SettingExpander\SettingExpanderStyles.xaml">
+    <Page Include="Themes\SettingsExpanderStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
index 048fb9f0b8..0e3bf06e76 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
@@ -53,6 +53,17 @@
                               IsBackButtonVisible="Collapsed"
                               MenuItemsSource="{x:Bind Modules, Mode=OneTime}"
                               MenuItemTemplate="{StaticResource NavigationViewMenuItem}">
+            <winui:NavigationView.PaneCustomContent>
+                <StackPanel Grid.Column="0" Margin="16"
+                            Orientation="Vertical">
+                    <TextBlock x:Uid="Oobe_GettingStarted"
+                               TextWrapping="Wrap"
+                               FontWeight="SemiBold"
+                               AutomationProperties.HeadingLevel="Level1"
+                               Style="{StaticResource PageTitleStyle}"
+                               Margin="0,0,0,16" />
+                </StackPanel>
+            </winui:NavigationView.PaneCustomContent>
             <winui:NavigationView.Content>
                 <Frame x:Name="NavigationFrame" />
             </winui:NavigationView.Content>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
index c9294a2315..13948e6343 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
@@ -59,7 +59,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
 
             Modules.Insert((int)PowerToysModulesEnum.Overview, new OobePowerToysModule()
             {
-                ModuleName = loader.GetString("Oobe_GettingStarted"),
+                ModuleName = loader.GetString("Oobe_Welcome"),
                 Tag = "Overview",
                 IsNew = false,
                 Icon = "\uEF3C",
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 3e2809d93d..5d971d9791 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -1322,6 +1322,9 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
     <value>Video Conference</value>
     <comment>Do not localize this string</comment>
   </data>
+  <data name="Oobe_Welcome" xml:space="preserve">
+    <value>Welcome</value>
+  </data>
   <data name="OOBE_Settings.Content" xml:space="preserve">
     <value>Open Settings</value>
   </data>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml
index 9b23257d6d..0b8193289f 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml
@@ -2,6 +2,15 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <!--Common texts-->
+    <Style x:Key="PageTitleStyle" TargetType="TextBlock">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
+        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+        <Setter Property="TextWrapping" Value="NoWrap" />
+    </Style>
+
     <Style x:Key="OobeSubtitleStyle" TargetType="TextBlock">
         <Setter Property="Margin" Value="0,16,0,0" />
         <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_FontSizes.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_FontSizes.xaml
index 37229b8d2d..7160b32323 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_FontSizes.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_FontSizes.xaml
@@ -1,4 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <x:Double x:Key="LargeFontSize">24</x:Double>
+    <x:Double x:Key="MediumFontSize">16</x:Double>
+
 </ResourceDictionary>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
index ed1b6ac9d1..a266a5b1ee 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
@@ -1,4 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- OOBE -->
+    <Thickness x:Key="OobePageContentMargin">32, 24, 32, 24</Thickness>
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpanderStyles.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
similarity index 100%
rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpanderStyles.xaml
rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml