diff options
16 files changed, 44 insertions, 122 deletions
@@ -46,4 +46,4 @@ Xamarin.Forms.Controls/secrets.txt Xamarin.Forms.Controls/controlgallery.config Xamarin.Forms.ControlGallery.Android/Properties/MapsKey.cs *.tss -*.bak +*.bak
\ No newline at end of file diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems index 18c86157..bb7d0f29 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems @@ -162,6 +162,7 @@ <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44453.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla53834.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla51536.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44940.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44944.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44166.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44461.cs" /> @@ -187,6 +188,7 @@ <Compile Include="$(MSBuildThisFileDirectory)Bugzilla37290.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla51553.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla51802.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)Bugzilla51236.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla51238.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla51642.xaml.cs"> <DependentUpon>Bugzilla51642.xaml</DependentUpon> diff --git a/Xamarin.Forms.Core/NavigationPage.cs b/Xamarin.Forms.Core/NavigationPage.cs index a199670a..f20a617a 100644 --- a/Xamarin.Forms.Core/NavigationPage.cs +++ b/Xamarin.Forms.Core/NavigationPage.cs @@ -312,9 +312,6 @@ namespace Xamarin.Forms if (index == 0) RootPage = page; - if (index == 0) - RootPage = page; - // Shouldn't be required? if (Width > 0 && Height > 0) ForceLayout(); @@ -373,9 +370,6 @@ namespace Xamarin.Forms if (InternalChildren.Count == 1) RootPage = page; - if (PageController.InternalChildren.Count == 1) - RootPage = page; - CurrentPage = page; } diff --git a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs index 84b9f313..429aca99 100644 --- a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs @@ -40,7 +40,6 @@ using Xamarin.Forms.Internals; [assembly: InternalsVisibleTo("Xamarin.Forms.Maps.iOS")] [assembly: InternalsVisibleTo("Xamarin.Forms.Maps.iOS.Classic")] [assembly: InternalsVisibleTo("Xamarin.Forms.Maps.Android")] -[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.Tizen")] [assembly: InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")] [assembly: InternalsVisibleTo("Xamarin.Forms.UITests")] [assembly: InternalsVisibleTo("Xamarin.Forms.FlexLayout.UnitTests")] @@ -60,4 +59,4 @@ using Xamarin.Forms.Internals; [assembly: InternalsVisibleTo("Xamarin.Forms.CarouselView")] [assembly: Preserve] -[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms")] +[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms")]
\ No newline at end of file diff --git a/Xamarin.Forms.Maps.iOS/MapRenderer.cs b/Xamarin.Forms.Maps.iOS/MapRenderer.cs index bdb7e68d..2fac61a8 100644 --- a/Xamarin.Forms.Maps.iOS/MapRenderer.cs +++ b/Xamarin.Forms.Maps.iOS/MapRenderer.cs @@ -210,6 +210,7 @@ namespace Xamarin.Forms.Maps.MacOS } #endif // For iOS versions < 9, the MKMapView will be disposed in ViewRenderer's Dispose method + if (_locationManager != null) { _locationManager.Dispose(); diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs index 626d5c79..7745f9dc 100644 --- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs @@ -486,4 +486,4 @@ namespace Xamarin.Forms.Platform.WinRT (this as ITitleProvider).BarForegroundBrush = GetBarForegroundBrush(); } } -} +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.iOS/Forms.cs b/Xamarin.Forms.Platform.iOS/Forms.cs index 50f7834d..f2ba923f 100644 --- a/Xamarin.Forms.Platform.iOS/Forms.cs +++ b/Xamarin.Forms.Platform.iOS/Forms.cs @@ -53,7 +53,6 @@ namespace Xamarin.Forms return s_isiOS9OrNewer.Value; } } -#endif internal static bool IsiOS10OrNewer diff --git a/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs b/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs index 45fd2443..d2ead786 100644 --- a/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs +++ b/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs @@ -3,6 +3,7 @@ using Xamarin.Forms.Xaml.Internals; using Xamarin.Forms.Internals; #if __MOBILE__ using UIKit; + [assembly: Xamarin.Forms.Dependency(typeof(Xamarin.Forms.Platform.iOS.NativeValueConverterService))] namespace Xamarin.Forms.Platform.iOS #else diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs index c38846e4..dd25e635 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs @@ -119,21 +119,6 @@ namespace Xamarin.Forms.Platform.iOS } } - protected override void SetAccessibilityLabel() - { - // If we have not specified an AccessibilityLabel and the AccessibiltyLabel is current bound to the Title, - // exit this method so we don't set the AccessibilityLabel value and break the binding. - // This may pose a problem for users who want to explicitly set the AccessibilityLabel to null, but this - // will prevent us from inadvertently breaking UI Tests that are using Query.Marked to get the dynamic Title - // of the Button. - - var elemValue = (string)Element?.GetValue(Accessibility.NameProperty); - if (string.IsNullOrWhiteSpace(elemValue) && Control?.AccessibilityLabel == Control?.Title(UIControlState.Normal)) - return; - - base.SetAccessibilityLabel(); - } - void OnButtonTouchUpInside(object sender, EventArgs eventArgs) { ((IButtonController)Element)?.SendReleased(); diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs index dda2dd5d..446cc95e 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs @@ -2,6 +2,7 @@ using Foundation; using Xamarin.Forms.Internals; #if __MOBILE__ using UIKit; + namespace Xamarin.Forms.Platform.iOS #else using AppKit; diff --git a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs index e9d9a254..a785fb0f 100644 --- a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs @@ -151,49 +151,6 @@ namespace Xamarin.Forms.Platform.MacOS Control.AccessibilityLabel = (string)Element.GetValue(Accessibility.NameProperty) ?? _defaultAccessibilityLabel; } -#if __MOBILE__ - protected override void SetAccessibilityHint() - { - if (Control == null) - { - base.SetAccessibilityHint(); - return; - } - - if (Element == null) - return; - - if (_defaultAccessibilityHint == null) - _defaultAccessibilityHint = Control.AccessibilityHint; - - Control.AccessibilityHint = (string)Element.GetValue(Accessibility.HintProperty) ?? _defaultAccessibilityHint; - - } - - protected override void SetAccessibilityLabel() - { - if (Control == null) - { - base.SetAccessibilityLabel(); - return; - } - - if (Element == null) - return; - - if (_defaultAccessibilityLabel == null) - _defaultAccessibilityLabel = Control.AccessibilityLabel; - - Control.AccessibilityLabel = (string)Element.GetValue(Accessibility.NameProperty) ?? _defaultAccessibilityLabel; - } - - protected override void SetIsAccessibilityElement() - { - if (Control == null) - { - base.SetIsAccessibilityElement(); - return; - } protected override void SetIsAccessibilityElement() { diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs index 5b4fabb4..14e0b8be 100644 --- a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs +++ b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs @@ -64,4 +64,4 @@ namespace Xamarin.Forms.Xaml return resource; } } -} +}
\ No newline at end of file diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml index e492c2e0..ef9c9b52 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml @@ -287,21 +287,6 @@ Device.BeginInvokeOnMainThread (() => { <remarks>To be added.</remarks> </Docs> </Member> - <Member MemberName="macOS"> - <MemberSignature Language="C#" Value="public const string macOS;" /> - <MemberSignature Language="ILAsm" Value=".field public static literal string macOS" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.String</ReturnType> - </ReturnValue> - <Docs> - <summary>To be added.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> <Member MemberName="OnPlatform"> <MemberSignature Language="C#" Value="public static void OnPlatform (Action iOS = null, Action Android = null, Action WinPhone = null, Action Default = null);" /> <MemberSignature Language="ILAsm" Value=".method public static hidebysig void OnPlatform(class System.Action iOS, class System.Action Android, class System.Action WinPhone, class System.Action Default) cil managed" /> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/IOpenGlViewController.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/IOpenGlViewController.xml new file mode 100644 index 00000000..10ea52a2 --- /dev/null +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/IOpenGlViewController.xml @@ -0,0 +1,34 @@ +<Type Name="IOpenGlViewController" FullName="Xamarin.Forms.IOpenGlViewController"> + <TypeSignature Language="C#" Value="public interface IOpenGlViewController : Xamarin.Forms.IViewController" /> + <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract IOpenGlViewController implements class Xamarin.Forms.IElementController, class Xamarin.Forms.IViewController, class Xamarin.Forms.IVisualElementController" /> + <AssemblyInfo> + <AssemblyName>Xamarin.Forms.Core</AssemblyName> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <Interfaces> + <Interface> + <InterfaceName>Xamarin.Forms.IViewController</InterfaceName> + </Interface> + </Interfaces> + <Docs> + <summary>To be added.</summary> + <remarks>To be added.</remarks> + </Docs> + <Members> + <Member MemberName="DisplayRequested"> + <MemberSignature Language="C#" Value="public event EventHandler DisplayRequested;" /> + <MemberSignature Language="ILAsm" Value=".event class System.EventHandler DisplayRequested" /> + <MemberType>Event</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <ReturnValue> + <ReturnType>System.EventHandler</ReturnType> + </ReturnValue> + <Docs> + <summary>To be added.</summary> + <remarks>To be added.</remarks> + </Docs> + </Member> + </Members> +</Type> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml index fca4c272..31d3543e 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml @@ -226,42 +226,6 @@ </remarks> </Docs> </Member> - <Member MemberName="RootPage"> - <MemberSignature Language="C#" Value="public Xamarin.Forms.Page RootPage { get; }" /> - <MemberSignature Language="ILAsm" Value=".property instance class Xamarin.Forms.Page RootPage" /> - <MemberType>Property</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.Page</ReturnType> - </ReturnValue> - <Docs> - <summary> - The <see cref="T:Xamarin.Forms.Page" /> that is the root of the navigation stack. - </summary> - <value>To be added.</value> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="RootPageProperty"> - <MemberSignature Language="C#" Value="public static readonly Xamarin.Forms.BindableProperty RootPageProperty;" /> - <MemberSignature Language="ILAsm" Value=".field public static initonly class Xamarin.Forms.BindableProperty RootPageProperty" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.BindableProperty</ReturnType> - </ReturnValue> - <Docs> - <summary> - Identifies the <see cref="P:Xamarin.Forms.NavigationPage.RootPage" /> property. - </summary> - <remarks> - </remarks> - </Docs> - </Member> <Member MemberName="GetBackButtonTitle"> <MemberSignature Language="C#" Value="public static string GetBackButtonTitle (Xamarin.Forms.BindableObject page);" /> <MemberSignature Language="ILAsm" Value=".method public static hidebysig string GetBackButtonTitle(class Xamarin.Forms.BindableObject page) cil managed" /> diff --git a/docs/Xamarin.Forms.Maps/index.xml b/docs/Xamarin.Forms.Maps/index.xml index cb165a30..318b3c5e 100644 --- a/docs/Xamarin.Forms.Maps/index.xml +++ b/docs/Xamarin.Forms.Maps/index.xml @@ -33,7 +33,7 @@ <AttributeName>System.Resources.NeutralResourcesLanguage("en")</AttributeName> </Attribute> <Attribute> - <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.macOS")</AttributeName> + <AttributeName>System.Runtime.CompilerServices.CompilationRelaxations(8)</AttributeName> </Attribute> <Attribute> <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.macOS")</AttributeName> |