1 files changed, 69 insertions, 6 deletions
diff --git a/Xamarin.Forms.Core/OnPlatform.cs b/Xamarin.Forms.Core/OnPlatform.cs
index 02e27083..68621134 100644
--- a/Xamarin.Forms.Core/OnPlatform.cs
+++ b/Xamarin.Forms.Core/OnPlatform.cs
@@ -1,16 +1,79 @@
+using System;
+using System.Collections.Generic;
+using Xamarin.Forms.Xaml;
+
 namespace Xamarin.Forms
 {
+	[ContentProperty("Platforms")]
 	public class OnPlatform<T>
 	{
-		public T Android { get; set; }
-		public T iOS { get; set; }
-		public T WinPhone { get; set; }
+		public OnPlatform()
+		{
+			Platforms = new List<On>();
+		}
+
+		bool useLegacyFallback;
+		T android;
+		[Obsolete]
+		public T Android {
+			get { return android; }
+			set {
+				useLegacyFallback = true;
+				android = value;
+			}
+		}
+
+		T ios;
+		[Obsolete]
+		public T iOS {
+			get { return ios; }
+			set {
+				useLegacyFallback = true;
+				ios = value;
+			}
+		}
 
-		public T Tizen { get; set; }
+		T winPhone;
+		[Obsolete]
+		public T WinPhone {
+			get { return winPhone; }
+			set {
+				useLegacyFallback = true;
+				winPhone = value;
+			}
+		}
+
+		public IList<On> Platforms { get; private set; }
+
+		static readonly IValueConverterProvider s_valueConverter = DependencyService.Get<IValueConverterProvider>();
 
 		public static implicit operator T(OnPlatform<T> onPlatform)
 		{
-			return Device.OnPlatform(iOS: onPlatform.iOS, Android: onPlatform.Android, WinPhone: onPlatform.WinPhone, Tizen: onPlatform.Tizen);
+			foreach (var onPlat in onPlatform.Platforms) {
+				if (onPlat.Platform == null)
+					continue;
+				if (!onPlat.Platform.Contains(Device.RuntimePlatform))
+					continue;
+				if (s_valueConverter == null)
+					continue;
+				return (T)s_valueConverter.Convert(onPlat.Value, typeof(T), null, null);
+			}
+
+			if (!onPlatform.useLegacyFallback)
+				return default(T);
+
+			//legacy fallback
+#pragma warning disable 0618, 0612
+			return Device.OnPlatform(iOS: onPlatform.iOS, Android: onPlatform.Android, WinPhone: onPlatform.WinPhone);
+#pragma warning restore 0618, 0612
 		}
 	}
-}
-\ No newline at end of file
+
+	[ContentProperty("Value")]
+	public class On
+	{
+		[TypeConverter(typeof(ListStringTypeConverter))]
+		public IList<string> Platform { get; set; }
+		public object Value { get; set; }
+	}
+}