Update Sample App + NuGet Packages

TheCodeTraveler · TheCodeTraveler · commit 7a5cc853d383 · 2021-05-25T11:19:51.000-07:00
diff --git a/Src/AsyncAwaitBestPractices.UnitTests/AsyncAwaitBestPractices.UnitTests.csproj b/Src/AsyncAwaitBestPractices.UnitTests/AsyncAwaitBestPractices.UnitTests.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="NUnit" Version="3.13.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0-beta.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/Src/HackerNews.Shared/Models/StoryModel.cs b/Src/HackerNews.Shared/Models/StoryModel.cs
@@ -17,7 +17,6 @@ public StoryModel(long id, string by, long score, long time, string title, strin
 
         public string Description => ToString();
 
-
         public long Id { get; }
         public string Author { get; }
         public long Score { get; }
@@ -28,7 +27,7 @@ public StoryModel(long id, string by, long score, long time, string title, strin
 
         public override string ToString() => $"{Score} Points by {Author}, {GetAgeOfStory(CreatedAt_DateTimeOffset)} ago";
 
-        static string GetAgeOfStory(DateTimeOffset storyCreatedAt)
+        static string GetAgeOfStory(in DateTimeOffset storyCreatedAt)
         {
             var timespanSinceStoryCreated = DateTimeOffset.UtcNow - storyCreatedAt;
 
diff --git a/Src/HackerNews.UITests/AppInitializer.cs b/Src/HackerNews.UITests/AppInitializer.cs
@@ -3,7 +3,7 @@
 
 namespace HackerNews.UITests
 {
-    public static class AppInitializer
+    static class AppInitializer
     {
         public static IApp StartApp(Platform platform) => platform switch
         {
diff --git a/Src/HackerNews.UITests/Pages/BasePage.cs b/Src/HackerNews.UITests/Pages/BasePage.cs
@@ -3,7 +3,7 @@
 
 namespace HackerNews.UITests
 {
-	public abstract class BasePage
+	abstract class BasePage
 	{
 		protected BasePage(IApp app, string pageTitle)
 		{
diff --git a/Src/HackerNews.UITests/Pages/NewsPage.cs b/Src/HackerNews.UITests/Pages/NewsPage.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using HackerNews.Shared;
 using Xamarin.UITest;
@@ -10,7 +9,7 @@
 
 namespace HackerNews.UITests
 {
-    public class NewsPage : BasePage
+    class NewsPage : BasePage
     {
         public NewsPage(IApp app) : base(app, PageTitleConstants.NewsPageTitle)
         {
diff --git a/Src/HackerNews.UITests/Tests/BaseTest.cs b/Src/HackerNews.UITests/Tests/BaseTest.cs
@@ -1,14 +1,13 @@
 ﻿using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
-
 using Xamarin.UITest;
 
 namespace HackerNews.UITests
 {
     [TestFixture(Platform.Android)]
     [TestFixture(Platform.iOS)]
-    public abstract class BaseTest
+    abstract class BaseTest
     {
         readonly Platform _platform;
 
diff --git a/Src/HackerNews.UITests/Tests/Tests.cs b/Src/HackerNews.UITests/Tests/Tests.cs
@@ -6,7 +6,7 @@
 
 namespace HackerNews.UITests
 {
-    public class Tests : BaseTest
+    class Tests : BaseTest
     {
         public Tests(Platform platform) : base(platform)
         {
diff --git a/Src/HackerNews/Constants/ColorConstants.cs b/Src/HackerNews/Constants/ColorConstants.cs
@@ -4,14 +4,14 @@ namespace HackerNews
 {
     public static class ColorConstants
     {
-        public static Color NavigationBarBackgroundColor => Color.FromHex("FF6601");
-        public static Color NavigationBarTextColor => Color.Black;
+        public static Color NavigationBarBackgroundColor { get; } = Color.FromHex("FF6601");
+        public static Color NavigationBarTextColor { get; } = Color.Black;
 
-        public static Color TextCellDetailColor => Color.FromHex("828282");
-        public static Color TextCellTextColor => Color.Black;
+        public static Color TextCellDetailColor { get; } = Color.FromHex("828282");
+        public static Color TextCellTextColor { get; } = Color.Black;
 
-        public static Color BrowserNavigationBarBackgroundColor => Color.FromHex("FFE6D5");
-        public static Color BrowserNavigationBarTextColor => Color.FromHex("3F3F3F");
+        public static Color BrowserNavigationBarBackgroundColor { get; } = Color.FromHex("FFE6D5");
+        public static Color BrowserNavigationBarTextColor { get; } = Color.FromHex("3F3F3F");
     }
 }
 
diff --git a/Src/HackerNews/HackerNews.csproj b/Src/HackerNews/HackerNews.csproj
@@ -7,7 +7,7 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
         <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
-        <PackageReference Include="Xamarin.CommunityToolkit.Markup" Version="1.1.0" />
+        <PackageReference Include="Xamarin.CommunityToolkit.Markup" Version="1.2.0-pre2" />
     </ItemGroup>
     <ItemGroup>
         <Folder Include="Pages\Base\" />
diff --git a/Src/HackerNews/Pages/NewsPage.cs b/Src/HackerNews/Pages/NewsPage.cs
@@ -1,9 +1,9 @@
-using Xamarin.Forms;
-using HackerNews.Shared;
-using Xamarin.Essentials;
 using System;
-using Xamarin.CommunityToolkit.Markup;
 using System.Linq;
+using HackerNews.Shared;
+using Xamarin.CommunityToolkit.Markup;
+using Xamarin.Essentials;
+using Xamarin.Forms;
 
 namespace HackerNews
 {
@@ -55,8 +55,8 @@ async void HandleSelectionChanged(object sender, SelectionChangedEventArgs e)
             }
         }
 
-        void HandleErrorOccurred(object sender, string e) =>
-            MainThread.BeginInvokeOnMainThread(async () => await DisplayAlert("Error", e, "OK"));
+        async void HandleErrorOccurred(object sender, string e) =>
+            await MainThread.InvokeOnMainThreadAsync(() => DisplayAlert("Error", e, "OK"));
 
     }
 }
diff --git a/Src/HackerNews/ViewModels/NewsViewModel_BadAsyncAwaitPractices.cs b/Src/HackerNews/ViewModels/NewsViewModel_BadAsyncAwaitPractices.cs
@@ -1,17 +1,12 @@
 ﻿using System;
-using System.Linq; 
+using System.Collections.Generic;
 using System.Diagnostics;
-using System.Windows.Input;
+using System.Linq;
 using System.Threading.Tasks;
-using System.Collections.Generic;
-
+using System.Windows.Input;
 using HackerNews.Shared;
-
 using Xamarin.Forms;
 
-using AsyncAwaitBestPractices;
-using AsyncAwaitBestPractices.MVVM;
-
 namespace HackerNews
 {
     class NewsViewModel_BadAsyncAwaitPractices : BaseViewModel
diff --git a/Src/HackerNews/ViewModels/NewsViewModel_GoodAsyncAwaitPractices.cs b/Src/HackerNews/ViewModels/NewsViewModel_GoodAsyncAwaitPractices.cs
@@ -1,12 +1,9 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Collections.Generic;
-
 using AsyncAwaitBestPractices;
 using AsyncAwaitBestPractices.MVVM;
-
 using HackerNews.Shared;
 
 namespace HackerNews
@@ -21,7 +18,7 @@ class NewsViewModel_GoodAsyncAwaitPractices : BaseViewModel
 
         public NewsViewModel_GoodAsyncAwaitPractices()
         {
-            ExecuteRefreshCommand().SafeFireAndForget(ex => Debug.WriteLine(ex));
+            ExecuteRefreshCommand().SafeFireAndForget(ex => OnErrorOccurred(ex.ToString()));
         }
 
         public event EventHandler<string> ErrorOccurred
@@ -30,7 +27,8 @@ public event EventHandler<string> ErrorOccurred
             remove => _errorOccurredEventManager.RemoveEventHandler(value);
         }
 
-        public IAsyncCommand RefreshCommand => _refreshCommand ??= new AsyncCommand(ExecuteRefreshCommand);
+        public IAsyncCommand RefreshCommand => _refreshCommand ??= new AsyncCommand(ExecuteRefreshCommand,
+                                                                                    onException: ex => OnErrorOccurred(ex.ToString()));
 
         public IReadOnlyList<StoryModel> TopStoryList
         {
@@ -75,7 +73,7 @@ async Task<List<StoryModel>> GetTopStories(int numberOfStories)
 
         Task<StoryModel> GetStory(string storyId) => GetDataObjectFromAPI<StoryModel>($"https://hacker-news.firebaseio.com/v0/item/{storyId}.json?print=pretty");
 
-        async ValueTask<List<string>> GetTopStoryIDs()
+        async ValueTask<IReadOnlyList<string>> GetTopStoryIDs()
         {
             if (TopStoryList.Any())
                 return TopStoryList.Select(x => x.Id.ToString()).ToList();
@@ -86,8 +84,8 @@ async ValueTask<List<string>> GetTopStoryIDs()
             }
             catch (Exception e)
             {
-                OnErrorOccurred(e.Message);
-                return Enumerable.Empty<string>().ToList();
+                OnErrorOccurred(e.ToString());
+                return Array.Empty<string>();
             }
         }
 
diff --git a/Src/HackerNews/Views/News/StoryDataTemplate.cs b/Src/HackerNews/Views/News/StoryDataTemplate.cs
@@ -5,23 +5,21 @@
 
 namespace HackerNews
 {
-    public class StoryDataTemplate : DataTemplate
+    class StoryDataTemplate : DataTemplate
     {
         public StoryDataTemplate() : base(CreateGrid)
         {
 
         }
 
-        public static GridLength AbsoluteGridLength(double value) => new GridLength(value, GridUnitType.Absolute);
-
         static Grid CreateGrid() => new()
         {
             RowSpacing = 1,
 
             RowDefinitions = Rows.Define(
-                (Row.Title, AbsoluteGridLength(20)),
-                (Row.Description, AbsoluteGridLength(20)),
-                (Row.BottomPadding, AbsoluteGridLength(1))),
+                (Row.Title, 20),
+                (Row.Description, 20),
+                (Row.BottomPadding, 1)),
 
             Children =
             {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace HackerNews.UITests`
`5`	`5`	`{`
`6`		`- public static class AppInitializer`
	`6`	`+ static class AppInitializer`
`7`	`7`	`{`
`8`	`8`	`public static IApp StartApp(Platform platform) => platform switch`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace HackerNews.UITests`
`5`	`5`	`{`
`6`		`- public abstract class BasePage`
	`6`	`+ abstract class BasePage`
`7`	`7`	`{`
`8`	`8`	`protected BasePage(IApp app, string pageTitle)`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`		`-using System.Threading;`
`5`	`4`	`using System.Threading.Tasks;`
`6`	`5`	`using HackerNews.Shared;`
`7`	`6`	`using Xamarin.UITest;`
`@@ -10,7 +9,7 @@`
`10`	`9`
`11`	`10`	`namespace HackerNews.UITests`
`12`	`11`	`{`
`13`		`- public class NewsPage : BasePage`
	`12`	`+ class NewsPage : BasePage`
`14`	`13`	`{`
`15`	`14`	`public NewsPage(IApp app) : base(app, PageTitleConstants.NewsPageTitle)`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using NUnit.Framework;`
`4`		`-`
`5`	`4`	`using Xamarin.UITest;`
`6`	`5`
`7`	`6`	`namespace HackerNews.UITests`
`8`	`7`	`{`
`9`	`8`	`[TestFixture(Platform.Android)]`
`10`	`9`	`[TestFixture(Platform.iOS)]`
`11`		`- public abstract class BaseTest`
	`10`	`+ abstract class BaseTest`
`12`	`11`	`{`
`13`	`12`	`readonly Platform _platform;`
`14`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace HackerNews.UITests`
`8`	`8`	`{`
`9`		`- public class Tests : BaseTest`
	`9`	`+ class Tests : BaseTest`
`10`	`10`	`{`
`11`	`11`	`public Tests(Platform platform) : base(platform)`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ namespace HackerNews`
`4`	`4`	`{`
`5`	`5`	`public static class ColorConstants`
`6`	`6`	`{`
`7`		`- public static Color NavigationBarBackgroundColor => Color.FromHex("FF6601");`
`8`		`- public static Color NavigationBarTextColor => Color.Black;`
	`7`	`+ public static Color NavigationBarBackgroundColor { get; } = Color.FromHex("FF6601");`
	`8`	`+ public static Color NavigationBarTextColor { get; } = Color.Black;`
`9`	`9`
`10`		`- public static Color TextCellDetailColor => Color.FromHex("828282");`
`11`		`- public static Color TextCellTextColor => Color.Black;`
	`10`	`+ public static Color TextCellDetailColor { get; } = Color.FromHex("828282");`
	`11`	`+ public static Color TextCellTextColor { get; } = Color.Black;`
`12`	`12`
`13`		`- public static Color BrowserNavigationBarBackgroundColor => Color.FromHex("FFE6D5");`
`14`		`- public static Color BrowserNavigationBarTextColor => Color.FromHex("3F3F3F");`
	`13`	`+ public static Color BrowserNavigationBarBackgroundColor { get; } = Color.FromHex("FFE6D5");`
	`14`	`+ public static Color BrowserNavigationBarTextColor { get; } = Color.FromHex("3F3F3F");`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-using Xamarin.Forms;`
`2`		`-using HackerNews.Shared;`
`3`		`-using Xamarin.Essentials;`
`4`	`1`	`using System;`
`5`		`-using Xamarin.CommunityToolkit.Markup;`
`6`	`2`	`using System.Linq;`
	`3`	`+using HackerNews.Shared;`
	`4`	`+using Xamarin.CommunityToolkit.Markup;`
	`5`	`+using Xamarin.Essentials;`
	`6`	`+using Xamarin.Forms;`
`7`	`7`
`8`	`8`	`namespace HackerNews`
`9`	`9`	`{`
`@@ -55,8 +55,8 @@ async void HandleSelectionChanged(object sender, SelectionChangedEventArgs e)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- void HandleErrorOccurred(object sender, string e) =>`
`59`		`- MainThread.BeginInvokeOnMainThread(async () => await DisplayAlert("Error", e, "OK"));`
	`58`	`+ async void HandleErrorOccurred(object sender, string e) =>`
	`59`	`+ await MainThread.InvokeOnMainThreadAsync(() => DisplayAlert("Error", e, "OK"));`
`60`	`60`
`61`	`61`	`}`
`62`	`62`	`}`