From 1be78f92b6f9ef8caeeb8be40385532a4bb6ddb0 Mon Sep 17 00:00:00 2001 From: Darshak Bhatti Date: Tue, 11 Jun 2024 17:22:44 -0700 Subject: [PATCH 1/2] icon --- src/Assets/Fonts/DevHome.ttf | Bin 10016 -> 13544 bytes src/Helpers/NavConfig.cs | 3 +++ src/NavConfig.jsonc | 3 ++- src/Views/ShellPage.xaml.cs | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Assets/Fonts/DevHome.ttf b/src/Assets/Fonts/DevHome.ttf index ff38366de3f90655a985c6c27381e292c5e46a95..54dfab604d1a5fdfc1ca2048493ddbe410e9115b 100644 GIT binary patch delta 6709 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 K6|QZZ?)ezX!Bxuu diff --git a/src/Helpers/NavConfig.cs b/src/Helpers/NavConfig.cs index eead864da9..423f128123 100644 --- a/src/Helpers/NavConfig.cs +++ b/src/Helpers/NavConfig.cs @@ -45,6 +45,9 @@ internal sealed class Tool [JsonPropertyName("viewModelFullName")] public string ViewModelFullName { get; set; } + [JsonPropertyName("iconFontFamily")] + public string IconFontFamily { get; set; } = "SymbolThemeFontFamily"; + [JsonPropertyName("icon")] public string Icon { get; set; } diff --git a/src/NavConfig.jsonc b/src/NavConfig.jsonc index 3c47f1a159..64e3d649a6 100644 --- a/src/NavConfig.jsonc +++ b/src/NavConfig.jsonc @@ -38,7 +38,8 @@ "assembly": "DevHome.Utilities", "viewFullName": "DevHome.Utilities.Views.UtilitiesMainPageView", "viewModelFullName": "DevHome.Utilities.ViewModels.UtilitiesMainPageViewModel", - "icon": "ED35" + "iconFontFamily": "DevHomeFluentIcons", + "icon": "ECED" } ] } diff --git a/src/Views/ShellPage.xaml.cs b/src/Views/ShellPage.xaml.cs index b9d81fc8ca..0cd6df6b78 100644 --- a/src/Views/ShellPage.xaml.cs +++ b/src/Views/ShellPage.xaml.cs @@ -165,7 +165,7 @@ private void UpdateNavigationMenuItems() helpers:NavigationHelper.NavigateTo=""{tool.ViewModelFullName}"" AutomationProperties.AutomationId=""{tool.Identity}""> - + "; NavigationViewItem navigationViewItem = (NavigationViewItem)XamlReader.Load(navigationViewItemString); From 14f5997333b76927024ebd230625455cc5500398 Mon Sep 17 00:00:00 2001 From: Darshak Bhatti Date: Tue, 11 Jun 2024 17:26:23 -0700 Subject: [PATCH 2/2] layout --- tools/Utilities/src/Views/UtilitiesMainPageView.xaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/Utilities/src/Views/UtilitiesMainPageView.xaml b/tools/Utilities/src/Views/UtilitiesMainPageView.xaml index 23f2014aa4..f08da95042 100644 --- a/tools/Utilities/src/Views/UtilitiesMainPageView.xaml +++ b/tools/Utilities/src/Views/UtilitiesMainPageView.xaml @@ -31,8 +31,7 @@ MinRowSpacing="12" MinColumnSpacing="12" ItemsStretch="Fill" - MaximumRowsOrColumns="3" - ItemsJustification="Center" /> + MaximumRowsOrColumns="3" />