diff options
author | Kangho <rookiejava+github@gmail.com> | 2017-02-03 04:25:40 +0900 |
---|---|---|
committer | Rui Marinho <me@ruimarinho.net> | 2017-02-02 19:25:40 +0000 |
commit | 3c7b2918b3065a81ecb4040fde09d93aae09f62d (patch) | |
tree | 5b5d27e0f2971c2df76613b7e9a603c5224c753b | |
parent | 01a56f9836a1cc5ea7da860032d8ca71859b1e17 (diff) | |
download | xamarin-forms-3c7b2918b3065a81ecb4040fde09d93aae09f62d.tar.gz xamarin-forms-3c7b2918b3065a81ecb4040fde09d93aae09f62d.tar.bz2 xamarin-forms-3c7b2918b3065a81ecb4040fde09d93aae09f62d.zip |
Add TV to TargetIdiom (#738)
-rw-r--r-- | Xamarin.Forms.Core/OnIdiom.cs | 6 | ||||
-rw-r--r-- | Xamarin.Forms.Core/TargetIdiom.cs | 5 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml | 17 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml | 14 |
4 files changed, 39 insertions, 3 deletions
diff --git a/Xamarin.Forms.Core/OnIdiom.cs b/Xamarin.Forms.Core/OnIdiom.cs index 24ada865..5d3226f7 100644 --- a/Xamarin.Forms.Core/OnIdiom.cs +++ b/Xamarin.Forms.Core/OnIdiom.cs @@ -1,4 +1,4 @@ -namespace Xamarin.Forms +namespace Xamarin.Forms { public class OnIdiom<T> { @@ -8,6 +8,8 @@ public T Desktop { get; set; } + public T TV { get; set; } + public static implicit operator T(OnIdiom<T> onIdiom) { switch (Device.Idiom) @@ -19,6 +21,8 @@ return onIdiom.Tablet; case TargetIdiom.Desktop: return onIdiom.Desktop; + case TargetIdiom.TV: + return onIdiom.TV; } } } diff --git a/Xamarin.Forms.Core/TargetIdiom.cs b/Xamarin.Forms.Core/TargetIdiom.cs index d19875db..645ac129 100644 --- a/Xamarin.Forms.Core/TargetIdiom.cs +++ b/Xamarin.Forms.Core/TargetIdiom.cs @@ -5,6 +5,7 @@ namespace Xamarin.Forms Unsupported, Phone, Tablet, - Desktop + Desktop, + TV } -}
\ No newline at end of file +} diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml index aed2ddc2..6e6b3727 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml @@ -139,5 +139,22 @@ </remarks> </Docs> </Member> + <Member MemberName="TV"> + <MemberSignature Language="C#" Value="public T TV { get; set; }" /> + <MemberSignature Language="ILAsm" Value=".property instance !T TV" /> + <MemberType>Property</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <ReturnValue> + <ReturnType>T</ReturnType> + </ReturnValue> + <Docs> + <summary>Gets or sets the value applied on TV-like devices.</summary> + <value>A T.</value> + <remarks> + </remarks> + </Docs> + </Member> </Members> </Type> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml index 1541f7a9..33c5ed16 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml @@ -80,6 +80,20 @@ <summary>Indicates that the width of the iPad, Windows 8.1, or Android device on which Forms is running is wider than 600 dips.</summary> </Docs> </Member> + <Member MemberName="TV"> + <MemberSignature Language="C#" Value="TV" /> + <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.TargetIdiom TV = int32(4)" /> + <MemberType>Field</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <ReturnValue> + <ReturnType>Xamarin.Forms.TargetIdiom</ReturnType> + </ReturnValue> + <Docs> + <summary>Indicates that Forms is running on a Tizen app on Tizen TV.</summary> + </Docs> + </Member> <Member MemberName="Unsupported"> <MemberSignature Language="C#" Value="Unsupported" /> <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.TargetIdiom Unsupported = int32(0)" /> |