MAUI viewer ran against PerformanceAnalysisMode (#1456)

williambohrmann3 · williambohrmann3 · commit 0b6780d03838 · 2024-07-01T09:22:13.000-07:00
diff --git a/src/MAUI/Maui.Samples/Controls/CategoriesFlyoutContent.xaml.cs b/src/MAUI/Maui.Samples/Controls/CategoriesFlyoutContent.xaml.cs
@@ -29,12 +29,12 @@ private void CategoriesCollectionView_SelectionChanged(object sender, SelectionC
             selectedCategory.IsSelected = true;
             previousCategory.IsSelected = false;
 
-            _viewModel.CategorySelected(selectedCategory.CategoryName);
+            FlyoutMenuViewModel.CategorySelected(selectedCategory.CategoryName);
 
         }
         catch (Exception ex)
         {
             Debug.Write(ex.ToString());
         }
     }
-}
+}
diff --git a/src/MAUI/Maui.Samples/ViewModels/CategoryViewModel.cs b/src/MAUI/Maui.Samples/ViewModels/CategoryViewModel.cs
@@ -11,7 +11,7 @@ namespace ArcGIS.ViewModels
 {
     public partial class CategoryViewModel : ObservableObject
     {
-        private static readonly string DefaultCategory = "Featured";
+        private const string DefaultCategory = "Featured";
         private double _sampleImageWidth;
         private double _sampleImageHeight;
         public double SampleImageWidth => _sampleImageWidth;
@@ -71,7 +71,7 @@ private void UpdateCategory(string category)
             SamplesItems = samplesCollection;
         }
 
-        private List<SampleInfo> GetSamplesInCategory(string category)
+        private static List<SampleInfo> GetSamplesInCategory(string category)
         {
             var categoryNode = SampleManager.Current.FullTree.Items.OfType<SearchableTreeNode>().FirstOrDefault(c => c.Name == category);
 
@@ -100,7 +100,7 @@ void UpdateFavorite(string sampleFormalName)
         }
 
         [RelayCommand]
-        void SampleSelected(SampleViewModel sampleViewModel)
+        static void SampleSelected(SampleViewModel sampleViewModel)
         {
             if(SampleManager.Current.SelectedSample == null)
                 _ = SampleLoader.LoadSample(sampleViewModel.SampleObject);
diff --git a/src/MAUI/Maui.Samples/ViewModels/FlyoutMenuViewModel.cs b/src/MAUI/Maui.Samples/ViewModels/FlyoutMenuViewModel.cs
@@ -68,7 +68,7 @@ private void Initialize()
         [ObservableProperty]
         private ObservableCollection<FlyoutCategoryViewModel> _categories;
 
-        public void CategorySelected(string categoryName)
+        public static void CategorySelected(string categoryName)
         {
             WeakReferenceMessenger.Default.Send(categoryName);
         }
diff --git a/src/MAUI/Maui.Samples/ViewModels/SearchViewModel.cs b/src/MAUI/Maui.Samples/ViewModels/SearchViewModel.cs
@@ -48,7 +48,7 @@ void PerformSearch()
             else
             {
                 // Remove punctuation from the search text and any trailing white space at the end.
-                var searchKeywords = GetKeywords(SearchText);
+                var searchKeywords = SearchViewModel.GetKeywords(SearchText);
 
                 // Check if the keywords are the same as the previous search.
                 if (Enumerable.SequenceEqual(searchKeywords, _previousSearchKeywords))
@@ -84,7 +84,7 @@ void PerformSearch()
 
                 try
                 {
-                    if (sampleResults.Any())
+                    if (sampleResults.Count != 0)
                     {
                         sampleResults = sampleResults.OrderByDescending(sampleResults => sampleResults.Score).ThenBy(sampleResults => sampleResults.SampleName).ToList();
                         SearchItems = new ObservableCollection<SearchResultViewModel>(sampleResults);
@@ -101,7 +101,7 @@ void PerformSearch()
             }
         }
 
-        private int GetMatches(string[] contentKeywords, string[] searchKeywords)
+        private static int GetMatches(string[] contentKeywords, string[] searchKeywords)
         {
             int matches = 0;
 
@@ -123,7 +123,7 @@ private int GetMatches(string[] contentKeywords, string[] searchKeywords)
             return matches;
         }
 
-        private string[] GetKeywords(string text)
+        private static string[] GetKeywords(string text)
         {
             // Remove punctuation from the search text and any trailing white space at the end.
             Regex regex = new Regex("[^a-zA-Z0-9 -]");
@@ -134,10 +134,7 @@ private string[] GetKeywords(string text)
 
             foreach (var word in commonWords)
             {
-                if (cleanedTextWords.Contains(word))
-                {
-                    cleanedTextWords.Remove(word);
-                }
+                cleanedTextWords.Remove(word);
             }
 
             return cleanedTextWords.ToArray();
diff --git a/src/MAUI/Maui.Samples/Views/SamplePage.xaml.cs b/src/MAUI/Maui.Samples/Views/SamplePage.xaml.cs
@@ -35,7 +35,7 @@ public partial class SamplePage : ContentPage
     {
         private ContentPage _sampleContent;
         private Assembly _assembly;
-        private int _lastViewedFileIndex = 0;
+        private int _lastViewedFileIndex;
 
         // single-instance webviews reused on each view, to avoid a memory leak in webview
         private static WebView DescriptionView = new WebView();
@@ -179,21 +179,21 @@ private static IEnumerable<T> TreeWalker<T>(VisualElement root)
         private async Task<string> GetDescriptionHtml(SampleInfo sampleInfo)
         {
             string category = sampleInfo.Category;
-            if (category.Contains(" "))
+            if (category.Contains(' '))
             {
                 // Make categories with spaces into titlecase folder name.
                 category = $"{category.Split(" ")[0]}{category.Split(" ")[1][0].ToString().ToUpper()}{category.Split(" ")[1].Substring(1)}";
             }
 
             using Stream fileStream = await FileSystem.Current.OpenAppPackageFileAsync($"Samples/{category}/{sampleInfo.FormalName}/readme.md").ConfigureAwait(false);
             StreamReader r = new StreamReader(fileStream);
-            var readmeContent = r.ReadToEnd();
+            var readmeContent = await r.ReadToEndAsync();
             readmeContent = Markdig.Markdown.ToHtml(readmeContent);
 
             // Set CSS for dark mode or light mode.
             string markdownCssType = Application.Current.RequestedTheme == Microsoft.Maui.ApplicationModel.AppTheme.Dark ? "github-markdown-dark.css" : "github-markdown.css";
             string cssResource = _assembly.GetManifestResourceNames().Single(n => n.EndsWith($"SyntaxHighlighting.{markdownCssType}"));
-            string cssContent = new StreamReader(_assembly.GetManifestResourceStream(cssResource)).ReadToEnd();
+            string cssContent = await new StreamReader(_assembly.GetManifestResourceStream(cssResource)).ReadToEndAsync();
 
 #if WINDOWS
             // Remove the readme header on Windows so it doesn't repeat the title.
@@ -205,7 +205,7 @@ private async Task<string> GetDescriptionHtml(SampleInfo sampleInfo)
             if (sourceStream is not null)
             {
                 using var memoryStream = new MemoryStream();
-                sourceStream.CopyTo(memoryStream);
+                await sourceStream.CopyToAsync(memoryStream);
                 byte[] image = memoryStream.ToArray();
                 memoryStream.Close();
 
@@ -502,7 +502,7 @@ private async void GitHubToolbarItem_Clicked(object sender, EventArgs e)
             await OpenGitHub();
         }
 
-        private async Task OpenGitHub()
+        private static async Task OpenGitHub()
         {
             try
             {
@@ -529,7 +529,7 @@ private void ScreenshotButton_Clicked(object sender, EventArgs e)
         // Code here is adapted from the following Stack Overflow answers:
         // https://stackoverflow.com/q/24466482
         // https://stackoverflow.com/a/15537372
-        private void SaveScreenshot(VisualElement source)
+        private static void SaveScreenshot(VisualElement source)
         {
             double scale = ScreenshotManager.ScreenshotSettings.ScaleFactor.HasValue ? ScreenshotManager.ScreenshotSettings.ScaleFactor.Value : double.NaN;
 
@@ -643,23 +643,23 @@ private async Task LoadContent()
                 {
                     var fileName = _path.Split('/').Last();
                     var xamlPath = assembly.GetManifestResourceNames().Single(n => n.EndsWith($"{fileName}"));
-                    SourceCode = baseContent = new StreamReader(assembly.GetManifestResourceStream(xamlPath)).ReadToEnd();
+                    SourceCode = baseContent = await new StreamReader(assembly.GetManifestResourceStream(xamlPath)).ReadToEndAsync();
                 }
                 else
                 {
                     using Stream fileStream = await FileSystem.Current.OpenAppPackageFileAsync(_path).ConfigureAwait(false);
-                    SourceCode = baseContent = new StreamReader(fileStream).ReadToEnd();
+                    SourceCode = baseContent = await new StreamReader(fileStream).ReadToEndAsync();
                 }
 #else
                 using Stream fileStream = await FileSystem.Current.OpenAppPackageFileAsync(_path).ConfigureAwait(false);
-                SourceCode = baseContent = new StreamReader(fileStream).ReadToEnd();
+                SourceCode = baseContent = await new StreamReader(fileStream).ReadToEndAsync();
 #endif
                 // For xaml files, search for dynamic resource styles, taking into account any whitespace.
                 if (_path.EndsWith(".xaml") && String.Concat(baseContent.Where(c => !Char.IsWhiteSpace(c)))
                     .Contains("Style=\"{DynamicResource"))
                 {
                     // Display a comment on the second line of the file.
-                    baseContent = baseContent.Insert(baseContent.IndexOf(">")+1, 
+                    baseContent = baseContent.Insert(baseContent.IndexOf('>')+1, 
                         "\n<!-- Styles used in this sample can be copied from Resources/Styles/Styles.xaml. -->");
                 }
                 
@@ -672,15 +672,15 @@ private async Task LoadContent()
                 // Set CSS for dark mode or light mode.
                 string markdownCssType = Application.Current.RequestedTheme == Microsoft.Maui.ApplicationModel.AppTheme.Dark ? "highlight-dark.css" : "highlight.css";
                 string cssResource = assembly.GetManifestResourceNames().Single(n => n.EndsWith($"SyntaxHighlighting.{markdownCssType}"));
-                string cssContent = new StreamReader(assembly.GetManifestResourceStream(cssResource)).ReadToEnd();
+                string cssContent = await new StreamReader(assembly.GetManifestResourceStream(cssResource)).ReadToEndAsync();
 
                 // Set the background color. Color values are taken from corresponding css files.
                 string backgroundColor = Application.Current.RequestedTheme == Microsoft.Maui.ApplicationModel.AppTheme.Dark ? "#1e1e1e" : "#fff";
                 cssContent = $"{cssContent} body {{ background: {backgroundColor};}}";
 
                 // Read javascript content.
                 string jsResource = assembly.GetManifestResourceNames().Single(n => n.EndsWith($"SyntaxHighlighting.highlight.js"));
-                string jsContent = new StreamReader(assembly.GetManifestResourceStream(jsResource)).ReadToEnd();
+                string jsContent = await new StreamReader(assembly.GetManifestResourceStream(jsResource)).ReadToEndAsync();
 
                 // Build the html.
                 _fullContent =

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ private void CategoriesCollectionView_SelectionChanged(object sender, SelectionC`
`29`	`29`	`selectedCategory.IsSelected = true;`
`30`	`30`	`previousCategory.IsSelected = false;`
`31`	`31`
`32`		`- _viewModel.CategorySelected(selectedCategory.CategoryName);`
	`32`	`+ FlyoutMenuViewModel.CategorySelected(selectedCategory.CategoryName);`
`33`	`33`
`34`	`34`	`}`
`35`	`35`	`catch (Exception ex)`
`36`	`36`	`{`
`37`	`37`	`Debug.Write(ex.ToString());`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`-}`
	`40`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace ArcGIS.ViewModels`
`11`	`11`	`{`
`12`	`12`	`public partial class CategoryViewModel : ObservableObject`
`13`	`13`	`{`
`14`		`- private static readonly string DefaultCategory = "Featured";`
	`14`	`+ private const string DefaultCategory = "Featured";`
`15`	`15`	`private double _sampleImageWidth;`
`16`	`16`	`private double _sampleImageHeight;`
`17`	`17`	`public double SampleImageWidth => _sampleImageWidth;`
`@@ -71,7 +71,7 @@ private void UpdateCategory(string category)`
`71`	`71`	`SamplesItems = samplesCollection;`
`72`	`72`	`}`
`73`	`73`
`74`		`- private List<SampleInfo> GetSamplesInCategory(string category)`
	`74`	`+ private static List<SampleInfo> GetSamplesInCategory(string category)`
`75`	`75`	`{`
`76`	`76`	`var categoryNode = SampleManager.Current.FullTree.Items.OfType<SearchableTreeNode>().FirstOrDefault(c => c.Name == category);`
`77`	`77`
`@@ -100,7 +100,7 @@ void UpdateFavorite(string sampleFormalName)`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`[RelayCommand]`
`103`		`- void SampleSelected(SampleViewModel sampleViewModel)`
	`103`	`+ static void SampleSelected(SampleViewModel sampleViewModel)`
`104`	`104`	`{`
`105`	`105`	`if(SampleManager.Current.SelectedSample == null)`
`106`	`106`	`_ = SampleLoader.LoadSample(sampleViewModel.SampleObject);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private void Initialize()`
`68`	`68`	`[ObservableProperty]`
`69`	`69`	`private ObservableCollection<FlyoutCategoryViewModel> _categories;`
`70`	`70`
`71`		`- public void CategorySelected(string categoryName)`
	`71`	`+ public static void CategorySelected(string categoryName)`
`72`	`72`	`{`
`73`	`73`	`WeakReferenceMessenger.Default.Send(categoryName);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ void PerformSearch()`
`48`	`48`	`else`
`49`	`49`	`{`
`50`	`50`	`// Remove punctuation from the search text and any trailing white space at the end.`
`51`		`- var searchKeywords = GetKeywords(SearchText);`
	`51`	`+ var searchKeywords = SearchViewModel.GetKeywords(SearchText);`
`52`	`52`
`53`	`53`	`// Check if the keywords are the same as the previous search.`
`54`	`54`	`if (Enumerable.SequenceEqual(searchKeywords, _previousSearchKeywords))`
`@@ -84,7 +84,7 @@ void PerformSearch()`
`84`	`84`
`85`	`85`	`try`
`86`	`86`	`{`
`87`		`- if (sampleResults.Any())`
	`87`	`+ if (sampleResults.Count != 0)`
`88`	`88`	`{`
`89`	`89`	`sampleResults = sampleResults.OrderByDescending(sampleResults => sampleResults.Score).ThenBy(sampleResults => sampleResults.SampleName).ToList();`
`90`	`90`	`SearchItems = new ObservableCollection<SearchResultViewModel>(sampleResults);`
`@@ -101,7 +101,7 @@ void PerformSearch()`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- private int GetMatches(string[] contentKeywords, string[] searchKeywords)`
	`104`	`+ private static int GetMatches(string[] contentKeywords, string[] searchKeywords)`
`105`	`105`	`{`
`106`	`106`	`int matches = 0;`
`107`	`107`
`@@ -123,7 +123,7 @@ private int GetMatches(string[] contentKeywords, string[] searchKeywords)`
`123`	`123`	`return matches;`
`124`	`124`	`}`
`125`	`125`
`126`		`- private string[] GetKeywords(string text)`
	`126`	`+ private static string[] GetKeywords(string text)`
`127`	`127`	`{`
`128`	`128`	`// Remove punctuation from the search text and any trailing white space at the end.`
`129`	`129`	`Regex regex = new Regex("[^a-zA-Z0-9 -]");`
`@@ -134,10 +134,7 @@ private string[] GetKeywords(string text)`
`134`	`134`
`135`	`135`	`foreach (var word in commonWords)`
`136`	`136`	`{`
`137`		`- if (cleanedTextWords.Contains(word))`
`138`		`- {`
`139`		`- cleanedTextWords.Remove(word);`
`140`		`- }`
	`137`	`+ cleanedTextWords.Remove(word);`
`141`	`138`	`}`
`142`	`139`
`143`	`140`	`return cleanedTextWords.ToArray();`