Merge pull request #44 from CommunityToolkit/update/uwp-sample

Sample app updates

Author: michael-hawker

samples/MvvmSample.Core/Models/Post.cs

@@ -4,62 +4,62 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace MvvmSample.Core.Models
 {
     /// <summary>
     /// A class for a query for posts in a given subreddit.
     /// </summary>
-    public class PostsQueryResponse
+    public sealed class PostsQueryResponse
     {
         /// <summary>
         /// Gets or sets the listing data for the response.
         /// </summary>
-        [JsonProperty("data")]
-        public PostListing Data { get; set; }
+        [JsonPropertyName("data")]
+        public PostListing? Data { get; set; }
     }
 
     /// <summary>
     /// A class for a Reddit listing of posts.
     /// </summary>
-    public class PostListing
+    public sealed class PostListing
     {
         /// <summary>
         /// Gets or sets the items in this listing.
         /// </summary>
-        [JsonProperty("children")]
-        public IList<PostData> Items { get; set; }
+        [JsonPropertyName("children")]
+        public IList<PostData>? Items { get; set; }
     }
 
     /// <summary>
     /// A wrapping class for a post.
     /// </summary>
-    public class PostData
+    public sealed class PostData
     {
         /// <summary>
         /// Gets or sets the <see cref="Post"/> instance.
         /// </summary>
-        [JsonProperty("data")]
-        public Post Data { get; set; }
+        [JsonPropertyName("data")]
+        public Post? Data { get; set; }
     }
 
     /// <summary>
     /// A simple model for a Reddit post.
     /// </summary>
-    public class Post
+    public sealed class Post
     {
         /// <summary>
         /// Gets or sets the title of the post.
         /// </summary>
-        [JsonProperty("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>
-        [JsonProperty("thumbnail")]
-        public string Thumbnail { get; set; }
+        [JsonPropertyName("thumbnail")]
+        public string? Thumbnail { get; set; }
 
         /// <summary>
         /// Gets the text of the post.

samples/MvvmSample.Core/MvvmSample.Core.csproj

@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-	<LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
+    <Nullable>enable</Nullable>
     <UserSecretsId>4e66f7b4-01a8-4f00-8733-4ae6a08c741f</UserSecretsId>
   </PropertyGroup>
 
@@ -43,9 +44,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.0-preview5" />
-		<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.0" />
-		<PackageReference Include="Refit" Version="5.2.1" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="7.0.3" />
+    <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.0" />
+    <PackageReference Include="Refit" Version="6.0.38" />
+  </ItemGroup>
 </Project>

samples/MvvmSample.Core/Services/ISettingsService.cs

@@ -26,6 +26,6 @@ public interface ISettingsService
         /// <typeparam name="T">The type of the object to retrieve.</typeparam>
         /// <param name="key">The key associated to the requested object.</param>
         [Pure]
-        T GetValue<T>(string key);
+        T? GetValue<T>(string key);
     }
 }

samples/MvvmSample.Core/ViewModels/AsyncRelayCommandPageViewModel.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 
 namespace MvvmSample.Core.ViewModels
 {

samples/MvvmSample.Core/ViewModels/MessengerPageViewModel.cs

@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
 
 namespace MvvmSample.Core.ViewModels
 {
@@ -21,9 +21,9 @@ public MessengerPageViewModel()
         public ICommand RequestCurrentUsernameCommand { get; }
         public ICommand ResetCurrentUsernameCommand { get; }
 
-        public UserSenderViewModel SenderViewModel { get; } = new UserSenderViewModel();
+        public UserSenderViewModel SenderViewModel { get; } = new();
 
-        public UserReceiverViewModel ReceiverViewModel { get; } = new UserReceiverViewModel();
+        public UserReceiverViewModel ReceiverViewModel { get; } = new();
 
         // Simple viewmodel for a module sending a username message
         public class UserSenderViewModel : ObservableRecipient
@@ -73,9 +73,9 @@ protected override void OnActivated()
             }
         }
 
-        private string username;
+        private string? username;
 
-        public string Username
+        public string? Username
         {
             get => username;
             private set => SetProperty(ref username, value);

samples/MvvmSample.Core/ViewModels/ObservableObjectPageViewModel.cs

@@ -2,9 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Mvvm.Input;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
 
 namespace MvvmSample.Core.ViewModels
 {
@@ -20,23 +20,23 @@ public ObservableObjectPageViewModel()
         /// </summary>
         public ICommand ReloadTaskCommand { get; }
 
-        private string name;
+        private string? name;
 
         /// <summary>
         /// Gets or sets the name to display.
         /// </summary>
-        public string Name
+        public string? Name
         {
             get => name;
             set => SetProperty(ref name, value);
         }
 
-        private TaskNotifier myTask;
+        private TaskNotifier? myTask;
 
         /// <summary>
         /// Gets or sets the name to display.
         /// </summary>
-        public Task MyTask
+        public Task? MyTask
         {
             get => myTask;
             private set => SetPropertyAndNotifyOnCompletion(ref myTask, value);

samples/MvvmSample.Core/ViewModels/RelayCommandPageViewModel.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Windows.Input;
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 
 namespace MvvmSample.Core.ViewModels
 {

samples/MvvmSample.Core/ViewModels/SamplePageViewModel.cs

@@ -5,9 +5,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.DependencyInjection;
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Input;
 using MvvmSample.Core.Helpers;
 using MvvmSample.Core.Services;
 
@@ -18,7 +18,6 @@ namespace MvvmSample.Core.ViewModels
     /// </summary>
     public class SamplePageViewModel : ObservableObject
     {
-        private IReadOnlyDictionary<string, string> texts;
         /// <summary>
         /// The <see cref="IFilesService"/> instance currently in use.
         /// </summary>
@@ -34,7 +33,9 @@ public SamplePageViewModel()
         /// </summary>
         public IAsyncRelayCommand<string> LoadDocsCommand { get; }
 
-        public IReadOnlyDictionary<string, string> Texts 
+        private IReadOnlyDictionary<string, string>? texts;
+
+        public IReadOnlyDictionary<string, string>? Texts 
         { 
             get => texts; 
             set => SetProperty(ref texts, value); 
@@ -47,15 +48,17 @@ public IReadOnlyDictionary<string, string> Texts
         /// <returns>The text of the specified paragraph, or <see langword="null"/>.</returns>
         public string GetParagraph(string key)
         {
-            return Texts != null && Texts.TryGetValue(key, out var value) ? value : string.Empty;
+            return Texts is not null && Texts.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         /// <summary>
         /// Implements the logic for <see cref="LoadDocsCommand"/>.
         /// </summary>
         /// <param name="name">The name of the docs file to load.</param>
-        private async Task LoadDocsAsync(string name)
+        private async Task LoadDocsAsync(string? name)
         {
+            if (name is null) return;
+
             // Skip if the loading has already started
             if (!(LoadDocsCommand.ExecutionTask is null)) return;
 

samples/MvvmSample.Core/ViewModels/Widgets/PostWidgetViewModel.cs

@@ -2,9 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Mvvm.Messaging.Messages;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
 using MvvmSample.Core.Models;
 
 namespace MvvmSample.Core.ViewModels.Widgets
@@ -14,12 +14,12 @@ namespace MvvmSample.Core.ViewModels.Widgets
     /// </summary>
     public sealed class PostWidgetViewModel : ObservableRecipient, IRecipient<PropertyChangedMessage<Post>>
     {
-        private Post post;
+        private Post? post;
 
         /// <summary>
         /// Gets the currently selected post, if any.
         /// </summary>
-        public Post Post
+        public Post? Post
         {
             get => post;
             private set => SetProperty(ref post, value);

samples/MvvmSample.Core/ViewModels/Widgets/SubredditWidgetViewModel.cs

@@ -5,9 +5,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.DependencyInjection;
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Input;
 using MvvmSample.Core.Models;
 using MvvmSample.Core.Services;
 using Nito.AsyncEx;
@@ -32,7 +32,7 @@ public sealed class SubredditWidgetViewModel : ObservableRecipient
         /// <summary>
         /// An <see cref="AsyncLock"/> instance to avoid concurrent requests.
         /// </summary>
-        private readonly AsyncLock LoadingLock = new AsyncLock();
+        private readonly AsyncLock LoadingLock = new();
 
         /// <summary>
         /// Creates a new <see cref="SubredditWidgetViewModel"/> instance.
@@ -52,7 +52,7 @@ public SubredditWidgetViewModel()
         /// <summary>
         /// Gets the collection of loaded posts.
         /// </summary>
-        public ObservableCollection<Post> Posts { get; } = new ObservableCollection<Post>();
+        public ObservableCollection<Post> Posts { get; } = new();
 
         /// <summary>
         /// Gets the collection of available subreddits to pick from.
@@ -83,12 +83,12 @@ public string SelectedSubreddit
             }
         }
 
-        private Post selectedPost;
+        private Post? selectedPost;
 
         /// <summary>
-        /// Gets or sets the currently selected subreddit.
+        /// Gets or sets the currently selected post, if any.
         /// </summary>
-        public Post SelectedPost
+        public Post? SelectedPost
         {
             get => selectedPost;
             set => SetProperty(ref selectedPost, value, true);
@@ -107,9 +107,9 @@ private async Task LoadPostsAsync()
 
                     Posts.Clear();
 
-                    foreach (var item in response.Data.Items)
+                    foreach (var item in response.Data!.Items!)
                     {
-                        Posts.Add(item.Data);
+                        Posts.Add(item.Data!);
                     }
                 }
                 catch