Resource Manager fix for F# File Resources (Bugzilla 53515) (#825)

* Resource Manager fix for F# File Resources (Bugzilla 53515)

* Changed spaces to tabs and changed the argument name in the ResourceManager.GetId() function.

* Improved the type checking in GetId().

Xamarin.Forms.Platform.Android/ResourceManager.cs

@@ -74,23 +74,23 @@ public static int GetResourceByName(string name)
 
 		public static void Init(Assembly masterAssembly)
 		{
-			DrawableClass = masterAssembly.GetTypes().FirstOrDefault(x => x.Name == "Drawable");
-			ResourceClass = masterAssembly.GetTypes().FirstOrDefault(x => x.Name == "Id");
+			DrawableClass = masterAssembly.GetTypes().FirstOrDefault(x => x.Name == "Drawable" || x.Name == "Resource_Drawable");
+			ResourceClass = masterAssembly.GetTypes().FirstOrDefault(x => x.Name == "Id" || x.Name == "Resource_Id");
 		}
 
 		internal static int IdFromTitle(string title, Type type)
 		{
 			string name = Path.GetFileNameWithoutExtension(title);
 			int id = GetId(type, name);
-			return id; // Resources.System.GetDrawable (Resource.Drawable.dashboard);
+			return id;
 		}
 
-		static int GetId(Type type, string propertyName)
+		static int GetId(Type type, string memberName)
 		{
-			FieldInfo[] props = type.GetFields();
-			FieldInfo prop = props.Select(p => p).FirstOrDefault(p => p.Name == propertyName);
-			if (prop != null)
-				return (int)prop.GetValue(type);
+			object value = type.GetFields().FirstOrDefault(p => p.Name == memberName)?.GetValue(type)
+				?? type.GetProperties().FirstOrDefault(p => p.Name == memberName)?.GetValue(type);
+			if (value is int)
+				return (int)value;
 			return 0;
 		}
 	}