[Tizen] Refactor compat renderers (dotnet#538)

myroot · Aug 25, 2022 · 87ce3c1 · 87ce3c1
1 parent 8c7ebb8
commit 87ce3c1
Show file tree

Hide file tree

Showing 17 changed files with 808 additions and 103 deletions.
diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
@@ -36,8 +36,6 @@
 #elif TIZEN
 using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
 using Microsoft.Maui.Graphics.Skia;
-using BoxRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.BoxViewRenderer;
-using CollectionViewRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.StructuredItemsViewRenderer;
 using OpenGLViewRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.DefaultRenderer;
 using StreamImagesourceHandler = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.StreamImageSourceHandler;
 using ImageLoaderSourceHandler = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.UriImageSourceHandler;
@@ -101,29 +99,15 @@ public static MauiAppBuilder UseMauiCompatibility(this MauiAppBuilder builder)
 #if TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
 #pragma warning disable CS0612 // Type or member is obsolete
-					handlers.TryAddCompatibilityRenderer(typeof(ContentView), typeof(LayoutRenderer));
 					handlers.TryAddCompatibilityRenderer(typeof(TabbedPage), typeof(TabbedPageRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(NavigationPage), typeof(NavigationPageRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(FlyoutPage), typeof(FlyoutPageRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(ListView), typeof(ListViewRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(Cell), typeof(CellRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(ImageCell), typeof(ImageCellRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(EntryCell), typeof(EntryCellRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(TextCell), typeof(TextCellRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(ViewCell), typeof(ViewCellRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(SwitchCell), typeof(SwitchCellRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(TableView), typeof(TableViewRenderer));
-					handlers.TryAddCompatibilityRenderer(typeof(Frame), typeof(FrameRenderer));
 #pragma warning disable CS0612 // Type or member is obsolete
 #pragma warning disable CS0618 // Type or member is obsolete
 #endif
 					// Shimmed renderers go directly to the registrar to load Image Handlers
 					Internals.Registrar.Registered.Register(typeof(FileImageSource), typeof(FileImageSourceHandler));
 					Internals.Registrar.Registered.Register(typeof(StreamImageSource), typeof(StreamImagesourceHandler));
 					Internals.Registrar.Registered.Register(typeof(UriImageSource), typeof(ImageLoaderSourceHandler));
-#if !TIZEN
 					Internals.Registrar.Registered.Register(typeof(FontImageSource), typeof(FontImageSourceHandler));
-#endif
 					Internals.Registrar.Registered.Register(typeof(Microsoft.Maui.EmbeddedFont), typeof(Microsoft.Maui.EmbeddedFontLoader));
 #endif
 

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/DefaultRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/DefaultRenderer.cs
@@ -17,73 +17,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VisualElement>
 		}
 	}
 
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class EllipseRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class LineRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class PathRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class PolygonRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class PolylineRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class RectangleRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class EntryRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class EditorRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class ButtonRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class RadioButtonRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class SliderRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class WebViewRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class SearchBarRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class SwitchRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class SwipeViewRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class DatePickerRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class TimePickerRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class PickerRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class StepperRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class ProgressBarRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class ActivityIndicatorRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class CheckBoxRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class CarouselPageRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class FlyoutPageRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class RefreshViewRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class ImageButtonRenderer : DefaultRenderer { }
 #pragma warning disable CS0612 // Type or member is obsolete
-	public class NativeViewWrapperRenderer : DefaultRenderer { }
+    public class NativeViewWrapperRenderer : DefaultRenderer { }
 #pragma warning restore CS0612 // Type or member is obsolete
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class ShellRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class CellRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class ImageCellRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class EntryCellRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class TextCellRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class ViewCellRenderer : DefaultRenderer { }
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
-	public class SwitchCellRenderer : DefaultRenderer { }
 }
diff --git a/src/Compatibility/Core/src/Tizen/Renderers/FrameRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/FrameRenderer.cs
@@ -1,12 +1,13 @@
-using Microsoft.Maui.Controls.Platform;
+using System;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using SkiaSharp;
 using Tizen.NUI;
 using Tizen.UIExtensions.NUI;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
 {
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
+	[Obsolete("Use Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer instead")]
 	public class FrameRenderer : LayoutRenderer
 	{
 		static float s_borderWidth = 1.0f;

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/ImageRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/ImageRenderer.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls.Platform;
@@ -120,4 +121,12 @@ public sealed class StreamImageSourceHandler : IImageSourceHandler
 			return false;
 		}
 	}
+
+	public sealed class FontImageSourceHandler : IImageSourceHandler
+	{
+		public Task<bool> LoadImageAsync(NUIImage image, ImageSource imageSource, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			throw new NotSupportedException($"FontImageSource: {imageSource}");
+		}
+	}
 }
diff --git a/src/Compatibility/Core/src/Tizen/Renderers/ListViewRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/ListViewRenderer.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Microsoft.Maui.Controls.Platform;
 using Tizen.UIExtensions.NUI;
@@ -7,7 +8,7 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
 {
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
+	[Obsolete("Use Microsoft.Maui.Controls.Platform.Compatibility.ListViewRenderer instead")]
 	public class ListViewRenderer : ViewRenderer<ListView, TCollectionView>
 	{
 		bool _isUpdateFromUI;

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/TabbedPageRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/TabbedPageRenderer.cs
@@ -1,5 +1,6 @@
 #nullable enable
 
+using System;
 using System.Linq;
 using Microsoft.Maui.Controls.Platform;
 using Tizen.NUI;
@@ -12,7 +13,7 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
 {
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
+	[Obsolete("Use Microsoft.Maui.Controls.Platform.Compatibility.TabbedRenderer instead")]
 	public class TabbedPageRenderer : VisualElementRenderer<TabbedPage>
 	{
 		NCollectionView? _tabbedView;

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/TableViewRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/TableViewRenderer.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
 {
-	[System.Obsolete(Compatibility.Hosting.MauiAppBuilderExtensions.UseMapperInstead)]
+	[Obsolete("Use Microsoft.Maui.Controls.Platform.Compatibility.TableViewRenderer instead")]
 	public class TableViewRenderer : ViewRenderer<TableView, TCollectionView>
 	{
 		List<Cell> _items = new List<Cell>();

diff --git a/src/Controls/samples/Controls.Sample/MauiProgram.cs b/src/Controls/samples/Controls.Sample/MauiProgram.cs
@@ -39,9 +39,6 @@ public static MauiApp CreateMauiApp()
 			var appBuilder = MauiApp.CreateBuilder();
 
 			appBuilder.UseMauiApp<XamlApp>();
-#if TIZEN
-			appBuilder.UseMauiCompatibility();
-#endif
 			var services = appBuilder.Services;
 
 			if (UseMauiGraphicsSkia)