Merge branch 'main' into niels9001/titlebar-improvements

Author: niels9001

CommunityToolkit.App.Shared/Assets/ControlIcons/Control.png

@@ -25,7 +25,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Behaviors\NavigateToUriAction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TitleBar\TitleBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TitleBar\TitleBar.Properties.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Converters\SubcategoryToIconConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Converters\StringToUriConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DocOrSampleTemplateSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\BackgroundHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\IconHelper.cs" />
@@ -110,11 +110,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)Assets\ControlIcons\Control.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\ControlIcons\Empty.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\ControlIcons\Input.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\ControlIcons\Status.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\ControlIcons\Layout.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\AppTitleBar.scale-100.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\AppTitleBar.scale-125.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\AppTitleBar.scale-150.png" />

CommunityToolkit.App.Shared/Assets/ControlIcons/Input.png

@@ -2,23 +2,18 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using CommunityToolkit.Tooling.SampleGen;
 using CommunityToolkit.App.Shared.Helpers;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace CommunityToolkit.App.Shared.Converters;
 
-public sealed class SubcategoryToIconConverter : IValueConverter
+public class StringToUriConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
-        ToolkitSampleSubcategory subcategory = (ToolkitSampleSubcategory)value;
-        return new Uri(IconHelper.GetSubcategoryIcon(subcategory));
+        return new Uri(IconHelper.GetIconPath((string)value));
     }
 
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    public object ConvertBack(object value, Type targetType,  object parameter, string language)
     {
         return value;
     }

CommunityToolkit.App.Shared/Assets/ControlIcons/Layout.png

@@ -8,11 +8,15 @@ namespace CommunityToolkit.App.Shared.Helpers;
 
 public static class IconHelper
 {
+    internal const string SourceAssetsPrefix = "ms-appx:///SourceAssets/";
+    internal const string FallBackControlIconPath = "ms-appx:///Assets/DefaultControlIcon.png";
+
     public static IconElement? GetCategoryIcon(ToolkitSampleCategory category)
     {
         IconElement? iconElement = null;
         switch (category)
         {
+            case ToolkitSampleCategory.Layouts: iconElement = new FontIcon() { Glyph = "\uF58C" }; break;
             case ToolkitSampleCategory.Controls: iconElement = new FontIcon() { Glyph = "\ue73a" }; break;
             case ToolkitSampleCategory.Animations: iconElement = new FontIcon() { Glyph = "\ue945" }; break;
             case ToolkitSampleCategory.Extensions: iconElement = new FontIcon() { Glyph = "\ue95f" }; break;
@@ -22,23 +26,15 @@ public static class IconHelper
         return iconElement;
     }
 
-    public static string GetSubcategoryIcon(ToolkitSampleSubcategory subcategory)
+    public static string GetIconPath(string? IconPath)
     {
-        string imagePath = string.Empty;
-        switch (subcategory)
+        if (!string.IsNullOrEmpty(IconPath))
+        {
+            return SourceAssetsPrefix + IconPath;
+        }
+        else
         {
-            case ToolkitSampleSubcategory.None: imagePath = "ms-appx:///Assets/ControlIcons/Control.png"; break;
-            case ToolkitSampleSubcategory.Behaviors: imagePath = "ms-appx:///Assets/ControlIcons/Input.png"; break;
-            case ToolkitSampleSubcategory.Controls: imagePath = "ms-appx:///Assets/ControlIcons/Control.png"; break;
-            case ToolkitSampleSubcategory.Converters: imagePath = "ms-appx:///Assets/ControlIcons/Input.png"; break;
-            case ToolkitSampleSubcategory.Input: imagePath = "ms-appx:///Assets/ControlIcons/Input.png"; break;
-            case ToolkitSampleSubcategory.Layout: imagePath = "ms-appx:///Assets/ControlIcons/Layout.png"; break;
-            case ToolkitSampleSubcategory.Markup: imagePath = "ms-appx:///Assets/ControlIcons/Input.png"; break;
-            case ToolkitSampleSubcategory.Math: imagePath = "ms-appx:///Assets/ControlIcons/Control.png"; break;
-            case ToolkitSampleSubcategory.Media: imagePath = "ms-appx:///Assets/ControlIcons/Control.png"; break;
-            case ToolkitSampleSubcategory.StatusAndInfo: imagePath = "ms-appx:///Assets/ControlIcons/Status.png"; break;
-            case ToolkitSampleSubcategory.Triggers: imagePath = "ms-appx:///Assets/ControlIcons/Input.png"; break;
+            return FallBackControlIconPath;
         }
-        return imagePath;
     }
 }

CommunityToolkit.App.Shared/Assets/ControlIcons/Status.png

@@ -29,7 +29,6 @@ public static class NavigationViewHelper
                 }
 
                 // Add subcategory to category
-       
                 navData.NavItem.MenuItems.Add(subcategoryItemData.NavItem);
             }
 
@@ -45,7 +44,7 @@ public static class NavigationViewHelper
             yield return new MUXC.NavigationViewItem
             {
                 Content = metadata.Title,
-                Icon = new BitmapIcon() { ShowAsMonochrome = false, UriSource = new Uri(IconHelper.GetSubcategoryIcon(metadata.Subcategory)) }, // TO DO: This is probably a property we need to add to ToolkitFrontMatter?
+                Icon = new BitmapIcon() { ShowAsMonochrome = false, UriSource = new Uri(IconHelper.GetIconPath(metadata.Icon)) },
                 Tag = metadata,
             };
         }
@@ -61,6 +60,7 @@ private static IEnumerable<GroupNavigationItemData> GenerateSubcategoryNavItems(
             {
                 Content = subcategoryGroup.Key,
                 SelectsOnInvoked = false,
+                IsExpanded = true,
                 Style = (Style)App.Current.Resources["SubcategoryNavigationViewItemStyle"],
             }, subcategoryGroup.ToArray());
         }

CommunityToolkit.App.Shared/Assets/ControlIcons/Empty.png renamed to CommunityToolkit.App.Shared/Assets/DefaultControlIcon.png

@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="CommunityToolkit.App.Shared.Pages.GettingStartedPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -36,7 +36,6 @@
     </Page.Resources>
     <Grid BorderBrush="{ThemeResource NavigationViewContentGridBorderBrush}"
           CornerRadius="8,0,0,0">
-
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />