Frame Compatibility Handlers (#4210)

* Frame Compat Handlers * - gallery fixes * - fix up property change and autopackaging * - add mappers * - fix up frame renderer mappers * - fix WinUI Measure calls * - fix containerview return * - fix android measure * - fix layout call * - fix handler registrations * - clean up apphost registration * - disable swipeview on iOS for now * - fix iOS shadow * - revert mapper fix * - simplify containerview check Co-authored-by: Redth <jondick@gmail.com>
dotnet · Jan 21, 2022 · e567ad2 · e567ad2
1 parent 863b2f7
commit e567ad2
Show file tree

Hide file tree

Showing 30 changed files with 917 additions and 84 deletions.
diff --git a/src/Compatibility/ControlGallery/src/Android/_5724CustomRenderers.cs b/src/Compatibility/ControlGallery/src/Android/_5724CustomRenderers.cs
@@ -54,12 +54,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 		}
 	}
 
-	public class CustomFrameRenderer5724 :
-#if !LEGACY_RENDERERS
-		Compatibility.Platform.Android.FastRenderers.FrameRenderer
-#else
-		FrameRenderer
-#endif
+	public class CustomFrameRenderer5724 : Handlers.Compatibility.FrameRenderer
 	{
 		public CustomFrameRenderer5724(Context context) : base(context)
 		{

diff --git a/src/Compatibility/ControlGallery/src/iOS/CustomRenderers/_9774CustomRenderer.cs b/src/Compatibility/ControlGallery/src/iOS/CustomRenderers/_9774CustomRenderer.cs
@@ -10,7 +10,7 @@
 [assembly: ExportRenderer(typeof(CustomFrame9974), typeof(_9774CustomRenderer))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.iOS.CustomRenderers
 {
-	public class _9774CustomRenderer : FrameRenderer
+	public class _9774CustomRenderer : Handlers.Compatibility.FrameRenderer
 	{
 		public _9774CustomRenderer()
 		{

diff --git a/src/Compatibility/ControlGallery/src/iOS/CustomRenderers/_CustomFrame10348Renderer.cs b/src/Compatibility/ControlGallery/src/iOS/CustomRenderers/_CustomFrame10348Renderer.cs
@@ -11,7 +11,7 @@
 [assembly: ExportRenderer(typeof(CustomFrame10348), typeof(_CustomFrame10348Renderer))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.iOS.CustomRenderers
 {
-	public class _CustomFrame10348Renderer : FrameRenderer
+	public class _CustomFrame10348Renderer : Handlers.Compatibility.FrameRenderer
 	{
 		protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
 		{

diff --git a/src/Compatibility/ControlGallery/src/iOS/PerformanceTrackerRenderer.cs b/src/Compatibility/ControlGallery/src/iOS/PerformanceTrackerRenderer.cs
@@ -234,7 +234,7 @@ protected override void Dispose(bool disposing)
 		}
 	}
 
-	public class PerformanceTrackingFrame : FrameRenderer, IDrawnObservable
+	public class PerformanceTrackingFrame : Handlers.Compatibility.FrameRenderer, IDrawnObservable
 	{
 		readonly SubviewWatcher<PerformanceTrackingFrame> _watcher;
 		int _Drawn;

diff --git a/src/Compatibility/Core/src/Android/AppCompat/FrameRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/FrameRenderer.cs
@@ -1,9 +1,11 @@
+using System;
 using Android.Content;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat
 {
 	// This version of FrameRenderer is here for backward compatibility with anyone referencing 
 	// FrameRenderer from this namespace
+	[Obsolete("Use Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer instead")]
 	public class FrameRenderer : FastRenderers.FrameRenderer
 	{
 		public FrameRenderer(Context context) : base(context)

diff --git a/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
@@ -14,6 +14,7 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers
 {
+	[Obsolete("Use Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer instead")]
 	public class FrameRenderer : CardView, IVisualElementRenderer, IViewRenderer, ITabStop
 	{
 		float _defaultElevation = -1f;

diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
@@ -80,8 +80,8 @@ static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 					handlers.AddHandler(typeof(ViewCell), typeof(Handlers.Compatibility.ViewCellRenderer));
 					handlers.AddHandler(typeof(SwitchCell), typeof(Handlers.Compatibility.SwitchCellRenderer));
 					handlers.AddHandler(typeof(TableView), typeof(Handlers.Compatibility.TableViewRenderer));
-
-					handlers.TryAddCompatibilityRenderer(typeof(Frame), typeof(FrameRenderer));
+					handlers.AddHandler(typeof(Frame), typeof(Handlers.Compatibility.FrameRenderer));
+          
 					handlers.TryAddCompatibilityRenderer(typeof(BoxView), typeof(BoxRenderer));
 					handlers.TryAddCompatibilityRenderer(typeof(Entry), typeof(EntryRenderer));
 					handlers.TryAddCompatibilityRenderer(typeof(Editor), typeof(EditorRenderer));