diff options
| -rw-r--r-- | Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs | 7 | ||||
| -rw-r--r-- | Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs b/Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs index 0ae8d969..54d2ba7f 100644 --- a/Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs +++ b/Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs @@ -18,11 +18,12 @@ namespace Xamarin.Forms.ControlGallery.iOS if (NavigationController.ViewControllers.Length > 1) { - NavigationController.TopViewController.NavigationItem.SetLeftBarButtonItem(new UIBarButtonItem( - UIImage.FromFile("bank.png"), UIBarButtonItemStyle.Plain, (sender, args) => + var btn = new UIBarButtonItem(UIImage.FromFile("bank.png"), UIBarButtonItemStyle.Plain, (sender, args) => { NavigationController.PopViewController(true); - }), true); + }); + btn.AccessibilityIdentifier = "goback"; + NavigationController.TopViewController.NavigationItem.SetLeftBarButtonItem(btn, true); } } } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs index 18dba4b4..08da2afe 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs @@ -16,7 +16,7 @@ using NUnit.Framework; namespace Xamarin.Forms.Controls.Issues { [Preserve(AllMembers = true)] - [Issue(IssueTracker.Bugzilla, 38731, "Xamarin.Forms.Platform.iOS.NavigationRenderer.GetAppearedOrDisappearedTask NullReferenceExceptionObject", PlatformAffected.Default)] + [Issue(IssueTracker.Bugzilla, 38731, "Xamarin.Forms.Platform.iOS.NavigationRenderer.GetAppearedOrDisappearedTask NullReferenceExceptionObject", PlatformAffected.iOS)] public class Bugzilla38731 : TestContentPage // or TestMasterDetailPage, etc ... { protected override void Init() @@ -113,16 +113,20 @@ namespace Xamarin.Forms.Controls.Issues } } -#if UITEST +#if UITEST && __IOS__ [Test] public void Bugzilla38731Test () { RunningApp.Tap(q => q.Marked("btn1")); RunningApp.Tap(q => q.Marked("btn2")); RunningApp.Tap(q => q.Marked("btn3")); - RunningApp.Back(); - RunningApp.Back(); - RunningApp.Back(); + if(RunningApp.Query(q => q.Marked("goback")).Length > 0) + { + RunningApp.Tap(q => q.Marked("goback")); + RunningApp.Tap(q => q.Marked("goback")); + RunningApp.Tap(q => q.Marked("goback")); + RunningApp.Tap(q => q.Marked("goback")); + } } #endif } |