Update NuGet Packages

TheCodeTraveler · TheCodeTraveler · commit f1f604a6018d · 2020-03-16T17:48:56.000-07:00
diff --git a/Src/AsyncAwaitBestPractices.MVVM/AsyncCommand.cs b/Src/AsyncAwaitBestPractices.MVVM/AsyncCommand.cs
@@ -70,11 +70,11 @@ void ICommand.Execute(object parameter)
                     ExecuteAsync(validParameter).SafeFireAndForget(_onException, _continueOnCapturedContext);
                     break;
 
-#pragma warning disable CS8601 //Possible null reference assignment
+#pragma warning disable CS8604 // Possible null reference argument.
                 case null when !typeof(T).GetTypeInfo().IsValueType:
                     ExecuteAsync((T)parameter).SafeFireAndForget(_onException, _continueOnCapturedContext);
                     break;
-#pragma warning restore CS8601
+#pragma warning restore CS8604 // Possible null reference argument.
 
                 case null:
                     throw new InvalidCommandParameterException(typeof(T));
diff --git a/Src/AsyncAwaitBestPractices.MVVM/AsyncValueCommand.cs b/Src/AsyncAwaitBestPractices.MVVM/AsyncValueCommand.cs
@@ -69,12 +69,11 @@ void ICommand.Execute(object parameter)
                 case T validParameter:
                     ExecuteAsync(validParameter).SafeFireAndForget(_onException, _continueOnCapturedContext);
                     break;
-
-#pragma warning disable CS8601 //Possible null reference assignment
+#pragma warning disable CS8604 // Possible null reference argument.
                 case null when !typeof(T).GetTypeInfo().IsValueType:
                     ExecuteAsync((T)parameter).SafeFireAndForget(_onException, _continueOnCapturedContext);
                     break;
-#pragma warning restore CS8601
+#pragma warning restore CS8604 // Possible null reference argument.
 
                 case null:
                     throw new InvalidCommandParameterException(typeof(T));
diff --git a/Src/HackerNews.Droid/HackerNews.Droid.csproj b/Src/HackerNews.Droid/HackerNews.Droid.csproj
@@ -64,8 +64,8 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="Xamarin.Forms" Version="4.5.0.282-pre4" />
-        <PackageReference Include="Xamarin.Essentials" Version="1.5.0-pre1" />
+        <PackageReference Include="Xamarin.Forms" Version="4.6.0.379-pre1" />
+        <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
     </ItemGroup>
     <ItemGroup>
         <Compile Include="MainActivity.cs" />
diff --git a/Src/HackerNews.UITests/HackerNews.UITests.csproj b/Src/HackerNews.UITests/HackerNews.UITests.csproj
@@ -32,7 +32,7 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="NUnit" Version="3.12.0" />
-        <PackageReference Include="Xamarin.UITest" Version="3.0.6" />
+        <PackageReference Include="Xamarin.UITest" Version="3.0.7" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
     <ItemGroup>
diff --git a/Src/HackerNews.iOS/HackerNews.iOS.csproj b/Src/HackerNews.iOS/HackerNews.iOS.csproj
@@ -93,9 +93,9 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="Xamarin.Forms" Version="4.5.0.282-pre4" />
+        <PackageReference Include="Xamarin.Forms" Version="4.6.0.379-pre1" />
         <PackageReference Include="Xamarin.TestCloud.Agent" Version="0.21.9" />
-        <PackageReference Include="Xamarin.Essentials" Version="1.5.0-pre1" />
+        <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
     </ItemGroup>
     <ItemGroup>
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
diff --git a/Src/HackerNews/App.cs b/Src/HackerNews/App.cs
@@ -1,16 +1,20 @@
-﻿using Xamarin.Forms;
-
+﻿using Xamarin.Forms.PlatformConfiguration;
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+
 namespace HackerNews
 {
-    public class App : Application
+    public class App : Xamarin.Forms.Application
     {
         public App()
         {
-            MainPage = new NavigationPage(new NewsPage())
+            var navigationPage = new Xamarin.Forms.NavigationPage(new NewsPage())
             {
                 BarBackgroundColor = ColorConstants.NavigationBarBackgroundColor,
                 BarTextColor = ColorConstants.NavigationBarTextColor
             };
+            navigationPage.On<iOS>().SetPrefersLargeTitles(true);
+
+            MainPage = navigationPage;
         }
     }
 }
diff --git a/Src/HackerNews/HackerNews.csproj b/Src/HackerNews/HackerNews.csproj
@@ -8,8 +8,8 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="Xamarin.Forms" Version="4.5.0.282-pre4" />
-		<PackageReference Include="Xamarin.Essentials" Version="1.5.0-pre1" />
+		<PackageReference Include="Xamarin.Forms" Version="4.6.0.379-pre1" />
+		<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="Pages\Base\" />
diff --git a/Src/HackerNews/ViewModels/Base/BaseViewModel.cs b/Src/HackerNews/ViewModels/Base/BaseViewModel.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Newtonsoft.Json;
+using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace HackerNews
@@ -61,16 +62,24 @@ async Task UpdateActivityIndicatorStatus(bool isActivityIndicatorRunning)
             if (isActivityIndicatorRunning)
             {
                 _networkIndicatorCount++;
-                await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.IsBusy = true).ConfigureAwait(false);
+                await setIsBusy(true).ConfigureAwait(false);
             }
             else if (--_networkIndicatorCount <= 0)
             {
                 _networkIndicatorCount = 0;
-                await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.IsBusy = false).ConfigureAwait(false);
+                await setIsBusy(false).ConfigureAwait(false);
+            }
+
+            static Task setIsBusy(bool isBusy)
+            {
+                if (Application.Current?.MainPage != null)
+                    return MainThread.InvokeOnMainThreadAsync(() => Application.Current.MainPage.IsBusy = true);
+
+                return Task.CompletedTask;
             }
         }
 
         void OnPropertyChanged([CallerMemberName]in string propertyName = "") =>
             _propertyChangedEventManager.HandleEvent(this, new PropertyChangedEventArgs(propertyName), nameof(INotifyPropertyChanged.PropertyChanged));
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,20 @@`
`1`		`-using Xamarin.Forms;`
`2`		`-`
	`1`	`+using Xamarin.Forms.PlatformConfiguration;`
	`2`	`+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;`
	`3`	`+`
`3`	`4`	`namespace HackerNews`
`4`	`5`	`{`
`5`		`- public class App : Application`
	`6`	`+ public class App : Xamarin.Forms.Application`
`6`	`7`	`{`
`7`	`8`	`public App()`
`8`	`9`	`{`
`9`		`- MainPage = new NavigationPage(new NewsPage())`
	`10`	`+ var navigationPage = new Xamarin.Forms.NavigationPage(new NewsPage())`
`10`	`11`	`{`
`11`	`12`	`BarBackgroundColor = ColorConstants.NavigationBarBackgroundColor,`
`12`	`13`	`BarTextColor = ColorConstants.NavigationBarTextColor`
`13`	`14`	`};`
	`15`	`+ navigationPage.On<iOS>().SetPrefersLargeTitles(true);`
	`16`	`+`
	`17`	`+ MainPage = navigationPage;`
`14`	`18`	`}`
`15`	`19`	`}`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using AsyncAwaitBestPractices;`
`9`	`9`	`using Newtonsoft.Json;`
	`10`	`+using Xamarin.Essentials;`
`10`	`11`	`using Xamarin.Forms;`
`11`	`12`
`12`	`13`	`namespace HackerNews`
`@@ -61,16 +62,24 @@ async Task UpdateActivityIndicatorStatus(bool isActivityIndicatorRunning)`
`61`	`62`	`if (isActivityIndicatorRunning)`
`62`	`63`	`{`
`63`	`64`	`_networkIndicatorCount++;`
`64`		`- await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.IsBusy = true).ConfigureAwait(false);`
	`65`	`+ await setIsBusy(true).ConfigureAwait(false);`
`65`	`66`	`}`
`66`	`67`	`else if (--_networkIndicatorCount <= 0)`
`67`	`68`	`{`
`68`	`69`	`_networkIndicatorCount = 0;`
`69`		`- await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.IsBusy = false).ConfigureAwait(false);`
	`70`	`+ await setIsBusy(false).ConfigureAwait(false);`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ static Task setIsBusy(bool isBusy)`
	`74`	`+ {`
	`75`	`+ if (Application.Current?.MainPage != null)`
	`76`	`+ return MainThread.InvokeOnMainThreadAsync(() => Application.Current.MainPage.IsBusy = true);`
	`77`	`+`
	`78`	`+ return Task.CompletedTask;`
`70`	`79`	`}`
`71`	`80`	`}`
`72`	`81`
`73`	`82`	`void OnPropertyChanged([CallerMemberName]in string propertyName = "") =>`
`74`	`83`	`_propertyChangedEventManager.HandleEvent(this, new PropertyChangedEventArgs(propertyName), nameof(INotifyPropertyChanged.PropertyChanged));`
`75`	`84`	`}`
`76`		`-}`
	`85`	`+}`