Skip to content

Commit cb53d5b

Browse files
committed
Remove usage of MasterDetailPage
1 parent 10e3176 commit cb53d5b

File tree

23 files changed

+74
-91
lines changed

23 files changed

+74
-91
lines changed

src/Compatibility/ControlGallery/src/Core/ControlGalleryPages/AppearingGalleryPage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery
99
public class AppearingGalleryPage : ContentPage
1010
{
1111
const string NavPageTitle = "NavAppearingPage";
12-
const string MasterPageTitle = "MasterAppearingPage";
12+
const string FlyoutPageTitle = "FlyoutPageAppearingPage";
1313
const string TabbedPageTitle = "TabbedAppearingPage";
1414
const string CarouselPageTitle = "CarouselAppearingPage";
1515

@@ -27,9 +27,9 @@ public AppearingGalleryPage()
2727
Application.Current.MainPage = new NavAppearingPage(initalPage);
2828
})
2929
},
30-
new Button { Text = MasterPageTitle, Command = new Command (() => {
30+
new Button { Text = FlyoutPageTitle, Command = new Command (() => {
3131
var page = new FlyoutPage {
32-
Title = MasterPageTitle,
32+
Title = FlyoutPageTitle,
3333
Flyout = new ContentPage { Title = "Flyout", BackgroundColor = Colors.Red },
3434
Detail = new NavAppearingPage(initalPage)
3535
};

src/Compatibility/ControlGallery/src/Core/GalleryPages/BackgroundImageGallery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ await Navigation.PushAsync(new TabbedPage
8686
});
8787
};
8888

89-
var master = new Button { Text = "MasterDetail" };
89+
var master = new Button { Text = "FlyoutPage" };
9090
master.Clicked += async (sender, args) =>
9191
{
9292
await Navigation.PushModalAsync(new FlyoutPage

src/Compatibility/ControlGallery/src/Core/GalleryPages/FlyoutPageTabletPage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class FlyoutPageTabletPage : ContentPage
77
{
88
public FlyoutPageTabletPage()
99
{
10-
Title = "MasterDetail FlyoutLayoutBehavior Gallery";
10+
Title = "FlyoutPage FlyoutLayoutBehavior Gallery";
1111

1212
var btn = new Button { Text = "Default (old behavior)" };
1313
btn.Clicked += async (sender, e) => await Navigation.PushModalAsync(new Issue1461Page(FlyoutLayoutBehavior.Default, null));

src/Compatibility/ControlGallery/src/Core/GalleryPages/TitleView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</NavigationPage.TitleView>
1212
<ScrollView>
1313
<StackLayout BackgroundColor="Pink">
14-
<Button Clicked="masterDetailsPage_Clicked" Text="Flyout Details Page"></Button>
15-
<Button Clicked="masterDetailsPageIcon_Clicked" Text="Toggle MDP Icon"></Button>
14+
<Button Clicked="flyoutPagesPage_Clicked" Text="Flyout Details Page"></Button>
15+
<Button Clicked="flyoutPagesPageIcon_Clicked" Text="Toggle MDP Icon"></Button>
1616
<Button Clicked="tabbedPage_Clicked" Text="Tabbed Page"></Button>
1717
<Button Clicked="navigationPage_Clicked" Text="Navigation Page"></Button>
1818
<Button Clicked="nextPage_Clicked" Text="Push a Page"></Button>

src/Compatibility/ControlGallery/src/Core/GalleryPages/TitleView.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public TitleView(bool initialLoad)
2121

2222
if (initialLoad)
2323
{
24-
Device.BeginInvokeOnMainThread(() => masterDetailsPage_Clicked(this, EventArgs.Empty));
24+
Device.BeginInvokeOnMainThread(() => flyoutPagesPage_Clicked(this, EventArgs.Empty));
2525
}
2626
}
2727

@@ -48,7 +48,7 @@ void swapDetails_Page(object sender, EventArgs e)
4848
}
4949
}
5050

51-
void masterDetailsPage_Clicked(object sender, EventArgs e)
51+
void flyoutPagesPage_Clicked(object sender, EventArgs e)
5252
{
5353
App.Current.MainPage =
5454
new FlyoutPage()
@@ -195,7 +195,7 @@ static void toggleTitleIcon(Page page)
195195
NavigationPage.SetTitleIconImageSource(page, null);
196196
}
197197

198-
void masterDetailsPageIcon_Clicked(object sender, EventArgs e)
198+
void flyoutPagesPageIcon_Clicked(object sender, EventArgs e)
199199
{
200200
if (App.Current.MainPage is FlyoutPage mdp)
201201
{

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30835.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues
1515
[Category(Compatibility.UITests.UITestCategories.Bugzilla)]
1616
#endif
1717
[Preserve(AllMembers = true)]
18-
[Issue(IssueTracker.Bugzilla, 30835, "Navigating to and from the Carousel page with MasterDetail page creates an Out of memory exception")]
18+
[Issue(IssueTracker.Bugzilla, 30835, "Navigating to and from the Carousel page with FlyoutPage creates an Out of memory exception")]
1919
public class Bugzilla30835 : TestFlyoutPage // or TestFlyoutPage, etc ...
2020
{
2121
protected override void Init()

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32776.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues
88
#if UITEST
99
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
1010
#endif
11-
[Issue(IssueTracker.Bugzilla, 32776, "MasterDetail page - page title not showing for Windows Phone 8.1 (any orientation) or in Windows 8.1 (portrait orientation).", PlatformAffected.WinRT, NavigationBehavior.PushModalAsync)]
11+
[Issue(IssueTracker.Bugzilla, 32776, "FlyoutPage - page title not showing for Windows Phone 8.1 (any orientation) or in Windows 8.1 (portrait orientation).", PlatformAffected.WinRT, NavigationBehavior.PushModalAsync)]
1212
public class Bugzilla32776
1313
: FlyoutPage
1414
{

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32902.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected override void Init()
8888
}
8989
});
9090

91-
//MASTERDETAIL PAGE
91+
//FLYOUTPAGE PAGE
9292
HomePage = new FlyoutPage()
9393
{
9494
Flyout = MasterPage,

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues
1212
{
1313
[Preserve(AllMembers = true)]
14-
[Issue(IssueTracker.Bugzilla, 43519, "[UWP] MasterDetail page ArguementException when nested in a TabbedPage and returning from modal page"
14+
[Issue(IssueTracker.Bugzilla, 43519, "[UWP] FlyoutPage ArgumentException when nested in a TabbedPage and returning from modal page"
1515
, PlatformAffected.UWP)]
1616

1717
#if UITEST

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla46494.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues
1313
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
1414
#endif
1515
[Preserve(AllMembers = true)]
16-
[Issue(IssueTracker.Bugzilla, 46494, "Hardware/Software back button from MainPage of type MasterDetail causes crash 'java.lang.IllegalStateException: Activity has been destroyed'", PlatformAffected.Android)]
16+
[Issue(IssueTracker.Bugzilla, 46494, "Hardware/Software back button from MainPage of type FlyoutPage causes crash 'java.lang.IllegalStateException: Activity has been destroyed'", PlatformAffected.Android)]
1717
public class Bugzilla46494 : TestFlyoutPage
1818
{
1919
protected override void Init()

0 commit comments

Comments
 (0)