From b164a973101da2aac7f1560a70a2ec683f711912 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Fri, 1 Sep 2023 20:09:28 -0700 Subject: [PATCH] Sort the Sample App Categories and Samples Alphabetically --- .../Helpers/NavigationViewHelper.cs | 8 +++++--- .../ToolkitSampleSubcategory.cs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CommunityToolkit.App.Shared/Helpers/NavigationViewHelper.cs b/CommunityToolkit.App.Shared/Helpers/NavigationViewHelper.cs index 60316133..e312ef2b 100644 --- a/CommunityToolkit.App.Shared/Helpers/NavigationViewHelper.cs +++ b/CommunityToolkit.App.Shared/Helpers/NavigationViewHelper.cs @@ -39,7 +39,7 @@ public static class NavigationViewHelper private static IEnumerable GenerateSampleNavItems(IEnumerable sampleMetadata) { - foreach (var metadata in sampleMetadata) + foreach (var metadata in sampleMetadata.OrderBy(meta => meta.Title)) { yield return new MUXC.NavigationViewItem { @@ -52,7 +52,8 @@ public static class NavigationViewHelper private static IEnumerable GenerateSubcategoryNavItems(IEnumerable sampleMetadata) { - var samplesBySubcategory = sampleMetadata.GroupBy(x => x.Subcategory); + var samplesBySubcategory = sampleMetadata.GroupBy(x => x.Subcategory) + .OrderBy(g => g.Key.ToString()); foreach (var subcategoryGroup in samplesBySubcategory) { @@ -68,7 +69,8 @@ private static IEnumerable GenerateSubcategoryNavItems( private static IEnumerable GenerateCategoryNavItems(IEnumerable sampleMetadata) { - var samplesByCategory = sampleMetadata.GroupBy(x => x.Category); + var samplesByCategory = sampleMetadata.GroupBy(x => x.Category) + .OrderBy(g => g.Key.ToString()); foreach (var categoryGroup in samplesByCategory) { diff --git a/CommunityToolkit.Tooling.SampleGen/ToolkitSampleSubcategory.cs b/CommunityToolkit.Tooling.SampleGen/ToolkitSampleSubcategory.cs index 6ad8d808..96ae750a 100644 --- a/CommunityToolkit.Tooling.SampleGen/ToolkitSampleSubcategory.cs +++ b/CommunityToolkit.Tooling.SampleGen/ToolkitSampleSubcategory.cs @@ -53,7 +53,7 @@ public enum ToolkitSampleSubcategory : byte Markup, /// - /// Samples that focus on helping with mathmatical operations. + /// Samples that focus on helping with mathematical operations. /// Math,