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

Commit 0c95d09

Browse files
authored
Rename MDP to Flyoutpage (#12073)
* - additional renames * - fix tizen exceptions * - files * - flyout pages * - obsolete * - fix android references * - fix android references * - obsolete attributes * - remove warnings as errors * - fix release
1 parent f35ae07 commit 0c95d09

File tree

263 files changed

+2384
-1804
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+2384
-1804
lines changed

Stubs/Xamarin.Forms.Platform.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,27 @@ internal class _CarouselPageRenderer { }
157157
[RenderWith (typeof (PageRenderer))]
158158
internal class _PageRenderer { }
159159

160+
161+
162+
163+
164+
#if !__IOS__ && !TIZEN4_0
165+
[RenderWith(typeof(FlyoutPageRenderer))]
166+
#elif TIZEN4_0
167+
#pragma warning disable CS0618 // Type or member is obsolete
168+
[RenderWith (typeof(MasterDetailPageRenderer))]
169+
#pragma warning restore CS0618 // Type or member is obsolete
170+
#else
171+
[RenderWith (typeof (PhoneFlyoutPageRenderer))]
172+
#endif
173+
internal class _FlyoutPageRenderer { }
174+
160175
#if !__IOS__ && !TIZEN4_0
161-
[RenderWith (typeof (MasterDetailRenderer))]
176+
[RenderWith(typeof(Android.AppCompat.MasterDetailPageRenderer))]
162177
#elif TIZEN4_0
178+
#pragma warning disable CS0618 // Type or member is obsolete
163179
[RenderWith (typeof(MasterDetailPageRenderer))]
180+
#pragma warning restore CS0618 // Type or member is obsolete
164181
#else
165182
[RenderWith (typeof (PhoneMasterDetailRenderer))]
166183
#endif

Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#if PRE_APPLICATION_CLASS
5656
#elif FORMS_APPLICATION_ACTIVITY
5757
#else
58-
[assembly: ExportRenderer(typeof(MasterDetailPage), typeof(NativeDroidMasterDetail))]
58+
[assembly: ExportRenderer(typeof(FlyoutPage), typeof(NativeDroidFlyoutPage))]
5959
#endif
6060
namespace Xamarin.Forms.ControlGallery.Android
6161
{
@@ -159,13 +159,13 @@ public AttachedStateEffectLabelRenderer(Context context) : base(context)
159159
}
160160
}
161161

162-
public class NativeDroidMasterDetail : Xamarin.Forms.Platform.Android.AppCompat.MasterDetailPageRenderer
162+
public class NativeDroidFlyoutPage : Xamarin.Forms.Platform.Android.AppCompat.MasterDetailPageRenderer
163163
{
164-
MasterDetailPage _page;
164+
FlyoutPage _page;
165165
bool _disposed;
166166

167167
#pragma warning disable 618
168-
public NativeDroidMasterDetail()
168+
public NativeDroidFlyoutPage()
169169
#pragma warning restore 618
170170
{
171171
System.Diagnostics.Debug.WriteLine($">>>>> NativeDroidMasterDetail NativeDroidMasterDetail 53: This is the obsolete constructor being selected");
@@ -180,7 +180,7 @@ protected override void OnElementChanged(VisualElement oldElement, VisualElement
180180
return;
181181
}
182182

183-
_page = newElement as MasterDetailPage;
183+
_page = newElement as FlyoutPage;
184184
_page.PropertyChanged += Page_PropertyChanged;
185185
_page.LayoutChanged += Page_LayoutChanged;
186186
}

Xamarin.Forms.ControlGallery.iOS/RegistrarValidationService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public bool Validate(VisualElement element, out string message)
2121

2222
if (renderer == null
2323
|| renderer.GetType().Name == "DefaultRenderer"
24-
|| (element is MasterDetailPage && Device.Idiom == TargetIdiom.Tablet && !(renderer is TabletMasterDetailRenderer))
25-
|| (element is MasterDetailPage && Device.Idiom == TargetIdiom.Phone && !(renderer is PhoneMasterDetailRenderer))
24+
|| (element is FlyoutPage && Device.Idiom == TargetIdiom.Tablet && !(renderer is TabletMasterDetailRenderer))
25+
|| (element is FlyoutPage && Device.Idiom == TargetIdiom.Phone && !(renderer is PhoneMasterDetailRenderer))
2626
)
2727
{
2828
message = $"Failed to load proper iOS renderer for {element.GetType().Name}";

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22401.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ namespace Xamarin.Forms.Controls.Issues
1010
[NUnit.Framework.Category(Core.UITests.UITestCategories.Bugzilla)]
1111
#endif
1212
[Preserve(AllMembers = true)]
13-
[Issue(IssueTracker.Bugzilla, 22401, "MasterDetailPage detail width broken when landscape", PlatformAffected.iOS, NavigationBehavior.PushAsync)]
14-
public class Bugzilla22401 : MasterDetailPage
13+
[Issue(IssueTracker.Bugzilla, 22401, "FlyoutPage detail width broken when landscape", PlatformAffected.iOS, NavigationBehavior.PushAsync)]
14+
public class Bugzilla22401 : FlyoutPage
1515
{
1616
public Bugzilla22401()
1717
{
@@ -53,7 +53,7 @@ public Bugzilla22401()
5353
})
5454
};
5555

56-
Master = new ContentPage { Title = "master", IconImageSource = "menuIcon.png", Content = listView };
56+
Flyout = new ContentPage { Title = "master", IconImageSource = "menuIcon.png", Content = listView };
5757

5858
listView.ItemSelected += (sender, e) =>
5959
{

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Xamarin.Forms.Controls.Issues
1414
#endif
1515
[Preserve(AllMembers = true)]
1616
[Issue(IssueTracker.Bugzilla, 25979, "https://bugzilla.xamarin.com/show_bug.cgi?id=25979")]
17-
public class Bugzilla25979 : TestNavigationPage // or TestMasterDetailPage, etc ...
17+
public class Bugzilla25979 : TestNavigationPage // or TestFlyoutPage, etc ...
1818
{
1919
[Preserve(AllMembers = true)]
2020
internal sealed class MyPage : ContentPage

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26171.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Xamarin.Forms.Controls.Issues
1919
#endif
2020
[Preserve(AllMembers = true)]
2121
[Issue(IssueTracker.Bugzilla, 26171, "Xamarin.Forms.Maps is not updating VisibleRegion property when layout is changed")]
22-
public class Bugzilla26171 : TestContentPage // or TestMasterDetailPage, etc ...
22+
public class Bugzilla26171 : TestContentPage // or TestFlyoutPage, etc ...
2323
{
2424
protected override void Init()
2525
{

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Xamarin.Forms.Controls.Issues
1717
#endif
1818
[Preserve(AllMembers = true)]
1919
[Issue(IssueTracker.Bugzilla, 26993, "https://bugzilla.xamarin.com/show_bug.cgi?id=26993")]
20-
public class Bugzilla26993 : TestContentPage // or TestMasterDetailPage, etc ...
20+
public class Bugzilla26993 : TestContentPage // or TestFlyoutPage, etc ...
2121
{
2222
[Preserve(AllMembers = true)]
2323
public class Bz26993ViewCell : ViewCell

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27085.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Xamarin.Forms.Controls.Issues
1313
[Category(Core.UITests.UITestCategories.Bugzilla)]
1414
#endif
1515
[Issue(IssueTracker.Bugzilla, 27085, "EntryCell has no possibility to hide keyboard on iOS")]
16-
public class Bugzilla27085 : TestContentPage // or TestMasterDetailPage, etc ...
16+
public class Bugzilla27085 : TestContentPage // or TestFlyoutPage, etc ...
1717
{
1818
protected override void Init()
1919
{

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27350.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Xamarin.Forms.Controls.Issues
1818
#endif
1919
[Preserve(AllMembers = true)]
2020
[Issue(IssueTracker.Bugzilla, 27350, "Binding throws Null Pointer Exception when Updating Tab")]
21-
public class Bugzilla27350 : TestContentPage // or TestMasterDetailPage, etc ...
21+
public class Bugzilla27350 : TestContentPage // or TestFlyoutPage, etc ...
2222
{
2323
protected override void Init()
2424
{

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Xamarin.Forms.Controls.Issues
1515
#endif
1616
[Preserve(AllMembers = true)]
1717
[Issue(IssueTracker.Bugzilla, 27642, "[Windows Phone] Adding a ScrollView control to a ContentView, remove it and re-add it will cause an exception on Windows Phone")]
18-
public class Bugzilla27642 : TestContentPage // or TestMasterDetailPage, etc ...
18+
public class Bugzilla27642 : TestContentPage // or TestFlyoutPage, etc ...
1919
{
2020
ContentView _mainContent;
2121
protected override void Init()

0 commit comments

Comments
 (0)