update summary page (#3837)

microsoft · Sep 20, 2024 · 9754d3f · 9754d3f
1 parent 6b805e3
commit 9754d3f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/src/App.xaml b/src/App.xaml
@@ -10,6 +10,7 @@
                 <ResourceDictionary Source="/Styles/Feedback_ThemeResources.xaml" />
                 <ResourceDictionary Source="/Styles/FontFamilies.xaml" />
                 <ResourceDictionary Source="/Styles/FontSizes.xaml" />
+                <ResourceDictionary Source="/Styles/HyperlinkButton.xaml" />
                 <ResourceDictionary Source="/Styles/LayoutSizes.xaml" />
                 <ResourceDictionary Source="/Styles/TextBlock.xaml" />
                 <ResourceDictionary Source="/Styles/Thickness.xaml" />

diff --git a/src/DevHome.csproj b/src/DevHome.csproj
@@ -61,6 +61,7 @@
     <None Remove="Assets\WhatsNewPage\DarkTheme\ExtensionsBig.png" />
     <None Remove="Assets\WhatsNewPage\LightTheme\Extensions.png" />
     <None Remove="Assets\WhatsNewPage\LightTheme\ExtensionsBig.png" />
+    <None Remove="Styles\HyperlinkButton.xaml" />
     <None Remove="Styles\WindowTitleBar_ThemeResources.xaml" />
   </ItemGroup>
 
@@ -123,6 +124,9 @@
     <None Update="NavConfig.jsonc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Styles\HyperlinkButton.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Styles\WindowTitleBar_ThemeResources.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>

diff --git a/src/Styles/HyperlinkButton.xaml b/src/Styles/HyperlinkButton.xaml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style
+        x:Key="HyperlinkButtonWithWrappedAndUnderlinedTextStyle"
+        TargetType="HyperlinkButton">
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock
+                        Text="{Binding}"
+                        TextWrapping="Wrap"
+                        TextDecorations="Underline" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/Summary/SummaryNextSteps.xaml b/tools/SetupFlow/DevHome.SetupFlow/Views/Summary/SummaryNextSteps.xaml
@@ -48,9 +48,6 @@
             Grid.Row="1"
             IsTabStop="false"
             XYFocusKeyboardNavigation="Enabled">
-            <Grid.Resources>
-                <Style BasedOn="{StaticResource TextBlockButtonStyle}" TargetType="HyperlinkButton" />
-            </Grid.Resources>
             <Grid.RowDefinitions>
                 <RowDefinition />
                 <RowDefinition />
@@ -59,25 +56,29 @@
                 <RowDefinition />
             </Grid.RowDefinitions>
             <TextBlock
-                x:Uid="ms-resource:///DevHome.SetupFlow/Resources/SummaryPage_NextSteps"
+                x:Uid="SummaryPage_NextSteps"
                 Grid.Row="0"
                 Padding="0,20,0,25"
                 Foreground="{ThemeResource TextFillColorSecondary}"
                 Style="{ThemeResource BodyStrongTextBlockStyle}" />
             <HyperlinkButton
-                x:Uid="ms-resource:///DevHome.SetupFlow/Resources/SummaryPage_SetUpAnotherProject"
+                Style="{StaticResource HyperlinkButtonWithWrappedAndUnderlinedTextStyle}"
+                x:Uid="SummaryPage_SetUpAnotherProject"
                 Grid.Row="1"
                 Command="{Binding GoToMainPageCommand}" />
             <HyperlinkButton
-                x:Uid="ms-resource:///DevHome.SetupFlow/Resources/SummaryPage_ChangeDevHomeSettings"
+                Style="{StaticResource HyperlinkButtonWithWrappedAndUnderlinedTextStyle}"
+                x:Uid="SummaryPage_ChangeDevHomeSettings"
                 Grid.Row="2"
                 Command="{Binding GoToDevHomeSettingsCommand}" />
             <HyperlinkButton
-                x:Uid="ms-resource:///DevHome.SetupFlow/Resources/SummaryPage_ChangeDeveloperSettingsInWindows"
+                Style="{StaticResource HyperlinkButtonWithWrappedAndUnderlinedTextStyle}"
+                x:Uid="SummaryPage_ChangeDeveloperSettingsInWindows"
                 Grid.Row="3"
                 Command="{Binding GoToForDevelopersSettingsPageCommand}" />
             <HyperlinkButton
-                x:Uid="ms-resource:///DevHome.SetupFlow/Resources/SummaryPage_LearnMoreAboutDevHome"
+                Style="{StaticResource HyperlinkButtonWithWrappedAndUnderlinedTextStyle}"
+                x:Uid="SummaryPage_LearnMoreAboutDevHome"
                 Grid.Row="4"
                 Command="{Binding LearnMoreCommand}" />
         </Grid>