[Android] Add native ctor to PageContainer (#3107) fixes #2740

* [Controls] Add repo and uitest for issue 2740

* [Android] Add native ctor to PageContainer
This commit is contained in:
Rui Marinho 2018-06-27 19:01:26 +01:00 коммит произвёл GitHub
Родитель 2d015f21cf
Коммит dfa2606a30
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 85 добавлений и 0 удалений

Просмотреть файл

@ -0,0 +1,78 @@
using System;
using System.Collections.Generic;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls.Issues
{
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Github, 2740, "System.NotSupportedException: Unable to activate instance of type Xamarin.Forms.Platform.Android.PageContainer from native handle", PlatformAffected.Android)]
public class Issue2740 : TestMasterDetailPage // or TestMasterDetailPage, etc ...
{
protected override void Init()
{
var page = new AddressListView();
// Initialize ui here instead of ctor
Master = new ContentPage
{
Content = new Label
{
Text = "Click a item on the left then the toolbar item switch"
},
Title = "2740"
};
Detail = new NavigationPage(page);
}
public partial class AddressListView : ContentPage
{
public AddressListView()
{
var listview = new ListView();
listview.ItemsSource = new List<string> { "1", "2" };
listview.ItemTapped += OnItemTapped;
Content = listview;
Title = "Unit List";
}
public async void OnItemTapped(object sender, ItemTappedEventArgs e)
{
var p = new UnitViolationView();
await Navigation.PushAsync(p);
}
}
public partial class UnitViolationView : ContentPage
{
public UnitViolationView()
{
ToolbarItems.Add(new ToolbarItem("Switch", null, MapAddressSwitch) { AutomationId = "Switch" });
}
async void MapAddressSwitch()
{
await Navigation.PopAsync(false);
(Application.Current.MainPage as MasterDetailPage).Detail = new NavigationPage(new AddressListView());
}
}
#if UITEST
[Test]
public void Issue2740Test ()
{
RunningApp.WaitForElement (q => q.Marked ("1"));
RunningApp.Tap (q => q.Marked ("1"));
RunningApp.WaitForElement (q => q.Marked ("Switch"));
RunningApp.Tap (q => q.Marked ("Switch"));
RunningApp.WaitForElement (q => q.Marked ("1"));
}
#endif
}
}

Просмотреть файл

@ -461,6 +461,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Issue2299.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue1900.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue2837.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue2740.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue1939.cs" />
<Compile Include="$(MSBuildThisFileDirectory)_Template.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla56298.cs" />

Просмотреть файл

@ -1,5 +1,7 @@
using Android.Content;
using Android.Runtime;
using Android.Views;
using System;
namespace Xamarin.Forms.Platform.Android
{
@ -17,6 +19,10 @@ namespace Xamarin.Forms.Platform.Android
public bool IsInFragment { get; set; }
protected PageContainer(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
{
}
protected override void OnLayout(bool changed, int l, int t, int r, int b)
{
Child.UpdateLayout();