chore(Droid): enable nullable Drawabler Helpers

unoplatform · Jun 17, 2023 · 43620a6 · 43620a6
1 parent a38fae9
commit 43620a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/Uno.UI/DrawableHelper.Android.cs b/src/Uno.UI/DrawableHelper.Android.cs
@@ -1,4 +1,5 @@
-using Android.Graphics.Drawables;
+#nullable enable
+using Android.Graphics.Drawables;
 using System;
 using System.ComponentModel;
 using Windows.UI.Xaml.Media;
@@ -14,7 +15,7 @@ public static class DrawableHelper
 		/// </summary>
 		/// <param name="uri">URI</param>
 		/// <returns>Drawable</returns>
-		public static Drawable FromUri(Uri uri) =>
+		public static Drawable? FromUri(Uri uri) =>
 			Uno.Helpers.DrawableHelper.FromUri(uri);
 	}
 }
diff --git a/src/Uno.UWP/Helpers/DrawableHelper.Android.cs b/src/Uno.UWP/Helpers/DrawableHelper.Android.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using Android.Graphics.Drawables;
 using AndroidX.Core.Content;
 using AndroidX.Core.Graphics.Drawable;
@@ -13,12 +14,12 @@ namespace Uno.Helpers
 {
 	public static class DrawableHelper
 	{
-		private static Dictionary<string, int> _drawablesLookup;
-		private static Type _drawables;
+		private static Dictionary<string, int>? _drawablesLookup;
+		private static Type? _drawables;
 
-		private static Func<string, int> _resolver;
+		private static Func<string, int>? _resolver;
 
-		public static Type Drawables
+		public static Type? Drawables
 		{
 			get => _drawables;
 			set
@@ -83,8 +84,8 @@ public static Type Drawables
 		/// Finds a Drawable by URI
 		/// </summary>
 		/// <param name="uri">Uri</param>
-		/// <returns>Drawable</returns>
-		public static Drawable FromUri(Uri uri)
+		/// <returns><seealso cref="Drawable"/> for the URI provided or null otherwise</returns>
+		public static Drawable? FromUri(Uri uri)
 		{
 			var id = FindResourceIdFromPath(uri.PathAndQuery.TrimStart(new[] { '/' }));
 			var drawable = id.HasValue
@@ -109,7 +110,7 @@ public static Drawable FromUri(Uri uri)
 		private static void InitializeDrawablesLookup()
 		{
 			_drawablesLookup = _drawables
-				.GetFields(BindingFlags.Static | BindingFlags.Public)
+				?.GetFields(BindingFlags.Static | BindingFlags.Public)
 				.ToDictionary(
 					p => p.Name,
 					p => (int)p.GetValue(null)