Skip to content

Commit 10e3176

Browse files
committed
Remove more obsolete from MasterDetailPage
1 parent 790797a commit 10e3176

File tree

3 files changed

+1
-29
lines changed

3 files changed

+1
-29
lines changed

src/Compatibility/ControlGallery/src/Android/CustomRenderers.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,13 @@ public AttachedStateEffectLabelRenderer(Context context) : base(context)
183183
}
184184
}
185185

186-
public class NativeDroidFlyoutPage : Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat.MasterDetailPageRenderer
186+
public class NativeDroidFlyoutPage : FlyoutPageRenderer
187187
{
188188
FlyoutPage _page;
189189
bool _disposed;
190190

191191
public NativeDroidFlyoutPage(Context context) : base(context)
192192
{
193-
System.Diagnostics.Debug.WriteLine($">>>>> NativeDroidMasterDetail NativeDroidMasterDetail 53: This is the obsolete constructor being selected");
194193
}
195194

196195
protected override void OnElementChanged(VisualElement oldElement, VisualElement newElement)

src/Compatibility/ControlGallery/src/iOS/RegistrarValidationService.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,6 @@ public bool Validate(VisualElement element, out string message)
1919

2020
var renderer = Platform.iOS.Platform.CreateRenderer(element);
2121

22-
#pragma warning disable CS0618 // Type or member is obsolete
23-
if (element is MasterDetailPage)
24-
{
25-
if (renderer == null
26-
|| renderer.GetType().Name == "DefaultRenderer"
27-
|| (Device.Idiom == TargetIdiom.Tablet && !(renderer is TabletMasterDetailRenderer))
28-
|| (Device.Idiom == TargetIdiom.Phone && !(renderer is PhoneMasterDetailRenderer))
29-
)
30-
{
31-
message = $"Failed to load proper iOS renderer for {element.GetType().Name}";
32-
return false;
33-
}
34-
35-
return true;
36-
}
37-
#pragma warning restore CS0618 // Type or member is obsolete
38-
3922
if (renderer == null
4023
|| renderer.GetType().Name == "DefaultRenderer"
4124
|| (element is FlyoutPage && Device.Idiom == TargetIdiom.Tablet && !(renderer is TabletFlyoutPageRenderer))

src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -498,13 +498,3 @@ void UpdateSplitViewLayout()
498498
}
499499
}
500500
}
501-
502-
namespace Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat
503-
{
504-
public class MasterDetailPageRenderer : FlyoutPageRenderer
505-
{
506-
public MasterDetailPageRenderer(Context context) : base(context)
507-
{
508-
}
509-
}
510-
}

0 commit comments

Comments
 (0)