Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
[Android] Add native ctor to PageContainer (#3107) fixes #2740
Browse files Browse the repository at this point in the history
* [Controls] Add repo and uitest for issue 2740

* [Android] Add native ctor to PageContainer
  • Loading branch information
rmarinho committed Jun 27, 2018
1 parent 2d015f2 commit dfa2606
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 0 deletions.
@@ -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
}
}
Expand Up @@ -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" />
Expand Down
6 changes: 6 additions & 0 deletions Xamarin.Forms.Platform.Android/Renderers/PageContainer.cs
@@ -1,5 +1,7 @@
using Android.Content;
using Android.Runtime;
using Android.Views;
using System;

namespace Xamarin.Forms.Platform.Android
{
Expand All @@ -17,6 +19,10 @@ public PageContainer(Context context, IVisualElementRenderer child, bool inFragm

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();
Expand Down

0 comments on commit dfa2606

Please sign in to comment.