Refactor to file-scoped namespaces

Author: Sergio0694

samples/MvvmSample.Core/Helpers/MarkdownHelper.cs

@@ -6,26 +6,25 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace MvvmSample.Core.Helpers
+namespace MvvmSample.Core.Helpers;
+
+/// <summary>
+/// A simple class to help with basic operations on markdown documents.
+/// </summary>
+public static class MarkdownHelper
 {
     /// <summary>
-    /// A simple class to help with basic operations on markdown documents.
+    /// Gets all the paragraphs in a given markdown document.
     /// </summary>
-    public static class MarkdownHelper
+    /// <param name="text">The input markdown document.</param>
+    /// <returns>The raw paragraphs from <paramref name="text"/>.</returns>
+    public static IReadOnlyDictionary<string, string> GetParagraphs(string text)
     {
-        /// <summary>
-        /// Gets all the paragraphs in a given markdown document.
-        /// </summary>
-        /// <param name="text">The input markdown document.</param>
-        /// <returns>The raw paragraphs from <paramref name="text"/>.</returns>
-        public static IReadOnlyDictionary<string, string> GetParagraphs(string text)
-        {
-            return
-               Regex.Matches(text, @"(?<=\W)#+ ([^\n]+).+?(?=\W#|$)", RegexOptions.Singleline)
-               .OfType<Match>()
-                .ToDictionary(
-                    m => m.Groups[1].Value.Trim().Replace("&lt;", "<"),
-                    m => m.Groups[0].Value.Trim().Replace("&lt;", "<").Replace("[!WARNING]", "**WARNING:**").Replace("[!NOTE]", "**NOTE:**"));
-        }
+        return
+           Regex.Matches(text, @"(?<=\W)#+ ([^\n]+).+?(?=\W#|$)", RegexOptions.Singleline)
+           .OfType<Match>()
+            .ToDictionary(
+                m => m.Groups[1].Value.Trim().Replace("&lt;", "<"),
+                m => m.Groups[0].Value.Trim().Replace("&lt;", "<").Replace("[!WARNING]", "**WARNING:**").Replace("[!NOTE]", "**NOTE:**"));
     }
 }

samples/MvvmSample.Core/Models/Post.cs

@@ -6,73 +6,72 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 
-namespace MvvmSample.Core.Models
+namespace MvvmSample.Core.Models;
+
+/// <summary>
+/// A class for a query for posts in a given subreddit.
+/// </summary>
+public sealed class PostsQueryResponse
 {
     /// <summary>
-    /// A class for a query for posts in a given subreddit.
+    /// Gets or sets the listing data for the response.
     /// </summary>
-    public sealed class PostsQueryResponse
-    {
-        /// <summary>
-        /// Gets or sets the listing data for the response.
-        /// </summary>
-        [JsonPropertyName("data")]
-        public PostListing? Data { get; set; }
-    }
+    [JsonPropertyName("data")]
+    public PostListing? Data { get; set; }
+}
 
+/// <summary>
+/// A class for a Reddit listing of posts.
+/// </summary>
+public sealed class PostListing
+{
     /// <summary>
-    /// A class for a Reddit listing of posts.
+    /// Gets or sets the items in this listing.
     /// </summary>
-    public sealed class PostListing
-    {
-        /// <summary>
-        /// Gets or sets the items in this listing.
-        /// </summary>
-        [JsonPropertyName("children")]
-        public IList<PostData>? Items { get; set; }
-    }
+    [JsonPropertyName("children")]
+    public IList<PostData>? Items { get; set; }
+}
 
+/// <summary>
+/// A wrapping class for a post.
+/// </summary>
+public sealed class PostData
+{
     /// <summary>
-    /// A wrapping class for a post.
+    /// Gets or sets the <see cref="Post"/> instance.
     /// </summary>
-    public sealed class PostData
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="Post"/> instance.
-        /// </summary>
-        [JsonPropertyName("data")]
-        public Post? Data { get; set; }
-    }
+    [JsonPropertyName("data")]
+    public Post? Data { get; set; }
+}
 
+/// <summary>
+/// A simple model for a Reddit post.
+/// </summary>
+public sealed class Post
+{
     /// <summary>
-    /// A simple model for a Reddit post.
+    /// Gets or sets the title of the post.
     /// </summary>
-    public sealed class Post
-    {
-        /// <summary>
-        /// Gets or sets the title of the post.
-        /// </summary>
-        [JsonPropertyName("title")]
-        public string? Title { get; set; }
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
-        /// <summary>
-        /// Gets or sets the URL to the post thumbnail, if present.
-        /// </summary>
-        [JsonPropertyName("thumbnail")]
-        public string? Thumbnail { get; set; }
+    /// <summary>
+    /// Gets or sets the URL to the post thumbnail, if present.
+    /// </summary>
+    [JsonPropertyName("thumbnail")]
+    public string? Thumbnail { get; set; }
 
-        /// <summary>
-        /// Gets the text of the post.
-        /// </summary>
-        /// <remarks>
-        /// Here we're just hardcoding some sample text to simplify how posts are displayed.
-        /// Normally, not all posts have a self text post available.
-        /// </remarks>
-        [JsonIgnore]
-        public string SelfText { get; } = string.Join(" ", Enumerable.Repeat(
+    /// <summary>
+    /// Gets the text of the post.
+    /// </summary>
+    /// <remarks>
+    /// Here we're just hardcoding some sample text to simplify how posts are displayed.
+    /// Normally, not all posts have a self text post available.
+    /// </remarks>
+    [JsonIgnore]
+    public string SelfText { get; } = string.Join(" ", Enumerable.Repeat(
 @"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
 Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
 Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", 20));
-    }
 }

samples/MvvmSample.Core/Services/IFileService.cs

@@ -5,23 +5,22 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace MvvmSample.Core.Services
+namespace MvvmSample.Core.Services;
+
+/// <summary>
+/// The default <see langword="interface"/> for a service that handles files.
+/// </summary>
+public interface IFilesService
 {
     /// <summary>
-    /// The default <see langword="interface"/> for a service that handles files.
+    /// Gets the path of the installation directory.
     /// </summary>
-    public interface IFilesService
-    {
-        /// <summary>
-        /// Gets the path of the installation directory.
-        /// </summary>
-        string InstallationPath { get; }
+    string InstallationPath { get; }
 
-        /// <summary>
-        /// Gets a readonly <see cref="Stream"/> for a file at a specified path.
-        /// </summary>
-        /// <param name="path">The path of the file to retrieve.</param>
-        /// <returns>The <see cref="Stream"/> for the specified file.</returns>
-        Task<Stream> OpenForReadAsync(string path);
-    }
+    /// <summary>
+    /// Gets a readonly <see cref="Stream"/> for a file at a specified path.
+    /// </summary>
+    /// <param name="path">The path of the file to retrieve.</param>
+    /// <returns>The <see cref="Stream"/> for the specified file.</returns>
+    Task<Stream> OpenForReadAsync(string path);
 }

samples/MvvmSample.Core/Services/IRedditService.cs

@@ -6,18 +6,17 @@
 using MvvmSample.Core.Models;
 using Refit;
 
-namespace MvvmSample.Core.Services
+namespace MvvmSample.Core.Services;
+
+/// <summary>
+/// An interface for a simple Reddit service.
+/// </summary>
+public interface IRedditService
 {
     /// <summary>
-    /// An interface for a simple Reddit service.
+    /// Get a list of posts from a given subreddit
     /// </summary>
-    public interface IRedditService
-    {
-        /// <summary>
-        /// Get a list of posts from a given subreddit
-        /// </summary>
-        /// <param name="subreddit">The subreddit name.</param>
-        [Get("/r/{subreddit}/.json")]
-        Task<PostsQueryResponse> GetSubredditPostsAsync(string subreddit);
-    }
+    /// <param name="subreddit">The subreddit name.</param>
+    [Get("/r/{subreddit}/.json")]
+    Task<PostsQueryResponse> GetSubredditPostsAsync(string subreddit);
 }

samples/MvvmSample.Core/Services/ISettingsService.cs

@@ -4,26 +4,25 @@
 
 using System;
 
-namespace MvvmSample.Core.Services
+namespace MvvmSample.Core.Services;
+
+/// <summary>
+/// The default <see langword="interface"/> for the settings manager used in the app.
+/// </summary>
+public interface ISettingsService
 {
     /// <summary>
-    /// The default <see langword="interface"/> for the settings manager used in the app.
+    /// Assigns a value to a settings key.
     /// </summary>
-    public interface ISettingsService
-    {
-        /// <summary>
-        /// Assigns a value to a settings key.
-        /// </summary>
-        /// <typeparam name="T">The type of the object bound to the key.</typeparam>
-        /// <param name="key">The key to check.</param>
-        /// <param name="value">The value to assign to the setting key.</param>
-        void SetValue<T>(string key, T? value);
+    /// <typeparam name="T">The type of the object bound to the key.</typeparam>
+    /// <param name="key">The key to check.</param>
+    /// <param name="value">The value to assign to the setting key.</param>
+    void SetValue<T>(string key, T? value);
 
-        /// <summary>
-        /// Reads a value from the current <see cref="IServiceProvider"/> instance and returns its casting in the right type.
-        /// </summary>
-        /// <typeparam name="T">The type of the object to retrieve.</typeparam>
-        /// <param name="key">The key associated to the requested object.</param>
-        T? GetValue<T>(string key);
-    }
+    /// <summary>
+    /// Reads a value from the current <see cref="IServiceProvider"/> instance and returns its casting in the right type.
+    /// </summary>
+    /// <typeparam name="T">The type of the object to retrieve.</typeparam>
+    /// <param name="key">The key associated to the requested object.</param>
+    T? GetValue<T>(string key);
 }

samples/MvvmSample.Core/ViewModels/AsyncRelayCommandPageViewModel.cs

@@ -5,22 +5,21 @@
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
 
-namespace MvvmSample.Core.ViewModels
+namespace MvvmSample.Core.ViewModels;
+
+public class AsyncRelayCommandPageViewModel : SamplePageViewModel
 {
-    public class AsyncRelayCommandPageViewModel : SamplePageViewModel
+    public AsyncRelayCommandPageViewModel()
     {
-        public AsyncRelayCommandPageViewModel()
-        {
-            DownloadTextCommand = new AsyncRelayCommand(DownloadTextAsync);
-        }
+        DownloadTextCommand = new AsyncRelayCommand(DownloadTextAsync);
+    }
 
-        public IAsyncRelayCommand DownloadTextCommand { get; }
+    public IAsyncRelayCommand DownloadTextCommand { get; }
 
-        private async Task<string> DownloadTextAsync()
-        {
-            await Task.Delay(3000); // Simulate a web request
+    private async Task<string> DownloadTextAsync()
+    {
+        await Task.Delay(3000); // Simulate a web request
 
-            return "Hello world!";
-        }
+        return "Hello world!";
     }
 }

samples/MvvmSample.Core/ViewModels/IocPageViewModel.cs

@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace MvvmSample.Core.ViewModels
+namespace MvvmSample.Core.ViewModels;
+
+public class IocPageViewModel : SamplePageViewModel
 {
-    public class IocPageViewModel : SamplePageViewModel
-    {
-    }
 }