diff options
author | Kangho Hur <kangho.hur@samsung.com> | 2017-04-24 15:37:51 +0900 |
---|---|---|
committer | Kangho Hur <kangho.hur@samsung.com> | 2017-07-10 11:11:23 +0900 |
commit | f823b1f41d283fcde1e385b515f8b7a5b902d028 (patch) | |
tree | 9a3dc736ba11b3f0475a8699265e2f9c53cac8fe /Xamarin.Forms.Platform.iOS | |
parent | 2e7be85cf19c1db5417b3ea030428413b26bc46c (diff) | |
download | xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.tar.gz xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.tar.bz2 xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.zip |
rebase to tags/beta-2.3.5-pre1
- this is base code of xamarin.forms 2.3.5-pre1 (https://github.com/xamarin/Xamarin.Forms/commit/fc778eb9789f50634d48fb9ad127f211b3fcfcc7)
Diffstat (limited to 'Xamarin.Forms.Platform.iOS')
5 files changed, 2 insertions, 59 deletions
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 c3002b01..ed9291bc 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 8044963f..13b11e6d 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(AutomationProperties.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() { |